diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/files.cmake b/BlueBerry/Bundles/org.blueberry.core.commands/files.cmake
index 1ee3011459..163e67c47c 100644
--- a/BlueBerry/Bundles/org.blueberry.core.commands/files.cmake
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/files.cmake
@@ -1,59 +1,67 @@
 set(MOC_H_FILES
+  src/berryAbstractHandler.h
+
   src/internal/berryPluginActivator.h
 )
 
 set(SRC_CPP_FILES
   berryAbstractHandler.cpp
+  berryAbstractHandlerWithState.cpp
   berryCommand.cpp
   berryCommandCategory.cpp
   berryCommandCategoryEvent.cpp
   berryCommandEvent.cpp
   berryCommandManager.cpp
   berryCommandManagerEvent.cpp
   berryExecutionEvent.cpp
   berryHandlerEvent.cpp
   berryICommandCategoryListener.cpp
   berryICommandListener.cpp
   berryICommandManagerListener.cpp
   berryIExecutionListener.cpp
   berryIExecutionListenerWithChecks.cpp
+  berryIHandler.h
   berryIHandlerListener.cpp
   berryINamedHandleStateIds.cpp
+  berryIObjectWithState.h
+  berryIParameter.h
   berryIParameterTypeListener.cpp
+  berryIParameterValueConverter.cpp
+  berryIParameterValues.cpp
   berryIStateListener.cpp
   berryNamedHandleObjectWithState.cpp
   berryParameterization.cpp
   berryParameterizedCommand.cpp
   berryParameterType.cpp
   berryParameterTypeEvent.cpp
   berryState.cpp
 
   util/berryCommandTracing.cpp
 )
 
 set(COMMON_CPP_FILES
   berryAbstractBitSetEvent.cpp
   berryAbstractHandleObjectEvent.cpp
   berryAbstractNamedHandleEvent.cpp
   berryCommandExceptions.cpp
   berryHandleObject.cpp
   berryHandleObjectManager.cpp
   berryNamedHandleObject.cpp
 )
 
 set(INTERNAL_CPP_FILES
   berryCommandUtils.cpp
   berryPluginActivator.cpp
 )
 
 foreach(file ${SRC_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/${file})
 endforeach(file ${SRC_CPP_FILES})
 
 foreach(file ${COMMON_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/common/${file})
 endforeach(file ${COMMON_CPP_FILES})
 
 foreach(file ${INTERNAL_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/internal/${file})
 endforeach(file ${INTERNAL_CPP_FILES})
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryAbstractHandler.cpp b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryAbstractHandler.cpp
index 512a980a11..a7bfb6823b 100644
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryAbstractHandler.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryAbstractHandler.cpp
@@ -1,48 +1,85 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryAbstractHandler.h"
 
+#include "berryHandlerEvent.h"
+
 namespace berry
 {
 
 AbstractHandler::AbstractHandler() :
   baseEnabled(true)
 {
 
 }
 
-bool AbstractHandler::IsEnabled()
+void AbstractHandler::AddHandlerListener(IHandlerListener *handlerListener)
+{
+  handlerListeners.AddListener(handlerListener);
+}
+
+void AbstractHandler::Dispose()
+{
+  // Do nothing.
+}
+
+bool AbstractHandler::IsEnabled() const
 {
   return baseEnabled;
 }
 
-bool AbstractHandler::IsHandled()
+void AbstractHandler::SetEnabled(const Object::Pointer& /*evaluationContext*/)
+{
+}
+
+bool AbstractHandler::IsHandled() const
 {
   return true;
 }
 
+void AbstractHandler::RemoveHandlerListener(IHandlerListener *handlerListener)
+{
+  handlerListeners.RemoveListener(handlerListener);
+}
+
+void AbstractHandler::FireHandlerChanged(const SmartPointer<HandlerEvent>& handlerEvent)
+{
+  if (handlerEvent.IsNull())
+  {
+    throw ctkInvalidArgumentException("Cannot fire a null handler event");
+  }
+
+  handlerListeners.handlerChanged(handlerEvent);
+}
+
 void AbstractHandler::SetBaseEnabled(bool state)
 {
   if (baseEnabled == state)
   {
     return;
   }
   baseEnabled = state;
-  //fireHandlerChanged(new HandlerEvent(this, true, false));
+  HandlerEvent::Pointer event(new HandlerEvent(IHandler::Pointer(this), true, false));
+  FireHandlerChanged(event);
+}
+
+bool AbstractHandler::HasListeners() const
+{
+  return handlerListeners.handlerChanged.HasListeners();
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryAbstractHandler.h b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryAbstractHandler.h
index 57e6140f9b..6679f6c7f8 100644
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryAbstractHandler.h
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryAbstractHandler.h
@@ -1,172 +1,163 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYABSTRACTHANDLER_H_
 #define BERRYABSTRACTHANDLER_H_
 
 #include "berryIHandler.h"
+#include "berryIHandlerListener.h"
+
 #include <org_blueberry_core_commands_Export.h>
 
 namespace berry {
 
 /**
  * <p>
  * This class is a partial implementation of <code>IHandler</code>. This
  * abstract implementation provides support for handler listeners. You should
  * subclass from this class unless you want to implement your own listener
  * support. Subclasses should call
  * {@link AbstractHandler#fireHandlerChanged(HandlerEvent)}when the handler
  * changes. Subclasses can also override {@link AbstractHandler#isEnabled()} and
  * {@link AbstractHandler#isHandled()}.
  * </p>
- *
- * @since 3.1
  */
-class BERRY_COMMANDS AbstractHandler : public IHandler { // ,public EventManager {
+class BERRY_COMMANDS AbstractHandler : public QObject, public IHandler { // ,public EventManager {
+
+  Q_OBJECT
+  Q_INTERFACES(berry::IHandler)
 
 public:
   berryObjectMacro(AbstractHandler);
 
 private:
 
   /**
    * Track this base class enabled state.
-   *
-   * @since 3.4
    */
   bool baseEnabled;
 
+  IHandlerListener::Events handlerListeners;
 
 public:
 
   AbstractHandler();
 
   /**
    * @see IHandler#addHandlerListener(IHandlerListener)
    */
-//  void AddHandlerListener(final IHandlerListener handlerListener) {
-//    addListenerObject(handlerListener);
-//  }
+  void AddHandlerListener(IHandlerListener* handlerListener);
 
   /**
    * The default implementation does nothing. Subclasses who attach listeners
    * to other objects are encouraged to detach them in this method.
    *
-   * @see org.blueberry.core.commands.IHandler#dispose()
+   * @see IHandler#Dispose()
    */
-  ~AbstractHandler() {
-    // Do nothing.
-  }
+  void Dispose();
 
   /**
    * Whether this handler is capable of executing at this time. Subclasses may
    * override this method. If clients override this method they should also
    * consider overriding {@link #setEnabled(Object)} so they can be notified
    * about framework execution contexts.
    *
    * @return <code>true</code>
    * @see #setEnabled(Object)
    * @see #setBaseEnabled(boolean)
    */
-  bool IsEnabled();
+  bool IsEnabled() const;
+
+  /**
+   * Called by the framework to allow the handler to update its enabled state
+   * by extracting the same information available at execution time. Clients
+   * may override if they need to extract information from the application
+   * context.
+   *
+   * @param evaluationContext
+   *            the application context. May be <code>null</code>
+   * @see #SetBaseEnabled(bool)
+   */
+  void SetEnabled(const Object::Pointer& evaluationContext);
 
   /**
    * Whether this handler is capable of handling delegated responsibilities at
    * this time. Subclasses may override this method.
    *
    * @return <code>true</code>
    */
-  bool IsHandled();
+  bool IsHandled() const;
 
   /**
    * @see IHandler#removeHandlerListener(IHandlerListener)
    */
-//  void RemoveHandlerListener(final IHandlerListener handlerListener) {
-//    removeListenerObject(handlerListener);
-//  }
-
+  void RemoveHandlerListener(IHandlerListener* handlerListener);
 
 protected:
 
   /**
    * Fires an event to all registered listeners describing changes to this
    * instance.
    * <p>
    * Subclasses may extend the definition of this method (i.e., if a different
    * type of listener can be attached to a subclass). This is used primarily
    * for support of <code>AbstractHandler</code> in
    * <code>org.blueberry.ui.workbench</code>, and clients should be wary of
    * overriding this behaviour. If this method is overridden, then the first
    * line of the method should be "<code>super.fireHandlerChanged(handlerEvent);</code>".
    * </p>
    *
    * @param handlerEvent
    *            the event describing changes to this instance. Must not be
    *            <code>null</code>.
    */
-//  void FireHandlerChanged(final HandlerEvent handlerEvent) {
-//    if (handlerEvent == null) {
-//      throw new NullPointerException();
-//    }
-//
-//    final Object[] listeners = getListeners();
-//    for (int i = 0; i < listeners.length; i++) {
-//      final IHandlerListener listener = (IHandlerListener) listeners[i];
-//      listener.handlerChanged(handlerEvent);
-//    }
-//  }
-
-
+  void FireHandlerChanged(const SmartPointer<HandlerEvent>& handlerEvent);
 
   /**
    * Allow the default {@link #isEnabled()} to answer our enabled state. It
    * will fire a HandlerEvent if necessary. If clients use this method they
    * should also consider overriding {@link #setEnabled(Object)} so they can
    * be notified about framework execution contexts.
    *
    * @param state
    *            the enabled state
-   * @since 3.4
    */
   void SetBaseEnabled(bool state);
 
   /**
    * <p>
    * Returns true iff there is one or more IHandlerListeners attached to this
    * AbstractHandler.
    * </p>
    * <p>
    * Subclasses may extend the definition of this method (i.e., if a different
    * type of listener can be attached to a subclass). This is used primarily
    * for support of <code>AbstractHandler</code> in
-   * <code>org.blueberry.ui.workbench</code>, and clients should be wary of
+   * <code>org.blueberry.ui.qt</code>, and clients should be wary of
    * overriding this behaviour. If this method is overridden, then the return
    * value should include "<code>super.hasListeners() ||</code>".
    * </p>
    *
    * @return true iff there is one or more IHandlerListeners attached to this
    *         AbstractHandler
    */
-//  bool HasListeners() {
-//    return isListenerAttached();
-//  }
-
+  virtual bool HasListeners() const;
 
 };
 
 }
 
 #endif /*BERRYABSTRACTHANDLER_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryAbstractHandlerWithState.cpp b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryAbstractHandlerWithState.cpp
new file mode 100644
index 0000000000..8e3827ad1a
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryAbstractHandlerWithState.cpp
@@ -0,0 +1,62 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berryAbstractHandlerWithState.h"
+
+#include "berryState.h"
+
+namespace berry {
+
+void AbstractHandlerWithState::AddState(const QString& stateId, const SmartPointer<State>& state)
+{
+  if (state.IsNull())
+  {
+    throw ctkInvalidArgumentException("Cannot add a null state");
+  }
+
+  states.insert(stateId, state);
+  state->AddListener(this);
+  HandleStateChange(state, Object::Pointer(0));
+}
+
+SmartPointer<State> AbstractHandlerWithState::GetState(const QString& stateId) const
+{
+  QHash<QString,State::Pointer>::const_iterator i = states.find(stateId);
+  if (i != states.end()) return *i;
+  return State::Pointer(0);
+}
+
+QList<QString> AbstractHandlerWithState::GetStateIds() const
+{
+  return states.keys();
+}
+
+void AbstractHandlerWithState::RemoveState(const QString& stateId)
+{
+  if (stateId.isNull())
+  {
+    throw ctkInvalidArgumentException("Cannot remove a null state");
+  }
+
+  QHash<QString,State::Pointer>::iterator i = states.find(stateId);
+  if (i != states.end())
+  {
+    (*i)->RemoveListener(this);
+    states.erase(i);
+  }
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryAbstractHandlerWithState.h b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryAbstractHandlerWithState.h
new file mode 100644
index 0000000000..07fba499ca
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryAbstractHandlerWithState.h
@@ -0,0 +1,101 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYABSTRACTHANDLERWITHSTATE_H
+#define BERRYABSTRACTHANDLERWITHSTATE_H
+
+#include "berryAbstractHandler.h"
+#include "berryIObjectWithState.h"
+#include "berryIStateListener.h"
+
+#include <org_blueberry_core_commands_Export.h>
+
+namespace berry {
+
+class State;
+
+/**
+ * <p>
+ * An abstract implementation of {@link IObjectWithState}. This provides basic
+ * handling for adding and remove state. When state is added, the handler
+ * attaches itself as a listener and fire a handleStateChange event to notify
+ * this handler. When state is removed, the handler removes itself as a
+ * listener.
+ * </p>
+ * <p>
+ * Clients may extend this class.
+ * </p>
+ */
+class BERRY_COMMANDS AbstractHandlerWithState : public AbstractHandler, public IObjectWithState,
+    protected IStateListener
+{
+
+private:
+
+  /**
+   * The map of states currently held by this handler. If this handler has no
+   * state (generally, when inactive), then this will be <code>null</code>.
+   */
+  QHash<QString,SmartPointer<State> > states;
+
+public:
+
+  berryObjectMacro(berry::AbstractHandlerWithState)
+
+  /**
+   * <p>
+   * Adds a state to this handler. This will add this handler as a listener to
+   * the state, and then fire a handleStateChange so that the handler can
+   * respond to the incoming state.
+   * </p>
+   * <p>
+   * Clients may extend this method, but they should call this super method
+   * first before doing anything else.
+   * </p>
+   *
+   * @param stateId
+   *            The identifier indicating the type of state being added; must
+   *            not be <code>null</code>.
+   * @param state
+   *            The state to add; must not be <code>null</code>.
+   */
+  void AddState(const QString& stateId, const SmartPointer<State>& state);
+
+  SmartPointer<State> GetState(const QString& stateId) const;
+
+  QList<QString> GetStateIds() const;
+
+  /**
+   * <p>
+   * Removes a state from this handler. This will remove this handler as a
+   * listener to the state. No event is fired to notify the handler of this
+   * change.
+   * </p>
+   * <p>
+   * Clients may extend this method, but they should call this super method
+   * first before doing anything else.
+   * </p>
+   *
+   * @param stateId
+   *            The identifier of the state to remove; must not be
+   *            <code>null</code>.
+   */
+  void RemoveState(const QString& stateId);
+};
+
+}
+
+#endif // BERRYABSTRACTHANDLERWITHSTATE_H
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommand.cpp b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommand.cpp
index 654256f3ff..c1bfc88bd3 100644
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommand.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommand.cpp
@@ -1,560 +1,559 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryCommand.h"
 
 #include "berryIParameter.h"
 #include "berryITypedParameter.h"
 #include "berryIHandler.h"
 #include "berryIHandlerListener.h"
 #include "berryIParameterValueConverter.h"
 #include "berryHandlerEvent.h"
 #include "berryCommandEvent.h"
 #include "berryExecutionEvent.h"
 #include "berryCommandCategory.h"
+#include "berryState.h"
 
 #include "util/berryCommandTracing.h"
 #include "internal/berryCommandUtils.h"
 
 #include <QTextStream>
 
 namespace berry {
 
-bool Command::DEBUG_COMMAND_EXECUTION = false;
+bool Command::DEBUG_COMMAND_EXECUTION = true;
 
-bool Command::DEBUG_HANDLERS = false;
+bool Command::DEBUG_HANDLERS = true;
 
 QString Command::DEBUG_HANDLERS_COMMAND_ID = "";
 
 
 Command::Command(const QString& id)
   : NamedHandleObjectWithState(id)
 {
 }
 
 void Command::AddCommandListener(ICommandListener* commandListener)
 {
   if (!commandListener)
   {
     throw ctkInvalidArgumentException("Cannot add a null command listener");
   }
   commandEvents.AddListener(commandListener);
 }
 
 void Command::AddExecutionListener(IExecutionListener* executionListener)
 {
   if (!executionListener)
   {
     throw ctkInvalidArgumentException("Cannot add a null execution listener");
   }
   executionEvents.AddListener(executionListener);
 }
 
-void Command::AddState(const QString& id, const State::Pointer state)
+void Command::AddState(const QString& id, const State::Pointer& state)
 {
   NamedHandleObjectWithState::AddState(id, state);
   state->SetId(id);
   if (IObjectWithState::Pointer stateHandler = handler.Cast<IObjectWithState>())
   {
     stateHandler->AddState(id, state);
   }
 }
 
 bool Command::operator<(const Object* object) const
 {
   const Command* castedObject = dynamic_cast<const Command*>(object);
   int compareTo = CommandUtils::CompareObj(category, castedObject->category);
   if (compareTo == 0)
   {
     compareTo = CommandUtils::Compare(defined, castedObject->defined);
     if (compareTo == 0)
     {
       compareTo = CommandUtils::Compare(description, castedObject->description);
       if (compareTo == 0)
       {
         compareTo = CommandUtils::CompareObj(handler, castedObject->handler);
         if (compareTo == 0)
         {
           compareTo = CommandUtils::Compare(id, castedObject->id);
           if (compareTo == 0)
           {
             compareTo = CommandUtils::Compare(name, castedObject->name);
             if (compareTo == 0)
             {
               compareTo = CommandUtils::Compare(parameters,
                                                 castedObject->parameters);
             }
           }
         }
       }
     }
   }
   return compareTo < 0;
 }
 
 void Command::Define(const QString& name, const QString& description,
                      const CommandCategory::Pointer category,
                      const QList<IParameter::Pointer>& parameters,
                      const ParameterType::Pointer& returnType,
                      const QString& helpContextId)
 {
   if (name == "")
   {
     throw ctkInvalidArgumentException("The name of a command cannot be empty");
   }
 
   if (!category)
   {
     throw ctkInvalidArgumentException("The category of a command cannot be null");
   }
 
   const bool definedChanged = !this->defined;
   this->defined = true;
 
   const bool nameChanged = this->name != name;
   this->name = name;
 
   const bool descriptionChanged = this->description != description;
   this->description = description;
 
   const bool categoryChanged = this->category != category;
   this->category = category;
 
   const bool parametersChanged = !CommandUtils::Equals(this->parameters,
                                                        parameters);
   this->parameters = parameters;
 
   const bool returnTypeChanged = this->returnType != returnType;
   this->returnType = returnType;
 
   const bool helpContextIdChanged = this->helpContextId != helpContextId;
   this->helpContextId = helpContextId;
 
   CommandEvent::Pointer event(new CommandEvent(Command::Pointer(this), categoryChanged,
                                                definedChanged, descriptionChanged, false, nameChanged,
                                                parametersChanged, returnTypeChanged, helpContextIdChanged));
   this->FireCommandChanged(event);
 }
 
 Object::Pointer Command::ExecuteWithChecks(const ExecutionEvent::ConstPointer event)
 {
   this->FirePreExecute(event);
   const IHandler::Pointer handler(this->handler);
 
   if (!this->IsDefined())
   {
     const NotDefinedException exception(
           "Trying to execute a command that is not defined. " + this->GetId());
     this->FireNotDefined(&exception);
     throw exception;
   }
 
   // Perform the execution, if there is a handler.
   if (handler && handler->IsHandled())
   {
     this->SetEnabled(event->GetApplicationContext());
     if (!this->IsEnabled()) {
       const NotEnabledException exception(
             "Trying to execute the disabled command " + this->GetId());
       this->FireNotEnabled(&exception);
       throw exception;
     }
 
     try
     {
       const Object::Pointer returnValue(handler->Execute(event));
       this->FirePostExecuteSuccess(returnValue);
       return returnValue;
     }
     catch (const ExecutionException* e)
     {
       this->FirePostExecuteFailure(e);
       throw e;
     }
   }
 
   const NotHandledException e(
         "There is no handler to execute for command " + this->GetId());
   this->FireNotHandled(&e);
   throw e;
 }
 
 void Command::FireCommandChanged(const CommandEvent::ConstPointer commandEvent)
 {
   if (!commandEvent)
   {
     throw ctkInvalidArgumentException("Cannot fire a null event");
   }
 
   try
   {
     commandEvents.commandChanged(commandEvent);
   }
   catch (...)
   {
     //TODO log exceptions?
   }
 }
 
 void Command::FireNotDefined(const NotDefinedException* e)
 {
   // Debugging output
   if (DEBUG_COMMAND_EXECUTION)
   {
     CommandTracing::PrintTrace("COMMANDS", "execute" + CommandTracing::SEPARATOR
                                + "not defined: id=" + this->GetId() + "; exception=" + e->what());
   }
 
   executionEvents.notDefined(this->GetId(), e);
 }
 
 void Command::FireNotEnabled(const NotEnabledException* e)
 {
   // Debugging output
   if (DEBUG_COMMAND_EXECUTION)
   {
     CommandTracing::PrintTrace("COMMANDS", "execute" + CommandTracing::SEPARATOR
                                + "not enabled: id=" + this->GetId() + "; exception=" + e->what());
   }
 
   executionEvents.notEnabled(this->GetId(), e);
 }
 
 void Command::FireNotHandled(const NotHandledException* e)
 {
   // Debugging output
   if (DEBUG_COMMAND_EXECUTION) {
     CommandTracing::PrintTrace("COMMANDS", "execute" + CommandTracing::SEPARATOR
                                + "not handled: id=" + this->GetId() + "; exception=" + e->what());
   }
 
   executionEvents.notHandled(this->GetId(), e);
 }
 
 void Command::FirePostExecuteFailure(const ExecutionException* e)
 {
   // Debugging output
   if (DEBUG_COMMAND_EXECUTION)
   {
     CommandTracing::PrintTrace("COMMANDS", "execute" + CommandTracing::SEPARATOR
                                + "failure: id=" + this->GetId() + "; exception=" + e->what());
   }
 
   executionEvents.postExecuteFailure(this->GetId(), e);
 }
 
 void Command::FirePostExecuteSuccess(const Object::Pointer returnValue)
 {
   // Debugging output
   if (DEBUG_COMMAND_EXECUTION)
   {
     CommandTracing::PrintTrace("COMMANDS", "execute" + CommandTracing::SEPARATOR
-                               + "success: id=" + this->GetId() + "; returnValue=" + returnValue->ToString());
+                               + "success: id=" + this->GetId() + "; returnValue=" +
+                               (returnValue.IsNull() ? QString("NULL") : returnValue->ToString()));
   }
 
   executionEvents.postExecuteSuccess(this->GetId(), returnValue);
 }
 
 void Command::FirePreExecute(const ExecutionEvent::ConstPointer event)
 {
   // Debugging output
   if (DEBUG_COMMAND_EXECUTION)
   {
     CommandTracing::PrintTrace("COMMANDS", "execute" + CommandTracing::SEPARATOR
                                + "starting: id=" + this->GetId() + "; event=" + event->ToString());
   }
 
   executionEvents.preExecute(this->GetId(), event);
 }
 
 IHandler::Pointer Command::GetHandler() const
 {
   return handler;
 }
 
 QString Command::GetHelpContextId() const
 {
   return helpContextId;
 }
 
 IParameter::Pointer Command::GetParameter(const QString& parameterId) const
 {
   if (!this->IsDefined())
   {
     throw NotDefinedException(
           "Cannot get a parameter from an undefined command. " + id);
   }
 
-  for (unsigned int i = 0; i < parameters.size(); i++)
+  for (int i = 0; i < parameters.size(); i++)
   {
     IParameter::Pointer parameter(parameters[i]);
     if (parameter->GetId() == parameterId) {
       return parameter;
     }
   }
 
   return IParameter::Pointer(0);
 }
 
 QList<SmartPointer<IParameter> > Command::GetParameters() const
 {
   if (!this->IsDefined())
   {
     throw NotDefinedException(
           "Cannot get the parameters from an undefined command. " + id);
   }
 
   return parameters;
 }
 
 ParameterType::Pointer Command::GetParameterType(const QString& parameterId) const
 {
   const IParameter::Pointer parameter(this->GetParameter(parameterId));
   if (ITypedParameter::Pointer parameterWithType = parameter.Cast<ITypedParameter>())
   {
     return parameterWithType->GetParameterType();
   }
   return ParameterType::Pointer(0);
 }
 
 ParameterType::Pointer Command::GetReturnType() const
 {
   if (!this->IsDefined())
   {
     throw NotDefinedException(
           "Cannot get the return type of an undefined command. " + id);
   }
 
   return returnType;
 }
 
 bool Command::IsEnabled() const
 {
   if (!handler)
   {
     return false;
   }
 
   return handler->IsEnabled();
 }
 
-void Command::SetEnabled(Object::ConstPointer evaluationContext)
+void Command::SetEnabled(const Object::Pointer& evaluationContext)
 {
-  handler->SetEnabled(evaluationContext);
+  if (handler)
+  {
+    handler->SetEnabled(evaluationContext);
+  }
 }
 
 bool Command::IsHandled() const
 {
   if (!handler)
   {
     return false;
   }
 
   return handler->IsHandled();
 }
 
 void Command::RemoveCommandListener(ICommandListener *commandListener)
 {
   if (!commandListener)
   {
     throw ctkInvalidArgumentException(
           "Cannot remove a null command listener");
   }
 
   commandEvents.RemoveListener(commandListener);
 }
 
 /**
    * Removes a listener from this command.
    *
    * @param executionListener
    *            The listener to be removed; must not be <code>null</code>.
    *
    */
 void Command::RemoveExecutionListener(IExecutionListener* executionListener)
 {
   if (!executionListener)
   {
     throw Poco::NullPointerException(
           "Cannot remove a null execution listener");
   }
   executionEvents.RemoveListener(executionListener);
 }
 
 void Command::RemoveState(const QString& stateId)
 {
   if (IObjectWithState::Pointer stateHandler = handler.Cast<IObjectWithState>())
   {
     stateHandler->RemoveState(stateId);
   }
   NamedHandleObjectWithState::RemoveState(stateId);
 }
 
 bool Command::SetHandler(const IHandler::Pointer handler)
 {
   if (handler == this->handler)
   {
     return false;
   }
 
   // Swap the state around.
-  const QStringList stateIds(this->GetStateIds());
-  for (unsigned int i = 0; i < stateIds.size(); ++i)
+  const QList<QString> stateIds(this->GetStateIds());
+  for (int i = 0; i < stateIds.size(); ++i)
   {
     const QString stateId = stateIds[i];
     if (IObjectWithState::Pointer stateHandler = this->handler.Cast<IObjectWithState>())
     {
       stateHandler->RemoveState(stateId);
     }
     if (IObjectWithState::Pointer stateHandler = handler.Cast<IObjectWithState>())
     {
       const State::Pointer stateToAdd(this->GetState(stateId));
       stateHandler->AddState(stateId, stateToAdd);
     }
   }
 
   bool enabled = this->IsEnabled();
   if (this->handler)
   {
     this->handler->RemoveHandlerListener(this->GetHandlerListener());
   }
 
   // Update the handler, and flush the string representation.
   this->handler = handler;
   if (this->handler)
   {
     this->handler->AddHandlerListener(this->GetHandlerListener());
   }
   this->str = "";
 
   // Debugging output
   if ((DEBUG_HANDLERS)
       && ((DEBUG_HANDLERS_COMMAND_ID.isEmpty()) || (DEBUG_HANDLERS_COMMAND_ID == id)))
   {
     QString buffer("Command('");
     buffer += id + "') has changed to ";
     if (!handler) {
       buffer += "no handler";
     } else {
       buffer += "\'" + handler->ToString() + "' as its handler";
     }
     CommandTracing::PrintTrace("HANDLERS", buffer);
   }
 
   // Send notification
   CommandEvent::Pointer cmdEvent(new CommandEvent(Command::Pointer(this), false, false, false, true,
                                                   false, false, false, false, enabled != this->IsEnabled()));
   this->FireCommandChanged(cmdEvent);
 
   return true;
 }
 
-SmartPointer<IHandlerListener> Command::GetHandlerListener()
+IHandlerListener* Command::GetHandlerListener()
 {
-  if (!handlerListener)
-  {
-    struct HandlerListener : public IHandlerListener
-    {
-      HandlerListener(Command* command) : command(command) {}
-
-      void HandlerChanged(SmartPointer<HandlerEvent> handlerEvent)
-      {
-        bool enabledChanged = handlerEvent->IsEnabledChanged();
-        bool handledChanged = handlerEvent->IsHandledChanged();
-        CommandEvent::Pointer cmdEvent(new CommandEvent(Command::Pointer(command), false,
-                                                        false, false, handledChanged, false, false, false,
-                                                        false, enabledChanged));
-        command->FireCommandChanged(cmdEvent);
-      }
+  return this;
+}
 
-    private:
-      Command* command;
-    };
-    handlerListener = new HandlerListener(this);
-  }
-  return handlerListener;
+void Command::HandlerChanged(const SmartPointer<HandlerEvent>& handlerEvent)
+{
+  bool enabledChanged = handlerEvent->IsEnabledChanged();
+  bool handledChanged = handlerEvent->IsHandledChanged();
+  CommandEvent::Pointer cmdEvent(new CommandEvent(Command::Pointer(this), false,
+                                                  false, false, handledChanged, false, false, false,
+                                                  false, enabledChanged));
+  this->FireCommandChanged(cmdEvent);
 }
 
 QString Command::ToString() const
 {
   if (str.isEmpty())
   {
     QTextStream buffer(&str);
 
     buffer << "Command(" << id << ',' << name << ",\n\t\t";
     buffer << description << ",\n\t\t" << (category ? category->ToString() : QString(""));
     buffer << ",\n\t\t" << (handler ? handler->ToString() : "");
     buffer << ",\n\t\t" << "[";
-    for (unsigned int i = 0; i < parameters.size(); ++i)
+    for (int i = 0; i < parameters.size(); ++i)
     {
       buffer << parameters[i]->GetId();
     }
     buffer << "]," << (returnType ? returnType->ToString() : "");
     buffer << "," << defined << ")";
   }
   return str;
 }
 
 void Command::Undefine()
 {
   bool enabledChanged = this->IsEnabled();
 
   str = "";
 
   const bool definedChanged = defined;
   defined = false;
 
   const bool nameChanged = !name.isEmpty();
   name = "";
 
   const bool descriptionChanged = !description.isEmpty();
   description = "";
 
   const bool categoryChanged = category;
   category = 0;
 
   const bool parametersChanged = !parameters.empty();
   parameters.clear();
 
   const bool returnTypeChanged = returnType;
   returnType = 0;
 
-  const QStringList stateIds(this->GetStateIds());
-  if (IObjectWithState::Pointer handlerWithState = handler.Cast<IObjectWithState>()) {
-    for (unsigned int i = 0; i < stateIds.size(); i++) {
+  const QList<QString> stateIds(this->GetStateIds());
+  if (IObjectWithState::Pointer handlerWithState = handler.Cast<IObjectWithState>())
+  {
+    for (int i = 0; i < stateIds.size(); i++)
+    {
       const QString stateId(stateIds[i]);
       handlerWithState->RemoveState(stateId);
 
       const State::Pointer state(this->GetState(stateId));
       this->RemoveState(stateId);
       //state.dispose();
     }
-  } else {
-    for (unsigned int i = 0; i < stateIds.size(); ++i) {
+  }
+  else
+  {
+    for (int i = 0; i < stateIds.size(); ++i)
+    {
       const QString stateId(stateIds[i]);
       const State::Pointer state(this->GetState(stateId));
       this->RemoveState(stateId);
       //state.dispose();
     }
   }
 
   CommandEvent::Pointer cmdEvent(new CommandEvent(Command::Pointer(this), categoryChanged,
                                                   definedChanged, descriptionChanged, false, nameChanged,
                                                   parametersChanged, returnTypeChanged, false, enabledChanged));
   this->FireCommandChanged(cmdEvent);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommand.h b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommand.h
index 5acd59a49b..7ad522c1e6 100644
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommand.h
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommand.h
@@ -1,513 +1,513 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYCOMMAND_H_
 #define BERRYCOMMAND_H_
 
 #include "berryNamedHandleObjectWithState.h"
 
 #include <berryICommandListener.h>
+#include <berryIHandlerListener.h>
 #include <berryIExecutionListenerWithChecks.h>
 #include <berryIParameter.h>
 
 #include <berryParameterType.h>
 
 namespace berry
 {
 
 class CommandCategory;
 class ExecutionEvent;
 struct IHandler;
-struct IHandlerListener;
 
 /**
  * <p>
  * A command is an abstract representation for some semantic behaviour. It is
  * not the actual implementation of this behaviour, nor is it the visual
  * appearance of this behaviour in the user interface. Instead, it is a bridge
  * between the two.
  * </p>
  * <p>
  * The concept of a command is based on the command design pattern. The notable
  * difference is how the command delegates responsibility for execution. Rather
  * than allowing concrete subclasses, it uses a handler mechanism (see the
  * <code>handlers</code> extension point). This provides another level of
  * indirection.
  * </p>
  * <p>
  * A command will exist in two states: defined and undefined. A command is
  * defined if it is declared in the XML of a resolved plug-in. If the plug-in is
  * unloaded or the command is simply not declared, then it is undefined. Trying
  * to reference an undefined command will succeed, but trying to access any of
  * its functionality will fail with a <code>NotDefinedException</code>. If
  * you need to know when a command changes from defined to undefined (or vice
  * versa), then attach a command listener.
  * </p>
  * <p>
  * Commands are mutable and will change as their definition changes.
  * </p>
  *
  */
-class BERRY_COMMANDS Command : public NamedHandleObjectWithState
+class BERRY_COMMANDS Command : public NamedHandleObjectWithState, private IHandlerListener
 { // implements Comparable {
 
 public:
 
   berryObjectMacro(Command);
 
   /**
    * This flag can be set to <code>true</code> if commands should print
    * information to <code>System.out</code> when executing.
    */
   static bool DEBUG_COMMAND_EXECUTION;
 
   /**
    * This flag can be set to <code>true</code> if commands should print
    * information to <code>System.out</code> when changing handlers.
    */
   static bool DEBUG_HANDLERS;
 
   /**
    * This flag can be set to a particular command identifier if only that
    * command should print information to <code>System.out</code> when
    * changing handlers.
    */
   static QString DEBUG_HANDLERS_COMMAND_ID;
 
 private:
 
   /**
    * The category to which this command belongs. This value should not be
    * <code>null</code> unless the command is undefined.
    */
   SmartPointer<CommandCategory> category;
 
   /**
    * A collection of objects listening to the execution of this command.
    */
   IExecutionListenerWithChecks::Events executionEvents;
   //ListenerList executionListeners;
 
   /**
    * A collection of objects listening to changes of this command.
    */
   ICommandListener::Events commandEvents;
 
   /**
    * The handler currently associated with this command. This value may be
    * <code>null</code> if there is no handler currently.
    */
   SmartPointer<IHandler> handler;
 
   /**
    * The help context identifier for this command. This can be
    * <code>null</code> if there is no help currently associated with the
    * command.
    */
   QString helpContextId;
 
   /**
    * The ordered array of parameters understood by this command. This value
    * may be <code>null</code> if there are no parameters, or if the command
    * is undefined. It may also be empty.
    */
   QList<SmartPointer<IParameter> > parameters;
 
   /**
    * The type of the return value of this command. This value may be
    * <code>null</code> if the command does not declare a return type.
    */
   SmartPointer<ParameterType> returnType;
 
-  /**
-   * Our command will listen to the active handler for enablement changes so
-   * that they can be fired from the command itself.
-   */
-  SmartPointer<IHandlerListener> handlerListener;
-
 protected:
 
   /**
    * Constructs a new instance of <code>Command</code> based on the given
    * identifier. When a command is first constructed, it is undefined.
    * Commands should only be constructed by the <code>CommandManager</code>
    * to ensure that the identifier remains unique.
    *
    * @param id
    *            The identifier for the command. This value must not be
    *            <code>null</code>, and must be unique amongst all commands.
    */
   Command(const QString& id);
 
   friend class CommandManager;
 
 public:
 
   /**
    * Adds a listener to this command that will be notified when this command's
    * state changes.
    *
    * @param commandListener
    *            The listener to be added; must not be <code>null</code>.
    */
   void AddCommandListener(ICommandListener* commandListener);
 
   /**
    * Adds a listener to this command that will be notified when this command
    * is about to execute.
    *
    * @param executionListener
    *            The listener to be added; must not be <code>null</code>.
    */
   void AddExecutionListener(IExecutionListener* executionListener);
 
   /**
    * <p>
    * Adds a state to this command. This will add this state to the active
    * handler, if the active handler is an instance of {@link IObjectWithState}.
    * </p>
    * <p>
    * A single instance of {@link State} cannot be registered with multiple
    * commands. Each command requires its own unique instance.
    * </p>
    *
    * @param id
    *            The identifier of the state to add; must not be
    *            <code>null</code>.
    * @param state
    *            The state to add; must not be <code>null</code>.
    */
-  void AddState(const QString& id, const State::Pointer state);
+  void AddState(const QString& id, const SmartPointer<State>& state);
 
   /**
    * Compares this command with another command by comparing each of its
    * non-transient attributes.
    *
    * @param object
    *            The object with which to compare; must be an instance of
    *            <code>Command</code>.
    * @return false if the object is
    *         equal to or greater than this command.
    */
   bool operator<(const Object* object) const;
 
   /**
    * <p>
    * Defines this command by giving it a name, and possibly a description as
    * well. The defined property automatically becomes <code>true</code>.
    * </p>
    * <p>
    * Notification is sent to all listeners that something has changed.
    * </p>
    *
    * @param name
    *            The name of this command; must not be <code>null</code>.
    * @param description
    *            The description for this command; may be <code>null</code>.
    * @param category
    *            The category for this command; must not be <code>null</code>.
    * @param parameters
    *            The parameters understood by this command. This value may be
    *            either <code>null</code> or empty if the command does not
    *            accept parameters.
    * @param returnType
    *            The type of value returned by this command. This value may be
    *            <code>null</code> if the command does not declare a return
    *            type.
    * @param helpContextId
    *            The identifier of the help context to associate with this
    *            command; may be <code>null</code> if this command does not
    *            have any help associated with it.
    */
   void Define(const QString& name, const QString& description,
               const SmartPointer<CommandCategory> category,
               const QList<SmartPointer<IParameter> >& parameters = QList<SmartPointer<IParameter> >(),
               const SmartPointer<ParameterType>& returnType = SmartPointer<ParameterType>(0),
               const QString& helpContextId = "");
 
   /**
    * Executes this command by delegating to the current handler, if any. If
    * the debugging flag is set, then this method prints information about
    * which handler is selected for performing this command. This does checks
    * to see if the command is enabled and defined. If it is not both enabled
    * and defined, then the execution listeners will be notified and an
    * exception thrown.
    *
    * @param event
    *            An event containing all the information about the current
    *            state of the application; must not be <code>null</code>.
    * @return The result of the execution; may be <code>null</code>. This
    *         result will be available to the client executing the command, and
    *         execution listeners.
    * @throws ExecutionException
    *             If the handler has problems executing this command.
    * @throws NotDefinedException
    *             If the command you are trying to execute is not defined.
    * @throws NotEnabledException
    *             If the command you are trying to execute is not enabled.
    * @throws NotHandledException
    *             If there is no handler.
    */
   Object::Pointer ExecuteWithChecks(const SmartPointer<const ExecutionEvent> event);
 
 private:
 
   /**
    * Notifies the listeners for this command that it has changed in some way.
    *
    * @param commandEvent
    *            The event to send to all of the listener; must not be
    *            <code>null</code>.
    */
   void FireCommandChanged(const SmartPointer<const CommandEvent> commandEvent);
 
   /**
    * Notifies the execution listeners for this command that an attempt to
    * execute has failed because the command is not defined.
    *
    * @param e
    *            The exception that is about to be thrown; never
    *            <code>null</code>.
    * @since 3.2
    */
   void FireNotDefined(const NotDefinedException* e);
 
   /**
    * Notifies the execution listeners for this command that an attempt to
    * execute has failed because there is no handler.
    *
    * @param e
    *            The exception that is about to be thrown; never
    *            <code>null</code>.
    */
   void FireNotEnabled(const NotEnabledException* e);
 
   /**
    * Notifies the execution listeners for this command that an attempt to
    * execute has failed because there is no handler.
    *
    * @param e
    *            The exception that is about to be thrown; never
    *            <code>null</code>.
    */
   void FireNotHandled(const NotHandledException* e);
 
   /**
    * Notifies the execution listeners for this command that an attempt to
    * execute has failed during the execution.
    *
    * @param e
    *            The exception that has been thrown; never <code>null</code>.
    *            After this method completes, the exception will be thrown
    *            again.
    */
   void FirePostExecuteFailure(const ExecutionException* e);
 
   /**
    * Notifies the execution listeners for this command that an execution has
    * completed successfully.
    *
    * @param returnValue
    *            The return value from the command; may be <code>null</code>.
    */
   void FirePostExecuteSuccess(const Object::Pointer returnValue);
 
   /**
    * Notifies the execution listeners for this command that an attempt to
    * execute is about to start.
    *
    * @param event
    *            The execution event that will be used; never <code>null</code>.
    */
   void FirePreExecute(const SmartPointer<const ExecutionEvent> event);
 
 public:
 
   /**
    * Returns the current handler for this command. This is used by the command
    * manager for determining the appropriate help context identifiers and by
    * the command service to allow handlers to update elements.
    * <p>
    * This value can change at any time and should never be cached.
    * </p>
    *
    * @return The current handler for this command; may be <code>null</code>.
    */
   SmartPointer<IHandler> GetHandler() const;
 
   /**
    * Returns the help context identifier associated with this command. This
    * method should not be called by clients. Clients should use
    * {@link CommandManager#getHelpContextId(Command)} instead.
    *
    * @return The help context identifier for this command; may be
    *         <code>null</code> if there is none.
    */
   QString GetHelpContextId() const;
 
   /**
    * Returns the parameter with the provided id or <code>null</code> if this
    * command does not have a parameter with the id.
    *
    * @param parameterId
    *            The id of the parameter to retrieve.
    * @return The parameter with the provided id or <code>null</code> if this
    *         command does not have a parameter with the id.
    * @throws NotDefinedException
    *             If the handle is not currently defined.
    */
   SmartPointer<IParameter> GetParameter(const QString& parameterId) const;
 
   /**
    * Returns the parameters for this command. This call triggers provides a
    * copy of the array, so excessive calls to this method should be avoided.
    *
    * @return The parameters for this command. This value might be
    *         <code>null</code>, if the command has no parameters.
    * @throws NotDefinedException
    *             If the handle is not currently defined.
    */
   QList<SmartPointer<IParameter> > GetParameters() const;
 
   /**
    * Returns the {@link ParameterType} for the parameter with the provided id
    * or <code>null</code> if this command does not have a parameter type
    * with the id.
    *
    * @param parameterId
    *            The id of the parameter to retrieve the {@link ParameterType}
    *            of.
    * @return The {@link ParameterType} for the parameter with the provided id
    *         or <code>null</code> if this command does not have a parameter
    *         type with the provided id.
    * @throws NotDefinedException
    *             If the handle is not currently defined.
    */
   SmartPointer<ParameterType> GetParameterType(const QString& parameterId) const;
 
   /**
    * Returns the {@link ParameterType} for the return value of this command or
    * <code>null</code> if this command does not declare a return value
    * parameter type.
    *
    * @return The {@link ParameterType} for the return value of this command or
    *         <code>null</code> if this command does not declare a return
    *         value parameter type.
    * @throws NotDefinedException
    *             If the handle is not currently defined.
    */
   SmartPointer<ParameterType> GetReturnType() const;
 
   /**
    * Returns whether this command has a handler, and whether this handler is
    * also handled and enabled.
    *
    * @return <code>true</code> if the command is handled; <code>false</code>
    *         otherwise.
    */
   bool IsEnabled() const;
 
   /**
    * Called be the framework to allow the handler to update its enabled state.
    *
    * @param evaluationContext
    *            the state to evaluate against. May be <code>null</code>
    *            which indicates that the handler can query whatever model that
    *            is necessary.  This context must not be cached.
    */
-  void SetEnabled(Object::ConstPointer evaluationContext);
+  void SetEnabled(const Object::Pointer& evaluationContext);
 
   /**
    * Returns whether this command has a handler, and whether this handler is
    * also handled.
    *
    * @return <code>true</code> if the command is handled; <code>false</code>
    *         otherwise.
    */
   bool IsHandled() const;
 
   /**
    * Removes a listener from this command.
    *
    * @param commandListener
    *            The listener to be removed; must not be <code>null</code>.
    *
    */
   void RemoveCommandListener(ICommandListener* commandListener);
 
   /**
    * Removes a listener from this command.
    *
    * @param executionListener
    *            The listener to be removed; must not be <code>null</code>.
    *
    */
   void RemoveExecutionListener(IExecutionListener* executionListener);
 
   /**
    * <p>
    * Removes a state from this command. This will remove the state from the
    * active handler, if the active handler is an instance of
    * {@link IObjectWithState}.
    * </p>
    *
    * @param stateId
    *            The identifier of the state to remove; must not be
    *            <code>null</code>.
    */
   void RemoveState(const QString& stateId);
 
   /**
    * Changes the handler for this command. This will remove all the state from
    * the currently active handler (if any), and add it to <code>handler</code>.
    * If debugging is turned on, then this will also print information about
    * the change to <code>System.out</code>.
    *
    * @param handler
    *            The new handler; may be <code>null</code> if none.
    * @return <code>true</code> if the handler changed; <code>false</code>
    *         otherwise.
    */
   bool SetHandler(const SmartPointer<IHandler> handler);
 
 private:
 
   /**
    * @return the handler listener
    */
-  SmartPointer<IHandlerListener> GetHandlerListener();
+  IHandlerListener* GetHandlerListener();
+
+  /**
+   * Our command will listen to the active handler for enablement changes so
+   * that they can be fired from the command itself.
+   */
+  void HandlerChanged(const SmartPointer<HandlerEvent>& handlerEvent);
 
 
 public:
 
   /**
    * The string representation of this command -- for debugging purposes only.
    * This string should not be shown to an end user.
    *
    * @return The string representation; never <code>null</code>.
    */
   QString ToString() const;
 
   /**
    * Makes this command become undefined. This has the side effect of changing
    * the name and description to <code>null</code>. This also removes all
    * state and disposes of it. Notification is sent to all listeners.
    */
   void Undefine();
 };
 
 }
 #endif /*BERRYCOMMAND_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommandCategory.cpp b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommandCategory.cpp
index 9aae3f08ca..8f7e8bdadf 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommandCategory.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommandCategory.cpp
@@ -1,106 +1,107 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryCommandCategory.h"
 #include "berryCommandCategoryEvent.h"
 
 #include <Poco/Exception.h>
 #include <QTextStream>
 
 namespace berry {
 
 void CommandCategory::AddCategoryListener(ICommandCategoryListener* categoryListener)
 {
   if (categoryListener == 0)
   {
     throw ctkInvalidArgumentException("Category listener cannot be null");
   }
 
   categoryEvents.AddListener(categoryListener);
 }
 
-void CommandCategory::Define(const QString& name, const QString& description) {
+void CommandCategory::Define(const QString& name, const QString& description)
+{
   if (name.isEmpty())
   {
     throw Poco::InvalidArgumentException(
           "The name of a command cannot be empty"); //$NON-NLS-1$
   }
 
   const bool definedChanged = !this->defined;
   this->defined = true;
 
   const bool nameChanged = !(this->name == name);
   this->name = name;
 
   const bool descriptionChanged = !(this->description == description);
   this->description = description;
 
   const CommandCategoryEvent::Pointer categoryEvent(new CommandCategoryEvent(CommandCategory::Pointer(this), definedChanged,
                                                                              descriptionChanged, nameChanged));
   this->FireCategoryChanged(categoryEvent);
 }
 
 void CommandCategory::RemoveCategoryListener(ICommandCategoryListener* categoryListener)
 {
   if (categoryListener == 0)
   {
     throw ctkInvalidArgumentException("CommandCategory listener cannot be null");
   }
 
   categoryEvents.RemoveListener(categoryListener);
 }
 
 QString CommandCategory::ToString() const
 {
   if (str.isEmpty())
   {
     QTextStream stringBuffer(&str);
     stringBuffer << "Category(" << id << "," << name << "," << description << "," << defined << ")";
   }
   return str;
 }
 
 void CommandCategory::Undefine() {
   str = "";
 
   const bool definedChanged = defined;
   defined = false;
 
   const bool nameChanged = !name.isEmpty();
   name = "";
 
   const bool descriptionChanged = !description.isEmpty();
   description = "";
 
   const CommandCategoryEvent::Pointer categoryEvent(new CommandCategoryEvent(CommandCategory::Pointer(this), definedChanged,
                                                                              descriptionChanged, nameChanged));
   this->FireCategoryChanged(categoryEvent);
 }
 
 CommandCategory::CommandCategory(const QString& id) :
   NamedHandleObject(id)
 {
 
 }
 
 void CommandCategory::FireCategoryChanged(const CommandCategoryEvent::Pointer categoryEvent) {
   if (!categoryEvent) {
     throw ctkInvalidArgumentException("Command category event cannot be null");
   }
   categoryEvents.categoryChanged(categoryEvent);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommandCategory.h b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommandCategory.h
index 5330b842c8..4cce4b0022 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommandCategory.h
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommandCategory.h
@@ -1,127 +1,127 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYCOMMANDCATEGORY_H_
 #define BERRYCOMMANDCATEGORY_H_
 
 #include "common/berryNamedHandleObject.h"
 #include "berryICommandCategoryListener.h"
 
+#include <org_blueberry_core_commands_Export.h>
+
 namespace berry
 {
 
 /**
  * <p>
  * A logical group for a set of commands. A command belongs to exactly one
  * category. The category has no functional effect, but may be used in graphical
  * tools that want to group the set of commands somehow.
  * </p>
- *
- * @since 3.1
  */
-class CommandCategory: public NamedHandleObject
+class BERRY_COMMANDS CommandCategory: public NamedHandleObject
 {
 
 public:
 
   berryObjectMacro(CommandCategory);
 
   /**
    * Adds a listener to this category that will be notified when this
    * category's state changes.
    *
    * @param categoryListener
    *            The listener to be added; must not be <code>null</code>.
    */
   void AddCategoryListener(ICommandCategoryListener* categoryListener);
 
   /**
    * <p>
    * Defines this category by giving it a name, and possibly a description as
    * well. The defined property automatically becomes <code>true</code>.
    * </p>
    * <p>
    * Notification is sent to all listeners that something has changed.
    * </p>
    *
    * @param name
    *            The name of this command; must not be <code>null</code>.
    * @param description
    *            The description for this command; may be <code>null</code>.
    */
   void Define(const QString& name, const QString& description);
 
   /**
    * Removes a listener from this category.
    *
    * @param categoryListener
    *            The listener to be removed; must not be <code>null</code>.
    *
    */
   void RemoveCategoryListener(ICommandCategoryListener* categoryListener);
 
   /*
    * (non-Javadoc)
    *
    * @see org.eclipse.core.commands.common.HandleObject#toString()
    */
   QString ToString() const;
 
   /*
    * (non-Javadoc)
    *
    * @see org.eclipse.core.commands.common.HandleObject#undefine()
    */
   void Undefine();
 
 protected:
 
   friend class CommandManager;
 
   /**
    * Constructs a new instance of <code>Category</code> based on the given
    * identifier. When a category is first constructed, it is undefined.
    * Category should only be constructed by the <code>CommandManager</code>
    * to ensure that identifier remain unique.
    *
    * @param id
    *            The identifier for the category. This value must not be
    *            <code>null</code>, and must be unique amongst all
    *            categories.
    */
   CommandCategory(const QString& id);
 
 private:
 
   /**
    * Notifies the listeners for this category that it has changed in some way.
    *
    * @param categoryEvent
    *            The event to send to all of the listener; must not be
    *            <code>null</code>.
    */
   void FireCategoryChanged(const SmartPointer<CommandCategoryEvent> categoryEvent);
 
   /**
    * A collection of objects listening to changes to this category. This
    * collection is <code>null</code> if there are no listeners.
    */
   ICommandCategoryListener::Events categoryEvents;
 };
 
 }
 
 #endif /* BERRYCOMMANDCATEGORY_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommandEvent.cpp b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommandEvent.cpp
index 2226149afd..de06fab9aa 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommandEvent.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommandEvent.cpp
@@ -1,109 +1,110 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryCommandEvent.h"
 #include "berryCommand.h"
 #include "berryCommandCategory.h"
+#include "berryState.h"
 #include "berryIParameterValueConverter.h"
 #include "berryIHandler.h"
 
 namespace berry
 {
 
 const int CommandEvent::CHANGED_CATEGORY = CommandEvent::LAST_USED_BIT << 1;
 const int CommandEvent::CHANGED_HANDLED = CommandEvent::LAST_USED_BIT << 2;
 const int CommandEvent::CHANGED_PARAMETERS = CommandEvent::LAST_USED_BIT << 3;
 const int CommandEvent::CHANGED_RETURN_TYPE = CommandEvent::LAST_USED_BIT << 4;
 const int CommandEvent::CHANGED_HELP_CONTEXT_ID = CommandEvent::LAST_USED_BIT
     << 5;
 const int CommandEvent::CHANGED_ENABLED = CommandEvent::LAST_USED_BIT << 6;
 
 CommandEvent::CommandEvent(const Command::Pointer command,
     bool categoryChanged, bool definedChanged, bool descriptionChanged,
     bool handledChanged, bool nameChanged, bool parametersChanged,
     bool returnTypeChanged, bool helpContextIdChanged,
     bool enabledChanged) :
   AbstractNamedHandleEvent(definedChanged, descriptionChanged, nameChanged),
       command(command)
 {
 
   if (!command)
   {
     throw Poco::NullPointerException("The command cannot be null");
   }
 
   if (categoryChanged)
   {
     changedValues |= CHANGED_CATEGORY;
   }
   if (handledChanged)
   {
     changedValues |= CHANGED_HANDLED;
   }
   if (parametersChanged)
   {
     changedValues |= CHANGED_PARAMETERS;
   }
   if (returnTypeChanged)
   {
     changedValues |= CHANGED_RETURN_TYPE;
   }
   if (helpContextIdChanged)
   {
     changedValues |= CHANGED_HELP_CONTEXT_ID;
   }
   if (enabledChanged)
   {
     changedValues |= CHANGED_ENABLED;
   }
 }
 
 Command::Pointer CommandEvent::GetCommand() const
 {
   return command;
 }
 
 bool CommandEvent::IsCategoryChanged() const
 {
   return ((changedValues & CHANGED_CATEGORY) != 0);
 }
 
 bool CommandEvent::IsHandledChanged() const
 {
   return ((changedValues & CHANGED_HANDLED) != 0);
 }
 
 bool CommandEvent::IsHelpContextIdChanged() const
 {
   return ((changedValues & CHANGED_HELP_CONTEXT_ID) != 0);
 }
 
 bool CommandEvent::IsParametersChanged() const
 {
   return ((changedValues & CHANGED_PARAMETERS) != 0);
 }
 
 bool CommandEvent::IsReturnTypeChanged() const
 {
   return ((changedValues & CHANGED_RETURN_TYPE) != 0);
 }
 
 bool CommandEvent::IsEnabledChanged() const
 {
   return ((changedValues & CHANGED_ENABLED) != 0);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommandManager.cpp b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommandManager.cpp
index cb655fcfd6..93f8016f45 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommandManager.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommandManager.cpp
@@ -1,661 +1,661 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryCommandManager.h"
 
 #include "berryIParameter.h"
 #include "berryIHandler.h"
 #include "berryParameterType.h"
 #include "berryParameterizedCommand.h"
 #include "berryParameterization.h"
 #include "berryCommand.h"
 #include "berryCommandCategory.h"
+#include "berryState.h"
 
 #include "berryExecutionEvent.h"
 #include "berryCommandEvent.h"
 #include "berryCommandCategoryEvent.h"
 #include "berryCommandManagerEvent.h"
 #include "berryParameterTypeEvent.h"
 
 namespace berry {
 
 CommandManager::ExecutionListener::ExecutionListener(CommandManager* commandManager) : commandManager(commandManager)
 {
 
 }
 
 void CommandManager::ExecutionListener::NotDefined(const QString& commandId, const NotDefinedException* exception)
 {
   commandManager->executionEvents.notDefined(commandId, exception);
 }
 
 void CommandManager::ExecutionListener::NotEnabled(const QString& commandId, const NotEnabledException* exception)
 {
   commandManager->executionEvents.notEnabled(commandId, exception);
 }
 
 void CommandManager::ExecutionListener::NotHandled(const QString& commandId, const NotHandledException* exception)
 {
   commandManager->executionEvents.notHandled(commandId, exception);
 }
 
 void CommandManager::ExecutionListener::PostExecuteFailure(const QString& commandId,
                                                            const ExecutionException* exception)
 {
   commandManager->executionEvents.postExecuteFailure(commandId, exception);
 }
 
 void CommandManager::ExecutionListener::PostExecuteSuccess(const QString& commandId,
-                                                           const Object::Pointer returnValue)
+                                                           const Object::Pointer& returnValue)
 {
   commandManager->executionEvents.postExecuteSuccess(commandId, returnValue);
 }
 
 void CommandManager::ExecutionListener::PreExecute(const QString& commandId,
-                                                   const ExecutionEvent::ConstPointer event)
+                                                   const ExecutionEvent::ConstPointer& event)
 {
   commandManager->executionEvents.preExecute(commandId, event);
 }
 
 CommandManager::CommandCategoryListener::CommandCategoryListener(CommandManager* commandManager)
   : commandManager(commandManager)
 {
 
 }
 
-void CommandManager::CommandCategoryListener::CategoryChanged(const CommandCategoryEvent::ConstPointer categoryEvent)
+void CommandManager::CommandCategoryListener::CategoryChanged(const CommandCategoryEvent::ConstPointer& categoryEvent)
 {
   if (categoryEvent->IsDefinedChanged())
   {
     const CommandCategory::Pointer category(categoryEvent->GetCategory());
     const QString categoryId(category->GetId());
     const bool categoryIdAdded = category->IsDefined();
     if (categoryIdAdded)
     {
       commandManager->definedCategoryIds.insert(categoryId);
     }
     else
     {
       commandManager->definedCategoryIds.remove(categoryId);
     }
     CommandManagerEvent::Pointer event(new CommandManagerEvent(*commandManager, "",
                                                                false, false, categoryId, categoryIdAdded, true));
     commandManager->FireCommandManagerChanged(event);
 
   }
 }
 
 CommandManager::CommandListener::CommandListener(CommandManager* commandManager)
   : commandManager(commandManager)
 {
 
 }
 
-void CommandManager::CommandListener::CommandChanged(const SmartPointer<const CommandEvent> commandEvent)
+void CommandManager::CommandListener::CommandChanged(const SmartPointer<const CommandEvent>& commandEvent)
 {
   if (commandEvent->IsDefinedChanged())
   {
     const Command::Pointer command(commandEvent->GetCommand());
     const QString commandId = command->GetId();
     const bool commandIdAdded = command->IsDefined();
     if (commandIdAdded)
     {
       commandManager->definedHandleObjects.insert(command);
     }
     else
     {
       commandManager->definedHandleObjects.remove(command);
     }
     CommandManagerEvent::Pointer event(new CommandManagerEvent(*commandManager,
                                                                commandId, commandIdAdded, true, "", false, false));
     commandManager->FireCommandManagerChanged(event);
 
   }
 }
 
 CommandManager::ParameterTypeListener::ParameterTypeListener(CommandManager* commandManager)
   : commandManager(commandManager)
 {
 
 }
 
 void CommandManager::ParameterTypeListener::ParameterTypeChanged(
-    const ParameterTypeEvent::ConstPointer parameterTypeEvent)
+    const ParameterTypeEvent::ConstPointer& parameterTypeEvent)
 {
   if (parameterTypeEvent->IsDefinedChanged())
   {
     const ParameterType::Pointer parameterType(parameterTypeEvent
                                                ->GetParameterType());
     const QString parameterTypeId = parameterType->GetId();
     const bool parameterTypeIdAdded = parameterType->IsDefined();
     if (parameterTypeIdAdded)
     {
       commandManager->definedParameterTypeIds.insert(parameterTypeId);
     }
     else
     {
       commandManager->definedParameterTypeIds.remove(parameterTypeId);
     }
 
     CommandManagerEvent::Pointer event(new CommandManagerEvent(*commandManager,
                                                                parameterTypeId, parameterTypeIdAdded, true));
     commandManager->FireCommandManagerChanged(event);
   }
 }
 
 
 const QString CommandManager::AUTOGENERATED_CATEGORY_ID = "org.blueberry.core.commands.categories.autogenerated";
 const char CommandManager::ESCAPE_CHAR = '%';
 const char CommandManager::ID_VALUE_CHAR = '=';
 const char CommandManager::PARAMETER_END_CHAR = ')';
 const char CommandManager::PARAMETER_SEPARATOR_CHAR = ',';
 const char CommandManager::PARAMETER_START_CHAR = '(';
 
 CommandManager::CommandManager()
   : categoryListener(new CommandCategoryListener(this)),
     commandListener(new CommandListener(this)),
     parameterTypeListener(new ParameterTypeListener(this))
 {
 
 }
 
 void CommandManager::AddCommandManagerListener(ICommandManagerListener* listener)
 {
   commandManagerEvents.AddListener(listener);
 }
 
 void CommandManager::AddExecutionListener(IExecutionListener *listener)
 {
   if (listener == 0)
   {
     throw ctkInvalidArgumentException(
           "Cannot add a null execution listener");
   }
 
   if (executionEvents.IsEmpty())
   {
     // Add an execution listener to every command.
-    executionListener = new ExecutionListener(this);
+    executionListener.reset(new ExecutionListener(this));
     for (HandleObjectsByIdMap::Iterator itr = handleObjectsById.begin();
          itr != handleObjectsById.end(); ++itr)
     {
       Command::Pointer command = itr.value().Cast<Command>();
       if (command)
       {
-        command->AddExecutionListener(executionListener.GetPointer());
+        command->AddExecutionListener(executionListener.data());
       }
     }
   }
 
   executionEvents.AddListener(listener);
 }
 
 void CommandManager::DefineUncategorizedCategory(const QString& name,
                                                  const QString& description)
 {
   CommandCategory::Pointer category(this->GetCategory(AUTOGENERATED_CATEGORY_ID));
   category->Define(name, description);
 }
 
 SmartPointer<ParameterizedCommand> CommandManager::Deserialize(
     const QString& serializedParameterizedCommand)
 {
 
   const int lparenPosition = this->UnescapedIndexOf(
         serializedParameterizedCommand, PARAMETER_START_CHAR);
 
   QString commandIdEscaped;
   QString serializedParameters;
   if (lparenPosition == -1)
   {
     commandIdEscaped = serializedParameterizedCommand;
   }
   else
   {
     commandIdEscaped = serializedParameterizedCommand.left(lparenPosition);
 
     if (serializedParameterizedCommand
         .at(serializedParameterizedCommand.size() - 1) != PARAMETER_END_CHAR)
     {
       throw SerializationException(
             "Parentheses must be balanced in serialized ParameterizedCommand");
     }
 
     serializedParameters = serializedParameterizedCommand.mid(
           lparenPosition + 1, // skip PARAMETER_START_CHAR
           serializedParameterizedCommand.size() - lparenPosition - 2); // skip
     // PARAMETER_END_CHAR
   }
 
   const QString commandId(this->Unescape(commandIdEscaped));
   Command::Pointer command(this->GetCommand(commandId));
   const QList<IParameter::Pointer> parameters(command->GetParameters());
   const QList<Parameterization>parameterizations(this->GetParameterizations(
                                                          serializedParameters, parameters));
 
   ParameterizedCommand::Pointer pCmd(new ParameterizedCommand(command, parameterizations));
   return pCmd;
 }
 
 QList<SmartPointer<Command> > CommandManager::GetAllCommands() const
 {
   QList<Command::Pointer> result;
   for (HandleObjectsByIdMap::ConstIterator itr = handleObjectsById.begin();
        itr != handleObjectsById.end(); ++itr)
   {
     if (Command::Pointer cmd = itr.value().Cast<Command>())
     {
       result.push_back(cmd);
     }
   }
   return result;
 }
 
 SmartPointer<CommandCategory> CommandManager::GetCategory(const QString& categoryId)
 {
   if (categoryId.isEmpty())
   {
     return this->GetCategory(AUTOGENERATED_CATEGORY_ID);
   }
 
   this->CheckId(categoryId);
 
   CommandCategory::Pointer category(categoriesById[categoryId]);
   if (!category)
   {
     category = new CommandCategory(categoryId);
     categoriesById[categoryId] = category;
-    category->AddCategoryListener(categoryListener.GetPointer());
+    category->AddCategoryListener(categoryListener.data());
   }
 
   return category;
 }
 
 SmartPointer<Command> CommandManager::GetCommand(const QString& commandId)
 {
   this->CheckId(commandId);
 
   Command::Pointer command(handleObjectsById[commandId].Cast<Command>());
   if (!command)
   {
     command = new Command(commandId);
     handleObjectsById[commandId] = command;
-    command->AddCommandListener(commandListener.GetPointer());
+    command->AddCommandListener(commandListener.data());
 
     if (executionListener)
     {
-      command->AddExecutionListener(executionListener.GetPointer());
+      command->AddExecutionListener(executionListener.data());
     }
   }
 
   return command;
 }
 
 QList<CommandCategory::Pointer> CommandManager::GetDefinedCategories()
 {
   QList<CommandCategory::Pointer> categories;
   for (QSet<QString>::Iterator itr = definedCategoryIds.begin();
        itr != definedCategoryIds.end(); ++itr)
   {
     categories.push_back(this->GetCategory(*itr));
   }
   return categories;
 }
 
 QSet<QString> CommandManager::GetDefinedCategoryIds() const
 {
   return definedCategoryIds;
 }
 
 QSet<QString> CommandManager::GetDefinedCommandIds() const
 {
   return this->GetDefinedHandleObjectIds();
 }
 
 QList<SmartPointer<Command> > CommandManager::GetDefinedCommands() const
 {
   QList<Command::Pointer> result;
   for (HandleObjectsSet::ConstIterator itr = definedHandleObjects.begin();
        itr != definedHandleObjects.end(); ++itr)
   {
     if (Command::Pointer cmd = itr->Cast<Command>())
       result.push_back(cmd);
   }
   return result;
 }
 
 QSet<QString> CommandManager::GetDefinedParameterTypeIds() const
 {
   return definedParameterTypeIds;
 }
 
 QList<SmartPointer<ParameterType> > CommandManager::GetDefinedParameterTypes()
 {
   QList<ParameterType::Pointer> parameterTypes;
   for (QSet<QString>::ConstIterator itr = definedParameterTypeIds.begin();
        itr != definedParameterTypeIds.end(); ++itr)
   {
     parameterTypes.push_back(this->GetParameterType(*itr));
   }
   return parameterTypes;
 }
 
 QString CommandManager::GetHelpContextId(const SmartPointer<const Command> command) const
 {
   // Check if the command is defined.
   if (!command->IsDefined())
   {
     throw NotDefinedException("The command is not defined. "
                               + command->GetId());
   }
 
   // Check the handler.
   const IHandler::Pointer handler(command->GetHandler());
   if (handler)
   {
     const IHandler::WeakPtr weakHandler(handler);
     QHash<WeakPointer<IHandler>, QString>::ConstIterator itr =
         helpContextIdsByHandler.find(weakHandler);
     if (itr != helpContextIdsByHandler.end() && !itr.value().isEmpty())
     {
       return itr.value();
     }
   }
 
   // Simply return whatever the command has as a help context identifier.
   return command->GetHelpContextId();
 }
 
 SmartPointer<ParameterType> CommandManager::GetParameterType(const QString& parameterTypeId)
 {
   this->CheckId(parameterTypeId);
 
   ParameterType::Pointer parameterType(parameterTypesById[parameterTypeId]);
   if (!parameterType)
   {
     parameterType = new ParameterType(parameterTypeId);
     parameterTypesById[parameterTypeId] = parameterType;
-    parameterType->AddListener(parameterTypeListener.GetPointer());
+    parameterType->AddListener(parameterTypeListener.data());
   }
 
   return parameterType;
 }
 
 void CommandManager::RemoveCommandManagerListener(ICommandManagerListener *listener)
 {
   commandManagerEvents.RemoveListener(listener);
 }
 
 void CommandManager::RemoveExecutionListener(IExecutionListener *listener)
 {
   if (!listener)
   {
     throw ctkInvalidArgumentException("Cannot remove a null listener");
   }
 
   if (executionEvents.IsEmpty())
   {
     return;
   }
 
   executionEvents.RemoveListener(listener);
 
   if (executionEvents.IsEmpty())
   {
     // Remove the execution listener from every command.
     for (HandleObjectsByIdMap::Iterator commandItr = handleObjectsById.begin();
          commandItr != handleObjectsById.end(); ++commandItr)
     {
       Command::Pointer command(commandItr.value().Cast<Command>());
-      command->RemoveExecutionListener(executionListener.GetPointer());
+      command->RemoveExecutionListener(executionListener.data());
     }
-    executionListener = 0;
-
+    executionListener.reset();
   }
 }
 
 void CommandManager::SetHandlersByCommandId(const QHash<QString, SmartPointer<IHandler> > &handlersByCommandId)
 {
   // Make that all the reference commands are created.
   for (QHash<QString, SmartPointer<IHandler> >::const_iterator commandItr = handlersByCommandId.begin();
        commandItr != handlersByCommandId.end(); ++commandItr)
   {
     this->GetCommand(commandItr.key());
   }
 
   // Now, set-up the handlers on all of the existing commands.
   for (HandleObjectsByIdMap::Iterator commandItr = handleObjectsById.begin();
        commandItr != handleObjectsById.end(); ++commandItr)
   {
     const Command::Pointer command(commandItr.value().Cast<Command>());
     const QString commandId(command->GetId());
     QHash<QString, SmartPointer<IHandler> >::const_iterator handlerItr = handlersByCommandId.find(commandId);
     if (handlerItr != handlersByCommandId.end())
     {
       command->SetHandler(handlerItr.value());
     }
     else
     {
       command->SetHandler(IHandler::Pointer(0));
     }
   }
 }
 
 void CommandManager::SetHelpContextId(const SmartPointer<IHandler> handler,
                                       const QString& helpContextId)
 {
   if (!handler)
   {
     throw ctkInvalidArgumentException("The handler cannot be null");
   }
   IHandler::WeakPtr weakHandler(handler);
   if (helpContextId.isEmpty())
   {
     helpContextIdsByHandler.remove(weakHandler);
   }
   else
   {
     helpContextIdsByHandler[weakHandler] = helpContextId;
   }
 }
 
 void CommandManager::FireNotEnabled(const QString& commandId, const NotEnabledException* exception)
 {
   executionEvents.notEnabled(commandId, exception);
 }
 
 void CommandManager::FireNotDefined(const QString& commandId, const NotDefinedException* exception)
 {
   executionEvents.notDefined(commandId, exception);
 }
 
 void CommandManager::FirePreExecute(const QString& commandId, const SmartPointer<const ExecutionEvent> event)
 {
   executionEvents.preExecute(commandId, event);
 }
 
 void CommandManager::FirePostExecuteSuccess(const QString& commandId, Object::Pointer returnValue)
 {
   executionEvents.postExecuteSuccess(commandId, returnValue);
 }
 
 void CommandManager::FirePostExecuteFailure(const QString& commandId,
                                             const ExecutionException* exception)
 {
   executionEvents.postExecuteFailure(commandId, exception);
 }
 
 QString CommandManager::Unescape(const QString& escapedText)
 {
 
   // defer initialization of a StringBuffer until we know we need one
   QString buffer;
 
   int pos = 0;
   for (QString::const_iterator itr = escapedText.begin();
        itr != escapedText.end(); ++itr, ++pos)
   {
     QString::value_type c = *itr;
     if (c != ESCAPE_CHAR)
     {
       // normal unescaped character
       if (!buffer.isEmpty())
       {
         buffer += c;
       }
     }
     else
     {
       if (buffer.isEmpty())
       {
         buffer = escapedText.left(pos);
       }
 
       if (++itr != escapedText.end())
       {
         c = *itr;
         if (c == PARAMETER_START_CHAR || c == PARAMETER_END_CHAR ||
             c == ID_VALUE_CHAR || c == PARAMETER_SEPARATOR_CHAR ||
             c == ESCAPE_CHAR)
         {
           buffer += c;
         }
         else
         {
           QString msg("Invalid character '");
           msg += c;
           msg += "' in escape sequence";
           throw SerializationException(msg);
         }
       }
       else
       {
         throw SerializationException(
               "Unexpected termination of escape sequence"); //$NON-NLS-1$
       }
     }
 
   }
 
   if (buffer.isEmpty())
   {
     return escapedText;
   }
 
   return buffer;
 }
 
 void CommandManager::FireCommandManagerChanged(const SmartPointer<const CommandManagerEvent> event)
 {
   if (!event)
   {
     throw ctkInvalidArgumentException("Event cannot be null.");
   }
 
   commandManagerEvents.commandManagerChanged(event);
 }
 
 QList<Parameterization> CommandManager::GetParameterizations(
     const QString& serializedParams, const QList<SmartPointer<IParameter> >& parameters) const
 {
 
   QString serializedParameters(serializedParams);
 
   if (serializedParameters.isEmpty() || parameters.isEmpty())
   {
     return QList<Parameterization>();
   }
 
   QList<Parameterization> paramList;
 
   int commaPosition; // split off each param by looking for ','
   do
   {
     commaPosition = this->UnescapedIndexOf(serializedParameters, ',');
 
     QString idEqualsValue;
     if (commaPosition == -1)
     {
       // no more parameters after this
       idEqualsValue = serializedParameters;
     }
     else
     {
       // take the first parameter...
       idEqualsValue = serializedParameters.left(commaPosition);
 
       // ... and put the rest back into serializedParameters
       serializedParameters = serializedParameters.mid(commaPosition + 1);
     }
 
     int equalsPosition = this->UnescapedIndexOf(idEqualsValue, '=');
 
     QString parameterId;
     QString parameterValue;
     if (equalsPosition == -1)
     {
       // missing values are null
       parameterId = this->Unescape(idEqualsValue);
     }
     else
     {
       parameterId = this->Unescape(idEqualsValue.left(equalsPosition));
       parameterValue = this->Unescape(idEqualsValue.mid(equalsPosition + 1));
     }
 
-    for (unsigned int i = 0; i < parameters.size(); i++)
+    for (int i = 0; i < parameters.size(); i++)
     {
       const IParameter::Pointer parameter(parameters[i]);
       if (parameter->GetId() == parameterId)
       {
         paramList.push_back(Parameterization(parameter,
                                              parameterValue));
         break;
       }
     }
 
   } while (commaPosition != -1);
 
   return paramList;
 }
 
 int CommandManager::UnescapedIndexOf(const QString& escapedText, const char ch) const
 {
 
   int pos = escapedText.indexOf(ch);
 
   // first char can't be escaped
   if (pos == 0)
   {
     return pos;
   }
 
   while (pos != -1)
   {
     // look back for the escape character
     if (escapedText.at(pos - 1) != ESCAPE_CHAR)
     {
       return pos;
     }
 
     // scan for the next instance of ch
     pos = escapedText.indexOf(ch, pos + 1);
   }
 
   return pos;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommandManager.h b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommandManager.h
index 665fa812b7..0985ea5420 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommandManager.h
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryCommandManager.h
@@ -1,630 +1,632 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYCOMMANDMANAGER_H_
 #define BERRYCOMMANDMANAGER_H_
 
 #include "common/berryHandleObjectManager.h"
 
 #include "berryIExecutionListenerWithChecks.h"
 #include "berryICommandListener.h"
 #include "berryIParameterTypeListener.h"
 #include "berryICommandCategoryListener.h"
 #include "berryICommandManagerListener.h"
 
+#include <QScopedPointer>
+
 
 namespace berry
 {
 
 struct IParameter;
 struct IHandler;
 class ParameterType;
 class ParameterizedCommand;
 class Parameterization;
 class Command;
 class CommandCategory;
 
 /**
  * <p>
  * A central repository for commands -- both in the defined and undefined
  * states. Commands can be created and retrieved using this manager. It is
  * possible to listen to changes in the collection of commands by attaching a
  * listener to the manager.
  * </p>
  *
  * @see CommandManager#getCommand(String)
  * @since 3.1
  */
 class BERRY_COMMANDS CommandManager: public HandleObjectManager
 {
 
 private:
 
   typedef HandleObjectManager::HandleObjectsSet HandleObjectsSet;
   typedef HandleObjectManager::HandleObjectsByIdMap HandleObjectsByIdMap;
 
   /**
    * A listener that forwards incoming execution events to execution listeners
    * on this manager. The execution events will come from any command on this
    * manager.
    */
   struct ExecutionListener: public IExecutionListenerWithChecks
   {
 
     ExecutionListener(CommandManager* commandManager);
 
     void NotDefined(const QString& commandId,
         const NotDefinedException* exception);
 
     void NotEnabled(const QString& commandId,
         const NotEnabledException* exception);
 
     void NotHandled(const QString& commandId,
         const NotHandledException* exception);
 
     void PostExecuteFailure(const QString& commandId,
         const ExecutionException* exception);
 
     void PostExecuteSuccess(const QString& commandId,
-        const Object::Pointer returnValue);
+        const Object::Pointer& returnValue);
 
     void PreExecute(const QString& commandId, const SmartPointer<
-        const ExecutionEvent> event);
+        const ExecutionEvent>& event);
 
   private:
 
     CommandManager* commandManager;
   };
 
   struct CommandCategoryListener: public ICommandCategoryListener
   {
 
     CommandCategoryListener(CommandManager* commandManager);
 
     void CategoryChanged(
-        const SmartPointer<const CommandCategoryEvent> categoryEvent);
+        const SmartPointer<const CommandCategoryEvent>& categoryEvent);
 
   private:
 
     CommandManager* commandManager;
   };
 
-  ICommandCategoryListener::Pointer categoryListener;
+  QScopedPointer<ICommandCategoryListener> categoryListener;
 
   struct CommandListener: public ICommandListener
   {
 
     CommandListener(CommandManager* commandManager);
 
-    void CommandChanged(const SmartPointer<const CommandEvent> commandEvent);
+    void CommandChanged(const SmartPointer<const CommandEvent>& commandEvent);
 
   private:
 
     CommandManager* commandManager;
 
   };
 
-  ICommandListener::Pointer commandListener;
+  QScopedPointer<ICommandListener> commandListener;
 
   struct ParameterTypeListener: public IParameterTypeListener
   {
 
     ParameterTypeListener(CommandManager* commandManager);
 
     void ParameterTypeChanged(
-        const SmartPointer<const ParameterTypeEvent> parameterTypeEvent);
+        const SmartPointer<const ParameterTypeEvent>& parameterTypeEvent);
 
   private:
 
     CommandManager* commandManager;
 
   };
 
-  IParameterTypeListener::Pointer parameterTypeListener;
+  QScopedPointer<IParameterTypeListener> parameterTypeListener;
 
 public:
 
   /**
    * The identifier of the category in which all auto-generated commands will
    * appear. This value must never be <code>null</code>.
    */
   static const QString AUTOGENERATED_CATEGORY_ID; // = "org.blueberry.core.commands.categories.autogenerated";
 
   /**
    * The default constructor
    */
   CommandManager();
 
   /**
    * Adds a listener to this command manager. The listener will be notified
    * when the set of defined commands changes. This can be used to track the
    * global appearance and disappearance of commands.
    *
    * @param listener
    *            The listener to attach; must not be <code>null</code>.
    */
   void AddCommandManagerListener(ICommandManagerListener* listener);
 
   /**
    * Adds an execution listener to this manager. This listener will be
    * notified if any of the commands controlled by this manager execute. This
    * can be used to support macros and instrumentation of commands.
    *
    * @param listener
    *            The listener to attach; must not be <code>null</code>.
    */
   void AddExecutionListener(IExecutionListener* listener);
 
   /**
    * Sets the name and description of the category for uncategorized commands.
    * This is the category that will be returned if
    * {@link #getCategory(String)} is called with <code>null</code>.
    *
    * @param name
    *            The name of the category for uncategorized commands; must not
    *            be <code>null</code>.
    * @param description
    *            The description of the category for uncategorized commands;
    *            may be <code>null</code>.
    */
   void DefineUncategorizedCategory(const QString& name,
                                    const QString& description);
 
   /**
    * <p>
    * Returns a {@link ParameterizedCommand} with a command and
    * parameterizations as specified in the provided
    * <code>serializedParameterizedCommand</code> string. The
    * <code>serializedParameterizedCommand</code> must use the format
    * returned by {@link ParameterizedCommand#serialize()} and described in the
    * Javadoc for that method.
    * </p>
    * <p>
    * If a parameter id encoded in the
    * <code>serializedParameterizedCommand</code> does not exist in the
    * encoded command, that parameter id and value are ignored. A given
    * parameter id should not be used more than once in
    * <code>serializedParameterizedCommand</code>. This will not result in
    * an exception, but in this case the value of the parameter when the
    * command is executed is unspecified.
    * </p>
    * <p>
    * This method will never return <code>null</code>, however it may throw
    * an exception if there is a problem processing the serialization string or
    * the encoded command is undefined.
    * </p>
    *
    * @param serializedParameterizedCommand
    *            a string representing a command id and parameter ids and
    *            values; must not be <code>null</code>
    * @return a {@link ParameterizedCommand} with the command and
    *         parameterizations encoded in the
    *         <code>serializedParameterizedCommand</code>; never
    *         <code>null</code>.
    * @throws NotDefinedException
    *             if the command indicated in
    *             <code>serializedParameterizedCommand</code> is not defined
    * @throws SerializationException
    *             if there is an error deserializing
    *             <code>serializedParameterizedCommand</code>
    * @see ParameterizedCommand#serialize()
    */
   SmartPointer<ParameterizedCommand> Deserialize(const QString& serializedParameterizedCommand);
 
   /**
    * Returns all of the commands known by this manager -- defined and
    * undefined.
    *
    * @return All of the commands; may be empty, but never <code>null</code>.
    */
   QList<SmartPointer<Command> > GetAllCommands() const;
 
   /**
    * Gets the category with the given identifier. If no such category
    * currently exists, then the category will be created (but be undefined).
    *
    * @param categoryId
    *            The identifier to find; must not be <code>null</code>. If
    *            the category is <code>null</code>, then a category suitable
    *            for uncategorized items is defined and returned.
    * @return The category with the given identifier; this value will never be
    *         <code>null</code>, but it might be undefined.
    * @see Category
    */
   SmartPointer<CommandCategory> GetCategory(const QString& categoryId);
 
   /**
    * Gets the command with the given identifier. If no such command currently
    * exists, then the command will be created (but will be undefined).
    *
    * @param commandId
    *            The identifier to find; must not be <code>null</code> and
    *            must not be zero-length.
    * @return The command with the given identifier; this value will never be
    *         <code>null</code>, but it might be undefined.
    * @see Command
    */
   SmartPointer<Command> GetCommand(const QString& commandId);
 
   /**
    * Returns the categories that are defined.
    *
    * @return The defined categories; this value may be empty, but it is never
    *         <code>null</code>.
    */
   QList<SmartPointer<CommandCategory> > GetDefinedCategories();
 
   /**
    * Returns the set of identifiers for those category that are defined.
    *
    * @return The set of defined category identifiers; this value may be empty,
    *         but it is never <code>null</code>.
    */
   QSet<QString> GetDefinedCategoryIds() const;
 
   /**
    * Returns the set of identifiers for those commands that are defined.
    *
    * @return The set of defined command identifiers; this value may be empty,
    *         but it is never <code>null</code>.
    */
   QSet<QString> GetDefinedCommandIds() const;
 
   /**
    * Returns the commands that are defined.
    *
    * @return The defined commands; this value may be empty, but it is never
    *         <code>null</code>.
    */
  QList<SmartPointer<Command> > GetDefinedCommands() const;
 
   /**
    * Returns the set of identifiers for those parameter types that are
    * defined.
    *
    * @return The set of defined command parameter type identifiers; this value
    *         may be empty, but it is never <code>null</code>.
    */
   QSet<QString> GetDefinedParameterTypeIds() const;
 
   /**
    * Returns the command parameter types that are defined.
    *
    * @return The defined command parameter types; this value may be empty, but
    *         it is never <code>null</code>.
    */
   QList<SmartPointer<ParameterType> > GetDefinedParameterTypes();
 
   /**
    * Gets the help context identifier for a particular command. The command's
    * handler is first checked for a help context identifier. If the handler
    * does not have a help context identifier, then the help context identifier
    * for the command is returned. If neither has a help context identifier,
    * then <code>null</code> is returned.
    *
    * @param command
    *            The command for which the help context should be retrieved;
    *            must not be <code>null</code>.
    * @return The help context identifier to use for the given command; may be
    *         <code>null</code>.
    * @throws NotDefinedException
    *             If the given command is not defined.
    */
   QString GetHelpContextId(const SmartPointer<const Command> command) const;
 
   /**
    * Gets the command {@link ParameterType} with the given identifier. If no
    * such command parameter type currently exists, then the command parameter
    * type will be created (but will be undefined).
    *
    * @param parameterTypeId
    *            The identifier to find; must not be <code>null</code> and
    *            must not be zero-length.
    * @return The {@link ParameterType} with the given identifier; this value
    *         will never be <code>null</code>, but it might be undefined.
    */
   SmartPointer<ParameterType> GetParameterType(const QString& parameterTypeId);
 
   /**
    * Removes a listener from this command manager.
    *
    * @param listener
    *            The listener to be removed; must not be <code>null</code>.
    */
   void RemoveCommandManagerListener(ICommandManagerListener* listener);
 
   /**
    * Removes an execution listener from this command manager.
    *
    * @param listener
    *            The listener to be removed; must not be <code>null</code>.
    */
   void RemoveExecutionListener(IExecutionListener* listener);
 
   /**
    * Block updates all of the handlers for all of the commands. If the handler
    * is <code>null</code> or the command id does not exist in the map, then
    * the command becomes unhandled. Otherwise, the handler is set to the
    * corresponding value in the map.
    *
    * @param handlersByCommandId
    *            A map of command identifiers (<code>String</code>) to
    *            handlers (<code>IHandler</code>). This map may be
    *            <code>null</code> if all handlers should be cleared.
    *            Similarly, if the map is empty, then all commands will become
    *            unhandled.
    */
   void SetHandlersByCommandId(
       const QHash<QString, SmartPointer<IHandler> >& handlersByCommandId);
 
   /**
    * Sets the help context identifier to associate with a particular handler.
    *
    * @param handler
    *            The handler with which to register a help context identifier;
    *            must not be <code>null</code>.
    * @param helpContextId
    *            The help context identifier to register; may be
    *            <code>null</code> if the help context identifier should be
    *            removed.
    */
   void SetHelpContextId(const SmartPointer<IHandler> handler,
                         const QString& helpContextId);
 
   /**
    * Fires the <code>notEnabled</code> event for
    * <code>executionListeners</code>.
    * <p>
    * <b>Note:</b> This supports bridging actions to the command framework,
    * and should not be used outside the framework.
    * </p>
    *
    * @param commandId
    *            The command id of the command about to execute, never
    *            <code>null</code>.
    * @param exception
    *            The exception, never <code>null</code>.
    */
   void FireNotEnabled(const QString& commandId,
                       const NotEnabledException* exception);
 
   /**
    * Fires the <code>notDefined</code> event for
    * <code>executionListeners</code>.
    * <p>
    * <b>Note:</b> This supports bridging actions to the command framework,
    * and should not be used outside the framework.
    * </p>
    *
    * @param commandId
    *            The command id of the command about to execute, never
    *            <code>null</code>.
    * @param exception
    *            The exception, never <code>null</code>.
    */
   void FireNotDefined(const QString& commandId,
                       const NotDefinedException* exception);
 
   /**
    * Fires the <code>preExecute</code> event for
    * <code>executionListeners</code>.
    * <p>
    * <b>Note:</b> This supports bridging actions to the command framework,
    * and should not be used outside the framework.
    * </p>
    *
    * @param commandId
    *            The command id of the command about to execute, never
    *            <code>null</code>.
    * @param event
    *            The event that triggered the command, may be <code>null</code>.
    */
   void FirePreExecute(const QString& commandId, const SmartPointer<
                       const ExecutionEvent> event);
 
   /**
    * Fires the <code>postExecuteSuccess</code> event for
    * <code>executionListeners</code>.
    * <p>
    * <b>Note:</b> This supports bridging actions to the command framework,
    * and should not be used outside the framework.
    * </p>
    *
    * @param commandId
    *            The command id of the command executed, never
    *            <code>null</code>.
    * @param returnValue
    *            The value returned from the command, may be <code>null</code>.
    */
   void FirePostExecuteSuccess(const QString& commandId,
                               Object::Pointer returnValue);
 
   /**
    * Fires the <code>postExecuteFailure</code> event for
    * <code>executionListeners</code>.
    * <p>
    * <b>Note:</b> This supports bridging actions to the command framework,
    * and should not be used outside the framework.
    * </p>
    *
    * @param commandId
    *            The command id of the command executed, never
    *            <code>null</code>.
    * @param exception
    *            The exception, never <code>null</code>.
    */
   void FirePostExecuteFailure(const QString& commandId,
                               const ExecutionException* exception);
 
 protected:
 
   /**
    * The escape character to use for serialization and deserialization of
    * parameterized commands.
    */
   static const char ESCAPE_CHAR; // = '%';
 
   /**
    * The character that separates a parameter id from its value.
    */
   static const char ID_VALUE_CHAR; // = '=';
 
   /**
    * The character that indicates the end of a list of parameters.
    */
   static const char PARAMETER_END_CHAR; // = ')';
 
   /**
    * The character that separators parameters from each other.
    */
   static const char PARAMETER_SEPARATOR_CHAR; // = ',';
 
   /**
    * The character that indicates the start of a list of parameters.
    */
   static const char PARAMETER_START_CHAR; // = '(';
 
   friend class ParameterizedCommand;
 
 private:
 
   /**
    * Unescapes special characters in the command id, parameter ids and
    * parameter values for {@link #deserialize(String)}. The special characters
    * {@link #PARAMETER_START_CHAR}, {@link #PARAMETER_END_CHAR},
    * {@link #ID_VALUE_CHAR}, {@link #PARAMETER_SEPARATOR_CHAR} and
    * {@link #ESCAPE_CHAR} are escaped by prepending an {@link #ESCAPE_CHAR}
    * character.
    * <p>
    * See also ParameterizedCommand.escape(String)
    * </p>
    *
    * @param escapedText
    *            a <code>String</code> that may contain escaped special
    *            characters for command serialization.
    * @return a <code>String</code> representing <code>escapedText</code>
    *         with any escaped characters replaced by their literal values
    * @throws SerializationException
    *             if <code>escapedText</code> contains an invalid escape
    *             sequence
    */
   static QString Unescape(const QString& escapedText);
 
   /**
    * The map of category identifiers (<code>String</code>) to categories (
    * <code>Category</code>). This collection may be empty, but it is never
    * <code>null</code>.
    */
   QHash<QString, SmartPointer<CommandCategory> > categoriesById;
 
   /**
    * The set of identifiers for those categories that are defined. This value
    * may be empty, but it is never <code>null</code>.
    */
   QSet<QString> definedCategoryIds;
 
   /**
    * The set of identifiers for those command parameter types that are
    * defined. This value may be empty, but it is never <code>null</code>.
    *
    */
   QSet<QString> definedParameterTypeIds;
 
   /**
    * The execution listener for this command manager. This just forwards
    * events from commands controlled by this manager to listeners on this
    * manager.
    */
-  SmartPointer<IExecutionListenerWithChecks> executionListener;
+  QScopedPointer<IExecutionListenerWithChecks> executionListener;
 
   /**
    * The collection of execution listeners. This collection is
    * <code>null</code> if there are no listeners.
    */
   IExecutionListenerWithChecks::Events executionEvents;
 
   /**
    *
    */
   ICommandManagerListener::Events commandManagerEvents;
 
   /**
    * The help context identifiers ({@link String}) for a handler ({@link IHandler}).
    * This map may be empty, but it is never <code>null</code>. Entries are
    * removed if all strong references to the handler are removed.
    */
   QHash<WeakPointer<IHandler>, QString> helpContextIdsByHandler;
 
   /**
    * The map of parameter type identifiers (<code>String</code>) to
    * parameter types ( <code>ParameterType</code>). This collection may be
    * empty, but it is never <code>null</code>.
    */
   QHash<QString, SmartPointer<ParameterType> > parameterTypesById;
 
   /**
    * Notifies all of the listeners to this manager that the set of defined
    * command identifiers has changed.
    *
    * @param event
    *            The event to send to all of the listeners; must not be
    *            <code>null</code>.
    */
   void FireCommandManagerChanged(
       const SmartPointer<const CommandManagerEvent> event);
 
   /**
    * Returns an array of parameterizations for the provided command by
    * deriving the parameter ids and values from the provided
    * <code>serializedParameters</code> string.
    *
    * @param serializedParameters
    *            a String encoding parameter ids and values; must not be
    *            <code>null</code>.
    * @param parameters
    *            array of parameters of the command being deserialized; may be
    *            <code>null</code>.
    * @return an array of parameterizations; may be <code>null</code>.
    * @throws SerializationException
    *             if there is an error deserializing the parameters
    */
   QList<Parameterization> GetParameterizations(
       const QString& serializedParameters,
       const QList<SmartPointer<IParameter> >& parameters) const;
 
   /**
    * Searches for the index of a <code>char</code> in a <code>String</code>
    * but disregards characters prefixed with the {@link #ESCAPE_CHAR} escape
    * character. This is used by {@link #deserialize(String)} and
    * {@link #getParameterizations(String, IParameter[])} to parse the
    * serialized parameterized command string.
    *
    * @param escapedText
    *            the string to search for the index of <code>ch</code> in
    * @param ch
    *            a character to search for in <code>escapedText</code>
    * @return the index of the first unescaped occurrence of the character in
    *         <code>escapedText</code>, or <code>-1</code> if the
    *         character does not occur unescaped.
    * @see String#indexOf(int)
    */
   int UnescapedIndexOf(const QString& escapedText, const char ch) const;
 
 };
 
 }
 
 #endif /* BERRYCOMMANDMANAGER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryExecutionEvent.cpp b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryExecutionEvent.cpp
index 616ec60e0a..9df2db493f 100644
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryExecutionEvent.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryExecutionEvent.cpp
@@ -1,124 +1,125 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryExecutionEvent.h"
 
 #include "common/berryCommandExceptions.h"
 #include "berryIParameterValueConverter.h"
 #include "berryCommandCategory.h"
+#include "berryState.h"
 #include "berryIHandler.h"
 
 #include <berryObjectString.h>
 
 #include <QTextStream>
 
 namespace berry
 {
 
 ExecutionEvent::ExecutionEvent()
 {
 
 }
 
-ExecutionEvent::ExecutionEvent(const Command::ConstPointer cmd,
-    const ParameterMap& params, const Object::ConstPointer trg,
-    const Object::ConstPointer appContext)
+ExecutionEvent::ExecutionEvent(const Command::ConstPointer& cmd,
+                               const ParameterMap& params, const Object::ConstPointer& trg,
+                               const Object::Pointer& appContext)
 : applicationContext(appContext), command(cmd), parameters(params), trigger(trg)
 {
 
 }
 
-const Object::ConstPointer ExecutionEvent::GetApplicationContext() const
+const Object::Pointer ExecutionEvent::GetApplicationContext() const
 {
   return applicationContext;
 }
 
 const Command::ConstPointer ExecutionEvent::GetCommand() const
 {
   return command;
 }
 
 const Object::ConstPointer ExecutionEvent::GetObjectParameterForExecution(
     const QString& parameterId) const
 {
   if (command.IsNull())
   {
     throw ExecutionException(
         "No command is associated with this execution event"); //$NON-NLS-1$
   }
 
   try
   {
 //    const ParameterType parameterType = command
 //    .getParameterType(parameterId);
 //    if (parameterType == null)
 //    {
 //      throw new ExecutionException(
 //          "Command does not have a parameter type for the given parameter"); //$NON-NLS-1$
 //    }
 //    const AbstractParameterValueConverter valueConverter = parameterType
 //    .getValueConverter();
 //    if (valueConverter == null)
 //    {
 //      throw new ExecutionException(
 //          "Command does not have a value converter"); //$NON-NLS-1$
 //    }
     const QString stringValue = this->GetParameter(parameterId);
     ObjectString::Pointer objectValue(new ObjectString(stringValue));
 //    const Object objectValue = valueConverter
 //    .convertToObject(stringValue);
     return objectValue;
   }
   catch (NotDefinedException e)
   {
     throw ExecutionException("Command is not defined", e); //$NON-NLS-1$
   }
 //  catch (ParameterValueConversionException e)
 //  {
 //    throw new ExecutionException(
 //        "The parameter string could not be converted to an object", e); //$NON-NLS-1$
 //  }
 }
 
 QString ExecutionEvent::GetParameter(const QString& parameterId) const
 {
   ParameterMap::const_iterator res = parameters.find(parameterId);
   if (res != parameters.end())
     return res.value();
   else return "";
 }
 
 const ExecutionEvent::ParameterMap& ExecutionEvent::GetParameters() const
 {
   return parameters;
 }
 
 const Object::ConstPointer ExecutionEvent::GetTrigger() const
 {
   return trigger;
 }
 
 QString ExecutionEvent::ToString() const
 {
   QString str;
   QTextStream ss(&str);
   ss << "ExecutionEvent(" << command->ToString() << ',' << parameters.size() << ','
-      << trigger->ToString() << ',' << applicationContext->ToString() << ')';
+     << (trigger ? trigger->ToString() : QString()) << ',' << applicationContext->ToString() << ')';
 
   return str;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryExecutionEvent.h b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryExecutionEvent.h
index 87a3c197e8..cb982079aa 100644
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryExecutionEvent.h
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryExecutionEvent.h
@@ -1,180 +1,173 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYEXECUTIONEVENT_H_
 #define BERRYEXECUTIONEVENT_H_
 
 #include <berryMacros.h>
 
 #include "berryCommand.h"
 
 #include <QHash>
 
 namespace berry {
 
 /**
  * <p>
  * The data object to pass to the command (and its handler) as it executes. This
  * carries information about the current state of the application, and the
  * application context in which the command was executed.
  * </p>
  * <p>
  * An execution event carries three blocks of data: the parameters, the trigger,
  * and the application context. How these blocks are used is application
  * dependent. In the BlueBerry workbench, the trigger is an SWT event, and the
  * application context contains information about the selection and active part.
  * </p>
- *
- * @since 3.1
  */
 class BERRY_COMMANDS ExecutionEvent : public Object {
 
 public:
 
   berryObjectMacro(ExecutionEvent);
 
   typedef QHash<QString, QString> ParameterMap;
 
 private:
 
   /**
    * The state of the application at the time the execution was triggered. In
    * the BlueBerry workbench, this might contain information about the active
    * part of the active selection (for example). This value may be
    * <code>null</code>.
    */
-  const Object::ConstPointer applicationContext;
+  const Object::Pointer applicationContext;
 
   /**
    * The command being executed. This value may be <code>null</code>.
    */
   const Command::ConstPointer command;
 
   /**
    * The parameters to qualify the execution. For handlers that normally
    * prompt for additional information, these can be used to avoid prompting.
    * This value may be empty, but it is never <code>null</code>.
    */
   const ParameterMap parameters;
 
   /**
    * The object that triggered the execution. In an event-driven architecture,
    * this is typically just another event. In the BlueBerry workbench, this is
    * typically an SWT event. This value may be <code>null</code>.
    */
   const Object::ConstPointer trigger;
 
 
 public:
 
   /**
    * Constructs a new instance of <code>ExecutionEvent</code> with no
    * parameters, no trigger and no application context. This is just a
    * convenience method.
-   *
-   * @since 3.2
    */
   ExecutionEvent();
 
   /**
    * Constructs a new instance of <code>ExecutionEvent</code>.
    *
    * @param command
    *            The command being executed; may be <code>null</code>.
    * @param parameters
    *            The parameters to qualify the execution; must not be
    *            <code>null</code>. This must be a map of parameter ids (<code>String</code>)
    *            to parameter values (<code>String</code>).
    * @param trigger
    *            The object that triggered the execution; may be
    *            <code>null</code>.
    * @param applicationContext
    *            The state of the application at the time the execution was
    *            triggered; may be <code>null</code>.
-   * @since 3.2
    */
-  ExecutionEvent(const Command::ConstPointer command, const ParameterMap& parameters,
-      const Object::ConstPointer trigger, const Object::ConstPointer applicationContext);
+  ExecutionEvent(const Command::ConstPointer& command, const ParameterMap& parameters,
+                 const Object::ConstPointer& trigger, const Object::Pointer& applicationContext);
 
   /**
    * Returns the state of the application at the time the execution was
    * triggered.
    *
    * @return The application context; may be <code>null</code>.
    */
-  const Object::ConstPointer GetApplicationContext() const;
+  const Object::Pointer GetApplicationContext() const;
 
   /**
    * Returns the command being executed.
    *
    * @return The command being executed.
-   * @since 3.2
    */
   const Command::ConstPointer GetCommand() const;
 
   /**
    * Returns the object represented by the string value of the parameter with
    * the provided id.
    * <p>
    * This is intended to be used in the scope of an
    * {@link IHandler#execute(ExecutionEvent)} method, so any problem getting
    * the object value causes <code>ExecutionException</code> to be thrown.
    * </p>
    *
    * @param parameterId
    *            The id of a parameter to retrieve the object value of.
    * @return The object value of the parameter with the provided id.
    * @throws ExecutionException
    *             if the parameter object value could not be obtained for any
    *             reason
-   * @since 3.2
    */
   const Object::ConstPointer GetObjectParameterForExecution(const QString& parameterId) const;
 
   /**
    * Returns the value of the parameter with the given id.
    *
    * @param parameterId
    *            The id of the parameter to retrieve; may be <code>null</code>.
    * @return The parameter value; <code>null</code> if the parameter cannot
    *         be found.
    */
   QString GetParameter(const QString &parameterId) const;
 
   /**
    * Returns all of the parameters.
    *
    * @return The parameters; never <code>null</code>, but may be empty.
    */
   const ParameterMap& GetParameters() const;
 
   /**
    * Returns the object that triggered the execution
    *
    * @return The trigger; <code>null</code> if there was no trigger.
    */
   const Object::ConstPointer GetTrigger() const;
 
   /**
    * The string representation of this execution event -- for debugging
    * purposes only. This string should not be shown to an end user.
    */
   QString ToString() const;
 };
 
 }
 
 #endif /*BERRYEXECUTIONEVENT_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryICommandCategoryListener.cpp b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryICommandCategoryListener.cpp
index 991b8f206a..0f65f59948 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryICommandCategoryListener.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryICommandCategoryListener.cpp
@@ -1,44 +1,48 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryICommandCategoryListener.h"
 
 #include "berryCommandCategory.h"
 #include "berryCommandCategoryEvent.h"
 
 namespace berry {
 
 void
 ICommandCategoryListener::Events
 ::AddListener(ICommandCategoryListener* l)
 {
   if (l == 0) return;
 
   categoryChanged += Delegate(l, &ICommandCategoryListener::CategoryChanged);
 }
 
 void
 ICommandCategoryListener::Events
 ::RemoveListener(ICommandCategoryListener* l)
 {
   if (l == 0) return;
 
   categoryChanged -= Delegate(l, &ICommandCategoryListener::CategoryChanged);
 }
 
+ICommandCategoryListener::~ICommandCategoryListener()
+{
+}
+
 }
 
 
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryICommandCategoryListener.h b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryICommandCategoryListener.h
index 003137396e..c71d2153ab 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryICommandCategoryListener.h
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryICommandCategoryListener.h
@@ -1,71 +1,71 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYICOMMANDCATEGORYLISTENER_H_
 #define BERRYICOMMANDCATEGORYLISTENER_H_
 
-#include <berryObject.h>
-#include <berryMacros.h>
 #include <berryMessage.h>
 
 namespace berry {
 
+template<class T> class SmartPointer;
+
 class CommandCategoryEvent;
 
 /**
  * An instance of this interface can be used by clients to receive notification
  * of changes to one or more instances of <code>Category</code>.
  * <p>
  * This interface may be implemented by clients.
  * </p>
  *
- * @since 3.1
  * @see CommandCategory#AddCategoryListener(ICommandCategoryListener)
  * @see CommandCategory#RemoveCategoryListener(ICommandCategoryListener)
  */
-struct ICommandCategoryListener : public virtual Object {
-
-  berryInterfaceMacro(ICommandCategoryListener, berry);
+struct ICommandCategoryListener
+{
 
   struct Events {
 
-    typedef Message1<const SmartPointer<const CommandCategoryEvent> > Event;
+    typedef Message1<const SmartPointer<const CommandCategoryEvent>& > Event;
 
     Event categoryChanged;
 
     void AddListener(ICommandCategoryListener* listener);
     void RemoveListener(ICommandCategoryListener* listener);
 
 
-    typedef MessageDelegate1<ICommandCategoryListener, const SmartPointer<const CommandCategoryEvent> > Delegate;
+    typedef MessageDelegate1<ICommandCategoryListener, const SmartPointer<const CommandCategoryEvent>& > Delegate;
   };
 
+  virtual ~ICommandCategoryListener();
+
   /**
    * Notifies that one or more properties of an instance of
    * <code>CommandCategory</code> have changed. Specific details are described in
    * the <code>CommandCategoryEvent</code>.
    *
    * @param categoryEvent
    *            the category event. Guaranteed not to be <code>null</code>.
    */
-  virtual void CategoryChanged(const SmartPointer<const CommandCategoryEvent> categoryEvent) = 0;
+  virtual void CategoryChanged(const SmartPointer<const CommandCategoryEvent>& categoryEvent) = 0;
 };
 
 }
 
 
 #endif /* BERRYICOMMANDCATEGORYLISTENER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryICommandListener.cpp b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryICommandListener.cpp
index 492cea52b0..2b1c78af83 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryICommandListener.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryICommandListener.cpp
@@ -1,47 +1,52 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryICommandListener.h"
 
 #include "berryCommand.h"
 #include "berryCommandEvent.h"
 #include "berryCommandCategory.h"
+#include "berryState.h"
 #include "berryIHandler.h"
 
 namespace berry {
 
 void
 ICommandListener::Events
 ::AddListener(ICommandListener* l)
 {
   if (l == 0) return;
 
   commandChanged += Delegate(l, &ICommandListener::CommandChanged);
 }
 
 void
 ICommandListener::Events
 ::RemoveListener(ICommandListener* l)
 {
   if (l == 0) return;
 
   commandChanged -= Delegate(l, &ICommandListener::CommandChanged);
 }
 
+ICommandListener::~ICommandListener()
+{
+}
+
 }
 
 
 
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryICommandListener.h b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryICommandListener.h
index 46cccb7b2e..c9c56e46c2 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryICommandListener.h
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryICommandListener.h
@@ -1,70 +1,72 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYICOMMANDLISTENER_H_
 #define BERRYICOMMANDLISTENER_H_
 
-#include <berryObject.h>
-#include <berryMacros.h>
 #include <berryMessage.h>
 
+#include <org_blueberry_core_commands_Export.h>
+
 namespace berry {
 
+template<class T> class SmartPointer;
+
 class CommandEvent;
 
 /**
  * An instance of this interface can be used by clients to receive notification
  * of changes to one or more instances of <code>Command</code>.
  * <p>
  * This interface may be implemented by clients.
  * </p>
  *
- * @since 3.1
  * @see Command#addCommandListener(ICommandListener)
  * @see Command#removeCommandListener(ICommandListener)
  */
-struct ICommandListener : public virtual Object {
-
-  berryInterfaceMacro(ICommandListener, berry);
+struct BERRY_COMMANDS ICommandListener
+{
 
   struct Events {
 
-    typedef Message1<const SmartPointer<const CommandEvent> > Event;
+    typedef Message1<const SmartPointer<const CommandEvent>&> Event;
 
     Event commandChanged;
 
     void AddListener(ICommandListener* listener);
     void RemoveListener(ICommandListener* listener);
 
   private:
-    typedef MessageDelegate1<ICommandListener, const SmartPointer<const CommandEvent> > Delegate;
+    typedef MessageDelegate1<ICommandListener, const SmartPointer<const CommandEvent>&> Delegate;
   };
 
+  virtual ~ICommandListener();
+
   /**
    * Notifies that one or more properties of an instance of
    * <code>Command</code> have changed. Specific details are described in
    * the <code>CommandEvent</code>.
    *
    * @param commandEvent
    *            the command event. Guaranteed not to be <code>null</code>.
    */
-  virtual void CommandChanged(const SmartPointer<const CommandEvent> commandEvent) = 0;
+  virtual void CommandChanged(const SmartPointer<const CommandEvent>& commandEvent) = 0;
 };
 
 }
 
 #endif /* BERRYICOMMANDLISTENER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryICommandManagerListener.cpp b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryICommandManagerListener.cpp
index 2613409cdc..a539b7c182 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryICommandManagerListener.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryICommandManagerListener.cpp
@@ -1,39 +1,43 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryICommandManagerListener.h"
 
 #include "berryCommandManagerEvent.h"
 
 namespace berry
 {
 
 void ICommandManagerListener::Events::AddListener(ICommandManagerListener* l)
 {
   if (l == 0) return;
 
   commandManagerChanged += Delegate(l, &ICommandManagerListener::CommandManagerChanged);
 }
 
 void ICommandManagerListener::Events::RemoveListener(ICommandManagerListener* l)
 {
   if (l == 0) return;
 
   commandManagerChanged -= Delegate(l, &ICommandManagerListener::CommandManagerChanged);
 }
 
+ICommandManagerListener::~ICommandManagerListener()
+{
+}
+
 }
 
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryICommandManagerListener.h b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryICommandManagerListener.h
index ab9b741995..f83131b557 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryICommandManagerListener.h
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryICommandManagerListener.h
@@ -1,73 +1,73 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYICOMMANDMANAGERLISTENER_H_
 #define BERRYICOMMANDMANAGERLISTENER_H_
 
 #include <org_blueberry_core_commands_Export.h>
 
-#include <berryObject.h>
-#include <berryMacros.h>
+#include <berryMessage.h>
 
 namespace berry
 {
 
+template<class T> class SmartPointer;
+
 class CommandManagerEvent;
 
 /**
  * An instance of this interface can be used by clients to receive notification
  * of changes to one or more instances of <code>ICommandManager</code>.
  * <p>
  * This interface may be implemented by clients.
  * </p>
  *
- * @since 3.1
  * @see CommandManager#addCommandManagerListener(ICommandManagerListener)
  * @see CommandManager#removeCommandManagerListener(ICommandManagerListener)
  */
-struct BERRY_COMMANDS ICommandManagerListener: public virtual Object
+struct BERRY_COMMANDS ICommandManagerListener
 {
 
-berryInterfaceMacro(ICommandManagerListener, berry);
-
-struct Events {
+  struct Events {
 
-    typedef Message1<const SmartPointer<const CommandManagerEvent> > Event;
+    typedef Message1<const SmartPointer<const CommandManagerEvent>& > Event;
 
     Event commandManagerChanged;
 
     void AddListener(ICommandManagerListener* listener);
     void RemoveListener(ICommandManagerListener* listener);
 
   private:
-    typedef MessageDelegate1<ICommandManagerListener, const SmartPointer<const CommandManagerEvent> > Delegate;
-  }  ;
+    typedef MessageDelegate1<ICommandManagerListener, const SmartPointer<const CommandManagerEvent>& > Delegate;
+  };
+
+  virtual ~ICommandManagerListener();
 
   /**
    * Notifies that one or more properties of an instance of
    * <code>ICommandManager</code> have changed. Specific details are
    * described in the <code>CommandManagerEvent</code>.
    *
    * @param commandManagerEvent
    *            the commandManager event. Guaranteed not to be
    *            <code>null</code>.
    */
-virtual  void CommandManagerChanged(const SmartPointer<const CommandManagerEvent> commandManagerEvent) = 0;
+  virtual  void CommandManagerChanged(const SmartPointer<const CommandManagerEvent>& commandManagerEvent) = 0;
 };
 
 }
 
 #endif /* BERRYICOMMANDMANAGERLISTENER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIExecutionListener.cpp b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIExecutionListener.cpp
index 2b99c9e29e..a6ce322ddd 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIExecutionListener.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIExecutionListener.cpp
@@ -1,77 +1,78 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryIExecutionListener.h"
 
 #include "berryIParameterValueConverter.h"
 #include "berryExecutionEvent.h"
 #include "berryCommandCategory.h"
+#include "berryState.h"
 #include "berryIHandler.h"
 
 namespace berry {
 
 IExecutionListener::Events::~Events()
 {
 }
 
 void
 IExecutionListener::Events
 ::AddListener(IExecutionListener* l)
 {
   if (l == 0) return;
 
   notHandled += NotHandledDelegate(l, &IExecutionListener::NotHandled);
   postExecuteFailure += PostExecuteFailureDelegate(l, &IExecutionListener::PostExecuteFailure);
   postExecuteSuccess += PostExecuteSuccessDelegate(l, &IExecutionListener::PostExecuteSuccess);
   preExecute += PreExecuteDelegate(l, &IExecutionListener::PreExecute);
 }
 
 void
 IExecutionListener::Events
 ::RemoveListener(IExecutionListener* l)
 {
   if (l == 0) return;
 
   notHandled -= NotHandledDelegate(l, &IExecutionListener::NotHandled);
   postExecuteFailure -= PostExecuteFailureDelegate(l, &IExecutionListener::PostExecuteFailure);
   postExecuteSuccess -= PostExecuteSuccessDelegate(l, &IExecutionListener::PostExecuteSuccess);
   preExecute -= PreExecuteDelegate(l, &IExecutionListener::PreExecute);
 }
 
 bool
 IExecutionListener::Events
 ::HasListeners() const
 {
   return notHandled.HasListeners() || postExecuteFailure.HasListeners() ||
          postExecuteSuccess.HasListeners() || preExecute.HasListeners();
 }
 
 bool
 IExecutionListener::Events
 ::IsEmpty() const
 {
   return !this->HasListeners();
 }
 
 IExecutionListener::~IExecutionListener()
 {
 }
 
 }
 
 
 
 
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIExecutionListener.h b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIExecutionListener.h
index fe3660665d..86be22628c 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIExecutionListener.h
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIExecutionListener.h
@@ -1,121 +1,117 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIEXECUTIONLISTENER_H_
 #define BERRYIEXECUTIONLISTENER_H_
 
 #include <berryObject.h>
-#include <berryMacros.h>
 #include <berryMessage.h>
 
 #include <org_blueberry_core_commands_Export.h>
 #include "common/berryCommandExceptions.h"
 
 namespace berry {
 
 class ExecutionEvent;
 
 /**
  * <p>
  * A listener to the execution of commands. This listener will be notified if a
  * command is about to execute, and when that execution completes. It is not
  * possible for the listener to prevent the execution, only to respond to it in
  * some way.
  * </p>
- *
- * @since 3.1
  */
-struct BERRY_COMMANDS IExecutionListener : public virtual Object {
-
-  berryInterfaceMacro(IExecutionListener, berry);
+struct BERRY_COMMANDS IExecutionListener
+{
 
   struct Events {
 
     Message2<const QString&, const NotHandledException*> notHandled;
     Message2<const QString&, const ExecutionException*> postExecuteFailure;
-    Message2<const QString&, Object::Pointer> postExecuteSuccess;
-    Message2<const QString&, const SmartPointer<const ExecutionEvent> > preExecute;
+    Message2<const QString&, const Object::Pointer&> postExecuteSuccess;
+    Message2<const QString&, const SmartPointer<const ExecutionEvent>& > preExecute;
 
     virtual ~Events();
 
     virtual void AddListener(IExecutionListener* listener);
     virtual void RemoveListener(IExecutionListener* listener);
     virtual bool HasListeners() const;
     virtual bool IsEmpty() const;
 
     private:
 
     typedef MessageDelegate2<IExecutionListener, const QString&, const NotHandledException* > NotHandledDelegate;
     typedef MessageDelegate2<IExecutionListener, const QString&, const ExecutionException*> PostExecuteFailureDelegate;
-    typedef MessageDelegate2<IExecutionListener, const QString&, Object::Pointer> PostExecuteSuccessDelegate;
-    typedef MessageDelegate2<IExecutionListener, const QString&, const SmartPointer<const ExecutionEvent> > PreExecuteDelegate;
+    typedef MessageDelegate2<IExecutionListener, const QString&, const Object::Pointer&> PostExecuteSuccessDelegate;
+    typedef MessageDelegate2<IExecutionListener, const QString&, const SmartPointer<const ExecutionEvent>& > PreExecuteDelegate;
   };
 
   virtual ~IExecutionListener();
 
   /**
    * Notifies the listener that an attempt was made to execute a command with
    * no handler.
    *
    * @param commandId
    *            The identifier of command that is not handled; never
    *            <code>null</code>
    * @param exception
    *            The exception that occurred; never <code>null</code>.
    */
   virtual void NotHandled(const QString& commandId, const NotHandledException* exception) = 0;
 
   /**
    * Notifies the listener that a command has failed to complete execution.
    *
    * @param commandId
    *            The identifier of the command that has executed; never
    *            <code>null</code>.
    * @param exception
    *            The exception that occurred; never <code>null</code>.
    */
   virtual void PostExecuteFailure(const QString& commandId,
       const ExecutionException* exception) = 0;
 
   /**
    * Notifies the listener that a command has completed execution
    * successfully.
    *
    * @param commandId
    *            The identifier of the command that has executed; never
    *            <code>null</code>.
    * @param returnValue
    *            The return value from the command; may be <code>null</code>.
    */
-  virtual void PostExecuteSuccess(const QString& commandId, const Object::Pointer returnValue) = 0;
+  virtual void PostExecuteSuccess(const QString& commandId, const Object::Pointer& returnValue) = 0;
 
   /**
    * Notifies the listener that a command is about to execute.
    *
    * @param commandId
    *            The identifier of the command that is about to execute, never
    *            <code>null</code>.
    * @param event
    *            The event that will be passed to the <code>execute</code>
    *            method; never <code>null</code>.
    */
-  virtual void PreExecute(const QString& commandId, const SmartPointer<const ExecutionEvent> event) = 0;
+  virtual void PreExecute(const QString& commandId, const SmartPointer<const ExecutionEvent>& event) = 0;
 };
 
 }
 
 #endif /* BERRYIEXECUTIONLISTENER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIExecutionListenerWithChecks.cpp b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIExecutionListenerWithChecks.cpp
index be246979e3..c51ee3279c 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIExecutionListenerWithChecks.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIExecutionListenerWithChecks.cpp
@@ -1,71 +1,72 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryIExecutionListenerWithChecks.h"
 
 #include "berryExecutionEvent.h"
 #include "berryIParameterValueConverter.h"
 #include "berryCommandCategory.h"
+#include "berryState.h"
 #include "berryIHandler.h"
 
 namespace berry {
 
 void
 IExecutionListenerWithChecks::Events
 ::AddListener(IExecutionListener* l)
 {
   if (l == 0) return;
 
   IExecutionListener::Events::AddListener(l);
 
   if (IExecutionListenerWithChecks* cl = dynamic_cast<IExecutionListenerWithChecks*>(l))
   {
     notDefined += NotDefinedDelegate(cl, &IExecutionListenerWithChecks::NotDefined);
     notEnabled += NotEnabledDelegate(cl, &IExecutionListenerWithChecks::NotEnabled);
   }
 }
 
 void
 IExecutionListenerWithChecks::Events
 ::RemoveListener(IExecutionListener* l)
 {
   if (l == 0) return;
 
   IExecutionListener::Events::RemoveListener(l);
 
   if (IExecutionListenerWithChecks* cl = dynamic_cast<IExecutionListenerWithChecks*>(l))
   {
     notDefined -= NotDefinedDelegate(cl, &IExecutionListenerWithChecks::NotDefined);
     notEnabled -= NotEnabledDelegate(cl, &IExecutionListenerWithChecks::NotEnabled);
   }
 }
 
 bool
 IExecutionListenerWithChecks::Events
 ::HasListeners() const
 {
   return IExecutionListener::Events::HasListeners() || notDefined.HasListeners() ||
          notEnabled.HasListeners();
 }
 
 bool
 IExecutionListenerWithChecks::Events
 ::IsEmpty() const
 {
   return !this->HasListeners();
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIExecutionListenerWithChecks.h b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIExecutionListenerWithChecks.h
index 2ac3962af4..d4570dc62b 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIExecutionListenerWithChecks.h
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIExecutionListenerWithChecks.h
@@ -1,87 +1,83 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIEXECUTIONLISTENERWITHCHECKS_H_
 #define BERRYIEXECUTIONLISTENERWITHCHECKS_H_
 
 #include "berryIExecutionListener.h"
 #include "common/berryCommandExceptions.h"
 
 namespace berry {
 
 /**
  * <p>
  * A listener to the execution of commands. This listener will be notified if
  * someone tries to execute a command and it is not enabled or not defined. The
  * listener also be notified if a command is about to execute, and when that
  * execution completes. It is not possible for the listener to prevent the
  * execution, only to respond to it in some way.
  * </p>
  * <p>
  * Clients may implement.
  * </p>
- *
- * @since 3.2
  */
 struct BERRY_COMMANDS IExecutionListenerWithChecks : public IExecutionListener {
 
-  berryInterfaceMacro(IExecutionListenerWithChecks, berry);
-
   struct Events : public IExecutionListener::Events {
 
     Message2<const QString&, const NotDefinedException*> notDefined;
     Message2<const QString&, const NotEnabledException*> notEnabled;
 
     void AddListener(IExecutionListener* listener);
     void RemoveListener(IExecutionListener* listener);
     bool HasListeners() const;
     bool IsEmpty() const;
 
     private:
 
     typedef MessageDelegate2<IExecutionListenerWithChecks, const QString&, const NotDefinedException* > NotDefinedDelegate;
     typedef MessageDelegate2<IExecutionListenerWithChecks, const QString&, const NotEnabledException*> NotEnabledDelegate;
   };
 
   /**
    * Notifies the listener that an attempt was made to execute a command that
    * is not defined.
    *
    * @param commandId
    *            The identifier of command that is not defined; never
    *            <code>null</code>
    * @param exception
    *            The exception that occurred; never <code>null</code>.
    */
   virtual void NotDefined(const QString& commandId, const NotDefinedException* exception) = 0;
 
   /**
    * Notifies the listener that an attempt was made to execute a command that
    * is disabled.
    *
    * @param commandId
    *            The identifier of command that is not enabled; never
    *            <code>null</code>
    * @param exception
    *            The exception that occurred; never <code>null</code>.
    */
   virtual void NotEnabled(const QString& commandId, const NotEnabledException* exception) = 0;
 };
 
 }
 
 #endif /* BERRYIEXECUTIONLISTENERWITHCHECKS_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIHandler.h b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIHandler.h
index b3e043c04c..e3ee947558 100644
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIHandler.h
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIHandler.h
@@ -1,123 +1,126 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIHANDLER_H_
 #define BERRYIHANDLER_H_
 
 #include <berryMacros.h>
 #include <berryObject.h>
 #include <org_blueberry_core_commands_Export.h>
 
 namespace berry {
 
 struct IHandlerListener;
 class ExecutionEvent;
 
 /**
  * A handler is the pluggable piece of a command that handles execution. Each
  * command can have zero or more handlers associated with it (in general), of
  * which only one will be active at any given moment in time. When the command
  * is asked to execute, it will simply pass that request on to its active
  * handler, if any.
  *
  * @see AbstractHandler
- * @since 3.1
  */
-struct BERRY_COMMANDS IHandler : public Object {
+struct BERRY_COMMANDS IHandler : public virtual Object
+{
 
-  berryInterfaceMacro(IHandler, berry);
+  berryObjectMacro(berry::IHandler)
 
   /**
    * Registers an instance of <code>IHandlerListener</code> to listen for
    * changes to properties of this instance.
    *
    * @param handlerListener
    *            the instance to register. Must not be <code>null</code>. If
    *            an attempt is made to register an instance which is already
    *            registered with this instance, no operation is performed.
    */
-  virtual void AddHandlerListener(SmartPointer<IHandlerListener> handlerListener) = 0;
+  virtual void AddHandlerListener(IHandlerListener* handlerListener) = 0;
 
   /**
-   * Disposes of this handler. This can be used as an opportunity to unhook listeners
+   * Disposes of this handler. This method is run once when the object is no
+   * longer referenced. This can be used as an opportunity to unhook listeners
    * from other objects.
    */
-  virtual ~IHandler() {}
+  virtual void Dispose() = 0;
 
   /**
    * Executes with the map of parameter values by name.
    *
    * @param event
    *            An event containing all the information about the current
    *            state of the application; must not be <code>null</code>.
    * @return the result of the execution. Reserved for future use, must be
    *         <code>null</code>.
    * @throws ExecutionException
    *             if an exception occurred during execution.
    */
-  virtual Object::Pointer Execute(const SmartPointer<const ExecutionEvent> event) = 0;
+  virtual Object::Pointer Execute(const SmartPointer<const ExecutionEvent>& event) = 0;
 
   /**
      * Called by the framework to allow the handler to update its enabled state.
      *
      * @param evaluationContext
      *            the state to evaluate against. May be <code>null</code>
      *            which indicates that the handler can query whatever model that
      *            is necessary. This context must not be cached.
      */
-  virtual void SetEnabled(Object::ConstPointer evaluationContext) = 0;
+  virtual void SetEnabled(const Object::Pointer& evaluationContext) = 0;
 
   /**
    * Returns whether this handler is capable of executing at this moment in
    * time. If the enabled state is other than true clients should also
    * consider implementing IHandler2 so they can be notified about framework
    * execution contexts.
    *
    * @return <code>true</code> if the command is enabled; <code>false</code>
    *         otherwise.
    * @see IHandler2#setEnabled(Object)
    */
   virtual bool IsEnabled() const = 0;
 
   /**
    * Returns whether this handler is really capable of handling delegation. In
    * the case of a handler that is a composition of other handlers, this reply
    * is intended to indicate whether the handler is truly capable of receiving
    * delegated responsibilities at this time.
    *
    * @return <code>true</code> if the handler is handled; <code>false</code>
    *         otherwise.
    */
   virtual bool IsHandled() const = 0;
 
   /**
    * Unregisters an instance of <code>IHandlerListener</code> listening for
    * changes to properties of this instance.
    *
    * @param handlerListener
    *            the instance to unregister. Must not be <code>null</code>.
    *            If an attempt is made to unregister an instance which is not
    *            already registered with this instance, no operation is
    *            performed.
    */
-  virtual void RemoveHandlerListener(SmartPointer<IHandlerListener> handlerListener) = 0;
+  virtual void RemoveHandlerListener(IHandlerListener* handlerListener) = 0;
 
 
 };
 
 }
 
+Q_DECLARE_INTERFACE(berry::IHandler, "org.blueberry.core.commands.IHandler")
+
 #endif /*BERRYIHANDLER_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIHandlerListener.cpp b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIHandlerListener.cpp
index 96985406ab..844978ae5c 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIHandlerListener.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIHandlerListener.cpp
@@ -1,43 +1,47 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryIHandlerListener.h"
 
 #include "berryIHandler.h"
 #include "berryHandlerEvent.h"
 
 namespace berry {
 
 void
 IHandlerListener::Events
-::AddListener(IHandlerListener::Pointer l)
+::AddListener(IHandlerListener* l)
 {
-  if (l.IsNull()) return;
+  if (l == NULL) return;
 
-  handlerChanged += Delegate(l.GetPointer(), &IHandlerListener::HandlerChanged);
+  handlerChanged += Delegate(l, &IHandlerListener::HandlerChanged);
 }
 
 void
 IHandlerListener::Events
-::RemoveListener(IHandlerListener::Pointer l)
+::RemoveListener(IHandlerListener* l)
 {
-  if (l.IsNull()) return;
+  if (l == NULL) return;
 
-  handlerChanged -= Delegate(l.GetPointer(), &IHandlerListener::HandlerChanged);
+  handlerChanged -= Delegate(l, &IHandlerListener::HandlerChanged);
+}
+
+IHandlerListener::~IHandlerListener()
+{
 }
 
 }
 
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIHandlerListener.h b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIHandlerListener.h
index 96673f4154..cde1f9fc6f 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIHandlerListener.h
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIHandlerListener.h
@@ -1,72 +1,72 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIHANDLERLISTENER_H_
 #define BERRYIHANDLERLISTENER_H_
 
-#include <berryObject.h>
-#include <berryMacros.h>
 #include <berryMessage.h>
 
 #include <org_blueberry_core_commands_Export.h>
 
 namespace berry {
 
+template<class T> class SmartPointer;
+
 class HandlerEvent;
 
 /**
  * An instance of this interface can be used by clients to receive notification
  * of changes to one or more instances of <code>IHandler</code>.
  * <p>
  * This interface may be implemented by clients.
  * </p>
  *
- * @since 3.1
  * @see IHandler#addHandlerListener(IHandlerListener)
  * @see IHandler#removeHandlerListener(IHandlerListener)
  */
-struct BERRY_COMMANDS IHandlerListener : public virtual Object {
-
-  berryInterfaceMacro(IHandlerListener, berry);
+struct BERRY_COMMANDS IHandlerListener
+{
 
   struct Events {
 
-    typedef Message1<SmartPointer<HandlerEvent> > Event;
+    typedef Message1<const SmartPointer<HandlerEvent>&> Event;
 
     Event handlerChanged;
 
-    void AddListener(IHandlerListener::Pointer listener);
-    void RemoveListener(IHandlerListener::Pointer listener);
+    void AddListener(IHandlerListener* listener);
+    void RemoveListener(IHandlerListener* listener);
 
   private:
-    typedef MessageDelegate1<IHandlerListener, SmartPointer<HandlerEvent> > Delegate;
+    typedef MessageDelegate1<IHandlerListener, const SmartPointer<HandlerEvent>&> Delegate;
   };
 
+  virtual ~IHandlerListener();
+
   /**
    * Notifies that one or more properties of an instance of
    * <code>IHandler</code> have changed. Specific details are described in
    * the <code>HandlerEvent</code>.
    *
    * @param handlerEvent
    *            the handler event. Guaranteed not to be <code>null</code>.
    */
-  virtual void HandlerChanged(SmartPointer<HandlerEvent> handlerEvent) = 0;
+  virtual void HandlerChanged(const SmartPointer<HandlerEvent>& handlerEvent) = 0;
 };
 
 }
 
 #endif /* BERRYIHANDLERLISTENER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIObjectWithState.h b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIObjectWithState.h
index 24d1ad12bf..fc15b5b424 100644
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIObjectWithState.h
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIObjectWithState.h
@@ -1,86 +1,87 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIOBJECTWITHSTATE_H_
 #define BERRYIOBJECTWITHSTATE_H_
 
-#include <org_blueberry_core_commands_Export.h>
-#include "berryState.h"
+#include "berryObject.h"
 
-#include <QStringList>
+#include <org_blueberry_core_commands_Export.h>
 
 namespace berry {
 
+class State;
+
 /**
  * <p>
  * An object that holds zero or more state objects. This state information can
  * be shared between different instances of <code>IObjectWithState</code>.
  * </p>
  * <p>
  * Clients may implement, but must not extend this interface.
  * </p>
  *
  * @see AbstractHandlerWithState
- * @since 3.2
  */
-struct BERRY_COMMANDS IObjectWithState : public virtual Object {
+struct BERRY_COMMANDS IObjectWithState : public virtual Object
+{
 
-  berryInterfaceMacro(IObjectWithState, berry);
+  berryObjectMacro(berry::IObjectWithState)
 
   /**
    * Adds state to this object.
    *
    * @param id
    *            The identifier indicating the type of state being added; must
    *            not be <code>null</code>.
    * @param state
    *            The new state to add to this object; must not be
    *            <code>null</code>.
    */
-  virtual void AddState(const QString& id, const State::Pointer state) = 0;
+  virtual void AddState(const QString& id, const SmartPointer<State>& state) = 0;
 
   /**
    * Gets the state with the given id.
    *
    * @param stateId
    *            The identifier of the state to retrieve; must not be
    *            <code>null</code>.
    * @return The state; may be <code>null</code> if there is no state with
    *         the given id.
    */
-  virtual State::Pointer GetState(const QString& stateId) const = 0;
+  virtual SmartPointer<State> GetState(const QString& stateId) const = 0;
 
   /**
    * Gets the identifiers for all of the state associated with this object.
    *
    * @return All of the state identifiers; may be empty, but never
    *         <code>null</code>.
    */
-  virtual QStringList GetStateIds() const = 0;
+  virtual QList<QString> GetStateIds() const = 0;
 
   /**
    * Removes state from this object.
    *
    * @param stateId
    *            The id of the state to remove from this object; must not be
    *            <code>null</code>.
    */
   virtual void RemoveState(const QString& stateId) = 0;
 };
 
 }
 
 #endif /*BERRYIOBJECTWITHSTATE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIParameter.h b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIParameter.h
index 5c50bd849c..44be5babf9 100644
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIParameter.h
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIParameter.h
@@ -1,78 +1,79 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIPARAMETER_H_
 #define BERRYIPARAMETER_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
 #include <org_blueberry_core_commands_Export.h>
 
-#include <QHash>
 
 namespace berry {
 
+struct IParameterValues;
+
 /**
  * <p>
  * A parameter for a command. A parameter identifies a type of information that
  * the command might accept. For example, a "Show View" command might accept the
  * id of a view for display. This parameter also identifies possible values, for
  * display in the user interface.
  * </p>
  */
 struct BERRY_COMMANDS IParameter : public virtual Object
 {
 
-  berryInterfaceMacro(IParameter, berry)
+  berryObjectMacro(berry::IParameter)
 
   typedef QHash<QString, QString> ParameterValues;
 
   /**
    * Returns the identifier for this parameter.
    *
    * @return The identifier; never <code>null</code>.
    */
   virtual QString GetId() const = 0;
 
   /**
    * Returns the human-readable name for this parameter.
    *
    * @return The parameter name; never <code>null</code>.
    */
   virtual QString GetName() const = 0;
 
   /**
    * Returns the values associated with this parameter.
    *
    * @return The values associated with this parameter. This must not be
    *         <code>null</code>.
    * @throws ParameterValuesException
    *             If the values can't be retrieved for some reason.
    */
-  virtual ParameterValues GetValues() const = 0;
+  virtual IParameterValues* GetValues() const = 0;
 
   /**
    * Returns whether parameter is optional. Otherwise, it is required.
    *
    * @return <code>true</code> if the parameter is optional;
    *         <code>false</code> if it is required.
    */
   virtual bool IsOptional() const = 0;
 };
 
 }
 
 #endif /*BERRYIPARAMETER_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIParameterTypeListener.cpp b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIParameterTypeListener.cpp
index 68b1a84a14..5df43bc944 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIParameterTypeListener.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIParameterTypeListener.cpp
@@ -1,43 +1,47 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryIParameterTypeListener.h"
 
 #include "berryParameterTypeEvent.h"
 #include "berryParameterType.h"
 
 namespace berry {
 
 void
 IParameterTypeListener::Events
 ::AddListener(IParameterTypeListener* l)
 {
   if (l == 0) return;
 
   parameterTypeChanged += Delegate(l, &IParameterTypeListener::ParameterTypeChanged);
 }
 
 void
 IParameterTypeListener::Events
 ::RemoveListener(IParameterTypeListener* l)
 {
   if (l == 0) return;
 
   parameterTypeChanged -= Delegate(l, &IParameterTypeListener::ParameterTypeChanged);
 }
 
+IParameterTypeListener::~IParameterTypeListener()
+{
+}
+
 }
 
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIParameterTypeListener.h b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIParameterTypeListener.h
index 7e2f86ac96..dd51f3bc42 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIParameterTypeListener.h
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIParameterTypeListener.h
@@ -1,72 +1,73 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIPARAMETERTYPELISTENER_H_
 #define BERRYIPARAMETERTYPELISTENER_H_
 
-#include <berryObject.h>
-#include <berryMacros.h>
 #include <berryMessage.h>
 
 #include <org_blueberry_core_commands_Export.h>
 
 namespace berry {
 
+template<class T> class SmartPointer;
+
 class ParameterTypeEvent;
 
 /**
  * An instance of this interface can be used by clients to receive notification
  * of changes to one or more instances of {@link ParameterType}.
  * <p>
  * This interface may be implemented by clients.
  * </p>
  *
  * @see ParameterType#AddListener(IParameterTypeListener::Pointer)
  * @see ParameterType#RemoveListener(IParameterTypeListener::Pointer)
  */
-struct BERRY_COMMANDS IParameterTypeListener : public virtual Object {
-
-  berryInterfaceMacro(IParameterTypeListener, berry);
+struct BERRY_COMMANDS IParameterTypeListener
+{
 
   struct Events {
 
-    typedef Message1<const SmartPointer<const ParameterTypeEvent> > Event;
+    typedef Message1<const SmartPointer<const ParameterTypeEvent>& > Event;
 
     Event parameterTypeChanged;
 
     void AddListener(IParameterTypeListener* listener);
     void RemoveListener(IParameterTypeListener* listener);
 
-    typedef MessageDelegate1<IParameterTypeListener, const SmartPointer<const ParameterTypeEvent> > Delegate;
+    typedef MessageDelegate1<IParameterTypeListener, const SmartPointer<const ParameterTypeEvent>& > Delegate;
   };
 
+  virtual ~IParameterTypeListener();
+
   /**
    * Notifies that one or more properties of an instance of
    * {@link ParameterType} have changed. Specific details are described in the
    * {@link ParameterTypeEvent}.
    *
    * @param parameterTypeEvent
    *            the event. Guaranteed not to be <code>null</code>.
    */
-  virtual void ParameterTypeChanged(const SmartPointer<const ParameterTypeEvent> parameterTypeEvent) = 0;
+  virtual void ParameterTypeChanged(const SmartPointer<const ParameterTypeEvent>& parameterTypeEvent) = 0;
 
 };
 
 
 }
 
 #endif /* BERRYIPARAMETERTYPELISTENER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryRuntime.cpp b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIParameterValueConverter.cpp
similarity index 82%
copy from BlueBerry/Bundles/org.blueberry.core.runtime/src/berryRuntime.cpp
copy to BlueBerry/Bundles/org.blueberry.core.commands/src/berryIParameterValueConverter.cpp
index 7be762e2ce..503ce215b1 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryRuntime.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIParameterValueConverter.cpp
@@ -1,23 +1,23 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
-#include "berryRuntime.h"
+#include "berryIParameterValueConverter.h"
 
 namespace berry {
 
-const std::string Runtime::ADAPTER_SERVICE_ID = "org.blueberry.service.adapter";
+IParameterValueConverter::~IParameterValueConverter() {}
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIParameterValueConverter.h b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIParameterValueConverter.h
index 1b1f04a13e..9c0d2e40b3 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIParameterValueConverter.h
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIParameterValueConverter.h
@@ -1,106 +1,108 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYABSTRACTPARAMETERVALUECONVERTER_H_
 #define BERRYABSTRACTPARAMETERVALUECONVERTER_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
 
 #include <org_blueberry_core_commands_Export.h>
 
 namespace berry {
 
 /**
  * <p>
  * Supports conversion between objects and strings for command parameter values.
  * Extenders must produce strings that identify objects (of a specific command
  * parameter type) as well as consume the strings to locate and return the
  * objects they identify.
  * </p>
  * <p>
  * This class offers multiple handlers of a command a consistent way of
  * converting string parameter values into the objects that the handlers would
  * prefer to deal with. This class also gives clients a way to serialize
  * object parameters as strings so that entire parameterized commands can be
  * serialized, stored and later deserialized and executed.
  * </p>
  * <p>
  * This class will typically be extended so the subclass can be referenced from
  * the <code>converter</code> attribute of the
  * <code>commandParameterType</code> elemement of the
- * <code>org.eclipse.ui.commands</code> extension-point. Objects implementing
+ * <code>org.blueberry.ui.commands</code> extension-point. Objects implementing
  * this interface may also be passed directly to
  * {@link ParameterType#Define(IParameterValueConverter::Pointer)} by
  * clients.
  * </p>
  *
  * @see ParameterType#Define(IParameterValueConverter::Pointer)
  * @see ParameterizedCommand#Serialize()
  */
-struct BERRY_COMMANDS IParameterValueConverter : public virtual Object {
+struct BERRY_COMMANDS IParameterValueConverter {
 
-  berryInterfaceMacro(IParameterValueConverter, berry);
+  virtual ~IParameterValueConverter();
 
   /**
    * Returns whether the provided value is compatible with this parameter
    * value converter. An object is compatible with a converter if the object is an
    * instance of the class defined in the <code>type</code> attribute of
    * the <code>commandParameterType</code> element.
    *
    * @param value
    *            an object to check for compatibility with this parameter type;
    *            may be <code>null</code>.
    * @return <code>true</code> if the value is compatible with this converter,
    *         <code>false</code> otherwise
    */
-  virtual bool IsCompatible(const Object::ConstPointer value) const = 0;
+  //virtual bool IsCompatible(const Object::ConstPointer value) const = 0;
 
   /**
    * Converts a string encoded command parameter value into the parameter
    * value object.
    *
    * @param parameterValue
    *            a command parameter value string describing an object; may be
    *            <code>null</code>
    * @return the object described by the command parameter value string; may
    *         be <code>null</code>
    * @throws ParameterValueConversionException
    *             if an object cannot be produced from the
    *             <code>parameterValue</code> string
    */
   virtual Object::Pointer ConvertToObject(const QString& parameterValue) = 0;
 
   /**
    * Converts a command parameter value object into a string that encodes a
    * reference to the object or serialization of the object.
    *
    * @param parameterValue
    *            an object to convert into an identifying string; may be
    *            <code>null</code>
    * @return a string describing the provided object; may be <code>null</code>
    * @throws ParameterValueConversionException
    *             if a string reference or serialization cannot be provided for
    *             the <code>parameterValue</code>
    */
-  virtual QString ConvertToString(const Object::Pointer parameterValue) = 0;
+  virtual QString ConvertToString(const Object::Pointer& parameterValue) = 0;
 
 };
 
 }
 
+Q_DECLARE_INTERFACE(berry::IParameterValueConverter, "org.blueberry.core.commands.IParameterValueConverter")
+
 #endif /* BERRYABSTRACTPARAMETERVALUECONVERTER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryRuntime.cpp b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIParameterValues.cpp
similarity index 82%
copy from BlueBerry/Bundles/org.blueberry.core.runtime/src/berryRuntime.cpp
copy to BlueBerry/Bundles/org.blueberry.core.commands/src/berryIParameterValues.cpp
index 7be762e2ce..c0230ebfaa 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryRuntime.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIParameterValues.cpp
@@ -1,23 +1,23 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
-#include "berryRuntime.h"
+#include "berryIParameterValues.h"
 
 namespace berry {
 
-const std::string Runtime::ADAPTER_SERVICE_ID = "org.blueberry.service.adapter";
+IParameterValues::~IParameterValues() {}
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIParameterValues.h b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIParameterValues.h
new file mode 100644
index 0000000000..56c70b1f0a
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIParameterValues.h
@@ -0,0 +1,53 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYIPARAMETERVALUES_H
+#define BERRYIPARAMETERVALUES_H
+
+#include "berryObject.h"
+
+#include <QHash>
+#include <QString>
+
+namespace berry {
+
+/**
+ * <p>
+ * The parameters for a command. This interface will only be consulted if the
+ * parameters need to be displayed to the user. Otherwise, they will be ignored.
+ * </p>
+*/
+struct IParameterValues
+{
+  virtual ~IParameterValues();
+
+  /**
+   * Returns a map keyed by externalized names for parameter values. These
+   * names should be human-readable, and are generally for display to the user
+   * in a user interface of some sort. The values should be actual values that
+   * will be interpreted by the handler for the command.
+   *
+   * @return A map of the externalizable name of the parameter value (<code>String</code>)
+   *         to the actual value of the parameter (<code>String</code>).
+   */
+  virtual QHash<QString,QString> GetParameterValues() const = 0;
+};
+
+}
+
+Q_DECLARE_INTERFACE(berry::IParameterValues, "org.blueberry.core.commands.IParameterValues")
+
+#endif // BERRYIPARAMETERVALUES_H
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIStateListener.h b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIStateListener.h
index 736b33ea5e..f99c226454 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIStateListener.h
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryIStateListener.h
@@ -1,73 +1,74 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYISTATELISTENER_H_
 #define BERRYISTATELISTENER_H_
 
-#include "berryObject.h"
-#include "berryMacros.h"
-
 #include <org_blueberry_core_commands_Export.h>
 
+#include "berryMessage.h"
+
 namespace berry {
 
+template<class T> class SmartPointer;
+
+class Object;
 class State;
 
 /**
  * <p>
  * A listener to changes in some state.
  * </p>
  * <p>
  * Clients may implement, but must not extend this interface.
  * </p>
  */
-struct BERRY_COMMANDS IStateListener {
-
-  berryInterfaceMacro(IStateListener, berry);
+struct BERRY_COMMANDS IStateListener
+{
 
   struct Events {
 
-    typedef Message2<const SmartPointer<State>&, const Object::Pointer&> StateEvent;
+    typedef Message2<const SmartPointer<State>&, const SmartPointer<Object>&> StateEvent;
 
     StateEvent stateChanged;
 
     void AddListener(IStateListener* listener);
     void RemoveListener(IStateListener* listener);
 
     private:
-    typedef MessageDelegate2<IStateListener, const SmartPointer<State>&, const Object::Pointer&> Delegate;
+    typedef MessageDelegate2<IStateListener, const SmartPointer<State>&, const SmartPointer<Object>&> Delegate;
   };
 
   virtual ~IStateListener();
 
   /**
    * Handles a change to the value in some state.
    *
    * @param state
    *            The state that has changed; never <code>null</code>. The
    *            value for this state has been updated to the new value.
    * @param oldValue
    *            The old value; may be anything.
    */
   virtual void HandleStateChange(const SmartPointer<State>& state,
-                                 const Object::Pointer& oldValue) = 0;
+                                 const SmartPointer<Object>& oldValue) = 0;
 };
 
 
 }
 
 #endif /* BERRYISTATELISTENER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryITypedParameter.h b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryITypedParameter.h
index 013838bbf9..2430c74129 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryITypedParameter.h
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryITypedParameter.h
@@ -1,55 +1,55 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYITYPEDPARAMETER_H_
 #define BERRYITYPEDPARAMETER_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
 
 #include <org_blueberry_core_commands_Export.h>
 
 namespace berry {
 
 class ParameterType;
 
 /**
  * A command parameter that has a declared type. This interface is intended to
  * be implemented by implementors of {@link IParameter} that will support
  * parameter types.
  *
  */
 struct BERRY_COMMANDS ITypedParameter : public virtual Object {
 
-  berryInterfaceMacro(ITypedParameter, berry);
+  berryObjectMacro(berry::ITypedParameter)
 
   /**
    * Returns the {@link ParameterType} associated with a command parameter or
    * <code>null</code> if the parameter does not declare a type.
    * <p>
    * Note that the parameter type returned may be undefined.
    * </p>
    *
    * @return the parameter type associated with a command parameter or
    *         <code>null</code> if the parameter does not declare a type
    */
-  virtual SmartPointer<ParameterType> GetParameterType() = 0;
+  virtual SmartPointer<ParameterType> GetParameterType() const = 0;
 };
 
 }
 
 #endif /* BERRYITYPEDPARAMETER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryNamedHandleObjectWithState.cpp b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryNamedHandleObjectWithState.cpp
index 2b0ce0c804..fb90b216af 100644
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryNamedHandleObjectWithState.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryNamedHandleObjectWithState.cpp
@@ -1,115 +1,115 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryNamedHandleObjectWithState.h"
 #include "berryINamedHandleStateIds.h"
 
-#include <Poco/Exception.h>
+#include "berryState.h"
 
 namespace berry
 {
 
 void NamedHandleObjectWithState::AddState(const QString& stateId,
-    const State::Pointer state)
+                                          const State::Pointer& state)
 {
   if (!state)
   {
-    throw Poco::NullPointerException("Cannot add a null state"); //$NON-NLS-1$
+    throw Poco::NullPointerException("Cannot add a null state");
   }
 
   states[stateId] = state;
 }
 
 QString NamedHandleObjectWithState::GetDescription() const
 {
   const QString description(NamedHandleObject::GetDescription()); // Trigger a NDE.
 
   const State::ConstPointer
       descriptionState(this->GetState(INamedHandleStateIds::DESCRIPTION));
   if (descriptionState.IsNotNull())
   {
     const Object::ConstPointer value(descriptionState->GetValue());
     if (value.IsNotNull())
     {
       return value->ToString();
     }
   }
 
   return description;
 }
 
 QString NamedHandleObjectWithState::GetName() const
 {
   const QString name(NamedHandleObject::GetName()); // Trigger a NDE, if necessary.
 
   const State::ConstPointer
       nameState(this->GetState(INamedHandleStateIds::NAME));
   if (nameState.IsNotNull())
   {
     const Object::ConstPointer value(nameState->GetValue());
     if (value.IsNotNull())
     {
       return value->ToString();
     }
   }
 
   return name;
 }
 
 State::Pointer NamedHandleObjectWithState::GetState(
     const QString& stateId) const
 {
   if (states.empty())
   {
     return State::Pointer(0);
   }
 
   QHash<QString, State::Pointer>::const_iterator iter = states.find(stateId);
   return iter.value();
 }
 
-QStringList NamedHandleObjectWithState::GetStateIds() const
+QList<QString> NamedHandleObjectWithState::GetStateIds() const
 {
   if (states.empty())
   {
-    return QStringList();
+    return QList<QString>();
   }
 
-  QStringList stateIds;
+  QList<QString> stateIds;
   for (QHash<QString, State::Pointer>::const_iterator iter = states.begin();
       iter != states.end(); ++iter)
   {
     stateIds.push_back(iter.key());
   }
   return stateIds;
 }
 
 void NamedHandleObjectWithState::RemoveState(const QString& id)
 {
   if (id.isEmpty())
   {
     throw ctkInvalidArgumentException("Cannot remove an empty id");
   }
 
   states.remove(id);
 }
 
 NamedHandleObjectWithState::NamedHandleObjectWithState(const QString& id)
   : NamedHandleObject(id)
 {
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryNamedHandleObjectWithState.h b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryNamedHandleObjectWithState.h
index ae0b688733..476cfc8529 100644
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryNamedHandleObjectWithState.h
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryNamedHandleObjectWithState.h
@@ -1,76 +1,76 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYNAMEDHANDLEOBJECTWITHSTATE_H_
 #define BERRYNAMEDHANDLEOBJECTWITHSTATE_H_
 
 #include "common/berryNamedHandleObject.h"
 #include "berryIObjectWithState.h"
 
 #include <QHash>
 
 namespace berry {
 
 /**
  * <p>
  * A named handle object that can carry state with it. This state can be used to
  * override the name or description.
  * </p>
  * <p>
  * Clients may neither instantiate nor extend this class.
  * </p>
  */
 class BERRY_COMMANDS NamedHandleObjectWithState : public NamedHandleObject, public IObjectWithState {
 
 public:
 
   berryObjectMacro(berry::NamedHandleObjectWithState)
 
-  void AddState(const QString& stateId, const State::Pointer state);
+  void AddState(const QString& stateId, const SmartPointer<State>& state);
 
   QString GetDescription() const;
 
   QString GetName() const;
 
-  State::Pointer GetState(const QString& stateId) const;
+  SmartPointer<State> GetState(const QString& stateId) const;
 
-  QStringList GetStateIds() const;
+  QList<QString> GetStateIds() const;
 
   void RemoveState(const QString& id);
 
-  private:
+private:
 
-    /**
-     * The map of states currently held by this command. If this command has no
-     * state, then this will be empty.
-     */
-    QHash<QString, State::Pointer> states;
+  /**
+   * The map of states currently held by this command. If this command has no
+   * state, then this will be empty.
+   */
+  QHash<QString, SmartPointer<State> > states;
 
-  protected:
+protected:
 
-    /**
-     * Constructs a new instance of <code>NamedHandleObject<WithState/code>.
-     *
-     * @param id
-     *            The identifier for this handle; must not be empty.
-     */
-    NamedHandleObjectWithState(const QString& id);
+  /**
+   * Constructs a new instance of <code>NamedHandleObject<WithState/code>.
+   *
+   * @param id
+   *            The identifier for this handle; must not be empty.
+   */
+  NamedHandleObjectWithState(const QString& id);
 
 };
 
 }
 
 #endif /*BERRYNAMEDHANDLEOBJECTWITHSTATE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryParameterType.cpp b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryParameterType.cpp
index ba64324439..8624badffe 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryParameterType.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryParameterType.cpp
@@ -1,126 +1,126 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryParameterType.h"
 #include "internal/berryCommandUtils.h"
 #include "common/berryCommandExceptions.h"
 
 #include "berryParameterTypeEvent.h"
 #include "berryIParameterValueConverter.h"
 
 #include <sstream>
 
 namespace berry
 {
 
 void ParameterType::AddListener(IParameterTypeListener* listener)
 {
   parameterTypeEvents.AddListener(listener);
 }
 
 bool ParameterType::operator<(const Object* object) const
 {
   const ParameterType* castedObject = dynamic_cast<const ParameterType*>(object);
   int compareTo = CommandUtils::Compare(defined, castedObject->defined);
   if (compareTo == 0)
   {
     compareTo = CommandUtils::Compare(id, castedObject->id);
   }
   return compareTo < 0;
 }
 
-void ParameterType::Define(
-    const SmartPointer<IParameterValueConverter> parameterTypeConverter)
+void ParameterType::Define(const QString&  type,
+                           const QSharedPointer<IParameterValueConverter>& parameterTypeConverter)
 {
-
   const bool definedChanged = !this->defined;
   this->defined = true;
 
+  this->type = type.isNull() ? QObject::staticMetaObject.className() : type;
   this->parameterTypeConverter = parameterTypeConverter;
 
   ParameterTypeEvent::Pointer event(
       new ParameterTypeEvent(ParameterType::Pointer(this), definedChanged));
   this->FireParameterTypeChanged(event);
 }
-
-SmartPointer<IParameterValueConverter> ParameterType::GetValueConverter() const
+#include <qplugin.h>
+IParameterValueConverter* ParameterType::GetValueConverter() const
 {
   if (!this->IsDefined())
   {
     throw NotDefinedException(
         "Cannot use GetValueConverter() with an undefined ParameterType"); //$NON-NLS-1$
   }
 
-  return parameterTypeConverter;
+  return parameterTypeConverter.data();
 }
 
-bool ParameterType::IsCompatible(const Object::ConstPointer value) const
+bool ParameterType::IsCompatible(const QObject* const value) const
 {
   if (!this->IsDefined())
   {
     throw NotDefinedException(
         "Cannot use IsCompatible() with an undefined ParameterType");
   }
-  return parameterTypeConverter->IsCompatible(value);
+  return value->inherits(qPrintable(type));
 }
 
 void ParameterType::RemoveListener(IParameterTypeListener* listener)
 {
   parameterTypeEvents.RemoveListener(listener);
 }
 
 QString ParameterType::ToString() const
 {
   if (str.isEmpty())
   {
     QTextStream stringBuffer(&str);
     stringBuffer << "ParameterType(" << id << "," << defined << ")";
   }
   return str;
 }
 
 void ParameterType::Undefine()
 {
   str = "";
 
   const bool definedChanged = defined;
   defined = false;
 
-  parameterTypeConverter = 0;
+  parameterTypeConverter.clear();
 
   ParameterTypeEvent::Pointer event(
       new ParameterTypeEvent(ParameterType::Pointer(this), definedChanged));
   this->FireParameterTypeChanged(event);
 }
 
 ParameterType::ParameterType(const QString& id) :
   HandleObject(id)
 {
 
 }
 
 void ParameterType::FireParameterTypeChanged(const SmartPointer<
     ParameterTypeEvent> event)
 {
   if (!event)
   {
     throw ctkInvalidArgumentException("Cannot send a null event to listeners.");
   }
 
   parameterTypeEvents.parameterTypeChanged(event);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryParameterType.h b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryParameterType.h
index 49e0f1b89e..c2855cbd8d 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryParameterType.h
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryParameterType.h
@@ -1,193 +1,207 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYPARAMETERTYPE_H_
 #define BERRYPARAMETERTYPE_H_
 
 #include "common/berryHandleObject.h"
 #include "berryIParameterTypeListener.h"
 #include "berryIParameterValueConverter.h"
 
+#include <QSharedPointer>
+
 namespace berry
 {
 
 struct IParameterValueConverter;
 
 /**
  * <p>
  * Provides information about the type of a command parameter. Clients can use a
  * parameter type to check if an object matches the type of the parameter with
  * {@link #IsCompatible(Object::Pointer)} and can get an
  * {@link IParameterValueConverter} to convert between objects matching
  * the parameter type and strings that encode the object's identity.
  * </p>
  * <p>
  * A command parameter is not required to declare a type. To determine if a
  * given parameter has a type, check if an {@link IParameter} implements
  * {@link ITypedParameter} and if so, use
  * {@link ITypedParameter#GetParameterType()} like this:
  * </p>
  *
  * <pre>
  *                   IParameter::Pointer parameter = // ... get IParameter from Command
  *                   if (ITypedParameter::Pointer typedParameter = parameter.Cast<ITypedParameter>())
  *                   {
  *                     ParameterType::Pointer type = typedParameter->GetParameterType();
  *                     if (type) {
  *                       // this parameter has a ParameterType
  *                     }
  *                   }
  * </pre>
  *
  * @see IParameter
  * @see ITypedParameter#GetParameterType()
  */
 class BERRY_COMMANDS ParameterType: public HandleObject
 { //implements Comparable {
 
 public:
 
   berryObjectMacro(ParameterType);
 
   /**
    * Adds a listener to this parameter type that will be notified when its
    * state changes.
    *
    * @param listener
    *            The listener to be added; must not be <code>null</code>.
    */
 void  AddListener(IParameterTypeListener* listener);
 
   /**
    * Compares this parameter type with another object by comparing each of the
    * non-transient attributes.
    *
    * @param object
    *            The object with which to compare; must be an instance of
    *            {@link ParameterType}.
    * @return A negative integer, zero or a positive integer, if the object is
    *         greater than, equal to or less than this parameter type.
    */
   bool operator<(const Object* object) const;
 
   /**
    * <p>
    * Defines this parameter type, setting the defined property to
    * <code>true</code>.
    * </p>
    * <p>
    * Notification is sent to all listeners that something has changed.
    * </p>
    *
+   * @param type
+   *            a string identifying the object type for this parameter
+   *            type; <code>null</code> is interpreted as
+   *            <code>"QObject"</code>
    * @param parameterTypeConverter
    *            an {@link AbstractParameterValueConverter} to perform
    *            string/object conversions for parameter values; may be
    *            <code>null</code>
    */
-  void Define(const SmartPointer<IParameterValueConverter> parameterTypeConverter);
+  void Define(const QString& type,
+              const QSharedPointer<IParameterValueConverter>& parameterTypeConverter);
 
   /**
    * Returns the value converter associated with this parameter, if any.
    *
    * @return The parameter value converter, or <code>null</code> if there is
    *         no value converter for this parameter.
    * @throws NotDefinedException
    *             if the parameter type is not currently defined
    */
-  SmartPointer<IParameterValueConverter> GetValueConverter() const;
+  IParameterValueConverter* GetValueConverter() const;
 
   /**
    * Returns whether the provided value is compatible with this parameter
    * type. An object is compatible with a parameter type if the object is an
    * instance of the class defined as the parameter's type class.
    *
    * @param value
    *            an object to check for compatibility with this parameter type;
    *            may be <code>null</code>.
    * @return <code>true</code> if the value is compatible with this type,
    *         <code>false</code> otherwise
    * @throws NotDefinedException
    *             if the parameter type is not currently defined
    */
-  bool IsCompatible(const Object::ConstPointer value) const;
+  bool IsCompatible(const QObject* const value) const;
 
   /**
    * Unregisters listener for changes to properties of this parameter type.
    *
    * @param listener
    *            the instance to unregister. Must not be <code>null</code>.
    *            If an attempt is made to unregister an instance which is not
    *            already registered with this instance, no operation is
    *            performed.
    */
   void RemoveListener(IParameterTypeListener* listener);
 
   /**
    * The string representation of this parameter type. For debugging purposes
    * only. This string should not be shown to an end user.
    *
    * @return The string representation; never <code>null</code>.
    */
   QString ToString() const;
 
   /**
    * Makes this parameter type become undefined. Notification is sent to all
    * listeners.
    */
   void Undefine();
 
 protected:
 
   friend class CommandManager;
 
   /**
    * Constructs a new instance based on the given identifier. When a parameter
    * type is first constructed, it is undefined. Parameter types should only
    * be constructed by the {@link CommandManager} to ensure that the
    * identifier remains unique.
    *
    * @param id
    *            The identifier for this type. This value must not be
    *            <code>null</code>, and must be unique amongst all parameter
    *            types.
    */
   ParameterType(const QString& id);
 
 private:
 
   /**
    * Notifies all listeners that this parameter type has changed. This sends
    * the given event to all of the listeners, if any.
    *
    * @param event
    *            The event to send to the listeners; must not be
    *            <code>null</code>.
    */
   void FireParameterTypeChanged(const SmartPointer<ParameterTypeEvent> event);
 
   /**
    * An {@link AbstractParameterValueConverter} for converting parameter
    * values between objects and strings. This may be <code>null</code>.
    */
-  SmartPointer<IParameterValueConverter> parameterTypeConverter;
+  QSharedPointer<IParameterValueConverter> parameterTypeConverter;
+
+  /**
+   * A string specifying the object type of this parameter type. This will be
+   * <code>null</code> when the parameter type is undefined but never null
+   * when it is defined.
+   */
+  QString type;
 
   IParameterTypeListener::Events parameterTypeEvents;
 
 };
 
 }
 
 #endif /* BERRYPARAMETERTYPE_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryParameterization.cpp b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryParameterization.cpp
index bb440b9754..7a01fcc78d 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryParameterization.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryParameterization.cpp
@@ -1,119 +1,120 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryParameterization.h"
 #include "berryIParameter.h"
+#include "berryIParameterValues.h"
 
 namespace berry
 {
 
 const uint Parameterization::HASH_CODE_NOT_COMPUTED = 0;
 const uint Parameterization::HASH_FACTOR = 89;
 const uint Parameterization::HASH_INITIAL = qHash("berry::Parameterization");
 
 Parameterization::Parameterization(const SmartPointer<const IParameter> parameter, const QString& value)
 : hashCode(HASH_CODE_NOT_COMPUTED), parameter(parameter), value(value)
 {
   if (!parameter)
   {
     throw ctkInvalidArgumentException(
         "You cannot parameterize a null parameter");
   }
 }
 
 Parameterization::Parameterization(const Parameterization& p)
 : hashCode(p.hashCode), parameter(p.parameter), value(p.value)
 {
 
 }
 
 Parameterization& Parameterization::operator=(const Parameterization& p)
 {
   this->hashCode = p.hashCode;
   this->parameter = p.parameter;
   this->value = p.value;
 
   return *this;
 }
 
 bool Parameterization::operator==(const Parameterization& parameterization) const
 {
   if (this == &parameterization)
   {
     return true;
   }
 
   //    if (!(object instanceof Parameterization)) {
   //      return false;
   //    }
 
   if (this->parameter->GetId() != parameterization.parameter->GetId())
   {
     return false;
   }
 
   return (this->value == parameterization.value);
 }
 
 Parameterization::operator bool() const
 {
   return true;
 }
 
 SmartPointer<const IParameter> Parameterization::GetParameter() const
 {
   return parameter;
 }
 
 QString Parameterization::GetValue() const
 {
   return value;
 }
 
 QString Parameterization::GetValueName() const
 {
-  const IParameter::ParameterValues parameterValues = parameter->GetValues();
+  const QHash<QString,QString> parameterValues = parameter->GetValues()->GetParameterValues();
 
   QString returnValue;
   for (IParameter::ParameterValues::const_iterator parameterValueItr = parameterValues.begin();
       parameterValueItr != parameterValues.end(); ++ parameterValueItr)
   {
     const QString currentValue(parameterValueItr.value());
     if (value == currentValue)
     {
       returnValue = parameterValueItr.key();
       break;
     }
   }
 
   return returnValue;
 }
 
 uint Parameterization::HashCode() const
 {
   if (hashCode == HASH_CODE_NOT_COMPUTED)
   {
     hashCode = HASH_INITIAL * HASH_FACTOR + parameter->HashCode();
     hashCode = hashCode * HASH_FACTOR + qHash(value);
     if (hashCode == HASH_CODE_NOT_COMPUTED)
     {
       hashCode++;
     }
   }
   return hashCode;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryParameterizedCommand.cpp b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryParameterizedCommand.cpp
index b4af02bae7..c18f6df375 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryParameterizedCommand.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryParameterizedCommand.cpp
@@ -1,432 +1,449 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryParameterizedCommand.h"
 
 #include "berryIParameter.h"
+#include "berryIParameterValues.h"
 #include "berryCommand.h"
 #include "berryParameterization.h"
 #include "berryExecutionEvent.h"
 #include "berryCommandManager.h"
 #include "berryCommandCategory.h"
+#include "berryState.h"
 #include "berryIHandler.h"
 
 #include "internal/berryCommandUtils.h"
 
 #include <berryObjectString.h>
 
 
 namespace berry
 {
 
 const int INDEX_PARAMETER_ID = 0;
 const int INDEX_PARAMETER_NAME = 1;
 const int INDEX_PARAMETER_VALUE_NAME = 2;
 const int INDEX_PARAMETER_VALUE_VALUE = 3;
 
 const uint ParameterizedCommand::HASH_CODE_NOT_COMPUTED = 0;
 const uint ParameterizedCommand::HASH_FACTOR = 89;
 const uint ParameterizedCommand::HASH_INITIAL = qHash("berry::ParameterizedCommand");
 
 ParameterizedCommand::ParameterizedCommand(const SmartPointer<Command>& command,
                                            const QList<Parameterization>& params)
   : command(command), hashCode(HASH_CODE_NOT_COMPUTED)
 {
   if (!command)
   {
     throw Poco::NullPointerException(
         "A parameterized command cannot have a null command");
   }
 
   QList<IParameter::Pointer> parameters;
   try
   {
     parameters = command->GetParameters();
   } catch (const NotDefinedException* /*e*/)
   {
     // This should not happen.
   }
   if (!params.empty() && !parameters.empty())
   {
-    for (unsigned int j = 0; j < parameters.size(); j++)
+    for (int j = 0; j < parameters.size(); j++)
     {
-      for (unsigned int i = 0; i < params.size(); i++)
+      for (int i = 0; i < params.size(); i++)
       {
         if (parameters[j] == params[i].GetParameter())
         {
           this->parameterizations.push_back(params[i]);
         }
       }
     }
   }
 }
 
 bool ParameterizedCommand::operator<(const Object* object) const
 {
   const ParameterizedCommand* command = dynamic_cast<const ParameterizedCommand*>(object);
   const bool thisDefined = this->command->IsDefined();
   const bool otherDefined = command->command->IsDefined();
   if (!thisDefined || !otherDefined)
   {
     return CommandUtils::Compare(thisDefined, otherDefined) < 0;
   }
 
   try
   {
     const int compareTo = this->GetName().compare(command->GetName());
     if (compareTo == 0)
     {
       return (this->GetId() < command->GetId());
     }
     return compareTo < 0;
   }
   catch (const NotDefinedException* /*e*/)
   {
     throw CommandException(
         "Concurrent modification of a command's defined state");
   }
 }
 
 bool ParameterizedCommand::operator==(const Object* object) const
 {
   if (this == object)
   {
     return true;
   }
 
   if (const ParameterizedCommand* command = dynamic_cast<const ParameterizedCommand*>(object))
   {
     if (!(this->command == command->command))
     {
       return false;
     }
 
     return CommandUtils::Equals(this->parameterizations, command->parameterizations);
   }
 
   return false;
 }
 
-Object::Pointer ParameterizedCommand::ExecuteWithChecks(const Object::ConstPointer trigger,
-    const Object::ConstPointer applicationContext)
+Object::Pointer ParameterizedCommand::ExecuteWithChecks(const Object::ConstPointer& trigger,
+    const Object::Pointer& applicationContext)
 {
   ExecutionEvent::Pointer excEvent(new ExecutionEvent(command,
           this->GetParameterMap(), trigger, applicationContext));
   return command->ExecuteWithChecks(excEvent);
 }
 
 SmartPointer<Command> ParameterizedCommand::GetCommand() const
 {
   return command;
 }
 
 QString ParameterizedCommand::GetId() const
 {
   return command->GetId();
 }
 
 QString ParameterizedCommand::GetName() const
 {
   if (name.isEmpty())
   {
     QTextStream nameBuffer(&name);
     nameBuffer << command->GetName() << " (";
     const unsigned int parameterizationCount = (unsigned int) parameterizations.size();
     for (unsigned int i = 0; i < parameterizationCount; i++)
     {
       const Parameterization& parameterization = parameterizations[i];
       nameBuffer << parameterization.GetParameter()->GetName() << ": ";
       try
       {
         nameBuffer << parameterization.GetValueName();
       }
-      catch (const ParameterValuesException* /*e*/)
+      catch (const ParameterValuesException& /*e*/)
       {
         /*
          * Just let it go for now. If someone complains we can
          * add more info later.
          */
       }
 
       // If there is another item, append a separator.
       if (i + 1 < parameterizationCount)
       {
         nameBuffer << ", ";
       }
 
       nameBuffer << ")";
     }
   }
   return name;
 }
 
 QHash<QString, QString> ParameterizedCommand::GetParameterMap() const
 {
   QHash<QString, QString> parameterMap;
-  for (unsigned int i = 0; i < parameterizations.size(); i++)
+  for (int i = 0; i < parameterizations.size(); i++)
   {
     const Parameterization& parameterization = parameterizations[i];
     parameterMap.insert(parameterization.GetParameter()->GetId(),
                         parameterization.GetValue());
   }
   return parameterMap;
 }
 
 uint ParameterizedCommand::HashCode() const
 {
   if (hashCode == HASH_CODE_NOT_COMPUTED)
   {
     hashCode = HASH_INITIAL * HASH_FACTOR + (command ? command->HashCode() : 0);
     hashCode = hashCode * HASH_FACTOR;
-    for (unsigned int i = 0; i < parameterizations.size(); i++)
+    for (int i = 0; i < parameterizations.size(); i++)
     {
       hashCode += parameterizations[i].HashCode();
     }
 
     if (hashCode == HASH_CODE_NOT_COMPUTED)
     {
       hashCode++;
     }
   }
   return hashCode;
 }
 
 QString ParameterizedCommand::Serialize()
 {
   const QString escapedId(this->Escape(this->GetId()));
 
   if (parameterizations.empty())
   {
     return escapedId;
   }
 
   QString str;
   QTextStream buffer(&str);
   buffer << CommandManager::PARAMETER_START_CHAR;
 
-  for (unsigned int i = 0; i < parameterizations.size(); i++)
+  for (int i = 0; i < parameterizations.size(); i++)
   {
 
     if (i> 0)
     {
       // insert separator between parameters
       buffer << CommandManager::PARAMETER_SEPARATOR_CHAR;
     }
 
     const Parameterization& parameterization = parameterizations[i];
     const QString parameterId(parameterization.GetParameter()->GetId());
     const QString escapedParameterId(this->Escape(parameterId));
 
     buffer << escapedParameterId;
 
     const QString parameterValue(parameterization.GetValue());
     if (!parameterValue.isEmpty())
     {
       const QString escapedParameterValue(this->Escape(parameterValue));
       buffer << CommandManager::ID_VALUE_CHAR
              << escapedParameterValue;
     }
   }
 
   buffer << CommandManager::PARAMETER_END_CHAR;
 
   return str;
 }
 
 QString ParameterizedCommand::ToString() const
 {
   QString str;
   QTextStream buffer(&str);
   buffer << "ParameterizedCommand(" << command->ToString() << ","
          << CommandUtils::ToString(parameterizations) << ")";
   return str;
 }
 
 QList<ParameterizedCommand::Pointer>
 ParameterizedCommand::GenerateCombinations(const SmartPointer<Command> command)
 {
   QList<IParameter::Pointer> parameters(command->GetParameters());
 
   typedef QList<QList<Parameterization> > ExpandedParamsType;
   const ExpandedParamsType expansion(ExpandParameters(0, parameters));
   QList<ParameterizedCommand::Pointer> combinations;
 
   for (ExpandedParamsType::const_iterator expansionItr = expansion.begin();
       expansionItr != expansion.end(); ++expansionItr)
   {
     QList<Parameterization> combination(*expansionItr);
 
     QList<Parameterization> parameterizations(combination);
     ParameterizedCommand::Pointer pCmd(new ParameterizedCommand(command,
             parameterizations));
     combinations.push_back(pCmd);
   }
 
   return combinations;
 }
 
 ParameterizedCommand::Pointer ParameterizedCommand::GenerateCommand(const SmartPointer<Command> command,
                                                                     const QHash<QString, Object::Pointer>& parameters)
 {
   // no parameters
   if (parameters.empty())
   {
     ParameterizedCommand::Pointer pCmd(new ParameterizedCommand(command, QList<Parameterization>()));
     return pCmd;
   }
 
   try
   {
     QList<Parameterization> parms;
 
     // iterate over given parameters
     for (QHash<QString, Object::Pointer>::const_iterator i = parameters.begin();
         i != parameters.end(); ++i)
     {
       QString key(i.key());
 
       // get the parameter from the command
       IParameter::Pointer parameter(command->GetParameter(key));
 
       // if the parameter is defined add it to the parameter list
       if (!parameter)
       {
         return ParameterizedCommand::Pointer(0);
       }
       ParameterType::Pointer parameterType(command->GetParameterType(key));
       if (!parameterType)
       {
         QString val(*(i.value().Cast<ObjectString>()));
         parms.push_back(Parameterization(parameter, val));
       }
       else
       {
-        IParameterValueConverter::Pointer valueConverter(parameterType
-            ->GetValueConverter());
+        IParameterValueConverter* valueConverter(parameterType->GetValueConverter());
         if (valueConverter)
         {
           QString val(valueConverter->ConvertToString(i.value()));
           parms.push_back(Parameterization(parameter, val));
         }
         else
         {
           QString val(*(i.value().Cast<ObjectString>()));
           parms.push_back(Parameterization(parameter, val));
         }
       }
     }
 
     // convert the parameters to an Parameterization array and create
     // the command
     ParameterizedCommand::Pointer pCmd(new ParameterizedCommand(command, parms));
     return pCmd;
   }
   catch (const NotDefinedException* /*e*/)
   {
   }
   catch (const ParameterValueConversionException* /*e*/)
   {
   }
   return ParameterizedCommand::Pointer(0);
 }
 
 QString ParameterizedCommand::Escape(const QString& rawText)
 {
 
   QString buffer;
 
   for (QString::const_iterator i = rawText.begin();
       i != rawText.end(); ++i)
   {
 
     QString::value_type c = *i;
     if (c == CommandManager::PARAMETER_START_CHAR ||
         c == CommandManager::PARAMETER_END_CHAR ||
         c == CommandManager::ID_VALUE_CHAR ||
         c == CommandManager::PARAMETER_SEPARATOR_CHAR ||
         c == CommandManager::ESCAPE_CHAR)
     {
       buffer += CommandManager::ESCAPE_CHAR;
     }
 
     buffer += c;
   }
 
   if (buffer.isEmpty())
   {
     return rawText;
   }
   return buffer;
 }
 
 QList<QList<Parameterization> > ParameterizedCommand::ExpandParameters(
     unsigned int startIndex, const QList<IParameter::Pointer>& parameters)
 {
   typedef QList<QList<Parameterization> > ReturnType;
 
-  const unsigned int nextIndex = startIndex + 1;
+  const int nextIndex = startIndex + 1;
   const bool noMoreParameters = (nextIndex >= parameters.size());
 
   const IParameter::Pointer parameter(parameters[startIndex]);
   ReturnType parameterizations;
 
   if (parameter->IsOptional())
   {
     parameterizations.push_back(QList<Parameterization>());
   }
 
-  IParameter::ParameterValues parameterValues(parameter->GetValues());
-  for (IParameter::ParameterValues::iterator parameterValueItr =
+  IParameterValues* values = NULL;
+  try
+  {
+    values = parameter->GetValues();
+  }
+  catch (const ParameterValuesException& /*e*/)
+  {
+    if (noMoreParameters)
+    {
+      return parameterizations;
+    }
+
+    // Make recursive call
+    return ExpandParameters(nextIndex, parameters);
+  }
+
+  const QHash<QString,QString> parameterValues = values->GetParameterValues();
+  for (IParameter::ParameterValues::const_iterator parameterValueItr =
       parameterValues.begin(); parameterValueItr != parameterValues.end(); ++parameterValueItr)
   {
     QList<Parameterization> combination;
     combination.push_back(
         Parameterization(parameter, parameterValueItr.value()));
     parameterizations.push_back(combination);
   }
 
   // Check if another iteration will produce any more names.
   if (noMoreParameters)
   {
     // This is it, so just return the current parameterizations.
     return parameterizations;
   }
 
   // Make recursive call
   ReturnType suffixes(ExpandParameters(nextIndex, parameters));
   if (suffixes.empty())
   {
     // This is it, so just return the current parameterizations.
     return parameterizations;
   }
 
   ReturnType returnValue;
   for (ReturnType::iterator suffixItr = suffixes.begin(); suffixItr
       != suffixes.end(); ++suffixItr)
   {
     for (ReturnType::iterator combinationItr = parameterizations.begin(); combinationItr
         != parameterizations.end(); ++combinationItr)
     {
       QList<Parameterization> newCombination(*combinationItr);
       newCombination.append(*suffixItr);
       returnValue.push_back(newCombination);
     }
   }
 
   return returnValue;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryParameterizedCommand.h b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryParameterizedCommand.h
index 40f60b8e95..7ba97d93c2 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryParameterizedCommand.h
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/berryParameterizedCommand.h
@@ -1,338 +1,338 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYPARAMETERIZEDCOMMAND_H_
 #define BERRYPARAMETERIZEDCOMMAND_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
 
 #include "common/berryCommandExceptions.h"
 #include <org_blueberry_core_commands_Export.h>
 
 #include <list>
 #include <map>
 
 namespace berry
 {
 
 struct IParameter;
 class Command;
 class Parameterization;
 
 /**
  * <p>
  * A command that has had one or more of its parameters specified. This class
  * serves as a utility class for developers that need to manipulate commands
  * with parameters. It handles the behaviour of generating a parameter map and a
  * human-readable name.
  * </p>
  */
 class BERRY_COMMANDS ParameterizedCommand: public Object
 { //implements Comparable {
 
 public:
 
   berryObjectMacro(ParameterizedCommand);
 
   /**
    * The index of the parameter id in the parameter values.
    *
    * @deprecated no longer used
    */
   static  const int INDEX_PARAMETER_ID; // = 0;
 
   /**
    * The index of the human-readable name of the parameter itself, in the
    * parameter values.
    *
    * @deprecated no longer used
    */
   static const int INDEX_PARAMETER_NAME; // = 1;
 
   /**
    * The index of the human-readable name of the value of the parameter for
    * this command.
    *
    * @deprecated no longer used
    */
   static const int INDEX_PARAMETER_VALUE_NAME; // = 2;
 
   /**
    * The index of the value of the parameter that the command can understand.
    *
    * @deprecated no longer used
    */
   static const int INDEX_PARAMETER_VALUE_VALUE; // = 3;
 
   /**
    * Constructs a new instance of <code>ParameterizedCommand</code> with
    * specific values for zero or more of its parameters.
    *
    * @param command
    *            The command that is parameterized; must not be
    *            <code>null</code>.
    * @param parameterizations
    *            An array of parameterizations binding parameters to values for
    *            the command. This value may be <code>null</code>.
    */
   ParameterizedCommand(const SmartPointer<Command>& command,
                        const QList<Parameterization>& parameterizations);
 
   bool operator<(const Object* object) const;
 
   bool operator==(const Object* object) const;
 
   /**
    * Executes this command with its parameters. This does extra checking to
    * see if the command is enabled and defined. If it is not both enabled and
    * defined, then the execution listeners will be notified and an exception
    * thrown.
    *
    * @param trigger
    *            The object that triggered the execution; may be
    *            <code>null</code>.
    * @param applicationContext
    *            The state of the application at the time the execution was
    *            triggered; may be <code>null</code>.
    * @return The result of the execution; may be <code>null</code>.
    * @throws ExecutionException
    *             If the handler has problems executing this command.
    * @throws NotDefinedException
    *             If the command you are trying to execute is not defined.
    * @throws NotEnabledException
    *             If the command you are trying to execute is not enabled.
    * @throws NotHandledException
    *             If there is no handler.
    */
-  Object::Pointer ExecuteWithChecks(const Object::ConstPointer trigger,
-                                    const Object::ConstPointer applicationContext);
+  Object::Pointer ExecuteWithChecks(const Object::ConstPointer& trigger,
+                                    const Object::Pointer& applicationContext);
 
   /**
    * Returns the base command. It is possible for more than one parameterized
    * command to have the same identifier.
    *
    * @return The command; never <code>null</code>, but may be undefined.
    */
   SmartPointer<Command> GetCommand() const;
 
   /**
    * Returns the command's base identifier. It is possible for more than one
    * parameterized command to have the same identifier.
    *
    * @return The command id; never <code>null</code>.
    */
   QString GetId() const;
 
   /**
    * Returns a human-readable representation of this command with all of its
    * parameterizations.
    *
    * @return The human-readable representation of this parameterized command;
    *         never <code>null</code>.
    * @throws NotDefinedException
    *             If the underlying command is not defined.
    */
   QString GetName() const;
 
   /**
    * Returns the parameter map, as can be used to construct an
    * <code>ExecutionEvent</code>.
    *
    * @return The map of parameter ids (<code>String</code>) to parameter
    *         values (<code>String</code>). This map is never
    *         <code>null</code>, but may be empty.
    */
   QHash<QString, QString> GetParameterMap() const;
 
   uint HashCode() const;
 
   /**
    * Returns a {@link String} containing the command id, parameter ids and
    * parameter values for this {@link ParameterizedCommand}. The returned
    * {@link String} can be stored by a client and later used to reconstruct an
    * equivalent {@link ParameterizedCommand} using the
    * {@link CommandManager#deserialize(String)} method.
    * <p>
    * The syntax of the returned {@link String} is as follows:
    * </p>
    *
    * <blockquote>
    * <code>serialization = <u>commandId</u> [ '(' parameters ')' ]</code><br>
    * <code>parameters = parameter [ ',' parameters ]</code><br>
    * <code>parameter = <u>parameterId</u> [ '=' <u>parameterValue</u> ]</code>
    * </blockquote>
    *
    * <p>
    * In the syntax above, sections inside square-brackets are optional. The
    * characters in single quotes (<code>(</code>, <code>)</code>,
    * <code>,</code> and <code>=</code>) indicate literal characters.
    * </p>
    * <p>
    * <code><u>commandId</u></code> represents the command id encoded with
    * separator characters escaped. <code><u>parameterId</u></code> and
    * <code><u>parameterValue</u></code> represent the parameter ids and
    * values encoded with separator characters escaped. The separator
    * characters <code>(</code>, <code>)</code>, <code>,</code> and
    * <code>=</code> are escaped by prepending a <code>%</code>. This
    * requires <code>%</code> to be escaped, which is also done by prepending
    * a <code>%</code>.
    * </p>
    * <p>
    * The order of the parameters is not defined (and not important). A missing
    * <code><u>parameterValue</u></code> indicates that the value of the
    * parameter is <code>null</code>.
    * </p>
    * <p>
    * For example, the string shown below represents a serialized parameterized
    * command that can be used to show the Resource perspective:
    * </p>
    * <p>
    * <code>org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.ui.resourcePerspective)</code>
    * </p>
    * <p>
    * This example shows the more general form with multiple parameters,
    * <code>null</code> value parameters, and escaped <code>=</code> in the
    * third parameter value.
    * </p>
    * <p>
    * <code>command.id(param1.id=value1,param2.id,param3.id=esc%=val3)</code>
    * </p>
    *
    * @return A string containing the escaped command id, parameter ids and
    *         parameter values; never <code>null</code>.
    * @see CommandManager#deserialize(String)
    */
   QString Serialize();
 
   QString ToString() const;
 
   /**
    * <p>
    * Generates all the possible combinations of command parameterizations for
    * the given command. If the command has no parameters, then this is simply
    * a parameterized version of that command. If a parameter is optional, both
    * the included and not included cases are considered.
    * </p>
    * <p>
    * If one of the parameters cannot be loaded due to a
    * <code>ParameterValuesException</code>, then it is simply ignored.
    * </p>
    *
    * @param command
    *            The command for which the parameter combinations should be
    *            generated; must not be <code>null</code>.
    * @return A collection of <code>ParameterizedCommand</code> instances
    *         representing all of the possible combinations. This value is
    *         never empty and it is never <code>null</code>.
    * @throws NotDefinedException
    *             If the command is not defined.
    */
   static QList<ParameterizedCommand::Pointer>
   GenerateCombinations(const SmartPointer<Command> command);
 
   /**
    * Take a command and a map of parameter IDs to values, and generate the
    * appropriate parameterized command.
    *
    * @param command
    *            The command object. Must not be <code>null</code>.
    * @param parameters
    *            A map of String parameter ids to objects. May be
    *            <code>null</code>.
    * @return the parameterized command, or <code>null</code> if it could not
    *         be generated
    */
   static ParameterizedCommand::Pointer GenerateCommand(const SmartPointer<Command> command,
                                                        const QHash<QString, Object::Pointer>& parameters);
 
 private:
 
   /**
    * The constant integer hash code value meaning the hash code has not yet
    * been computed.
    */
   static const uint HASH_CODE_NOT_COMPUTED; // = 0;
 
   /**
    * A factor for computing the hash code for all parameterized commands.
    */
   static const uint HASH_FACTOR; // = 89;
 
   /**
    * The seed for the hash code for all parameterized commands.
    */
   static const uint HASH_INITIAL;
 
   /**
    * Escapes special characters in the command id, parameter ids and parameter
    * values for {@link #serialize()}. The special characters
    * {@link CommandManager#PARAMETER_START_CHAR},
    * {@link CommandManager#PARAMETER_END_CHAR},
    * {@link CommandManager#ID_VALUE_CHAR},
    * {@link CommandManager#PARAMETER_SEPARATOR_CHAR} and
    * {@link CommandManager#ESCAPE_CHAR} are escaped by prepending a
    * {@link CommandManager#ESCAPE_CHAR} character.
    *
    * @param rawText
    *            a <code>String</code> to escape special characters in for
    *            serialization.
    * @return a <code>String</code> representing <code>rawText</code> with
    *         special serialization characters escaped
    */
   static QString Escape(const QString& rawText);
 
   /**
    * Generates every possible combination of parameter values for the given
    * parameters. Parameters values that cannot be initialized are just
    * ignored. Optional parameters are considered.
    *
    * @param startIndex
    *            The index in the <code>parameters</code> that we should
    *            process. This must be a valid index.
    * @param parameters
    *            The parameters in to process; must not be <code>null</code>.
    * @return A collection (<code>Collection</code>) of combinations (<code>List</code>
    *         of <code>Parameterization</code>).
    */
   static QList<QList<Parameterization> > ExpandParameters(unsigned int startIndex,
                                                           const QList<SmartPointer<IParameter> >& parameters);
 
   /**
    * The base command which is being parameterized. This value is never
    * <code>null</code>.
    */
   const SmartPointer<Command> command;
 
   /**
    * The hash code for this object. This value is computed lazily, and marked
    * as invalid when one of the values on which it is based changes.
    */
   mutable uint hashCode;
 
   /**
    * This is an array of parameterization defined for this command. This value
    * may be <code>null</code> if the command has no parameters.
    */
   QList<Parameterization> parameterizations;
 
   mutable QString name;
 
 };
 
 }
 
 #endif /* BERRYPARAMETERIZEDCOMMAND_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/common/berryHandleObject.cpp b/BlueBerry/Bundles/org.blueberry.core.commands/src/common/berryHandleObject.cpp
index 8139043b37..bd5db0aad9 100644
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/common/berryHandleObject.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/common/berryHandleObject.cpp
@@ -1,60 +1,60 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryHandleObject.h"
 #include <typeinfo>
 
 namespace berry
 {
 
 const uint HandleObject::HASH_CODE_NOT_COMPUTED = 0;
 const uint HandleObject::HASH_FACTOR = 89;
-const uint HandleObject::HASH_INITIAL = qHash("berry::HandleObject");
+const uint HandleObject::HASH_INITIAL = qHash(HandleObject::GetStaticClassName());
 
 HandleObject::HandleObject(const QString& ID) :
   hashCode(HASH_CODE_NOT_COMPUTED), defined(false), id(ID)
 {
 }
 
 bool HandleObject::operator==(const Object* object) const
 {
   // Check if they're the same.
   if (object == this)
   {
     return true;
   }
 
   // Check if they're the same type.
   if (const Self* o = dynamic_cast<const Self*>(object))
   {
     // Check each property in turn.
     return (id == o->id);
   }
 
   return false;
 }
 
 QString HandleObject::GetId() const
 {
   return id;
 }
 
 bool HandleObject::IsDefined() const
 {
   return defined;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/common/berryHandleObject.h b/BlueBerry/Bundles/org.blueberry.core.commands/src/common/berryHandleObject.h
index c50ece2d86..d680036029 100644
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/common/berryHandleObject.h
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/common/berryHandleObject.h
@@ -1,168 +1,168 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYHANDLEOBJECT_H_
 #define BERRYHANDLEOBJECT_H_
 
 #include <berryMacros.h>
 #include <berryObject.h>
 #include <org_blueberry_core_commands_Export.h>
 
 #include <QHash>
 
 namespace berry {
 
 /**
  * <p>
  * An object that can exist in one of two states: defined and undefined. This is
  * used by APIs that want to give a handle to an object, even though the object
  * does not fully exist yet. This way, users can attach listeners to objects
  * before they come into existence. It also protects the API from users that do
  * not release references when they should.
  * </p>
  * <p>
  * To enforce good coding practice, all handle objects must implement
  * <code>equals</code> and <code>toString</code>. Please use
  * <code>string</code> to cache the result for <code>toString</code> once
  * calculated.
  * </p>
  * <p>
  * All handle objects are referred to using a single identifier. This identifier
  * is a instance of <code>String</code>. It is important that this identifier
  * remain unique within whatever context that handle object is being used. For
  * example, there should only ever be one instance of <code>Command</code>
  * with a given identifier.
  * </p>
  *
  * @since 3.1
  */
 class BERRY_COMMANDS HandleObject : public virtual Object { // extends EventManager implements IIdentifiable {
 
 public:
 
   berryObjectMacro(HandleObject);
 
 private:
 
   /**
    * The constant integer hash code value meaning the hash code has not yet
    * been computed.
    */
   static const uint HASH_CODE_NOT_COMPUTED; // = 0;
 
   /**
    * A factor for computing the hash code for all schemes.
    */
   static const uint HASH_FACTOR; // = 89;
 
   /**
    * The seed for the hash code for all schemes.
    */
   static const uint HASH_INITIAL;
 
   /**
    * The hash code for this object. This value is computed lazily, and marked
    * as invalid when one of the values on which it is based changes.
    */
   mutable uint hashCode; // = HASH_CODE_NOT_COMPUTED;
 
 
 protected:
 
   /**
    * Whether this object is defined. A defined object is one that has been
    * fully initialized. By default, all objects start as undefined.
    */
    bool defined;
 
   /**
    * The identifier for this object. This identifier should be unique across
    * all objects of the same type and should never change. This value will
    * never be <code>null</code>.
    */
   const  QString id;
 
   /**
    * The string representation of this object. This string is for debugging
    * purposes only, and is not meant to be displayed to the user. This value
    * is computed lazily, and is cleared if one of its dependent values
    * changes.
    */
   mutable QString str;
 
   /**
    * Constructs a new instance of <code>HandleObject</code>.
    *
    * @param id
    *            The id of this handle; must not be <code>null</code>.
    */
   HandleObject(const QString& id);
 
 
 public:
 
     /**
      * Tests whether this object is equal to another object. A handle object is
      * only equal to another handle object with the same id and the same class.
      *
      * @param object
      *            The object with which to compare; may be <code>null</code>.
      * @return <code>true</code> if the objects are equal; <code>false</code>
      *         otherwise.
      */
    bool operator==(const Object* object) const;
 
-   virtual QString GetId() const;
+   QString GetId() const;
 
     /**
      * Computes the hash code for this object based on the id.
      *
      * @return The hash code for this object.
      */
    virtual uint HashCode() const
    {
      if (hashCode == HASH_CODE_NOT_COMPUTED)
      {
        hashCode = HASH_INITIAL * HASH_FACTOR + qHash(id);
        if (hashCode == HASH_CODE_NOT_COMPUTED)
        {
          hashCode++;
        }
      }
      return hashCode;
    }
 
     /**
      * Whether this instance is defined. A defined instance is one that has been
      * fully initialized. This allows objects to effectively disappear even
      * though other objects may still have references to them.
      *
      * @return <code>true</code> if this object is defined; <code>false</code>
      *         otherwise.
      */
-    virtual bool IsDefined() const;
+    bool IsDefined() const;
 
     /**
      * Makes this object becomes undefined. This method should make any defined
      * properties <code>null</code>. It should also send notification to any
      * listeners that these properties have changed.
      */
     virtual void Undefine() = 0;
 };
 
 }
 
 #endif /*BERRYHANDLEOBJECT_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/internal/berryCommandUtils.h b/BlueBerry/Bundles/org.blueberry.core.commands/src/internal/berryCommandUtils.h
index e45659096a..2063a44b80 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/internal/berryCommandUtils.h
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/internal/berryCommandUtils.h
@@ -1,148 +1,148 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef __BERRY_COMMAND_UTILS_H__
 #define __BERRY_COMMAND_UTILS_H__
 
 #include <berryObject.h>
 
 #include <QList>
 #include <QTextStream>
 
 namespace berry
 {
 
 /**
  * A class providing utility functions for the commands plug-in.
  */
 class CommandUtils
 {
 public:
 
   /**
    * Compares two boolean values. <code>false</code> is considered to be
    * less than <code>true</code>.
    *
    * @param left
    *            The left value to compare.
    * @param right
    *            The right value to compare.
    * @return <code>-1</code> if <code>left</code> is <code>false</code>
    *         and <code>right</code> is <code>true</code>;<code>0</code>
    *         if they are equal; <code>1</code> if <code>left</code> is
    *         <code>true</code> and <code>right</code> is
    *         <code>false</code>
    */
   static int Compare(const bool left, const bool right);
 
   static int Compare(const QString& left, const QString& right);
 
   /**
    * Compares two objects that are not otherwise comparable. If neither object
    * is <code>null</code>, then the string representation of each object is
    * used.
    *
    * @param left
    *            The left value to compare. The string representation of this
    *            value must not be <code>null</code>.
    * @param right
    *            The right value to compare. The string representation of this
    *            value must not be <code>null</code>.
    * @return <code>-1</code> if <code>left</code> is <code>null</code>
    *         and <code>right</code> is not <code>null</code>;
    *         <code>0</code> if they are both <code>null</code>;
    *         <code>1</code> if <code>left</code> is not <code>null</code>
    *         and <code>right</code> is <code>null</code>. Otherwise, the
    *         result of
    *         <code>left.toString().compareTo(right.toString())</code>.
    */
   static int CompareObj(const Object::ConstPointer left,
       const Object::ConstPointer right);
 
   /**
    * Tests whether two arrays of objects are equal to each other. The arrays
    * must not be <code>null</code>, but their elements may be
    * <code>null</code>.
    *
    * @param leftArray
    *            The left array to compare; may be <code>null</code>, and
    *            may be empty and may contain <code>null</code> elements.
    * @param rightArray
    *            The right array to compare; may be <code>null</code>, and
    *            may be empty and may contain <code>null</code> elements.
    * @return <code>true</code> if the arrays are equal length and the
    *         elements at the same position are equal; <code>false</code>
    *         otherwise.
    */
   template<class T>
   static int Compare(const QList<T>& leftArray,
                      const QList<T>& rightArray)
   {
     int result = (int) (leftArray.size() - rightArray.size());
     if (result == 0)
     {
-      for (unsigned int i = 0; i < leftArray.size(); ++i)
+      for (int i = 0; i < leftArray.size(); ++i)
       {
         if (!(leftArray[i] == rightArray[i]))
         {
           return leftArray[i]->ToString().compare(rightArray[i]->ToString());
         }
       }
     }
 
     return result < 0 ? -1 : (result > 0 ? 1 : 0);
   }
 
   /**
    * Tests whether two arrays of objects are equal to each other. The arrays
    * must not be <code>null</code>, but their elements may be
    * <code>null</code>.
    *
    * @param leftArray
    *            The left array to compare; may be <code>null</code>, and
    *            may be empty and may contain <code>null</code> elements.
    * @param rightArray
    *            The right array to compare; may be <code>null</code>, and
    *            may be empty and may contain <code>null</code> elements.
    * @return <code>true</code> if the arrays are equal length and the
    *         elements at the same position are equal; <code>false</code>
    *         otherwise.
    */
   template<class T>
   static bool Equals(const QList<T>& leftArray,
                      const QList<T>& rightArray)
   {
     return leftArray == rightArray;
   }
 
   template<class T>
   static QString ToString(const QList<T>& vec)
   {
     QString str;
     QTextStream ss(&str);
     ss << "[";
-    for (unsigned int i = 0; i < vec.size(); ++i)
+    for (int i = 0; i < vec.size(); ++i)
     {
       if (i > 0) ss << ",";
       ss << vec[i];
     }
     return str;
   }
 };
 
 }
 
 #endif // __BERRY_COMMAND_UTILS_H__
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/util/berryCommandTracing.h b/BlueBerry/Bundles/org.blueberry.core.commands/src/util/berryCommandTracing.h
index a7dd0b4864..0e4cb7827f 100755
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/util/berryCommandTracing.h
+++ b/BlueBerry/Bundles/org.blueberry.core.commands/src/util/berryCommandTracing.h
@@ -1,73 +1,74 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYCOMMANDTRACING_H_
 #define BERRYCOMMANDTRACING_H_
 
 #include <QString>
 
+#include <org_blueberry_core_commands_Export.h>
+
 namespace berry {
 
 /**
  * <p>
  * A utility class for printing tracing output to the console.
  * </p>
  * <p>
  * Clients must not extend or instantiate this class.
  * </p>
- *
- * @since 3.2
  */
-class CommandTracing {
+class BERRY_COMMANDS CommandTracing
+{
 
 public:
 
   /**
    * The separator to place between the component and the message.
    */
   static const QString SEPARATOR; // = " >>> ";
 
   /**
    * <p>
    * Prints a tracing message to standard out. The message is prefixed by a
    * component identifier and some separator. See the example below.
    * </p>
    *
    * <pre>
    *        BINDINGS &gt;&gt; There are 4 deletion markers
    * </pre>
    *
    * @param component
    *            The component for which this tracing applies; may be
    *            empty
    * @param message
    *            The message to print to standard out; may be empty
    */
   static void PrintTrace(const QString& component,
                          const QString& message);
 
 private:
 
   /**
    * This class is not intended to be instantiated.
    */
   CommandTracing();
 };
 
 }
 
 #endif /* BERRYCOMMANDTRACING_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/files.cmake b/BlueBerry/Bundles/org.blueberry.core.expressions/files.cmake
index 9967694ac9..dc7bc9f4da 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/files.cmake
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/files.cmake
@@ -1,57 +1,58 @@
 set(MOC_H_FILES
 )
 
 set(CACHED_RESOURCE_FILES
   plugin.xml
 )
 
 set(SRC_CPP_FILES
   berryElementHandler.cpp
   berryEvaluationContext.cpp
   berryEvaluationResult.cpp
   berryExpression.cpp
   berryExpressionConverter.cpp
   berryExpressionInfo.cpp
   berryExpressionTagNames.cpp
+  berryICountable.h
   berryIEvaluationContext.cpp
   berryIIterable.cpp
   berryIPropertyTester.cpp
   berryIVariableResolver.cpp
   berryPropertyTester.cpp
 )
 
 set(INTERNAL_CPP_FILES
   berryAdaptExpression.cpp
   berryAndExpression.cpp
   berryCompositeExpression.cpp
   berryCountExpression.cpp
   berryDefaultVariable.cpp
   berryDefinitionRegistry.cpp
   berryEnablementExpression.cpp
   berryEqualsExpression.cpp
   berryExpressionPlugin.cpp
   berryExpressions.cpp
   berryExpressionStatus.cpp
   berryInstanceofExpression.cpp
   berryIterateExpression.cpp
   berryNotExpression.cpp
   berryOrExpression.cpp
   berryProperty.cpp
   berryPropertyTesterDescriptor.cpp
   berryReferenceExpression.cpp
   berryResolveExpression.cpp
   berryStandardElementHandler.cpp
   berrySystemTestExpression.cpp
   berryTestExpression.cpp
   berryTypeExtension.cpp
   berryTypeExtensionManager.cpp
   berryWithExpression.cpp
 )
 
 foreach(file ${SRC_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/${file})
 endforeach(file ${SRC_CPP_FILES})
 
 foreach(file ${INTERNAL_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/internal/${file})
 endforeach(file ${INTERNAL_CPP_FILES})
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryEvaluationContext.cpp b/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryEvaluationContext.cpp
index 10daf39653..d5639fb95e 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryEvaluationContext.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryEvaluationContext.cpp
@@ -1,137 +1,132 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryEvaluationContext.h"
 
 namespace berry {
 
 EvaluationContext::EvaluationContext(IEvaluationContext* parent,
-                                     const Object::Pointer& defaultVariable)
+                                     const Object::ConstPointer& defaultVariable)
   : fParent(parent), fDefaultVariable(defaultVariable), fAllowPluginActivation(-1)
 {
   poco_assert(defaultVariable != 0);
 }
 
 EvaluationContext::EvaluationContext(IEvaluationContext* parent,
-                                     const Object::Pointer& defaultVariable,
+                                     const Object::ConstPointer& defaultVariable,
                                      const std::vector<IVariableResolver*>& resolvers)
   : fParent(parent), fDefaultVariable(defaultVariable),
     fVariableResolvers(resolvers), fAllowPluginActivation(-1)
 {
   poco_assert(defaultVariable != 0);
   poco_assert(resolvers.size() != 0);
 }
 
-IEvaluationContext*
-EvaluationContext::GetParent() const
+IEvaluationContext* EvaluationContext::GetParent() const
 {
   return fParent;
 }
 
-IEvaluationContext*
-EvaluationContext::GetRoot()
+IEvaluationContext* EvaluationContext::GetRoot() const
 {
   if (fParent == 0)
-    return this;
+    return const_cast<EvaluationContext*>(this);
   return fParent->GetRoot();
 }
 
-Object::Pointer
-EvaluationContext::GetDefaultVariable() const
+Object::ConstPointer EvaluationContext::GetDefaultVariable() const
 {
   return fDefaultVariable;
 }
 
-void
-EvaluationContext::SetAllowPluginActivation(bool value)
+void EvaluationContext::SetAllowPluginActivation(bool value)
 {
   fAllowPluginActivation= value ? 1 : 0;
 }
 
-bool
-EvaluationContext::GetAllowPluginActivation() const
+bool EvaluationContext::GetAllowPluginActivation() const
 {
   if (fAllowPluginActivation < 0)
   {
     if (fParent)
     {
       return fParent->GetAllowPluginActivation();
     }
     return false;
   }
   return fAllowPluginActivation;
 }
 
 void
-EvaluationContext::AddVariable(const QString &name, const Object::Pointer& value)
+EvaluationContext::AddVariable(const QString &name, const Object::ConstPointer& value)
 {
   poco_assert(name.size() != 0);
   poco_assert(value.IsNotNull());
 
   fVariables[name] = value;
 }
 
-Object::Pointer
+Object::ConstPointer
 EvaluationContext::RemoveVariable(const QString &name)
 {
   poco_assert(name.size() != 0);
 
-  Object::Pointer elem(fVariables[name]);
+  Object::ConstPointer elem(fVariables[name]);
   fVariables.remove(name);
   return elem;
 }
 
-Object::Pointer
+Object::ConstPointer
 EvaluationContext::GetVariable(const QString& name) const
 {
   poco_assert(name.size() != 0);
 
-  Object::Pointer result;
+  Object::ConstPointer result;
 
-  QHash<QString, Object::Pointer>::const_iterator iter(fVariables.find(name));
+  QHash<QString, Object::ConstPointer>::const_iterator iter(fVariables.find(name));
   if (iter != fVariables.end())
   {
     result = iter.value();
   }
 
   if (!result.IsNull())
     return result;
 
   if (fParent != 0)
     return fParent->GetVariable(name);
 
   return result;
 }
 
-Object::Pointer
-EvaluationContext::ResolveVariable(const QString &name, const QList<Object::Pointer>& args)
+Object::ConstPointer
+EvaluationContext::ResolveVariable(const QString &name, const QList<Object::Pointer>& args) const
 {
   if (fVariableResolvers.size() > 0) {
     for (unsigned int i= 0; i < fVariableResolvers.size(); ++i) {
       IVariableResolver* resolver = fVariableResolvers[i];
       Object::Pointer variable(resolver->Resolve(name, args));
       if (!variable.IsNull())
         return variable;
     }
   }
 
   if (fParent != 0)
     return fParent->ResolveVariable(name, args);
 
   return Object::Pointer();
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryEvaluationContext.h b/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryEvaluationContext.h
index b5b12a303e..39a8da7094 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryEvaluationContext.h
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryEvaluationContext.h
@@ -1,125 +1,125 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYEVALUATIONCONTEXT_H_
 #define BERRYEVALUATIONCONTEXT_H_
 
 #include "berryIEvaluationContext.h"
 #include "berryIVariableResolver.h"
 #include <org_blueberry_core_expressions_Export.h>
 
 #include "Poco/Any.h"
 
 #include <vector>
 
 #include <QHash>
 
 namespace berry {
 
 /**
  * A default implementation of an evaluation context.
  * <p>
  * Clients may instantiate this default context. The class is
  * not intended to be subclassed by clients.
  * </p>
  *
  * @since 3.0
  */
 class BERRY_EXPRESSIONS EvaluationContext : public IEvaluationContext
 {
 
 private:
-  IEvaluationContext* fParent;
-  Object::Pointer fDefaultVariable;
-  QHash<QString, Object::Pointer> fVariables;
+  IEvaluationContext* const fParent;
+  Object::ConstPointer fDefaultVariable;
+  QHash<QString, Object::ConstPointer> fVariables;
   std::vector<IVariableResolver*> fVariableResolvers;
   int fAllowPluginActivation;
 
 public:
 
   /**
    * Create a new evaluation context with the given parent and default
    * variable.
    *
    * @param parent the parent context. Can be <code>null</code>.
    * @param defaultVariable the default variable
    */
-  EvaluationContext(IEvaluationContext* parent, const Object::Pointer& defaultVariable);
+  EvaluationContext(IEvaluationContext* parent, const Object::ConstPointer& defaultVariable);
 
   /**
    * Create a new evaluation context with the given parent and default
    * variable.
    *
    * @param parent the parent context. Can be <code>null</code>.
    * @param defaultVariable the default variable
    * @param resolvers an array of <code>IVariableResolvers</code> to
    *  resolve additional variables.
    *
    * @see #resolveVariable(String, Object[])
    */
-  EvaluationContext(IEvaluationContext* parent, const Object::Pointer& defaultVariable,
+  EvaluationContext(IEvaluationContext* parent, const Object::ConstPointer& defaultVariable,
                     const std::vector<IVariableResolver*>& resolvers);
 
 
   /**
    * {@inheritDoc}
    */
   IEvaluationContext* GetParent() const;
 
   /**
    * {@inheritDoc}
    */
-  IEvaluationContext* GetRoot();
+  IEvaluationContext* GetRoot() const;
 
   /**
    * {@inheritDoc}
    */
-  Object::Pointer GetDefaultVariable() const;
+  Object::ConstPointer GetDefaultVariable() const;
 
   /**
    * {@inheritDoc}
    */
   void SetAllowPluginActivation(bool value);
 
   /**
    * {@inheritDoc}
    */
   bool GetAllowPluginActivation() const;
 
   /**
    * {@inheritDoc}
    */
-  void AddVariable(const QString& name, const Object::Pointer& value);
+  void AddVariable(const QString& name, const Object::ConstPointer& value);
 
   /**
    * {@inheritDoc}
    */
-  Object::Pointer RemoveVariable(const QString& name);
+  Object::ConstPointer RemoveVariable(const QString& name);
 
   /**
    * {@inheritDoc}
    */
-  Object::Pointer GetVariable(const QString &name) const;
+  Object::ConstPointer GetVariable(const QString &name) const;
 
   /**
    * {@inheritDoc}
    */
-  Object::Pointer ResolveVariable(const QString& name, const QList<Object::Pointer>& args);
+  Object::ConstPointer ResolveVariable(const QString& name, const QList<Object::Pointer>& args) const;
 };
 
 }  // namespace berry
 
 #endif /*BERRYEVALUATIONCONTEXT_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryEvaluationResult.cpp b/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryEvaluationResult.cpp
index 8b9a6db801..42d70c214b 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryEvaluationResult.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryEvaluationResult.cpp
@@ -1,114 +1,115 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryEvaluationResult.h"
 
 namespace berry {
 
 const int EvaluationResult::FALSE_VALUE = 0;
 const int EvaluationResult::TRUE_VALUE = 1;
 const int EvaluationResult::NOT_LOADED_VALUE = 2;
 
 const SmartPointer<const EvaluationResult> EvaluationResult::FALSE_EVAL(new EvaluationResult(EvaluationResult::FALSE_VALUE));
 const SmartPointer<const EvaluationResult> EvaluationResult::TRUE_EVAL(new EvaluationResult(EvaluationResult::TRUE_VALUE));
 const SmartPointer<const EvaluationResult> EvaluationResult::NOT_LOADED(new EvaluationResult(NOT_LOADED_VALUE));
 
 bool EvaluationResult::operator==(const Object* result) const
 {
   if(const EvaluationResult* o = dynamic_cast<const EvaluationResult*>(result))
   {
     return this->fValue == o->fValue;
   }
   return false;
 }
 
 bool EvaluationResult::operator!=(const Object* result) const
 {
   return !(this == result);
 }
 
 const SmartPointer<const EvaluationResult> EvaluationResult::AND[3][3] = {
     //                    FALSE                      TRUE                  NOT_LOADED
     /* FALSE   */ { EvaluationResult::FALSE_EVAL, EvaluationResult::FALSE_EVAL, EvaluationResult::FALSE_EVAL   },
     /* TRUE    */ { EvaluationResult::FALSE_EVAL, EvaluationResult::TRUE_EVAL,  EvaluationResult::NOT_LOADED  },
     /* PNL     */ { EvaluationResult::FALSE_EVAL, EvaluationResult::NOT_LOADED, EvaluationResult::NOT_LOADED  }
 };
 
 const SmartPointer<const EvaluationResult> EvaluationResult::OR[3][3] = {
     //                      FALSE                   TRUE                  NOT_LOADED
     /* FALSE   */ { EvaluationResult::FALSE_EVAL, EvaluationResult::TRUE_EVAL, EvaluationResult::NOT_LOADED  },
     /* TRUE    */ { EvaluationResult::TRUE_EVAL,  EvaluationResult::TRUE_EVAL, EvaluationResult::TRUE_EVAL    },
     /* PNL     */ { EvaluationResult::NOT_LOADED, EvaluationResult::TRUE_EVAL,   EvaluationResult::NOT_LOADED  }
 };
 
 const SmartPointer<const EvaluationResult> EvaluationResult::NOT[3] = {
     //    FALSE                        TRUE                  NOT_LOADED
     EvaluationResult::TRUE_EVAL, EvaluationResult::FALSE_EVAL, EvaluationResult::NOT_LOADED
 };
 
 
 EvaluationResult::EvaluationResult(int value)
 {
   fValue= value;
 }
 
 EvaluationResult::EvaluationResult(const EvaluationResult &o)
-  : fValue(o.fValue)
+  : Object()
+  , fValue(o.fValue)
 {
 }
 
 EvaluationResult::ConstPointer
 EvaluationResult::And(const EvaluationResult::ConstPointer& other) const
 {
   return AND[fValue][other->fValue];
 }
 
 EvaluationResult::ConstPointer
 EvaluationResult::Or(const EvaluationResult::ConstPointer& other) const
 {
   return OR[fValue][other->fValue];
 }
 
 
 EvaluationResult::ConstPointer
 EvaluationResult::Not() const
 {
   return NOT[fValue];
 }
 
 EvaluationResult::ConstPointer
 EvaluationResult::ValueOf(bool b)
 {
   return (b ? TRUE_EVAL : FALSE_EVAL);
 }
 
 
 QString EvaluationResult::ToString() const
 {
   switch (fValue) {
   case 0:
     return "false";
   case 1:
     return "true";
   case 2:
     return "not_loaded";
   default:
     Q_ASSERT(false);
     return "";
   }
 }
 
 }  // namespace berry
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryExpression.cpp b/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryExpression.cpp
index 30046c2f0a..c32c30dd1e 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryExpression.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryExpression.cpp
@@ -1,132 +1,132 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryExpression.h"
 #include <Poco/Hash.h>
 
 
 namespace berry {
 
 const uint Expression::HASH_CODE_NOT_COMPUTED = 0;
 const uint Expression::HASH_FACTOR = 89;
 const QString Expression::ATT_VALUE= "value";
 
 const Expression::Pointer Expression::TRUE_EVAL(new TRUE_EVALExpression());
 const Expression::Pointer Expression::FALSE_EVAL(new FALSE_EVALExpression());
 
 Expression::Expression()
 {
   fHashCode = HASH_CODE_NOT_COMPUTED;
 }
 
 Expression::~Expression()
 {
 
 }
 
 bool Expression::Equals(const QList<Expression::Pointer>& leftArray,
                         const QList<Expression::Pointer>& rightArray)
 {
   return (leftArray == rightArray);
 }
 
 bool Expression::Equals(const QList<Object::Pointer>& leftArray,
                         const QList<Object::Pointer>& rightArray)
 {
   return (leftArray == rightArray);
 }
 
 uint
 Expression::HashCode(Expression::Pointer object)
 {
   return object != 0 ? object->HashCode() : 0;
 }
 
 uint
 Expression::HashCode(const QList<Expression::Pointer>& array)
 {
   if (array.size() == 0)
   {
     return 0;
   }
   uint hashCode = qHash("QList<Expression::Pointer>");
-  for (unsigned int i= 0; i < array.size(); i++)
+  for (int i= 0; i < array.size(); i++)
   {
     hashCode = hashCode * HASH_FACTOR + HashCode(array[i]);
   }
   return hashCode;
 }
 
 uint
 Expression::HashCode(const QList<Object::Pointer>& array)
 {
   if (array.isEmpty())
   {
     return 0;
   }
   int hashCode = (int) Poco::hash("std::vector<Object::Pointer>");
-  for (unsigned int i= 0; i < array.size(); i++)
+  for (int i= 0; i < array.size(); i++)
   {
     hashCode = hashCode + (int) array[i]->HashCode();
   }
   return hashCode;
 }
 
 const ExpressionInfo*
 Expression::ComputeExpressionInfo() const
 {
   ExpressionInfo* result= new ExpressionInfo();
   this->CollectExpressionInfo(result);
   return result;
 }
 
 void
 Expression::CollectExpressionInfo(ExpressionInfo* info) const
 {
   info->AddMisBehavingExpressionType(typeid(this));
 }
 
 uint
 Expression::ComputeHashCode() const
 {
   return qHash(this);
 }
 
 uint Expression::HashCode() const
 {
   if (fHashCode != HASH_CODE_NOT_COMPUTED)
     return fHashCode;
   fHashCode= this->ComputeHashCode();
   if (fHashCode == HASH_CODE_NOT_COMPUTED)
     fHashCode++;
   return fHashCode;
 }
 
 bool
 Expression::operator==(const Object* object) const
 {
   if (const Expression* other = dynamic_cast<const Expression*>(object))
     return this->HashCode() == other->HashCode();
 
   return false;
 }
 
 QString Expression::ToString() const
 {
   return typeid(this).name();
 }
 
 }  // namespace berry
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryExpression.h b/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryExpression.h
index 516fd12190..b0c351fc43 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryExpression.h
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryExpression.h
@@ -1,224 +1,224 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYEXPRESSION_H_
 #define BERRYEXPRESSION_H_
 
 #include "berryExpressionInfo.h"
 #include "berryIEvaluationContext.h"
 #include "berryEvaluationResult.h"
 #include <org_blueberry_core_expressions_Export.h>
 
 #include <berryMacros.h>
 #include <berryObject.h>
 
 
 namespace berry {
 
 /**
  * Abstract base class for all expressions provided by the common
  * expression language.
  * <p>
  * An expression is evaluated by calling {@link #evaluate(IEvaluationContext)}.
  * </p>
  * <p>
  * This class may be subclassed to provide specific expressions.
  * </p>
  */
 class BERRY_EXPRESSIONS Expression : public Object {
 
 
 public:
   berryObjectMacro(Expression);
 
   /**
    * The constant integer hash code value meaning the hash code has not yet
    * been computed.
    */
   static const uint HASH_CODE_NOT_COMPUTED;
 
   /**
    * A factor for computing the hash code for all expressions.
    */
   static const uint HASH_FACTOR;
 
   /**
    * Name of the value attribute of an expression (value is <code>value</code>).
    */
   static const QString ATT_VALUE;
 
 private:
 
   /**
    * The hash code for this object. This value is computed lazily.  If it is
    * not yet computed, it is equal to {@link #HASH_CODE_NOT_COMPUTED}.
    */
   mutable uint fHashCode;
 
 protected:
 
   /**
    * Checks whether two objects are equal using the
    * <code>equals(Object)</code> method of the <code>left</code> object.
    * This method handles <code>null</code> for either the <code>left</code>
    * or <code>right</code> object.
    *
    * @param left the first object to compare; may be <code>null</code>.
    * @param right the second object to compare; may be <code>null</code>.
    * @return <code>TRUE_EVAL</code> if the two objects are equivalent;
    *         <code>FALSE_EVAL</code> otherwise.
    */
    // static bool Equals(final Object left, final Object right);
 
   /**
    * Tests whether two arrays of objects are equal to each other. The arrays
    * must not be <code>null</code>, but their elements may be
    * <code>null</code>.
    *
    * @param leftArray the left array to compare; may be <code>null</code>, and
    *  may be empty and may contain <code>null</code> elements.
    * @param rightArray the right array to compare; may be <code>null</code>,
    *  and may be empty and may contain <code>null</code> elements.
    *
    * @return <code>TRUE_EVAL</code> if the arrays are equal length and the elements
    *  at the same position are equal; <code>FALSE_EVAL</code> otherwise.
    */
   static bool Equals(const QList<Expression::Pointer>& leftArray,
                      const QList<Expression::Pointer>& rightArray);
 
   static bool Equals(const QList<Object::Pointer>& leftArray,
                      const QList<Object::Pointer>& rightArray);
 
   /**
    * Returns the hash code for the given <code>object</code>. This method
    * handles <code>null</code>.
    *
    * @param object the object for which the hash code is desired; may be
    *  <code>null</code>.
    *
    * @return The hash code of the object; zero if the object is
    *  <code>null</code>.
    */
    static uint HashCode(Expression::Pointer object);
 
   /**
    * Returns the hash code for the given array. This method handles
    * <code>null</code>.
    *
    * @param array the array for which the hash code is desired; may be
    *  <code>null</code>.
    * @return the hash code of the array; zero if the object is
    *  <code>null</code>.
    */
   static uint HashCode(const QList<Expression::Pointer>& array);
 
   static uint HashCode(const QList<Object::Pointer>& array);
 
   /**
    * Method to compute the hash code for this object. The result
    * returned from this method is cached in the <code>fHashCode</code>
    * field. If the value returned from the method equals {@link #HASH_CODE_NOT_COMPUTED}
    * (e.g. <code>-1</code>) then the value is incremented by one.
    * <p>
    * This default implementation calls <code>super.hashCode()</code>
    * </p>
    * @return a hash code for this object.
    */
   virtual uint ComputeHashCode() const;
 
 
 public:
 
   /**
    * The expression corresponding to {@link EvaluationResult#TRUE_EVAL}.
    */
   static const Expression::Pointer TRUE_EVAL;
 
   /**
    * The expression corresponding to {@link EvaluationResult#FALSE_EVAL}.
    */
   static const Expression::Pointer FALSE_EVAL;
 
   Expression();
   virtual ~Expression();
 
   virtual uint HashCode() const;
 
   /**
    * Evaluates this expression.
    *
    * @param context an evaluation context providing information like variable,
    *  name spaces, etc. necessary to evaluate this expression
    *
    * @return the result of the expression evaluation
    *
    * @throws CoreException if the evaluation failed. The concrete reason is
    *  defined by the subclass implementing this method
    */
   virtual SmartPointer<const EvaluationResult> Evaluate(IEvaluationContext* context) const = 0;
 
   /**
    * Computes the expression information for the given expression tree.
    * <p>
    * This is a convenience method for collecting the expression information
    * using {@link Expression#collectExpressionInfo(ExpressionInfo)}.
    * </p>
    *
    * @return the expression information
    */
   virtual const ExpressionInfo* ComputeExpressionInfo() const;
 
   /**
    * Collects information about this expression tree. This default
    * implementation add the expression's type to the set of misbehaving
    * expression types.
    *
    * @param info the expression information object used
    *  to collect the information
    */
   virtual void CollectExpressionInfo(ExpressionInfo* info) const;
 
   virtual QString ToString() const;
 
   virtual bool operator==(const Object* object) const;
 
 };
 
 class TRUE_EVALExpression : public Expression
 {
 public:
   SmartPointer<const EvaluationResult> Evaluate(IEvaluationContext* /*context*/) const
   {
       return EvaluationResult::TRUE_EVAL;
   }
 
-  void CollectExpressionInfo(ExpressionInfo* /*info*/) {}
+  void CollectExpressionInfo(ExpressionInfo* /*info*/) const {}
 };
 
 class FALSE_EVALExpression : public Expression
 {
 public:
   SmartPointer<const EvaluationResult> Evaluate(IEvaluationContext* /*context*/) const
   {
       return EvaluationResult::FALSE_EVAL;
   }
 
-  void CollectExpressionInfo(ExpressionInfo* /*info*/) {}
+  void CollectExpressionInfo(ExpressionInfo* /*info*/) const {}
 };
 
 } // namespace berry
 
 #endif /*BERRYEXPRESSION_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryExpressionConverter.cpp b/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryExpressionConverter.cpp
index e430f7cbb7..198b395c6a 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryExpressionConverter.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryExpressionConverter.cpp
@@ -1,161 +1,161 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryExpressionConverter.h"
 
 #include "berryPlatformException.h"
 #include "berryIConfigurationElement.h"
 #include "berryIExtension.h"
 #include "berryIContributor.h"
 
 #include "berryCoreException.h"
 #include "berryElementHandler.h"
 #include "berryExpression.h"
 #include "berryStatus.h"
 
 #include "internal/berryExpressionPlugin.h"
 #include "internal/berryCompositeExpression.h"
 
 #include "Poco/DOM/Node.h"
 #include "Poco/DOM/Element.h"
 
 
 namespace berry {
 
 ExpressionConverter* ExpressionConverter::INSTANCE = 0;
 
 ExpressionConverter*
 ExpressionConverter::GetDefault()
 {
   if (INSTANCE) return INSTANCE;
 
   QList<ElementHandler::Pointer> handlers;
   handlers.push_back(ElementHandler::GetDefault());
   INSTANCE = new ExpressionConverter(handlers);
 
   return INSTANCE;
 }
 
 ExpressionConverter::ExpressionConverter(const QList<ElementHandler::Pointer>& handlers)
 {
   fHandlers = handlers;
 }
 
 Expression::Pointer
 ExpressionConverter::Perform(const IConfigurationElement::Pointer& root)
 {
-  for (unsigned int i = 0; i < fHandlers.size(); i++) {
+  for (int i = 0; i < fHandlers.size(); i++) {
     ElementHandler::Pointer handler = fHandlers[i];
     Expression::Pointer result = handler->Create(this, root);
     if (!result.IsNull())
       return result;
   }
   return Expression::Pointer();
 }
 
 Expression::Pointer
 ExpressionConverter::Perform(Poco::XML::Element* root)
 {
-  for (unsigned int i = 0; i < fHandlers.size(); i++) {
+  for (int i = 0; i < fHandlers.size(); i++) {
     ElementHandler::Pointer handler = fHandlers[i];
     Expression::Pointer result = handler->Create(this, root);
     if (!result.IsNull())
       return result;
   }
   return Expression::Pointer();
 }
 
 void
 ExpressionConverter::ProcessChildren(const IConfigurationElement::Pointer& element,
                                      const CompositeExpression::Pointer& result)
 {
   QList<IConfigurationElement::Pointer> children(element->GetChildren());
 
   QList<IConfigurationElement::Pointer>::iterator iter;
   for (iter = children.begin(); iter != children.end(); ++iter)
   {
     Expression::Pointer child = this->Perform(*iter);
     if (child.IsNull())
     {
       IStatus::Pointer status(new Status(IStatus::ERROR_TYPE, ExpressionPlugin::GetPluginId(),
                                          IStatus::ERROR_TYPE, QString("Unknown expression element ") + GetDebugPath(*iter),
                                          BERRY_STATUS_LOC));
       throw CoreException(status);
     }
 
     result->Add(child);
   }
 }
 
 QString
 ExpressionConverter::GetDebugPath(const IConfigurationElement::Pointer& configurationElement)
 {
   QString buf;
   buf.append(configurationElement->GetName());
   Object::Pointer parent= configurationElement->GetParent();
   while (parent)
   {
     if (IConfigurationElement::Pointer parent2 = parent.Cast<IConfigurationElement>())
     {
       buf.append(" > ");
       buf.append(parent2->GetName());
       QString id= parent2->GetAttribute("id");
       if (!id.isEmpty())
       {
         buf.append(" (id=").append(id).append(')');
       }
       parent= parent2->GetParent();
     }
     else if (IExtension::Pointer parent2 = parent.Cast<IExtension>())
     {
       buf.append(" : ");
       buf.append(parent2->GetExtensionPointUniqueIdentifier());
       buf.append(" @ ");
       buf.append(parent2->GetContributor()->GetName());
       parent = 0;
     }
     else
     {
       parent = 0;
     }
   }
   return buf;
 }
 
 void
 ExpressionConverter::ProcessChildren(Poco::XML::Element* element,
                                      const CompositeExpression::Pointer& result)
 {
   Poco::XML::Node* child = element->firstChild();
   while (child != 0) {
     if (child->nodeType() == Poco::XML::Node::ELEMENT_NODE) {
       Poco::XML::Element* elem = static_cast<Poco::XML::Element*>(child);
       Expression::Pointer exp = this->Perform(elem);
       if (exp.IsNull())
       {
         IStatus::Pointer status(new Status(IStatus::ERROR_TYPE, ExpressionPlugin::GetPluginId(),
                                            IStatus::ERROR_TYPE, QString("Unknown expression element ")
                                            + QString::fromStdString(elem->nodeName()), BERRY_STATUS_LOC));
 
         throw CoreException(status);
       }
       result->Add(exp);
     }
     child = child->nextSibling();
   }
 }
 
 }  // namespace berry
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryICountable.h b/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryICountable.h
index 141216be22..79fbd0b5b9 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryICountable.h
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryICountable.h
@@ -1,53 +1,52 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYICOUNTABLE_H_
 #define BERRYICOUNTABLE_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
 
 #include <org_blueberry_core_expressions_Export.h>
 
 namespace berry {
 
 /**
  * Objects that are adaptable to <code>ICountable</code> can be used
  * as the default variable in a count expression.
  *
  * @see IAdaptable
  * @see IAdapterManager
- *
- * @since 3.3
  */
-struct BERRY_EXPRESSIONS ICountable : public Object {
+struct BERRY_EXPRESSIONS ICountable : public Object
+{
 
   berryObjectMacro(ICountable);
 
   /**
    * Returns the number of elements.
    *
    * @return the number of elements
    */
-  virtual int Count() = 0;
-
-  virtual ~ICountable() {}
+  virtual int Count() const = 0;
 
 };
 
 }
 
+Q_DECLARE_INTERFACE(berry::ICountable, "org.blueberry.core.ICountable")
+
 #endif /*BERRYICOUNTABLE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryIEvaluationContext.cpp b/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryIEvaluationContext.cpp
index 7ef6ad5d51..80ad062c8a 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryIEvaluationContext.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryIEvaluationContext.cpp
@@ -1,30 +1,30 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryIEvaluationContext.h"
 
 namespace berry {
 
 struct UndefinedVariable : public Object
 {
 };
 
-Object::Pointer IEvaluationContext::UNDEFINED_VARIABLE(new UndefinedVariable());
+Object::ConstPointer IEvaluationContext::UNDEFINED_VARIABLE(new UndefinedVariable());
 
 IEvaluationContext::~IEvaluationContext()
 {}
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryIEvaluationContext.h b/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryIEvaluationContext.h
index 30cf414033..8267078b1a 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryIEvaluationContext.h
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryIEvaluationContext.h
@@ -1,149 +1,149 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIEVALUATIONCONTEXT_H_
 #define BERRYIEVALUATIONCONTEXT_H_
 
 #include <berryMacros.h>
 #include <berryObject.h>
 
 #include <org_blueberry_core_expressions_Export.h>
 
 namespace berry {
 
 /**
  * An evaluation context is used to manage a set of objects needed during
  * XML expression evaluation. A context has a parent context, can manage
  * a set of named variables and has a default variable. The default variable
  * is used during XML expression evaluation if no explicit variable is
  * referenced.
  * <p>
  * This interface is not intended to be implemented by clients. Clients
  * are allowed to instantiate <code>EvaluationContext</code>.
  * </p>
  *
  * @since 3.0
  */
 struct BERRY_EXPRESSIONS IEvaluationContext : public Object
 {
 
-  berryInterfaceMacro(IEvaluationContext, berry)
+  berryObjectMacro(berry::IEvaluationContext)
 
   /**
    * Represents the value used by variables that exist but are not defined
    * in a evaluation context. When tested by the 'with' expression, <code>false</code>
    * will be returned.
    */
-  static Object::Pointer UNDEFINED_VARIABLE;
+  static Object::ConstPointer UNDEFINED_VARIABLE;
 
   virtual ~IEvaluationContext();
 
   /**
    * Returns the parent context or <code>null</code> if
    * this is the root of the evaluation context hierarchy.
    *
    * @return the parent evaluation context or <code>null</code>
    */
   virtual IEvaluationContext* GetParent() const = 0;
 
   /**
    * Returns the root evaluation context.
    *
    * @return the root evaluation context
    */
-  virtual IEvaluationContext* GetRoot() = 0;
+  virtual IEvaluationContext* GetRoot() const = 0;
 
   /**
    * Specifies whether this evaluation context allows activation
    * of plug-ins for testers used in the expression tree. To actual
    * trigger the plug-in loading this flag has to be set to <code>
    * true</code> and the actual test expression must have the
    * attribute <code>forcePluginActivation</code> set to <code>
    * true</code> as well.
    *
    * @param value whether this evaluation context allows plug-in activation
    * @since 3.2
    */
   virtual void SetAllowPluginActivation(bool value) = 0;
 
   /**
    * Returns whether this evaluation context supports plug-in
    * activation. If not set via {@link #setAllowPluginActivation(boolean)}
    * the parent value is returned. If no parent is set <code>false</code>
    * is returned.
    *
    * @return whether plug-in activation is supported or not
    * @since 3.2
    */
   virtual bool GetAllowPluginActivation() const = 0;
 
   /**
    * Returns the default variable.
    *
    * @return the default variable or <code>null</code> if
    *  no default variable is managed.
    */
-  virtual Object::Pointer GetDefaultVariable() const = 0;
+  virtual Object::ConstPointer GetDefaultVariable() const = 0;
 
   /**
    * Adds a new named variable to this context. If a variable
    * with the name already exists the new one overrides the
    * existing one.
    *
    * @param name the variable's name
    * @param value the variable's value
    */
-  virtual void AddVariable(const QString& name, const Object::Pointer& value) = 0;
+  virtual void AddVariable(const QString& name, const Object::ConstPointer& value) = 0;
 
   /**
    * Removes the variable managed under the given name
    * from this evaluation context.
    *
    * @param name the variable's name
    * @return the currently stored value or <code>null</code> if
    *  the variable doesn't exist
    */
-  virtual Object::Pointer RemoveVariable(const QString& name) = 0;
+  virtual Object::ConstPointer RemoveVariable(const QString& name) = 0;
 
   /**
    * Returns the variable managed under the given name.
    *
    * @param name the variable's name
    * @return the variable's value or <code>null</code> if the content
    *  doesn't manage a variable with the given name
    */
-  virtual Object::Pointer GetVariable(const QString& name) const = 0;
+  virtual Object::ConstPointer GetVariable(const QString& name) const = 0;
 
   /**
    * Resolves a variable for the given name and arguments. This
    * method can be used to dynamically resolve variable such as
    * plug-in descriptors, resources, etc. The method is used
    * by the <code>resolve</code> expression.
    *
    * @param name the variable to resolve
    * @param args an object array of arguments used to resolve the
    *  variable
    * @return the variable's value or <code>null</code> if no variable
    *  can be resolved for the given name and arguments
    * @exception CoreException if an errors occurs while resolving
    *  the variable
    */
-  virtual Object::Pointer ResolveVariable(const QString& name, const QList<Object::Pointer>& args) = 0;
+  virtual Object::ConstPointer ResolveVariable(const QString& name, const QList<Object::Pointer>& args) const = 0;
 };
 
 }  // namespace berry
 
 #endif /*BERRYIEVALUATIONCONTEXT_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryIIterable.h b/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryIIterable.h
index 485d1a640b..fc8cb4927b 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryIIterable.h
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryIIterable.h
@@ -1,55 +1,61 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIITERABLE_H_
 #define BERRYIITERABLE_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
 
 #include <org_blueberry_core_expressions_Export.h>
 
 namespace berry {
 
 /**
  * Objects that are adaptable to <code>IIterable</code> can be used
  * as the default variable in an iterate expression.
  *
  * @see IAdaptable
  * @see IAdapterManager
  */
 struct BERRY_EXPRESSIONS IIterable : public Object
 {
 
-  berryInterfaceMacro(IIterable, berry)
+  berryObjectMacro(berry::IIterable)
 
   typedef QList<Object::Pointer>::iterator iterator;
+  typedef QList<Object::Pointer>::const_iterator const_iterator;
 
   virtual ~IIterable();
 
   /**
    * Returns an iterator to iterate over the elements.
    *
    * @return an iterator
    */
   virtual iterator begin() = 0;
   virtual iterator end() = 0;
 
+  virtual const_iterator begin() const = 0;
+  virtual const_iterator end() const = 0;
+
 };
 
 }  // namespace berry
 
+Q_DECLARE_INTERFACE(berry::IIterable, "org.blueberry.core.IIterable")
+
 #endif /*BERRYIITERABLE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryIPropertyTester.h b/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryIPropertyTester.h
index 3efa96ed46..2ecdc2f2ec 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryIPropertyTester.h
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryIPropertyTester.h
@@ -1,113 +1,112 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIPROPERTYTESTER_H_
 #define BERRYIPROPERTYTESTER_H_
 
 #include <berryMacros.h>
 #include <berryObject.h>
 
 #include <org_blueberry_core_expressions_Export.h>
 
 #include <Poco/Any.h>
 
 #include <string>
 #include <vector>
 
 #include <QObject>
 
 namespace berry {
 
 /**
  * A property tester can be used to add additional properties to test to an
  * existing type.
  * <p>
  * This interface is not intended to be implemented by clients. Clients
  * should subclass type <code>PropertyTester</code>.
  * </p>
- *
- * @since 3.0
  */
-struct BERRY_EXPRESSIONS IPropertyTester : public Object {
+struct BERRY_EXPRESSIONS IPropertyTester : public Object
+{
 
-  berryInterfaceMacro(IPropertyTester, berry);
+  berryObjectMacro(berry::IPropertyTester)
 
   virtual ~IPropertyTester();
 
   /**
    * Returns whether the property tester can handle the given
    * property or not.
    *
    * @param namespace the name space to be considered
    * @param property the property to test
    * @return <code>true</code> if the tester provides an implementation
    *  for the given property; otherwise <code>false</code> is returned
    */
   virtual bool Handles(const QString& namespaze, const QString& property) = 0;
 
   /**
    * Returns whether the implementation class for this property tester is
    * loaded or not.
    *
    * @return <code>true</code>if the implementation class is loaded;
    *  <code>false</code> otherwise
    */
   virtual bool IsInstantiated() = 0;
 
   /**
    * Returns <code>true</code> if the implementation class of this property
    * tester can be loaded. This is the case if the plug-in providing
    * the implementation class is active. Returns <code>false</code> otherwise.
    *
    * @return whether the implementation class can be loaded or not
    */
   virtual bool IsDeclaringPluginActive() = 0;
 
   /**
    * Loads the implementation class for this property tester and returns an
    * instance of this class.
    *
    * @return an instance of the implementation class for this property tester
    *
    * @throws CoreException if the implementation class cannot be loaded
    */
   virtual IPropertyTester* Instantiate() = 0;
 
   /**
    * Executes the property test determined by the parameter <code>property</code>.
    *
    * @param receiver the receiver of the property test
    * @param property the property to test
    * @param args additional arguments to evaluate the property. If no arguments
    *  are specified in the <code>test</code> expression an array of length 0
    *  is passed
    * @param expectedValue the expected value of the property. The value is either
    *  of type <code>java.lang.String</code> or a boxed base type. If no value was
    *  specified in the <code>test</code> expressions then <code>null</code> is passed
    *
    * @return returns <code>true<code> if the property is equal to the expected value;
    *  otherwise <code>false</code> is returned
    */
-  virtual bool Test(Object::Pointer receiver, const QString& property,
+  virtual bool Test(Object::ConstPointer receiver, const QString& property,
                     const QList<Object::Pointer>& args, Object::Pointer expectedValue) = 0;
 
 };
 
 }  // namespace berry
 
 Q_DECLARE_INTERFACE(berry::IPropertyTester, "org.blueberry.IPropertyTester")
 
 #endif /*BERRYIPROPERTYTESTER_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryPropertyTester.cpp b/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryPropertyTester.cpp
index 86b505952f..4814ca3fa2 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryPropertyTester.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/berryPropertyTester.cpp
@@ -1,61 +1,63 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryPropertyTester.h"
 
 #include "berryPlatform.h"
 #include "berryIContributor.h"
 
+#include <ctkPlugin.h>
+
 namespace berry
 {
 
 void PropertyTester::InternalInitialize(PropertyTesterDescriptor::Pointer descriptor)
 {
   fProperties = descriptor->GetProperties();
   fNamespace= descriptor->GetNamespace();
   fConfigElement= descriptor->GetExtensionElement();
 }
 
 PropertyTesterDescriptor::Pointer PropertyTester::InternalCreateDescriptor()
 {
   PropertyTesterDescriptor::Pointer tester(new PropertyTesterDescriptor(fConfigElement, fNamespace, fProperties));
   return tester;
 }
 
 bool PropertyTester::Handles(const QString &namespaze,
     const QString &property)
 {
   return fNamespace == namespaze && fProperties.contains("," + property + ",");
 }
 
 bool PropertyTester::IsInstantiated()
 {
   return true;
 }
 
 bool PropertyTester::IsDeclaringPluginActive()
 {
   QSharedPointer<ctkPlugin> plugin = Platform::GetCTKPlugin(fConfigElement->GetContributor()->GetName());
   return plugin->getState() == ctkPlugin::ACTIVE;
 }
 
 IPropertyTester* PropertyTester::Instantiate()
 {
   return this;
 }
 
 
 }  // namespace berry
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryAdaptExpression.cpp b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryAdaptExpression.cpp
index 0a76e1cac8..63d4646f24 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryAdaptExpression.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryAdaptExpression.cpp
@@ -1,129 +1,124 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryAdaptExpression.h"
 
 #include <berryPlatform.h>
-#include <berryRuntime.h>
 #include <berryIAdapterManager.h>
 #include <berryIConfigurationElement.h>
 
 #include "berryExpressions.h"
 #include "berryDefaultVariable.h"
 
 #include <Poco/DOM/Node.h>
 
 namespace berry {
 
 const QString AdaptExpression::ATT_TYPE= "type";
 
 /**
  * The seed for the hash code for all adapt expressions.
  */
 const uint AdaptExpression::HASH_INITIAL = qHash("berry::AdaptExpression");
 
 AdaptExpression::AdaptExpression(IConfigurationElement::Pointer configElement)
 {
   fTypeName = configElement->GetAttribute(ATT_TYPE);
   Expressions::CheckAttribute(ATT_TYPE, fTypeName);
 }
 
 AdaptExpression::AdaptExpression(Poco::XML::Node* /*element*/)
 {
   throw Poco::NotImplementedException();
   //fTypeName = element->GetAttribute(ATT_TYPE);
   //Expressions::CheckAttribute(ATT_TYPE, fTypeName.length() > 0 ? fTypeName : null);
 }
 
 AdaptExpression::AdaptExpression(const QString& typeName)
 {
   poco_assert(typeName.size() != 0);
   fTypeName= typeName;
 }
 
 //bool
 //AdaptExpression::equals(final Object object)
 //{
 //  if (!(object instanceof AdaptExpression))
 //    return FALSE_EVAL;
 //
 //  final AdaptExpression that= (AdaptExpression)object;
 //  return this.fTypeName.equals(that.fTypeName)
 //      && equals(this.fExpressions, that.fExpressions);
 //}
 
 uint
-AdaptExpression::ComputeHashCode()
+AdaptExpression::ComputeHashCode() const
 {
   throw Poco::NotImplementedException("ComputeHashCode not implemented");
   //return HASH_INITIAL * HASH_FACTOR + HashCode(fExpressions)
   //  * HASH_FACTOR + fTypeName.hashCode();
 }
 
 /* (non-Javadoc)
  * @see Expression#evaluate(IVariablePool)
  */
 EvaluationResult::ConstPointer
 AdaptExpression::Evaluate(IEvaluationContext* context) const
 {
   if (fTypeName.size() == 0)
     return EvaluationResult::FALSE_EVAL;
-  Object::Pointer var = context->GetDefaultVariable();
-  Object::Pointer adapted;
+  Object::ConstPointer var = context->GetDefaultVariable();
+  Object::ConstPointer adapted;
   IAdapterManager* manager = Platform::GetAdapterManager();
   if (Expressions::IsInstanceOf(var.GetPointer(), fTypeName))
   {
     adapted = var;
   }
   else
   {
-    if (!manager->HasAdapter(var->GetClassName(), fTypeName.toStdString()))
+    if (!manager->HasAdapter(var.GetPointer(), fTypeName))
       return EvaluationResult::FALSE_EVAL;
 
-    Poco::Any anyAdapted(manager->GetAdapter(var.GetPointer(), fTypeName.toStdString()));
-    if (!anyAdapted.empty() && anyAdapted.type() == typeid(Object::Pointer))
-    {
-      adapted = Poco::AnyCast<Object::Pointer>(anyAdapted);
-    }
+    adapted = manager->GetAdapter(var.GetPointer(), fTypeName);
   }
   // the adapted result is null but hasAdapter returned TRUE_EVAL check
   // if the adapter is loaded.
   if (adapted.IsNull())
   {
-    if (manager->QueryAdapter(var->GetClassName(), fTypeName.toStdString()) == IAdapterManager::NOT_LOADED)
+    if (manager->QueryAdapter(var.GetPointer(), fTypeName) == IAdapterManager::NOT_LOADED)
     {
       return EvaluationResult::NOT_LOADED;
     }
     else
     {
       return EvaluationResult::FALSE_EVAL;
     }
   }
   DefaultVariable scope(context, adapted);
   return this->EvaluateAnd(&scope);
 }
 
 void
-AdaptExpression::CollectExpressionInfo(ExpressionInfo* info)
+AdaptExpression::CollectExpressionInfo(ExpressionInfo* info) const
 {
   // Although the default variable is passed to the children of this
   // expression as an instance of the adapted type it is OK to only
   // mark a default variable access.
   info->MarkDefaultVariableAccessed();
   CompositeExpression::CollectExpressionInfo(info);
 }
 
 }  // namespace berry
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryAdaptExpression.h b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryAdaptExpression.h
index cf847a7166..c1011d4690 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryAdaptExpression.h
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryAdaptExpression.h
@@ -1,80 +1,80 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYADAPTEXPRESSION_H_
 #define BERRYADAPTEXPRESSION_H_
 
 #include "berryCompositeExpression.h"
 
 namespace Poco {
 namespace XML {
 class Node;
 }
 }
 
 namespace berry {
 
 struct IConfigurationElement;
 
 class AdaptExpression : public CompositeExpression
 {
 
 private:
 
   static const QString ATT_TYPE;
 
   /**
    * The seed for the hash code for all adapt expressions.
    */
   static const uint HASH_INITIAL;
 
   QString fTypeName;
 
 
 public:
 
   AdaptExpression(SmartPointer<IConfigurationElement> configElement);
 
   AdaptExpression(Poco::XML::Node* element);
 
   AdaptExpression(const QString& typeName);
 
 //  bool equals(final Object object) {
 //    if (!(object instanceof AdaptExpression))
 //      return false;
 //
 //    final AdaptExpression that= (AdaptExpression)object;
 //    return this.fTypeName.equals(that.fTypeName)
 //        && equals(this.fExpressions, that.fExpressions);
 //  }
 
 
   /* (non-Javadoc)
    * @see Expression#evaluate(IVariablePool)
    */
   EvaluationResult::ConstPointer Evaluate(IEvaluationContext* context) const;
 
-  void CollectExpressionInfo(ExpressionInfo* info);
+  void CollectExpressionInfo(ExpressionInfo* info) const;
 
 
 protected:
 
-  uint ComputeHashCode();
+  uint ComputeHashCode() const;
 };
 
 }  // namespace berry
 
 #endif /*BERRYADAPTEXPRESSION_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryCompositeExpression.cpp b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryCompositeExpression.cpp
index 9f6e8f93b7..b8a0266b37 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryCompositeExpression.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryCompositeExpression.cpp
@@ -1,82 +1,82 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryCompositeExpression.h"
 
 #include "Poco/Hash.h"
 
 namespace berry
 {
 
 const uint CompositeExpression::HASH_INITIAL = Poco::Hash<std::string>()("berry::CompositeExpression");
 
 void CompositeExpression::Add(Expression::Pointer expression)
 {
   fExpressions.push_back(expression);
 }
 
 QList<Expression::Pointer> CompositeExpression::GetChildren()
 {
   return fExpressions;
 }
 
 EvaluationResult::ConstPointer CompositeExpression::EvaluateAnd(IEvaluationContext* scope) const
 {
   if (fExpressions.size() == 0)
     return EvaluationResult::TRUE_EVAL;
   EvaluationResult::ConstPointer result = EvaluationResult::TRUE_EVAL;
   foreach (Expression::Pointer iter, fExpressions)
   {
     result = result->And(iter->Evaluate(scope));
     // keep iterating even if we have a not loaded found. It can be
     // that we find a FALSE_EVAL which will result in a better result.
     if (result == EvaluationResult::FALSE_EVAL)
       return result;
   }
   return result;
 }
 
 EvaluationResult::ConstPointer CompositeExpression::EvaluateOr(IEvaluationContext* scope) const
 {
   if (fExpressions.size() == 0)
     return EvaluationResult::TRUE_EVAL;
   EvaluationResult::ConstPointer result = EvaluationResult::FALSE_EVAL;
   foreach (Expression::Pointer iter, fExpressions)
   {
     result = result->Or(iter->Evaluate(scope));
     if (result == EvaluationResult::TRUE_EVAL)
       return result;
   }
   return result;
 }
 
-void CompositeExpression::CollectExpressionInfo(ExpressionInfo* info)
+void CompositeExpression::CollectExpressionInfo(ExpressionInfo* info) const
 {
   if (fExpressions.size() == 0)
     return;
 
   foreach (Expression::Pointer iter, fExpressions)
   {
     iter->CollectExpressionInfo(info);
   }
 }
 
-uint CompositeExpression::ComputeHashCode()
+uint CompositeExpression::ComputeHashCode() const
 {
   return HASH_INITIAL * HASH_FACTOR + this->HashCode(fExpressions);
 }
 
 } // namespace berry
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryCompositeExpression.h b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryCompositeExpression.h
index b1e89cdb2e..65a72b636c 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryCompositeExpression.h
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryCompositeExpression.h
@@ -1,62 +1,62 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYCOMPOSITEEXPRESSION_H_
 #define BERRYCOMPOSITEEXPRESSION_H_
 
 #include "berryExpression.h"
 #include "berryExpressionInfo.h"
 #include "berryEvaluationResult.h"
 #include "berryIEvaluationContext.h"
 
 
 namespace berry
 {
 
 class CompositeExpression : public Expression
 {
 
 public:
   berryObjectMacro(CompositeExpression);
 
 private:
 
   /**
    * The seed for the hash code for all composite expressions.
    */
   static const uint HASH_INITIAL;
 
 protected:
   QList<Expression::Pointer> fExpressions;
 
   virtual EvaluationResult::ConstPointer EvaluateAnd(IEvaluationContext* scope) const;
   virtual EvaluationResult::ConstPointer EvaluateOr(IEvaluationContext* scope) const;
 
-  virtual uint ComputeHashCode();
+  virtual uint ComputeHashCode() const;
 
 public:
 
   virtual void Add(Expression::Pointer expression);
 
   virtual QList<Expression::Pointer> GetChildren();
 
-  virtual void CollectExpressionInfo(ExpressionInfo* info);
+  virtual void CollectExpressionInfo(ExpressionInfo* info) const;
 
 };
 
 } // namespace berry
 
 #endif /*BERRYCOMPOSITEEXPRESSION_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryCountExpression.cpp b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryCountExpression.cpp
index 3b6c73cd31..98f824f39a 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryCountExpression.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryCountExpression.cpp
@@ -1,139 +1,139 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryCountExpression.h"
 
 #include "berryExpressions.h"
 
 #include <berryObjectList.h>
 #include <berryIConfigurationElement.h>
 
 namespace berry {
 
 const int CountExpression::ANY_NUMBER= 5;
 const int CountExpression::EXACT= 4;
 const int CountExpression::ONE_OR_MORE= 3;
 const int CountExpression::NONE_OR_ONE= 2;
 const int CountExpression::NONE= 1;
 const int CountExpression::UNKNOWN= 0;
 
 const uint CountExpression::HASH_INITIAL = qHash("berry::CountExpression");
 
   void
   CountExpression::InitializeSize(QString size)
   {
     if (size.isNull())
       size = "*";
     if (size == "*")
       fMode = ANY_NUMBER;
     else if (size == "?")
       fMode = NONE_OR_ONE;
     else if (size == "!")
       fMode = NONE;
     else if (size == "+")
       fMode = ONE_OR_MORE;
     else
     {
       bool ok = false;
       fSize = size.toInt(&ok);
       if (ok)
       {
         fMode = EXACT;
       }
       else
       {
         fMode = UNKNOWN;
       }
     }
   }
 
   CountExpression::CountExpression(const IConfigurationElement::Pointer& configElement)
   {
     QString size = configElement->GetAttribute(ATT_VALUE);
     this->InitializeSize(size);
   }
 
   CountExpression::CountExpression(Poco::XML::Element* element)
   {
     std::string size = element->getAttribute(ATT_VALUE.toStdString());
     this->InitializeSize(size.size() > 0 ? QString::fromStdString(size) : QString());
   }
 
   CountExpression::CountExpression(const QString& size)
   {
     this->InitializeSize(size);
   }
 
   EvaluationResult::ConstPointer
   CountExpression::Evaluate(IEvaluationContext* context) const
   {
-    Object::Pointer var(context->GetDefaultVariable());
+    Object::ConstPointer var(context->GetDefaultVariable());
     ObjectList<Object::Pointer>::size_type size;
 
-    if(ObjectList<Object::Pointer>::Pointer coll = var.Cast<ObjectList<Object::Pointer> >())
+    if(ObjectList<Object::Pointer>::ConstPointer coll = var.Cast<const ObjectList<Object::Pointer> >())
     {
       size = coll->size();
     }
     else
     {
-      ICountable::Pointer countable = Expressions::GetAsICountable(var, Expression::ConstPointer(this));
+      ICountable::ConstPointer countable = Expressions::GetAsICountable(var, Expression::ConstPointer(this));
       if (!countable)
         return EvaluationResult::NOT_LOADED;
       size = countable->Count();
     }
 
     switch (fMode)
     {
       case UNKNOWN:
       return EvaluationResult::FALSE_EVAL;
       case NONE:
       return EvaluationResult::ValueOf(size == 0);
       case NONE_OR_ONE:
       return EvaluationResult::ValueOf(size == 0 || size == 1);
       case ONE_OR_MORE:
       return EvaluationResult::ValueOf(size >= 1);
       case EXACT:
       return EvaluationResult::ValueOf( (ObjectList<Object::Pointer>::size_type) fSize == size);
       case ANY_NUMBER:
       return EvaluationResult::TRUE_EVAL;
     }
 
     return EvaluationResult::FALSE_EVAL;
   }
 
   void
-  CountExpression::CollectExpressionInfo(ExpressionInfo* info)
+  CountExpression::CollectExpressionInfo(ExpressionInfo* info) const
   {
     info->MarkDefaultVariableAccessed();
   }
 
   bool
   CountExpression::operator==(const Object* object) const
   {
     if (const CountExpression* that = dynamic_cast<const CountExpression*>(object))
     {
       return (this->fMode == that->fMode) && (this->fSize == that->fSize);
     }
     return false;
   }
 
   uint
-  CountExpression::ComputeHashCode()
+  CountExpression::ComputeHashCode() const
   {
     return HASH_INITIAL * HASH_FACTOR + fMode * HASH_FACTOR + fSize;
   }
 
 }  // namespace berry
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryCountExpression.h b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryCountExpression.h
index 3199c44301..56bd12494d 100755
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryCountExpression.h
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryCountExpression.h
@@ -1,74 +1,74 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef __BERRY_COUNT_EXPRESSION_H__
 #define __BERRY_COUNT_EXPRESSION_H__
 
 #include "berryExpression.h"
 #include "berryIEvaluationContext.h"
 #include "berryExpressionInfo.h"
 
 #include "Poco/DOM/Element.h"
 
 #include <string>
 
 namespace berry {
 
 struct IConfigurationElement;
 
 class CountExpression : public Expression {
 
 private:
   static const int ANY_NUMBER;
   static const int EXACT;
    static const int ONE_OR_MORE;
    static const int NONE_OR_ONE;
    static const int NONE;
    static const int UNKNOWN;
 
   /**
    * The seed for the hash code for all count expressions.
    */
   static const uint HASH_INITIAL;
 
   int fMode;
   int fSize;
 
   void InitializeSize(QString size);
 
 public:
 
   CountExpression(const SmartPointer<IConfigurationElement>& configElement);
 
   CountExpression(Poco::XML::Element* element);
 
   CountExpression(const QString& size);
 
   EvaluationResult::ConstPointer Evaluate(IEvaluationContext* context) const;
 
-  void CollectExpressionInfo(ExpressionInfo* info);
+  void CollectExpressionInfo(ExpressionInfo* info) const;
 
   bool operator==(const Object* object) const;
 
 protected:
 
-  uint ComputeHashCode();
+  uint ComputeHashCode() const;
 
 };
 
 } // namespace berry
 
 #endif // __BERRY_COUNT_EXPRESSION_H__
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryDefaultVariable.cpp b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryDefaultVariable.cpp
index 9d759c5023..1c7f8a62f4 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryDefaultVariable.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryDefaultVariable.cpp
@@ -1,85 +1,85 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryDefaultVariable.h"
 
 #include <Poco/Bugcheck.h>
 
 namespace berry {
 
 DefaultVariable::DefaultVariable(IEvaluationContext* parent,
-                                 const Object::Pointer& defaultVariable)
+                                 const Object::ConstPointer& defaultVariable)
+  : fDefaultVariable(defaultVariable)
+  , fParent(parent)
 {
-  poco_check_ptr(parent);
+  Q_ASSERT(parent);
 
-  fParent= parent;
-
-  while (dynamic_cast<DefaultVariable*>(parent))
+  while (dynamic_cast<const DefaultVariable*>(parent))
   {
     parent = parent->GetParent();
   }
-  fManagedPool= parent;
-  fDefaultVariable= defaultVariable;
+  fManagedPool = parent;
+  fDefaultVariable = defaultVariable;
 }
 
 IEvaluationContext* DefaultVariable::GetParent() const
 {
   return fParent;
 }
 
-IEvaluationContext* DefaultVariable::GetRoot()
+IEvaluationContext* DefaultVariable::GetRoot() const
 {
   return fParent->GetRoot();
 }
 
-Object::Pointer DefaultVariable::GetDefaultVariable() const
+Object::ConstPointer DefaultVariable::GetDefaultVariable() const
 {
   return fDefaultVariable;
 }
 
 void DefaultVariable::SetAllowPluginActivation(bool value)
 {
   fParent->SetAllowPluginActivation(value);
 }
 
 bool DefaultVariable::GetAllowPluginActivation() const
 {
   return fParent->GetAllowPluginActivation();
 }
 
-void DefaultVariable::AddVariable(const QString& name, const Object::Pointer& value)
+void DefaultVariable::AddVariable(const QString& name, const Object::ConstPointer& value)
 {
   fManagedPool->AddVariable(name, value);
 }
 
-Object::Pointer DefaultVariable::RemoveVariable(const QString &name)
+Object::ConstPointer DefaultVariable::RemoveVariable(const QString &name)
 {
   return fManagedPool->RemoveVariable(name);
 }
 
-Object::Pointer DefaultVariable::GetVariable(const QString &name) const
+Object::ConstPointer DefaultVariable::GetVariable(const QString &name) const
 {
   return fManagedPool->GetVariable(name);
 }
 
-Object::Pointer DefaultVariable::ResolveVariable(const QString &name,
-                                                 const QList<Object::Pointer>& args)
+Object::ConstPointer DefaultVariable::ResolveVariable(const QString &name,
+                                                 const QList<Object::Pointer>& args) const
 {
   return fManagedPool->ResolveVariable(name, args);
 }
 
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryDefaultVariable.h b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryDefaultVariable.h
index a47301c461..a686acd783 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryDefaultVariable.h
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryDefaultVariable.h
@@ -1,91 +1,92 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYDEFAULTVARIABLE_H_
 #define BERRYDEFAULTVARIABLE_H_
 
 #include "berryIEvaluationContext.h"
 
 namespace berry {
 
-class DefaultVariable : public IEvaluationContext {
+class DefaultVariable : public IEvaluationContext
+{
 
 private:
-  Object::Pointer fDefaultVariable;
+  Object::ConstPointer fDefaultVariable;
   IEvaluationContext* fParent;
   IEvaluationContext* fManagedPool;
 
 
 public:
 
   /**
      * Constructs a new variable pool for a single default variable.
      *
      * @param parent the parent context for the default variable. Must not
      *  be <code>null</code>.
      * @param defaultVariable the default variable
      */
-  DefaultVariable(IEvaluationContext* parent, const Object::Pointer& defaultVariable);
+  DefaultVariable(IEvaluationContext* parent, const Object::ConstPointer& defaultVariable);
 
   /**
    * {@inheritDoc}
    */
   IEvaluationContext* GetParent() const;
 
   /**
    * {@inheritDoc}
    */
-  IEvaluationContext* GetRoot();
+  IEvaluationContext* GetRoot() const;
 
   /**
    * {@inheritDoc}
    */
-  Object::Pointer GetDefaultVariable() const;
+  Object::ConstPointer GetDefaultVariable() const;
 
   /**
    * {@inheritDoc}
    */
   void SetAllowPluginActivation(bool value);
 
   /**
    * {@inheritDoc}
    */
   bool GetAllowPluginActivation() const;
 
   /**
    * {@inheritDoc}
    */
-  void AddVariable(const QString& name, const Object::Pointer& value);
+  void AddVariable(const QString& name, const Object::ConstPointer& value);
 
   /**
    * {@inheritDoc}
    */
-  Object::Pointer RemoveVariable(const QString& name);
+  Object::ConstPointer RemoveVariable(const QString& name);
 
   /**
    * {@inheritDoc}
    */
-  Object::Pointer GetVariable(const QString& name) const;
+  Object::ConstPointer GetVariable(const QString& name) const;
 
   /**
    * {@inheritDoc}
    */
-  Object::Pointer ResolveVariable(const QString& name, const QList<Object::Pointer>& args);
+  Object::ConstPointer ResolveVariable(const QString& name, const QList<Object::Pointer>& args) const;
 };
 
 }  // namespace berry
 
 #endif /*BERRYDEFAULTVARIABLE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryDefinitionRegistry.cpp b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryDefinitionRegistry.cpp
index 2cfe5acfac..396970d4b9 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryDefinitionRegistry.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryDefinitionRegistry.cpp
@@ -1,101 +1,102 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryDefinitionRegistry.h"
 
 #include "berryExpressionConverter.h"
 #include "berryExpressionStatus.h"
 #include "berryCoreException.h"
+#include "berryElementHandler.h"
 
 #include "berryPlatform.h"
 #include "berryPlatformException.h"
 #include "berryStatus.h"
 #include "berryIExtensionRegistry.h"
 #include "berryIConfigurationElement.h"
 #include "berryInvalidRegistryObjectException.h"
 
 namespace berry {
 
 QHash<QString, Expression::Pointer>& DefinitionRegistry::GetCache()
 {
   return cache;
 }
 
 DefinitionRegistry::DefinitionRegistry()
 {
   //Platform.getExtensionRegistry().addRegistryChangeListener(this, "org.blueberry.core.expressions"); //$NON-NLS-1$
 }
 
 Expression::Pointer DefinitionRegistry::GetExpression(const QString& id)
 {
   Expression::Pointer cachedExpression= this->GetCache()[id];
   if (!cachedExpression.IsNull())
   {
     return cachedExpression;
   }
 
   IExtensionRegistry* registry = Platform::GetExtensionRegistry();
   QList<IConfigurationElement::Pointer> ces =
       registry->GetConfigurationElementsFor("org.blueberry.core.expressions.definitions");
 
   Expression::Pointer foundExpression;
   for (QList<IConfigurationElement::Pointer>::iterator i= ces.begin(); i != ces.end(); ++i)
   {
     QString cid = (*i)->GetAttribute("id");
     if (!cid.isNull())
     {
       if (cid == id)
       {
         try
         {
           foundExpression= this->GetExpression(id, *i);
           break;
         }
-        catch (const InvalidRegistryObjectException& e)
+        catch (const InvalidRegistryObjectException& /*e*/)
         {
           IStatus::Pointer status(new ExpressionStatus(ExpressionStatus::MISSING_EXPRESSION,
                                                        QString("Unable to locate expression definition ") + id,
                                                        BERRY_STATUS_LOC));
           throw CoreException(status);
         }
       }
     }
   }
   if (foundExpression.IsNull())
   {
     IStatus::Pointer status(new ExpressionStatus(ExpressionStatus::MISSING_EXPRESSION,
                                                  QString("Unable to locate expression definition ") + id,
                                                  BERRY_STATUS_LOC));
     throw CoreException(status);
   }
 
   return foundExpression;
 }
 
 Expression::Pointer DefinitionRegistry::GetExpression(const QString& id,
                                                       const IConfigurationElement::Pointer& element)
 {
   QList<IConfigurationElement::Pointer> children(element->GetChildren());
   Expression::Pointer expr= ExpressionConverter::GetDefault()->Perform(children[0]);
   if (!expr.IsNull())
   {
     this->GetCache()[id] = expr;
   }
 
   return expr;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryEqualsExpression.cpp b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryEqualsExpression.cpp
index 6719e938a1..64ddef9856 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryEqualsExpression.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryEqualsExpression.cpp
@@ -1,77 +1,79 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryEqualsExpression.h"
 
 #include "berryExpressions.h"
 #include <berryIConfigurationElement.h>
 
 #include <Poco/Hash.h>
 #include <Poco/Exception.h>
 #include <Poco/Bugcheck.h>
 
 namespace berry {
 
 const std::size_t EqualsExpression::HASH_INITIAL= Poco::Hash<std::string>()("berry::EqualsExpression");
 
 
 EqualsExpression::EqualsExpression(Object::Pointer expectedValue) {
   poco_assert(expectedValue.IsNotNull());
 
   fExpectedValue = expectedValue;
 }
 
 EqualsExpression::EqualsExpression(const IConfigurationElement::Pointer& element) {
   QString value = element->GetAttribute(ATT_VALUE);
   Expressions::CheckAttribute(ATT_VALUE, value);
   fExpectedValue = Expressions::ConvertArgument(value);
 }
 
 EqualsExpression::EqualsExpression(Poco::XML::Element* element) {
   std::string strValue = element->getAttribute(ATT_VALUE.toStdString());
   QString value(strValue.size() > 0 ? QString::fromStdString(strValue) : QString());
   Expressions::CheckAttribute(ATT_VALUE, value);
   fExpectedValue = Expressions::ConvertArgument(value);
 }
 
 EvaluationResult::ConstPointer
 EqualsExpression::Evaluate(IEvaluationContext* context) const
 {
-  Object::Pointer element= context->GetDefaultVariable();
+  Object::ConstPointer element= context->GetDefaultVariable();
   return EvaluationResult::ValueOf(element == fExpectedValue);
 }
 
 void
-EqualsExpression::CollectExpressionInfo(ExpressionInfo* info) {
+EqualsExpression::CollectExpressionInfo(ExpressionInfo* info) const
+{
   info->MarkDefaultVariableAccessed();
 }
 
 bool
 EqualsExpression::operator==(const Object* object) const
 {
   if(const EqualsExpression* that = dynamic_cast<const EqualsExpression*>(object))
   {
     return this->fExpectedValue == that->fExpectedValue;
   }
   return false;
 }
 
-std::size_t
-EqualsExpression::ComputeHashCode() {
+uint
+EqualsExpression::ComputeHashCode() const
+{
   return HASH_INITIAL * HASH_FACTOR + fExpectedValue->HashCode();
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryEqualsExpression.h b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryEqualsExpression.h
index 57fc45eacd..62384f53dc 100755
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryEqualsExpression.h
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryEqualsExpression.h
@@ -1,61 +1,61 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef __BERRY_EQUALS_EXPRESSION_H__
 #define __BERRY_EQUALS_EXPRESSION_H__
 
 #include "berryExpression.h"
 #include "berryExpressionInfo.h"
 #include "berryIEvaluationContext.h"
 
 #include "Poco/DOM/Element.h"
 
 namespace berry {
 
 struct IConfigurationElement;
 
 class EqualsExpression : public Expression {
   /**
    * The seed for the hash code for all equals expressions.
    */
 private:
 
   static const std::size_t HASH_INITIAL;
 
   Object::Pointer fExpectedValue;
 
 public:
 
   EqualsExpression(const Object::Pointer expectedValue);
 
   EqualsExpression(const SmartPointer<IConfigurationElement>& element);
 
   EqualsExpression(Poco::XML::Element* element);
 
   EvaluationResult::ConstPointer Evaluate(IEvaluationContext* context) const;
 
-  void CollectExpressionInfo(ExpressionInfo* info);
+  void CollectExpressionInfo(ExpressionInfo* info) const;
 
   bool operator==(const Object* object) const;
 
 protected:
 
-  std::size_t ComputeHashCode();
+  uint ComputeHashCode() const;
 };
 
 } // namespace berry
 
 #endif // __BERRY_EQUALS_EXPRESSION_H__
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryExpressions.cpp b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryExpressions.cpp
index 428b6d18da..b177dcdfa7 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryExpressions.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryExpressions.cpp
@@ -1,346 +1,334 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryExpressions.h"
 
 #include "berryExpressionStatus.h"
 
 #include <berryPlatform.h>
 #include <berryCoreException.h>
 
 #include <berryIAdapterManager.h>
 #include <berryIConfigurationElement.h>
 
 #include <berryObjects.h>
 #include <berryObjectString.h>
 #include <berryObjectList.h>
 
 
 namespace berry
 {
 
   const bool Expressions::TRACING = true;
 
   Expressions::Expressions()
   {
     // no instance
   }
 
   bool
   Expressions::IsInstanceOf(const Object* element, const QString& type)
   {
     // null isn't an instanceof of anything.
     if (element == 0)
       return false;
 
     // TODO Reflection
     // return IsSubtype(element, type)
 
     return element->GetClassName() == type;
   }
 
 
   void
   Expressions::CheckAttribute(const QString& name, const QString& value)
   {
     if (value.isNull())
     {
       IStatus::Pointer status(new ExpressionStatus(
                                 ExpressionStatus::MISSING_ATTRIBUTE,
                                 QString("Mandatory attribute %1 is missing").arg(name),
                                 BERRY_STATUS_LOC));
       throw CoreException(status);
     }
   }
 
   void
   Expressions::CheckAttribute(const QString& name, const QString& value, QStringList &validValues)
   {
     CheckAttribute(name, value);
     if (validValues.contains(value)) return;
     IStatus::Pointer status(new ExpressionStatus(ExpressionStatus::WRONG_ATTRIBUTE_VALUE,
                                                  QString("Attribute value %1 is not valid").arg(value),
                                                  BERRY_STATUS_LOC));
     throw CoreException(status);
   }
 
   void
   Expressions::CheckCollection(Object::ConstPointer var, Expression::Pointer expression)
   {
     if (var.Cast<const ObjectList<Object::Pointer> >())
       return;
     IStatus::Pointer status(new ExpressionStatus(ExpressionStatus::VARIABLE_IS_NOT_A_COLLECTION,
                                                  QString("The default variable is not of type ObjectList<Object::Pointer>. "
                                                          "Failed expression: %1").arg(expression->ToString()),
                                                  BERRY_STATUS_LOC));
     throw CoreException(status);
   }
 
-  IIterable::Pointer
-  Expressions::GetAsIIterable(Object::Pointer var, Expression::ConstPointer expression)
+  IIterable::ConstPointer
+  Expressions::GetAsIIterable(Object::ConstPointer var, Expression::ConstPointer expression)
   {
-    IIterable::Pointer iterable(var.Cast<IIterable>());
+    IIterable::ConstPointer iterable(var.Cast<const IIterable>());
     if (!iterable.IsNull())
     {
       return iterable;
     }
     else
     {
       IAdapterManager* manager= Platform::GetAdapterManager();
-      Object::Pointer result;
-      Poco::Any any(manager->GetAdapter(var, IIterable::GetStaticClassName()));
-      if (!any.empty() && any.type() == typeid(Object::Pointer))
-      {
-        result = Poco::AnyCast<Object::Pointer>(any);
-      }
+      iterable = manager->GetAdapter<IIterable>(var.GetPointer());
 
-      if (result)
+      if (iterable)
       {
-        iterable = result.Cast<IIterable>();
         return iterable;
       }
 
-      if (manager->QueryAdapter(var->GetClassName(), IIterable::GetStaticClassName()) == IAdapterManager::NOT_LOADED)
+      if (manager->QueryAdapter<IIterable>(var.GetPointer()) == IAdapterManager::NOT_LOADED)
         return IIterable::Pointer();
 
       IStatus::Pointer status(new ExpressionStatus(ExpressionStatus::VARIABLE_IS_NOT_A_COLLECTION,
                                                    QString("The default variable is not iterable. Failed expression: %1").arg(expression->ToString()),
                                                    BERRY_STATUS_LOC));
       throw CoreException(status);
     }
   }
 
-  ICountable::Pointer
-  Expressions::GetAsICountable(Object::Pointer var, Expression::ConstPointer expression)
+  ICountable::ConstPointer
+  Expressions::GetAsICountable(Object::ConstPointer var, Expression::ConstPointer expression)
   {
-    ICountable::Pointer countable(var.Cast<ICountable>());
+    ICountable::ConstPointer countable(var.Cast<const ICountable>());
     if (!countable.IsNull())
     {
       return countable;
     }
     else
     {
       IAdapterManager* manager = Platform::GetAdapterManager();
-      Object::Pointer result;
-      Poco::Any any(manager->GetAdapter(var, ICountable::GetStaticClassName()));
-      if (!any.empty() && any.type() == typeid(Object::Pointer))
-      {
-        result = Poco::AnyCast<Object::Pointer>(any);
-      }
-
+      ICountable::ConstPointer result(manager->GetAdapter<ICountable>(var.GetPointer()));
       if (result)
       {
-        countable = result.Cast<ICountable>();
+        return result;
       }
 
-      if (manager->QueryAdapter(var->GetClassName(), ICountable::GetStaticClassName()) == IAdapterManager::NOT_LOADED)
-        return ICountable::Pointer();
+      if (manager->QueryAdapter<ICountable>(var.GetPointer()) == IAdapterManager::NOT_LOADED)
+        return ICountable::ConstPointer();
 
       IStatus::Pointer status(new ExpressionStatus(ExpressionStatus::VARIABLE_IS_NOT_A_COLLECTION,
                                                    QString("The default variable is not countable. Failed expression: %1").arg(expression->ToString()),
                                                    BERRY_STATUS_LOC));
       throw CoreException(status);
     }
   }
 
   bool
   Expressions::GetOptionalBooleanAttribute(IConfigurationElement::Pointer element, const QString& attributeName)
   {
     QString value = element->GetAttribute(attributeName);
     if (value.isNull())
       return false;
 
     return value.compare("true", Qt::CaseInsensitive) == 0;
   }
 
   bool
   Expressions::GetOptionalBooleanAttribute(Poco::XML::Element* element, const QString& attributeName)
   {
     QString value = QString::fromStdString(element->getAttribute(attributeName.toStdString()));
     if (value.size() == 0)
       return false;
 
     return value.compare("true", Qt::CaseInsensitive) == 0;
   }
 
   QList<Object::Pointer>
   Expressions::GetArguments(const IConfigurationElement::Pointer& element, const QString& attributeName)
   {
     QString value = element->GetAttribute(attributeName);
     if (!value.isNull())
     {
       return ParseArguments(value);
     }
     return QList<Object::Pointer>();
   }
 
   QList<Object::Pointer>
   Expressions::GetArguments(Poco::XML::Element* element, const QString& attributeName)
   {
     std::string value = element->getAttribute(attributeName.toStdString());
     if (value.size() > 0)
     {
       return ParseArguments(QString::fromStdString(value));
     }
     return QList<Object::Pointer>();
   }
 
   QList<Object::Pointer>
   Expressions::ParseArguments(const QString& args)
   {
     QList<Object::Pointer> result;
     int start= 0;
     int comma;
     while ((comma = FindNextComma(args, start)) != -1)
     {
       result.push_back(ConvertArgument(args.mid(start, comma-start).trimmed()));
       start= comma + 1;
     }
     result.push_back(ConvertArgument(args.mid(start).trimmed()));
     return result;
   }
 
   int
   Expressions::FindNextComma(const QString& str, int start)
   {
     bool inString = false;
-    for (unsigned int i = start; i < str.size(); i++)
+    for (int i = start; i < str.size(); i++)
     {
       const QChar ch = str.at(i);
       if (ch == ',' && ! inString)
       return i;
       if (ch == '\'')
       {
         if (!inString)
         {
           inString= true;
         }
         else
         {
           if (i + 1 < str.size() && str.at(i + 1) == '\'')
           {
             i++;
           }
           else
           {
             inString= false;
           }
         }
       }
       else if (ch == ',' && !inString)
       {
         return i;
       }
     }
     if (inString)
     {
       IStatus::Pointer status(new ExpressionStatus(ExpressionStatus::STRING_NOT_TERMINATED,
                                                    QString("The String \"%1\" is not correctly terminated with an apostrophe character.").arg(str),
                                                    BERRY_STATUS_LOC));
       throw CoreException(status);
     }
 
     return -1;
   }
 
   Object::Pointer
   Expressions::ConvertArgument(const QString& arg)
   {
     if (arg.isNull())
     {
       return Object::Pointer();
     }
     else if (arg.length() == 0)
     {
       ObjectString::Pointer var(new ObjectString(arg));
       return var;
     }
     else if (arg.at(0) == '\'' && arg.at(arg.size() - 1) == '\'')
     {
       ObjectString::Pointer var(new ObjectString(UnEscapeString(arg.mid(1, arg.size() - 2))));
       return var;
     }
     else if ("true" == arg)
     {
       ObjectBool::Pointer var(new ObjectBool(true));
       return var;
     }
     else if ("false" == arg)
     {
       ObjectBool::Pointer var(new ObjectBool(false));
       return var;
     }
     else if (arg.indexOf('.') != -1)
     {
       bool ok = false;
       float num = arg.toFloat(&ok);
       if (ok)
       {
         ObjectFloat::Pointer var(new ObjectFloat(num));
         return var;
       }
       else
       {
         ObjectString::Pointer var(new ObjectString(arg));
         return var;
       }
     }
     else
     {
       bool ok = false;
       int num = arg.toInt(&ok);
       if (ok)
       {
         ObjectInt::Pointer var(new ObjectInt(num));
         return var;
       }
       else
       {
         ObjectString::Pointer var(new ObjectString(arg));
         return var;
       }
     }
   }
 
   QString
   Expressions::UnEscapeString(const QString& str)
   {
     QString result = "";
-    for (unsigned int i= 0; i < str.size(); i++)
+    for (int i= 0; i < str.size(); i++)
     {
       const QChar ch= str.at(i);
       if (ch == '\'')
       {
         if (i == str.size() - 1 || str.at(i + 1) != '\'')
         {
           IStatus::Pointer status(new ExpressionStatus(ExpressionStatus::STRING_NOT_CORRECT_ESCAPED,
                                                        QString("The String \"%1\" is not correctly escaped. "
                                                                "Wrong number of apostrophe characters.").arg(str),
                                                        BERRY_STATUS_LOC));
           throw CoreException(status);
         }
         result.append('\'');
         i++;
       }
       else
       {
         result.append(ch);
       }
     }
     return result;
   }
 
 } // namespace berry
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryExpressions.h b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryExpressions.h
index ad99d89d98..e9475b0c1a 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryExpressions.h
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryExpressions.h
@@ -1,104 +1,104 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYEXPRESSIONS_H_
 #define BERRYEXPRESSIONS_H_
 
 #include "Poco/Any.h"
 #include "Poco/DOM/Element.h"
 
 #include "berryExpression.h"
 #include "berryIIterable.h"
 #include "berryICountable.h"
 
 #include <vector>
 #include <typeinfo>
 
 namespace berry
 {
 
 struct IConfigurationElement;
 
 class Expressions {
 
 private:
 
   Expressions();
 
   static int FindNextComma(const QString& str, int start);
 
 public:
 
   /* debugging flag to enable tracing */
   static const bool TRACING;
 
   static bool IsInstanceOf(const Object *element, const QString& type);
 
   static void CheckAttribute(const QString& name, const QString& value);
 
   static void CheckAttribute(const QString& name, const QString& value, QStringList& validValues);
 
   static void CheckCollection(Object::ConstPointer var, Expression::Pointer expression);
 
   /**
    * Converts the given variable into an <code>IIterable</code>. If a corresponding adapter can't be found an
    * exception is thrown. If the corresponding adapter isn't loaded yet, <code>null</code> is returned.
    *
    * @param var the variable to turn into an <code>IIterable</code>
    * @param expression the expression referring to the variable
    *
    * @return the <code>IIterable</code> or <code>null<code> if a corresponding adapter isn't loaded yet
    *
    * @throws CoreException if the var can't be adapted to an <code>IIterable</code>
    */
-  static IIterable::Pointer GetAsIIterable(Object::Pointer var, Expression::ConstPointer expression);
+  static IIterable::ConstPointer GetAsIIterable(Object::ConstPointer var, Expression::ConstPointer expression);
 
   /**
    * Converts the given variable into an <code>ICountable</code>. If a corresponding adapter can't be found an
    * exception is thrown. If the corresponding adapter isn't loaded yet, <code>null</code> is returned.
    *
    * @param var the variable to turn into an <code>ICountable</code>
    * @param expression the expression referring to the variable
    *
    * @return the <code>ICountable</code> or <code>null<code> if a corresponding adapter isn't loaded yet
    *
    * @throws CoreException if the var can't be adapted to an <code>ICountable</code>
    */
-  static ICountable::Pointer GetAsICountable(Object::Pointer var, Expression::ConstPointer expression);
+  static ICountable::ConstPointer GetAsICountable(Object::ConstPointer var, Expression::ConstPointer expression);
 
   static bool GetOptionalBooleanAttribute(SmartPointer<IConfigurationElement> element, const QString& attributeName);
 
   static bool GetOptionalBooleanAttribute(Poco::XML::Element* element, const QString& attributeName);
 
   //---- Argument parsing --------------------------------------------
 
   static QList<Object::Pointer> GetArguments(const SmartPointer<IConfigurationElement>& element,
                                              const QString& attributeName);
 
   static QList<Object::Pointer> GetArguments(Poco::XML::Element* element,
                                              const QString& attributeName);
 
   static QList<Object::Pointer> ParseArguments(const QString& args);
 
   static Object::Pointer ConvertArgument(const QString& arg);
 
   static QString UnEscapeString(const QString& str);
 
 };
 
 }
 
 #endif /*BERRYEXPRESSIONS_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryInstanceofExpression.cpp b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryInstanceofExpression.cpp
index eb403d4653..621fd05908 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryInstanceofExpression.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryInstanceofExpression.cpp
@@ -1,80 +1,80 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryInstanceofExpression.h"
 
 #include "berryExpressions.h"
 #include <berryIConfigurationElement.h>
 
 namespace berry {
 
 const uint InstanceofExpression::HASH_INITIAL= qHash("berry::InstanceofExpression");
 
 InstanceofExpression::InstanceofExpression(const IConfigurationElement::Pointer& element)
 {
   fTypeName = element->GetAttribute(ATT_VALUE);
   Expressions::CheckAttribute(ATT_VALUE, fTypeName);
 }
 
 InstanceofExpression::InstanceofExpression(Poco::XML::Element* element)
 {
   std::string value = element->getAttribute(ATT_VALUE.toStdString());
   fTypeName = value.size() > 0 ? QString::fromStdString(value) : QString();
   Expressions::CheckAttribute(ATT_VALUE, fTypeName);
 }
 
 InstanceofExpression::InstanceofExpression(const QString& typeName)
  : fTypeName(typeName)
 {
 
 }
 
 EvaluationResult::ConstPointer
 InstanceofExpression::Evaluate(IEvaluationContext* context) const
 {
-  Object::Pointer element= context->GetDefaultVariable();
+  Object::ConstPointer element= context->GetDefaultVariable();
   return EvaluationResult::ValueOf(Expressions::IsInstanceOf(element.GetPointer(), fTypeName));
 }
 
 void
-InstanceofExpression::CollectExpressionInfo(ExpressionInfo* info)
+InstanceofExpression::CollectExpressionInfo(ExpressionInfo* info) const
 {
   info->MarkDefaultVariableAccessed();
 }
 
 bool
 InstanceofExpression::operator==(const Object* object) const
 {
   if (const InstanceofExpression* that = dynamic_cast<const InstanceofExpression*>(object))
   {
     return this->fTypeName == that->fTypeName;
   }
   return false;
 }
 
 QString
 InstanceofExpression::ToString() const
 {
   return QString("<instanceof value=\"") + fTypeName + "\"/>";
 }
 
 uint
-InstanceofExpression::ComputeHashCode()
+InstanceofExpression::ComputeHashCode() const
 {
   return HASH_INITIAL * HASH_FACTOR + qHash(fTypeName);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryInstanceofExpression.h b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryInstanceofExpression.h
index f5b03bb017..cf1164740b 100755
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryInstanceofExpression.h
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryInstanceofExpression.h
@@ -1,73 +1,73 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef __BERRY_INSTANCEOF_EXPRESSION_H__
 #define __BERRY_INSTANCEOF_EXPRESSION_H__
 
 #include "berryExpression.h"
 
 #include "Poco/DOM/Element.h"
 
 namespace berry {
 
 struct IConfigurationElement;
 
 struct InstanceofExpression : public Expression {
 
 private:
 
   /**
     * The seed for the hash code for all instance of expressions.
     */
   static const uint HASH_INITIAL;
 
   QString fTypeName;
 
 
 public:
 
   InstanceofExpression(const SmartPointer<IConfigurationElement>& element);
 
   InstanceofExpression(Poco::XML::Element* element);
 
   InstanceofExpression(const QString &typeName);
 
   /*
    * @see org.blueberry.jdt.internal.corext.refactoring.participants.Expression#evaluate(java.lang.Object)
    */
   EvaluationResult::ConstPointer Evaluate(IEvaluationContext* context) const;
 
-  void CollectExpressionInfo(ExpressionInfo* info);
+  void CollectExpressionInfo(ExpressionInfo* info) const;
 
   bool operator==(const Object* object) const;
 
   //---- Debugging ---------------------------------------------------
 
     /*
      * @see java.lang.Object#toString()
      */
   QString ToString() const;
 
 protected:
 
-  uint ComputeHashCode();
+  uint ComputeHashCode() const;
 
 
 };
 
 } // namespace berry
 
 #endif // __BERRY_INSTANCEOF_EXPRESSION_H__
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryIterateExpression.cpp b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryIterateExpression.cpp
index 96076452ff..15e9d5157a 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryIterateExpression.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryIterateExpression.cpp
@@ -1,292 +1,293 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryIterateExpression.h"
 
 #include "berryExpressions.h"
 #include "berryDefaultVariable.h"
 
 #include <berryObjectList.h>
 #include <berryIConfigurationElement.h>
 
 #include <QStringList>
 
 namespace berry
 {
 
 const QString IterateExpression::ATT_OPERATOR = "operator";
 const QString IterateExpression::ATT_IF_EMPTY = "ifEmpty";
 const int IterateExpression::OR = 1;
 const int IterateExpression::AND = 2;
 
 const uint IterateExpression::HASH_INITIAL = qHash("berry::IterateExpression");
 
 struct IteratePool : public IEvaluationContext
 {
 
 private:
-  QList<Object::Pointer>::iterator fIterator;
-  QList<Object::Pointer>::iterator fIterEnd;
-  Object::Pointer fDefaultVariable;
+  QList<Object::Pointer>::const_iterator fIterator;
+  QList<Object::Pointer>::const_iterator fIterEnd;
+  Object::ConstPointer fDefaultVariable;
   IEvaluationContext* fParent;
 
 public:
 
-  IteratePool(IEvaluationContext* parent, QList<Object::Pointer>::iterator begin, QList<Object::Pointer>::iterator end)
+  IteratePool(IEvaluationContext* parent, QList<Object::Pointer>::const_iterator begin,
+              QList<Object::Pointer>::const_iterator end)
   {
     poco_check_ptr(parent);
 
     fParent= parent;
     fIterator = begin;
     fIterEnd = end;
   }
 
   IEvaluationContext* GetParent() const {
     return fParent;
   }
 
-  IEvaluationContext* GetRoot() {
+  IEvaluationContext* GetRoot() const {
     return fParent->GetRoot();
   }
 
-  Object::Pointer GetDefaultVariable() const {
+  Object::ConstPointer GetDefaultVariable() const {
     return fDefaultVariable;
   }
 
   bool GetAllowPluginActivation() const {
     return fParent->GetAllowPluginActivation();
   }
 
   void SetAllowPluginActivation(bool value) {
     fParent->SetAllowPluginActivation(value);
   }
 
-  void AddVariable(const QString& name, const Object::Pointer& value) {
+  void AddVariable(const QString& name, const Object::ConstPointer& value) {
     fParent->AddVariable(name, value);
   }
 
-  Object::Pointer RemoveVariable(const QString& name) {
+  Object::ConstPointer RemoveVariable(const QString& name) {
     return fParent->RemoveVariable(name);
   }
 
-  Object::Pointer GetVariable(const QString& name) const {
+  Object::ConstPointer GetVariable(const QString& name) const {
     return fParent->GetVariable(name);
   }
 
-  Object::Pointer ResolveVariable(const QString& name, const QList<Object::Pointer>& args) {
+  Object::ConstPointer ResolveVariable(const QString& name, const QList<Object::Pointer>& args) const {
     return fParent->ResolveVariable(name, args);
   }
 
   Poco::Any Next() {
     fDefaultVariable = (++fIterator)->GetPointer();
     return fDefaultVariable;
   }
 
   bool HasNext() {
     return (fIterator != fIterEnd);
   }
 };
 
 IterateExpression::IterateExpression(
     const IConfigurationElement::Pointer& configElement)
 {
   QString opValue = configElement->GetAttribute(ATT_OPERATOR);
   this->InitializeOperatorValue(opValue);
   this->InitializeEmptyResultValue(configElement->GetAttribute(ATT_IF_EMPTY));
 }
 
 IterateExpression::IterateExpression(Poco::XML::Element* element)
 {
   std::string opValue = element->getAttribute(ATT_OPERATOR.toStdString());
   this->InitializeOperatorValue(opValue.size() > 0 ? QString::fromStdString(opValue) : QString());
   std::string ifEmpty = element->getAttribute(ATT_IF_EMPTY.toStdString());
   this->InitializeEmptyResultValue(ifEmpty.size() > 0 ? QString::fromStdString(ifEmpty) : QString());
 }
 
 IterateExpression::IterateExpression(const QString& opValue)
 {
   this->InitializeOperatorValue(opValue);
 }
 
 IterateExpression::IterateExpression(const QString& opValue,
                                      const QString& ifEmpty)
 {
   this->InitializeOperatorValue(opValue);
   this->InitializeEmptyResultValue(ifEmpty);
 }
 
 void IterateExpression::InitializeOperatorValue(const QString& opValue)
 {
   if (opValue.isNull())
   {
     fOperator = AND;
   }
   else
   {
     QStringList fValidOperators;
     fValidOperators.push_back("and");
     fValidOperators.push_back("or");
     Expressions::CheckAttribute(ATT_OPERATOR, opValue, fValidOperators);
 
     if ("and" == opValue)
     {
       fOperator = AND;
     }
     else
     {
       fOperator = OR;
     }
   }
 }
 
 void IterateExpression::InitializeEmptyResultValue(const QString& value)
 {
   if (value.isNull())
   {
     fEmptyResult = -1;
   }
   else
   {
     fEmptyResult = value.compare("true", Qt::CaseInsensitive) == 0 ? 1 : 0;
   }
 }
 
 EvaluationResult::ConstPointer IterateExpression::Evaluate(IEvaluationContext* context) const
 {
-  Object::Pointer var = context->GetDefaultVariable();
-  ObjectList<Object::Pointer>* col = dynamic_cast<ObjectList<Object::Pointer>*>(var.GetPointer());
+  Object::ConstPointer var = context->GetDefaultVariable();
+  const ObjectList<Object::Pointer>* col = dynamic_cast<const ObjectList<Object::Pointer>*>(var.GetPointer());
   if (col)
   {
     switch (col->size())
     {
     case 0:
     {
       if (fEmptyResult == -1)
       {
         return fOperator == AND ? EvaluationResult::TRUE_EVAL
             : EvaluationResult::FALSE_EVAL;
       }
       else
       {
         return fEmptyResult == 1 ? EvaluationResult::TRUE_EVAL
             : EvaluationResult::FALSE_EVAL;
       }
     }
     case 1:
     {
       IEvaluationContext::Pointer scope(new DefaultVariable(context,
                                                             col->front()));
       return this->EvaluateAnd(scope.GetPointer());
     }
     default:
       IteratePool iter(context, col->begin(), col->end());
       EvaluationResult::ConstPointer result = fOperator == AND ? EvaluationResult::TRUE_EVAL
           : EvaluationResult::FALSE_EVAL;
       while (iter.HasNext())
       {
         switch (fOperator)
         {
         case OR:
           result = result->Or(this->EvaluateAnd(&iter));
           if (result == EvaluationResult::TRUE_EVAL)
             return result;
           break;
         case AND:
           result = result->And(this->EvaluateAnd(&iter));
           if (result != EvaluationResult::TRUE_EVAL)
             return result;
           break;
         }
         iter.Next();
       }
       return result;
     }
   }
   else
   {
-    IIterable::Pointer iterable = Expressions::GetAsIIterable(Object::Pointer(var),
+    IIterable::ConstPointer iterable = Expressions::GetAsIIterable(var,
                                                               Expression::ConstPointer(this));
     if (iterable.IsNull())
       return EvaluationResult::NOT_LOADED;
 
     int count = 0;
     IteratePool iter(context, iterable->begin(), iterable->end());
     EvaluationResult::ConstPointer result = fOperator == AND ? EvaluationResult::TRUE_EVAL
                                                              : EvaluationResult::FALSE_EVAL;
     while (iter.HasNext())
     {
       count++;
       switch (fOperator)
       {
       case OR:
         result = result->Or(this->EvaluateAnd(&iter));
         if (result == EvaluationResult::TRUE_EVAL)
           return result;
         break;
       case AND:
         result = result->And(this->EvaluateAnd(&iter));
         if (result != EvaluationResult::TRUE_EVAL)
           return result;
         break;
       }
       iter.Next();
     }
     if (count > 0)
     {
       return result;
     }
     else
     {
       if (fEmptyResult == -1)
       {
         return fOperator == AND ? EvaluationResult::TRUE_EVAL
             : EvaluationResult::FALSE_EVAL;
       }
       else
       {
         return fEmptyResult == 1 ? EvaluationResult::TRUE_EVAL
             : EvaluationResult::FALSE_EVAL;
       }
     }
   }
 }
 
-void IterateExpression::CollectExpressionInfo(ExpressionInfo* info)
+void IterateExpression::CollectExpressionInfo(ExpressionInfo* info) const
 {
   // Although we access every single variable we only mark the default
   // variable as accessed since we don't have single variables for the
   // elements.
   info->MarkDefaultVariableAccessed();
   CompositeExpression::CollectExpressionInfo(info);
 }
 
 bool IterateExpression::operator==(const Object* object) const
 {
   if (const IterateExpression* that = dynamic_cast<const IterateExpression*>(object))
   {
     return (this->fOperator == that->fOperator) &&
         this->Equals(this->fExpressions, that->fExpressions);
   }
   return false;
 }
 
-uint IterateExpression::ComputeHashCode()
+uint IterateExpression::ComputeHashCode() const
 {
   return HASH_INITIAL * HASH_FACTOR + this->HashCode(fExpressions)
       * HASH_FACTOR + fOperator;
 }
 
 } // namespace berry
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryIterateExpression.h b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryIterateExpression.h
index d039067f78..d6782ff57a 100755
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryIterateExpression.h
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryIterateExpression.h
@@ -1,83 +1,83 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef __BERRY_ITERATE_EXPRESSION_H__
 #define __BERRY_ITERATE_EXPRESSION_H__
 
 #include "berryCompositeExpression.h"
 
 #include "Poco/DOM/Element.h"
 #include "Poco/Any.h"
 
 
 namespace berry {
 
 struct IConfigurationElement;
 
 struct IterateExpression : public CompositeExpression {
 
 private:
 
   static const QString ATT_OPERATOR;
   static const QString ATT_IF_EMPTY;
   static const int OR;
   static const int AND;
 
   /**
    * The seed for the hash code for all iterate expressions.
    */
   static const uint HASH_INITIAL;
 
   int fOperator;
   int fEmptyResult;
 
 public:
 
   IterateExpression(const SmartPointer<IConfigurationElement>& configElement);
 
   IterateExpression(Poco::XML::Element* element);
 
   IterateExpression(const QString& opValue);
 
   IterateExpression(const QString& opValue, const QString& ifEmpty);
 
 private:
 
   void InitializeOperatorValue(const QString& opValue);
 
   void InitializeEmptyResultValue(const QString& value);
 
 
 public:
 
   /* (non-Javadoc)
     * @see Expression#evaluate(IVariablePool)
     */
   EvaluationResult::ConstPointer Evaluate(IEvaluationContext* context) const;
 
-  void CollectExpressionInfo(ExpressionInfo* info);
+  void CollectExpressionInfo(ExpressionInfo* info) const;
 
   bool operator==(const Object* object) const;
 
 
 protected:
 
-  uint ComputeHashCode();
+  uint ComputeHashCode() const;
 };
 
 } // namespace berry
 
 #endif // __BERRY_ITERATE_EXPRESSION_H__
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryNotExpression.cpp b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryNotExpression.cpp
index 6f37a3579e..b23c0be84c 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryNotExpression.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryNotExpression.cpp
@@ -1,61 +1,61 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryNotExpression.h"
 
 #include <Poco/Exception.h>
 #include <Poco/Hash.h>
 
 namespace berry {
 
 const std::size_t NotExpression::HASH_INITIAL = Poco::hash("berry::NotExpression");
 
 NotExpression::NotExpression(Expression::Pointer expression)
 {
   poco_assert(expression.IsNotNull());
 
   fExpression= expression;
 }
 
 EvaluationResult::ConstPointer
 NotExpression::Evaluate(IEvaluationContext* context) const
 {
   return fExpression->Evaluate(context)->Not();
 }
 
 void
-NotExpression::CollectExpressionInfo(ExpressionInfo* info)
+NotExpression::CollectExpressionInfo(ExpressionInfo* info) const
 {
   fExpression->CollectExpressionInfo(info);
 }
 
 bool
 NotExpression::operator==(const Object* object) const
 {
   if (const NotExpression* that = dynamic_cast<const NotExpression*>(object))
   {
     return this->fExpression == that->fExpression;
   }
   return false;
 }
 
-std::size_t
-NotExpression::ComputeHashCode()
+uint
+NotExpression::ComputeHashCode() const
 {
   return HASH_INITIAL * HASH_FACTOR + fExpression->HashCode();
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryNotExpression.h b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryNotExpression.h
index e3c2312021..8f5e920418 100755
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryNotExpression.h
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryNotExpression.h
@@ -1,53 +1,53 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef __BERRY_NOT_EXPRESSION_H__
 #define __BERRY_NOT_EXPRESSION_H__
 
 #include "berryExpression.h"
 
 namespace berry {
 
 class NotExpression : public Expression {
 
 private:
 
   /**
     * The seed for the hash code for all not expressions.
     */
   static const std::size_t HASH_INITIAL;
 
   Expression::Pointer fExpression;
 
 public:
 
   NotExpression(Expression::Pointer expression);
 
   EvaluationResult::ConstPointer Evaluate(IEvaluationContext* context) const;
 
-  void CollectExpressionInfo(ExpressionInfo* info);
+  void CollectExpressionInfo(ExpressionInfo* info) const;
 
   bool operator==(const Object* object) const;
 
 
   protected:
 
-    std::size_t ComputeHashCode();
+    uint ComputeHashCode() const;
 };
 
 } // namespace berry
 
 #endif // __BERRY_NOT_EXPRESSION_H__
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryProperty.cpp b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryProperty.cpp
index ebda0bfaef..267a218754 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryProperty.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryProperty.cpp
@@ -1,84 +1,84 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryProperty.h"
 
 #include <Poco/Hash.h>
 #include <Poco/Bugcheck.h>
 
 namespace berry {
 
-Property::Property(Object::Pointer type,
+Property::Property(Object::ConstPointer type,
                    const QString &namespaze, const QString &name)
  : fType(type), fNamespace(namespaze), fName(name)
 {
 }
 
 void Property::SetPropertyTester(IPropertyTester::Pointer tester)
 {
   poco_check_ptr(tester);
 
   fTester= tester;
 }
 
 bool Property::IsInstantiated()
 {
   return fTester->IsInstantiated();
 }
 
 bool Property::IsDeclaringPluginActive()
 {
   return fTester->IsDeclaringPluginActive();
 }
 
 bool Property::IsValidCacheEntry(bool forcePluginActivation)
 {
   if (forcePluginActivation)
   {
     return this->IsInstantiated() && this->IsDeclaringPluginActive();
   }
   else
   {
     return  (this->IsInstantiated() && this->IsDeclaringPluginActive()) ||
         (!this->IsInstantiated() && !this->IsDeclaringPluginActive());
   }
 }
 
-bool Property::Test(Object::Pointer receiver, const QList<Object::Pointer>& args,
+bool Property::Test(Object::ConstPointer receiver, const QList<Object::Pointer>& args,
                     Object::Pointer expectedValue)
 {
   return fTester->Test(receiver, fName, args, expectedValue);
 }
 
 bool Property::operator==(Property& obj)
 {
    return fType == obj.fType && fNamespace == obj.fNamespace &&
            fName == obj.fName;
  }
 
 bool Property::operator==(Property* obj)
 {
   return this->operator==(*obj);
 }
 
 int Property::HashCode()
 {
   return (int) ((Poco::Hash<std::string>()(typeid(fType).name()) << 16) |
                 (Poco::Hash<std::string>()(fNamespace.toStdString()) << 8) |
                 Poco::Hash<std::string>()(fName.toStdString()));
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryProperty.h b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryProperty.h
index 782e46ca88..9ca3b844d1 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryProperty.h
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryProperty.h
@@ -1,71 +1,71 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYPROPERTY_H_
 #define BERRYPROPERTY_H_
 
 #include "berryIPropertyTester.h"
 
 #include "berryObject.h"
 
 #include "Poco/SharedPtr.h"
 #include "Poco/Any.h"
 
 #include <vector>
 #include <typeinfo>
 
 namespace berry {
 
 class Property {
 
 public:
   typedef Property Self;
   typedef Poco::SharedPtr<Self> Pointer;
   typedef Poco::SharedPtr<const Self> ConstPointer;
 
 private:
-  Object::Pointer fType;
+  Object::ConstPointer fType;
   QString fNamespace;
   QString fName;
 
   IPropertyTester::Pointer fTester;
 
   friend class TypeExtensionManager;
-  /* package */ Property(Object::Pointer type,
+  /* package */ Property(Object::ConstPointer type,
                          const QString& namespaze, const QString& name);
 
   /* package */ void SetPropertyTester(IPropertyTester::Pointer tester);
 
 public:
   bool IsInstantiated();
 
   bool IsDeclaringPluginActive();
 
   bool IsValidCacheEntry(bool forcePluginActivation);
 
-  bool Test(Object::Pointer receiver, const QList<Object::Pointer>& args,
+  bool Test(Object::ConstPointer receiver, const QList<Object::Pointer>& args,
             Object::Pointer expectedValue);
 
   bool operator==(Property& obj);
 
   bool operator==(Property* obj);
 
   int HashCode();
 };
 
 }  // namespace berry
 
 #endif /*BERRYPROPERTY_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryPropertyTesterDescriptor.cpp b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryPropertyTesterDescriptor.cpp
index 66d2c7c0dd..13a01cd9c4 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryPropertyTesterDescriptor.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryPropertyTesterDescriptor.cpp
@@ -1,126 +1,126 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryPropertyTesterDescriptor.h"
 
 #include "berryPlatform.h"
 #include "berryCoreException.h"
 #include "berryStatus.h"
 #include "berryExpressionPlugin.h"
 
 #include <berryIConfigurationElement.h>
 #include <berryIContributor.h>
 
 #include "Poco/String.h"
 
 namespace berry
 {
 
 const QString PropertyTesterDescriptor::PROPERTIES= "properties";
 const QString PropertyTesterDescriptor::NAMESPACE= "namespace";
 const QString PropertyTesterDescriptor::CLASS= "class";
 
 PropertyTesterDescriptor::PropertyTesterDescriptor(const IConfigurationElement::Pointer& element)
  : fConfigElement(element)
 {
   fNamespace = fConfigElement->GetAttribute(NAMESPACE);
   if (fNamespace.isNull())
   {
     IStatus::Pointer status(new Status(IStatus::ERROR_TYPE, ExpressionPlugin::GetPluginId(),
                                        IStatus::ERROR_TYPE,
                                        "The mandatory attribute namespace is missing. Tester has been disabled.",
                                        BERRY_STATUS_LOC));
     throw CoreException(status);
   }
   QString buffer(",");
   QString properties = fConfigElement->GetAttribute(PROPERTIES);
   if (properties.isNull())
   {
     IStatus::Pointer status(new Status(IStatus::ERROR_TYPE, ExpressionPlugin::GetPluginId(),
                                        IStatus::ERROR_TYPE,
                                        "The mandatory attribute properties is missing. Tester has been disabled.",
                                        BERRY_STATUS_LOC));
     throw CoreException(status);
   }
   foreach(QChar ch, properties)
   {
     if (!ch.isSpace())
     {
       buffer.append(ch);
     }
   }
   buffer.append(',');
   fProperties = buffer;
 }
 
 PropertyTesterDescriptor::PropertyTesterDescriptor(const IConfigurationElement::Pointer& element,
                                                    const QString& namespaze, const QString& properties)
  : fConfigElement(element), fNamespace(namespaze), fProperties(properties)
 {
 
 }
 
 QString
 PropertyTesterDescriptor::GetProperties()
 {
   return fProperties;
 }
 
 QString PropertyTesterDescriptor::GetNamespace()
 {
   return fNamespace;
 }
 
 IConfigurationElement::Pointer
 PropertyTesterDescriptor::GetExtensionElement()
 {
   return fConfigElement;
 }
 
 bool
 PropertyTesterDescriptor::Handles(const QString &namespaze, const QString &property)
 {
   return fNamespace == namespaze && fProperties.contains("," + property + ",");
 }
 
 bool
 PropertyTesterDescriptor::IsInstantiated()
 {
   return false;
 }
 
 bool
 PropertyTesterDescriptor::IsDeclaringPluginActive()
 {
   QSharedPointer<ctkPlugin> plugin = Platform::GetPlugin(fConfigElement->GetContributor()->GetName());
   return plugin->getState() == ctkPlugin::ACTIVE;
 }
 
 IPropertyTester*
 PropertyTesterDescriptor::Instantiate()
 {
   return fConfigElement->CreateExecutableExtension<IPropertyTester>(CLASS);
 }
 
 bool
-PropertyTesterDescriptor::Test(Object::Pointer  /*receiver*/, const QString &  /*method*/,
+PropertyTesterDescriptor::Test(Object::ConstPointer  /*receiver*/, const QString &  /*method*/,
                                const QList<Object::Pointer> &  /*args*/, Object::Pointer  /*expectedValue*/)
 {
   poco_bugcheck_msg("Method should never be called");
   return false;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryPropertyTesterDescriptor.h b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryPropertyTesterDescriptor.h
index c2a267d3d7..7ae877be22 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryPropertyTesterDescriptor.h
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryPropertyTesterDescriptor.h
@@ -1,71 +1,71 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYPROPERTYTESTERDESCRIPTOR_H_
 #define BERRYPROPERTYTESTERDESCRIPTOR_H_
 
 #include "berryIPropertyTester.h"
 
 #include "Poco/Any.h"
 
 namespace berry
 {
 
 struct IConfigurationElement;
 
 class PropertyTesterDescriptor : public IPropertyTester {
 
 public:
   berryObjectMacro(PropertyTesterDescriptor);
 
 private:
 
   const SmartPointer<IConfigurationElement> fConfigElement;
   QString fNamespace;
   QString fProperties;
 
   static const QString PROPERTIES;
   static const QString NAMESPACE;
   static const QString CLASS;
 
 public:
 
   PropertyTesterDescriptor(const SmartPointer<IConfigurationElement>& element);
 
   PropertyTesterDescriptor(const SmartPointer<IConfigurationElement>& element,
                            const QString& namespaze, const QString& properties);
 
   QString GetProperties();
 
   QString GetNamespace();
 
   SmartPointer<IConfigurationElement> GetExtensionElement();
 
   bool Handles(const QString& namespaze, const QString& property);
 
   bool IsInstantiated();
 
   bool IsDeclaringPluginActive();
 
   IPropertyTester* Instantiate();
 
-  bool Test(Object::Pointer receiver, const QString& method,
+  bool Test(Object::ConstPointer receiver, const QString& method,
             const QList<Object::Pointer>& args, Object::Pointer expectedValue);
 };
 
 }  // namespace berry
 
 #endif /*BERRYPROPERTYTESTERDESCRIPTOR_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryReferenceExpression.cpp b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryReferenceExpression.cpp
index ef2dde9809..cc87312074 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryReferenceExpression.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryReferenceExpression.cpp
@@ -1,96 +1,96 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryReferenceExpression.h"
 
 #include "berryExpressions.h"
 
 #include <berryIConfigurationElement.h>
 #include <berryCoreException.h>
 
 #include "Poco/Hash.h"
 
 namespace berry {
 
 const QString ReferenceExpression::ATT_DEFINITION_ID= "definitionId";
 const std::size_t ReferenceExpression::HASH_INITIAL= Poco::Hash<std::string>()("berry::ReferenceExpression");
 
 DefinitionRegistry ReferenceExpression::fgDefinitionRegistry = DefinitionRegistry();
 
 DefinitionRegistry&
 ReferenceExpression::GetDefinitionRegistry()
 {
   return fgDefinitionRegistry;
 }
 
 ReferenceExpression::ReferenceExpression(const QString &definitionId)
 {
   fDefinitionId= definitionId;
 }
 
 ReferenceExpression::ReferenceExpression(IConfigurationElement::Pointer element)
 {
   fDefinitionId = element->GetAttribute(ATT_DEFINITION_ID);
   Expressions::CheckAttribute(ATT_DEFINITION_ID, fDefinitionId);
 }
 
 ReferenceExpression::ReferenceExpression(Poco::XML::Element* element)
 {
   fDefinitionId = QString::fromStdString(element->getAttribute(ATT_DEFINITION_ID.toStdString()));
   Expressions::CheckAttribute(ATT_DEFINITION_ID, fDefinitionId.size() > 0 ? fDefinitionId : QString());
 }
 
 EvaluationResult::ConstPointer
 ReferenceExpression::Evaluate(IEvaluationContext* context) const
 {
   Expression::Pointer expr= GetDefinitionRegistry().GetExpression(fDefinitionId);
   return expr->Evaluate(context);
 }
 
 void
-ReferenceExpression::CollectExpressionInfo(ExpressionInfo* info)
+ReferenceExpression::CollectExpressionInfo(ExpressionInfo* info) const
 {
   Expression::Pointer expr;
   try
   {
     expr= GetDefinitionRegistry().GetExpression(fDefinitionId);
   }
-  catch (const CoreException& e)
+  catch (const CoreException& /*e*/)
   {
     // We didn't find the expression definition. So no
     // expression info can be collected.
     return;
   }
   expr->CollectExpressionInfo(info);
 }
 
 bool
 ReferenceExpression::operator==(const Object* object) const
 {
   if (const ReferenceExpression* that = dynamic_cast<const ReferenceExpression*>(object))
   {
     return this->fDefinitionId == that->fDefinitionId;
   }
   return false;
 }
 
-std::size_t
-ReferenceExpression::ComputeHashCode()
+uint
+ReferenceExpression::ComputeHashCode() const
 {
   return HASH_INITIAL * HASH_FACTOR + Poco::Hash<std::string>()(fDefinitionId.toStdString());
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryReferenceExpression.h b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryReferenceExpression.h
index fa1aa4f528..2bf6021639 100755
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryReferenceExpression.h
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryReferenceExpression.h
@@ -1,72 +1,72 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef __BERRY_REFERENCE_EXPRESSION_H__
 #define __BERRY_REFERENCE_EXPRESSION_H__
 
 #include "berryDefinitionRegistry.h"
 
 #include "Poco/DOM/Element.h"
 
 namespace berry {
 
 /**
  * This class makes use of the <b>org.blueberry.core.expressions.definitions</b>
  * extension point to evaluate the current context against pre-defined
  * expressions. It provides core expression re-use.
  */
 class ReferenceExpression : public Expression {
 
 private:
 
   // consider making this a more general extension manager
   // for now it's just part of the reference expression
   static DefinitionRegistry fgDefinitionRegistry;
 
   static DefinitionRegistry& GetDefinitionRegistry();
 
   static const QString ATT_DEFINITION_ID;
 
   /**
    * The seed for the hash code for all equals expressions.
    */
   static const std::size_t HASH_INITIAL;
 
   QString fDefinitionId;
 
 
 public:
 
   ReferenceExpression(const QString& definitionId);
 
   ReferenceExpression(SmartPointer<IConfigurationElement> element);
 
   ReferenceExpression(Poco::XML::Element* element);
 
   EvaluationResult::ConstPointer Evaluate(IEvaluationContext* context) const;
 
-  void CollectExpressionInfo(ExpressionInfo* info);
+  void CollectExpressionInfo(ExpressionInfo* info) const;
 
   bool operator==(const Object* object) const;
 
 
 protected:
-  std::size_t ComputeHashCode();
+  uint ComputeHashCode() const;
 };
 
 } // namespace berry
 
 #endif // __BERRY_REFERENCE_EXPRESSION_H__
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryResolveExpression.cpp b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryResolveExpression.cpp
index 8dd9e9687a..a9f2105a16 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryResolveExpression.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryResolveExpression.cpp
@@ -1,99 +1,99 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryResolveExpression.h"
 
 #include "berryExpressions.h"
 #include "berryEvaluationContext.h"
 #include "berryExpressionStatus.h"
 
 #include <berryIConfigurationElement.h>
 #include <berryCoreException.h>
 
 namespace berry {
 
 const QString ResolveExpression::ATT_VARIABLE= "variable";
 const QString ResolveExpression::ATT_ARGS= "args";
 const uint ResolveExpression::HASH_INITIAL = qHash("berry::ResolveExpression");
 
 ResolveExpression::ResolveExpression(const IConfigurationElement::Pointer& configElement)
 {
   fVariable = configElement->GetAttribute(ATT_VARIABLE);
   Expressions::CheckAttribute(ATT_VARIABLE, fVariable);
   fArgs = Expressions::GetArguments(configElement, ATT_ARGS);
 }
 
 ResolveExpression::ResolveExpression(Poco::XML::Element* element)
 {
   fVariable = QString::fromStdString(element->getAttribute(ATT_VARIABLE.toStdString()));
   Expressions::CheckAttribute(ATT_VARIABLE, fVariable.size() > 0 ? fVariable : QString());
   fArgs = Expressions::GetArguments(element, ATT_ARGS);
 }
 
 ResolveExpression::ResolveExpression(const QString& variable, const QList<Object::Pointer>& args)
  : fVariable(variable), fArgs(args)
 {
 
 }
 
 EvaluationResult::ConstPointer
 ResolveExpression::Evaluate(IEvaluationContext* context) const
 {
-  Object::Pointer variable= context->ResolveVariable(fVariable, fArgs);
+  Object::ConstPointer variable= context->ResolveVariable(fVariable, fArgs);
   if (variable.IsNull())
   {
     IStatus::Pointer status(new ExpressionStatus(ExpressionStatus::VARIABLE_NOT_DEFINED,
                                                  QString("The variable %1 is not defined.").arg(fVariable),
                                                  BERRY_STATUS_LOC));
     throw CoreException(status);
   }
   EvaluationContext evalContext(context, variable);
   return this->EvaluateAnd(&evalContext);
 }
 
 void
-ResolveExpression::CollectExpressionInfo(ExpressionInfo* info)
+ResolveExpression::CollectExpressionInfo(ExpressionInfo* info) const
 {
   ExpressionInfo other;
   this->CompositeExpression::CollectExpressionInfo(&other);
   if (other.HasDefaultVariableAccess())
   {
     info->AddVariableNameAccess(fVariable);
   }
   info->MergeExceptDefaultVariable(&other);
 }
 
 bool
 ResolveExpression::operator==(const Object* object) const
 {
   if (const ResolveExpression* that = dynamic_cast<const ResolveExpression*>(object))
   {
     return this->fVariable == that->fVariable
         && this->Equals(this->fArgs, that->fArgs)
         && this->Equals(this->fExpressions, that->fExpressions);
   }
   return false;
 }
 
 uint
-ResolveExpression::ComputeHashCode()
+ResolveExpression::ComputeHashCode() const
 {
   return HASH_INITIAL * HASH_FACTOR + this->HashCode(fExpressions)
       * HASH_FACTOR + this->HashCode(fArgs)
       * HASH_FACTOR + qHash(fVariable);
 }
 
 } // namespace berry
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryResolveExpression.h b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryResolveExpression.h
index cbdbc9ad16..cbe8f9cdd5 100755
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryResolveExpression.h
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryResolveExpression.h
@@ -1,66 +1,66 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef __BERRY_RESOLVE_EXPRESSION_H__
 #define __BERRY_RESOLVE_EXPRESSION_H__
 
 #include "berryCompositeExpression.h"
 
 #include "Poco/DOM/Element.h"
 
 #include <vector>
 
 namespace berry {
 
 struct IConfigurationElement;
 
 class ResolveExpression : public CompositeExpression {
 
 private:
   QString fVariable;
   QList<Object::Pointer> fArgs;
 
   static const QString ATT_VARIABLE;
   static const QString ATT_ARGS;
 
   /**
    * The seed for the hash code for all resolve expressions.
    */
   static const uint HASH_INITIAL;
 
 public:
 
   ResolveExpression(const SmartPointer<IConfigurationElement>& configElement);
 
   ResolveExpression(Poco::XML::Element* element);
 
   ResolveExpression(const QString& variable, const QList<Object::Pointer>& args);
 
   EvaluationResult::ConstPointer Evaluate(IEvaluationContext* context) const;
 
-  void CollectExpressionInfo(ExpressionInfo* info);
+  void CollectExpressionInfo(ExpressionInfo* info) const;
 
   bool operator==(const Object* object) const;
 
 
 protected:
 
-  uint ComputeHashCode();
+  uint ComputeHashCode() const;
 };
 
 } // namespace berry
 
 #endif // __BERRY_RESOLVE_EXPRESSION_H__
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berrySystemTestExpression.cpp b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berrySystemTestExpression.cpp
index 38cb7e7e9b..74a939f46f 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berrySystemTestExpression.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berrySystemTestExpression.cpp
@@ -1,93 +1,93 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berrySystemTestExpression.h"
 
 #include "berryExpressions.h"
 
 #include <berryPlatform.h>
 #include <berryIConfigurationElement.h>
 
 namespace berry {
 
 const QString SystemTestExpression::ATT_PROPERTY= "property";
 
 const uint SystemTestExpression::HASH_INITIAL = qHash("berry::SystemTestExpression");
 
 SystemTestExpression::SystemTestExpression(const IConfigurationElement::Pointer& element)
 {
   fProperty = element->GetAttribute(ATT_PROPERTY);
   Expressions::CheckAttribute(ATT_PROPERTY, fProperty);
   fExpectedValue = element->GetAttribute(ATT_VALUE);
   Expressions::CheckAttribute(ATT_VALUE, fExpectedValue);
 }
 
 SystemTestExpression::SystemTestExpression(Poco::XML::Element* element)
 {
   fProperty= QString::fromStdString(element->getAttribute(ATT_PROPERTY.toStdString()));
   Expressions::CheckAttribute(ATT_PROPERTY, fProperty.size() > 0 ? fProperty : QString());
   fExpectedValue = QString::fromStdString(element->getAttribute(ATT_VALUE.toStdString()));
   Expressions::CheckAttribute(ATT_VALUE, fExpectedValue.size() > 0 ? fExpectedValue : QString());
 }
 
 SystemTestExpression::SystemTestExpression(const QString &property, const QString &expectedValue)
  : fProperty(property), fExpectedValue(expectedValue)
 {
 
 }
 
 EvaluationResult::ConstPointer
 SystemTestExpression::Evaluate(IEvaluationContext*  /*context*/) const
 {
   QString str = Platform::GetProperty(fProperty);
   if (str.isEmpty())
     return EvaluationResult::FALSE_EVAL;
 
   return EvaluationResult::ValueOf(str == fExpectedValue);
 }
 
 void
-SystemTestExpression::CollectExpressionInfo(ExpressionInfo* info)
+SystemTestExpression::CollectExpressionInfo(ExpressionInfo* info) const
 {
   info->MarkSystemPropertyAccessed();
 }
 
 bool
 SystemTestExpression::operator==(const Object* object) const
 {
   if (const SystemTestExpression* that = dynamic_cast<const SystemTestExpression*>(object))
   {
     return this->fProperty == that->fProperty
         && this->fExpectedValue == that->fExpectedValue;
   }
   return false;
 }
 
 uint
-SystemTestExpression::ComputeHashCode()
+SystemTestExpression::ComputeHashCode() const
 {
   return HASH_INITIAL * HASH_FACTOR + qHash(fExpectedValue)
       * HASH_FACTOR + qHash(fProperty);
 }
 
 QString
 SystemTestExpression::ToString() const
 {
   return QString("<systemTest property=\"") + fProperty +
       "\" value=\"" + fExpectedValue + "\"";
   }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berrySystemTestExpression.h b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berrySystemTestExpression.h
index 8ac68e565a..625abd6fd5 100755
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berrySystemTestExpression.h
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berrySystemTestExpression.h
@@ -1,65 +1,65 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef __BERRY_SYSTEM_TEXT_EXPRESSION_H__
 #define __BERRY_SYSTEM_TEXT_EXPRESSION_H__
 
 #include "berryExpression.h"
 
 #include "Poco/DOM/Element.h"
 
 namespace berry {
 
 struct IConfigurationElement;
 
 class SystemTestExpression : public Expression {
 
 private:
   QString fProperty;
   QString fExpectedValue;
 
   static const QString ATT_PROPERTY;
 
   /**
    * The seed for the hash code for all system test expressions.
    */
   static const uint HASH_INITIAL;
 
 public:
 
   SystemTestExpression(const SmartPointer<IConfigurationElement>& element);
 
   SystemTestExpression(Poco::XML::Element* element);
 
   SystemTestExpression(const QString& property, const QString& expectedValue);
 
   EvaluationResult::ConstPointer Evaluate(IEvaluationContext* context) const;
 
-  void CollectExpressionInfo(ExpressionInfo* info);
+  void CollectExpressionInfo(ExpressionInfo* info) const;
 
   bool operator==(const Object* object) const;
 
   QString ToString() const;
 
 protected:
 
-  uint ComputeHashCode();
+  uint ComputeHashCode() const ;
 
 };
 
 } // namespace berry
 
 #endif // __BERRY_SYSTEM_TEXT_EXPRESSION_H__
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryTestExpression.cpp b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryTestExpression.cpp
index d3e9229e31..97a48c8965 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryTestExpression.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryTestExpression.cpp
@@ -1,190 +1,190 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryTestExpression.h"
 
 #include "berryExpressions.h"
 #include "berryExpressionStatus.h"
 
 #include "berryPlatform.h"
 #include "berryCoreException.h"
 
 #include <berryObjectString.h>
 #include <berryIConfigurationElement.h>
 
 namespace berry {
 
 const QChar TestExpression::PROP_SEP = '.';
 const QString TestExpression::ATT_PROPERTY = "property";
 const QString TestExpression::ATT_ARGS = "args";
 const QString TestExpression::ATT_FORCE_PLUGIN_ACTIVATION = "forcePluginActivation";
 
 TypeExtensionManager TestExpression::fgTypeExtensionManager("propertyTesters");
 
 const uint TestExpression::HASH_INITIAL= qHash("berry::TextExpression");
 
 
 TestExpression::TestExpression(const IConfigurationElement::Pointer& element)
 {
   QString property = element->GetAttribute(ATT_PROPERTY);
   int pos = property.lastIndexOf(PROP_SEP);
   if (pos == -1)
   {
     IStatus::Pointer status(new ExpressionStatus(
                               ExpressionStatus::NO_NAMESPACE_PROVIDED,
                               "The property attribute of the test expression must be qualified by a name space.",
                               BERRY_STATUS_LOC));
     throw CoreException(status);
   }
   fNamespace = property.left(pos);
   fProperty = property.mid(pos + 1);
   fArgs = Expressions::GetArguments(element, ATT_ARGS);
   fExpectedValue = Expressions::ConvertArgument(element->GetAttribute(ATT_VALUE));
   fForcePluginActivation = Expressions::GetOptionalBooleanAttribute(element, ATT_FORCE_PLUGIN_ACTIVATION);
 }
 
 TestExpression::TestExpression(Poco::XML::Element* element)
 {
   QString property= QString::fromStdString(element->getAttribute(ATT_PROPERTY.toStdString()));
   int pos = property.lastIndexOf(PROP_SEP);
   if (pos == -1)
   {
     IStatus::Pointer status(new ExpressionStatus(
                               ExpressionStatus::NO_NAMESPACE_PROVIDED,
                               "The property attribute of the test expression must be qualified by a name space.",
                               BERRY_STATUS_LOC));
     throw CoreException(status);
   }
   fNamespace = property.left(pos);
   fProperty = property.mid(pos + 1);
   fArgs = Expressions::GetArguments(element, ATT_ARGS);
   std::string value = element->getAttribute(ATT_VALUE.toStdString());
   fExpectedValue = Expressions::ConvertArgument(value.size() > 0 ? QString::fromStdString(value) : QString());
   fForcePluginActivation = Expressions::GetOptionalBooleanAttribute(element, ATT_FORCE_PLUGIN_ACTIVATION);
 }
 
 TestExpression::TestExpression(const QString& namespaze, const QString& property,
                                const QList<Object::Pointer>& args, Object::Pointer expectedValue)
   : fNamespace(namespaze), fProperty(property), fArgs(args),
     fExpectedValue(expectedValue), fForcePluginActivation(false)
 {
 }
 
 TestExpression::TestExpression(const QString &namespaze, const QString &property, const QList<Object::Pointer>& args,
                                Object::Pointer expectedValue, bool forcePluginActivation)
  : fNamespace(namespaze), fProperty(property), fArgs(args),
    fExpectedValue(expectedValue), fForcePluginActivation(forcePluginActivation)
 {
 }
 
 EvaluationResult::ConstPointer
 TestExpression::Evaluate(IEvaluationContext* context) const
 {
-  Object::Pointer element(context->GetDefaultVariable());
+  Object::ConstPointer element(context->GetDefaultVariable());
   if (typeid(Platform) == typeid(element.GetPointer()))
   {
     QString str = Platform::GetProperty(fProperty);
     if (str.isEmpty())
     {
       return EvaluationResult::FALSE_EVAL;
     }
 
     ObjectString::Pointer var = fArgs[0].Cast<ObjectString>();
     if (var)
       return EvaluationResult::ValueOf(static_cast<QString&>(*var) == str);
 
     return EvaluationResult::FALSE_EVAL;
   }
 
   Property::Pointer property= fgTypeExtensionManager.GetProperty(element, fNamespace, fProperty, context->GetAllowPluginActivation() && fForcePluginActivation);
   if (!property->IsInstantiated())
     return EvaluationResult::NOT_LOADED;
   return EvaluationResult::ValueOf(property->Test(element, fArgs, fExpectedValue));
 }
 
 void
-TestExpression::CollectExpressionInfo(ExpressionInfo* info)
+TestExpression::CollectExpressionInfo(ExpressionInfo* info) const
 {
   info->MarkDefaultVariableAccessed();
   info->AddAccessedPropertyName(fNamespace + PROP_SEP + fProperty);
 }
 
 bool
 TestExpression::operator==(const Object* object) const
 {
   if (const TestExpression* that = dynamic_cast<const TestExpression*>(object))
   {
     return this->fNamespace == that->fNamespace &&
             this->fProperty == that->fProperty &&
             this->fForcePluginActivation == that->fForcePluginActivation &&
             this->Equals(this->fArgs, that->fArgs) &&
             this->fExpectedValue == that->fExpectedValue;
   }
   return false;
 }
 
-uint TestExpression::ComputeHashCode()
+uint TestExpression::ComputeHashCode() const
 {
   return HASH_INITIAL * HASH_FACTOR + this->HashCode(fArgs)
   * HASH_FACTOR + fExpectedValue->HashCode()
   * HASH_FACTOR + qHash(fNamespace)
   * HASH_FACTOR + qHash(fProperty)
   * HASH_FACTOR + (fForcePluginActivation ? 1 : 0);
 }
 
 QString
 TestExpression::ToString() const
 {
   QString args("");
-  for (unsigned int i= 0; i < fArgs.size(); i++)
+  for (int i= 0; i < fArgs.size(); i++)
   {
     Object::Pointer arg= fArgs[i];
     ObjectString::Pointer strarg = arg.Cast<ObjectString>();
     if (strarg)
     {
       args.append('\'');
       args.append(static_cast<QString&>(*strarg));
       args.append('\'');
     }
     else
     {
       args.append(arg->ToString());
     }
     if (i < fArgs.size() - 1)
     args.append(", ");
   }
 
   return "<test property=\"" + fProperty +
       (!fArgs.isEmpty() ? "\" args=\"" + args + "\"" : "\"") +
       (!fExpectedValue.IsNull() ? "\" value=\"" + fExpectedValue->ToString() + "\"" : "\"") +
       " plug-in activation: " + (fForcePluginActivation ? "eager" : "lazy") + "/>";
 }
 
 //---- testing ---------------------------------------------------
 
 bool
 TestExpression::TestGetForcePluginActivation()
 {
   return fForcePluginActivation;
 }
 
 TypeExtensionManager&
 TestExpression::TestGetTypeExtensionManager()
 {
   return fgTypeExtensionManager;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryTestExpression.h b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryTestExpression.h
index 5d57871f11..f8807fc433 100755
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryTestExpression.h
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryTestExpression.h
@@ -1,93 +1,93 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef __BERRY_TEST_EXPRESSION_H__
 #define __BERRY_TEST_EXPRESSION_H__
 
 #include "berryExpression.h"
 #include "berryTypeExtensionManager.h"
 
 #include "berryObject.h"
 
 #include "Poco/DOM/Element.h"
 
 namespace berry {
 
 struct IConfigurationElement;
 
 class TestExpression : public Expression {
 
 private:
   QString fNamespace;
   QString fProperty;
   QList<Object::Pointer> fArgs;
   Object::Pointer fExpectedValue;
   bool fForcePluginActivation;
 
   static const QChar PROP_SEP;
   static const QString ATT_PROPERTY;
   static const QString ATT_ARGS;
   static const QString ATT_FORCE_PLUGIN_ACTIVATION;
   /**
    * The seed for the hash code for all test expressions.
    */
   static const uint HASH_INITIAL;
 
   static TypeExtensionManager fgTypeExtensionManager;
 
 
 public:
 
   TestExpression(const SmartPointer<IConfigurationElement>& element);
 
   TestExpression(Poco::XML::Element* element);
 
   TestExpression(const QString& namespaze, const QString& property,
                  const QList<Object::Pointer>& args, Object::Pointer expectedValue);
 
   TestExpression(const QString& namespaze, const QString& property,
                  const QList<Object::Pointer>& args, Object::Pointer expectedValue,
                  bool forcePluginActivation);
 
   EvaluationResult::ConstPointer Evaluate(IEvaluationContext* context) const;
 
-  void CollectExpressionInfo(ExpressionInfo* info);
+  void CollectExpressionInfo(ExpressionInfo* info) const;
 
   bool operator==(const Object* object) const;
 
 protected:
 
-  uint ComputeHashCode();
+  uint ComputeHashCode() const;
 
   //---- Debugging ---------------------------------------------------
 
   /* (non-Javadoc)
    * @see java.lang.Object#toString()
    */
 public:
 
   QString ToString() const;
 
   //---- testing ---------------------------------------------------
 
   bool TestGetForcePluginActivation();
 
   static TypeExtensionManager& TestGetTypeExtensionManager();
 };
 
 } // namespace berry
 
 #endif // __BERRY_TEST_EXPRESSION_H__
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryTypeExtension.cpp b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryTypeExtension.cpp
index 96fad6796a..79459c51fd 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryTypeExtension.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryTypeExtension.cpp
@@ -1,123 +1,123 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryTypeExtension.h"
 
 #include "berryTypeExtensionManager.h"
 #include "berryPropertyTesterDescriptor.h"
 #include "berryPropertyTester.h"
 #include "berryExpressionStatus.h"
 
 #include <berryCoreException.h>
 
 namespace berry {
 
 
 TypeExtension::TypeExtension(const QString& typeInfo)
  : fTypeInfo(typeInfo), fExtendersLoaded(false), fExtendsLoaded(false)
 {
 
 }
 
 IPropertyTester::Pointer TypeExtension::FindTypeExtender(
     TypeExtensionManager& manager, const QString& namespaze, const QString& method,
     bool staticMethod, bool forcePluginActivation)
 {
   if (!fExtendersLoaded)
   {
     fExtenders = manager.LoadTesters(fTypeInfo);
     fExtendersLoaded = true;
   }
   IPropertyTester::Pointer result;
 
   // handle extenders associated with this type extender
-  for (unsigned int i= 0; i < fExtenders.size(); i++)
+  for (int i= 0; i < fExtenders.size(); i++)
   {
     IPropertyTester::Pointer extender = fExtenders[i];
     if (extender.IsNull() || !extender->Handles(namespaze, method))
       continue;
     if (extender->IsInstantiated())
     {
       // There is no need to check for an active plug-in here. If a plug-in
       // gets uninstalled we receive an registry event which will flush the whole
       // type extender cache and will reinstantiate the testers. However Bundle#stop
       // isn't handled by this. According to bug https://bugs.blueberry.org/bugs/show_bug.cgi?id=130338
       // we don't have to support stop in 3.2. If we have to in the future we have to
       // reactivate the stopped plug-in if we are in forcePluginActivation mode.
       return extender;
     }
     else
     {
       if (extender->IsDeclaringPluginActive() || forcePluginActivation)
       {
         PropertyTesterDescriptor::Pointer descriptor = extender.Cast<PropertyTesterDescriptor>();
         if (!descriptor.IsNull())
         {
           try
           {
             IPropertyTester::Pointer inst(descriptor->Instantiate());
             inst.Cast<PropertyTester>()->InternalInitialize(descriptor);
             fExtenders[i]= extender = inst;
             return extender;
           }
           catch (const CoreException& e)
           {
             fExtenders[i] = IPropertyTester::Pointer();
             throw e;
           }
         }
         else
         {
           fExtenders[i]= IPropertyTester::Pointer();
           IStatus::Pointer status(new ExpressionStatus(ExpressionStatus::TYPE_EXTENDER_INCORRECT_TYPE,
                                                        "The implementation class is not a sub type of berry::PropertyTester",
                                                        BERRY_STATUS_LOC));
           throw CoreException(status);
         }
       }
       else
       {
         return extender;
       }
     }
   }
 
   // there is no inheritance for static methods
   if (staticMethod)
     return CONTINUE_::Pointer(new CONTINUE_());
 
   // handle inheritance chain
   // TODO Reflection
 //  if (!fExtendsLoaded) {
 //    fExtends.clear();
 //    Object::ExtTypeInfo types(fTypeInfo);
 //    while (!types.m_TypeNames.empty()) {
 //      types.m_TypeNames.pop_back();
 //      types.m_TypeInfos.pop_back();
 //      fExtends.push_back(manager.Get(types));
 //    }
 //    fExtendsLoaded = true;
 //  }
 //  for (unsigned int i= 0; i < fExtends.size(); i++) {
 //    result = fExtends[i]->FindTypeExtender(manager, namespaze, method, staticMethod, forcePluginActivation);
 //    if (result.Cast<CONTINUE_>().IsNull())
 //      return result;
 //  }
   return CONTINUE_::Pointer(new CONTINUE_());
 }
 
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryTypeExtension.h b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryTypeExtension.h
index 516fb62e14..47e044eec7 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryTypeExtension.h
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryTypeExtension.h
@@ -1,109 +1,109 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYTYPEEXTENSION_H_
 #define BERRYTYPEEXTENSION_H_
 
 #include <berryMacros.h>
 #include <berryObject.h>
 
 #include "berryIPropertyTester.h"
 
 
 namespace berry {
 
 class TypeExtensionManager;
 class END_POINT_;
 
 class TypeExtension : public Object {
 
 public:
   berryObjectMacro(TypeExtension);
 
 private:
 
   /* the type this extension is extending */
   QString fTypeInfo;
   /* the list of associated extenders */
   QList<IPropertyTester::Pointer> fExtenders;
   bool fExtendersLoaded;
 
   /* the extensions associated with <code>fType</code>'s super classes */
   QList<TypeExtension::Pointer> fExtends;
   bool fExtendsLoaded;
 
   TypeExtension() : fExtendersLoaded(false), fExtendsLoaded(false) {
     // special constructor to create the CONTINUE instance
   }
 
 
 protected:
 
   friend class TypeExtensionManager;
 
   /* a special property tester instance that is used to signal that method searching has to continue */
    /* package */ class CONTINUE_ : public IPropertyTester {
 
    public:
 
      berryObjectMacro(CONTINUE_);
 
      bool Handles(const QString&  /*namespaze*/, const QString&  /*method*/) {
        return false;
      }
      bool IsInstantiated() {
        return true;
      }
      bool IsDeclaringPluginActive() {
        return true;
      }
      IPropertyTester* Instantiate() {
        return this;
      }
-     bool Test(Object::Pointer /*receiver*/, const QString& /*method*/,
+     bool Test(Object::ConstPointer /*receiver*/, const QString& /*method*/,
                const QList<Object::Pointer>&  /*args*/, Object::Pointer  /*expectedValue*/) {
        return false;
      }
    };
 
    static const CONTINUE_ CONTINUE;
    static const END_POINT_ END_POINT;
 
   /* package */
    TypeExtension(const QString &typeInfo);
 
   /* package */
    IPropertyTester::Pointer FindTypeExtender(TypeExtensionManager& manager,
        const QString &namespaze, const QString &method,
        bool staticMethod, bool forcePluginActivation);
 };
 
 
 /* a special type extension instance that marks the end of an evaluation chain */
 class END_POINT_ : public TypeExtension
 {
 protected:
   IPropertyTester::Pointer FindTypeExtender(TypeExtensionManager& /*manager*/,
       const QString& /*namespaze*/, const QString& /*name*/,
       bool  /*staticMethod*/, bool  /*forcePluginActivation*/)
   {
     return CONTINUE_::Pointer(new CONTINUE_());
   }
 };
 
 }  // namespace berry
 
 #endif /*BERRYTYPEEXTENSION_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryTypeExtensionManager.cpp b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryTypeExtensionManager.cpp
index 465e2295d4..139559f5a9 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryTypeExtensionManager.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryTypeExtensionManager.cpp
@@ -1,167 +1,167 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryLog.h"
 
 #include "berryTypeExtensionManager.h"
 
 #include "berryExpressions.h"
 #include "berryExpressionStatus.h"
 
 #include "berryPropertyTesterDescriptor.h"
 
 #include "berryPlatform.h"
 #include "berryCoreException.h"
 #include <berryIExtensionRegistry.h>
 
 #include <ctime>
 
 namespace berry {
 
   const QString TypeExtensionManager::TYPE= "type";
 
   TypeExtensionManager::TypeExtensionManager(const QString& extensionPoint)
   : fExtensionPoint(extensionPoint)
   {
     //Platform.getExtensionRegistry().addRegistryChangeListener(this);
     this->InitializeCaches();
   }
 
-  Property::Pointer TypeExtensionManager::GetProperty(Object::Pointer receiver,
+  Property::Pointer TypeExtensionManager::GetProperty(Object::ConstPointer receiver,
       const QString& namespaze, const QString& method)
   {
     return GetProperty(receiver, namespaze, method, false);
   }
 
   /*synchronized*/Property::Pointer
   TypeExtensionManager::GetProperty(
-      Object::Pointer receiver, const QString& namespaze,
+      Object::ConstPointer receiver, const QString& namespaze,
       const QString& method, bool forcePluginActivation)
   {
     std::clock_t start= 0;
     if (Expressions::TRACING)
     start = std::clock();
 
     // if we call a static method than the receiver is the class object
     //Class clazz= receiver instanceof Class ? (Class)receiver : receiver.getClass();
 
     Property::Pointer result(new Property(receiver, namespaze, method));
     Property::Pointer cached(fPropertyCache->Get(result));
     if (!cached.isNull())
     {
       if (cached->IsValidCacheEntry(forcePluginActivation))
       {
         if (Expressions::TRACING)
         {
           BERRY_INFO << "[Type Extension] - method "
                      << receiver->ToString() << "#" << method.toStdString()
                      << " found in cache: "
                      << (double(std::clock() - start))/(CLOCKS_PER_SEC/1000) << " ms.";
         }
         return cached;
       }
       // The type extender isn't loaded in the cached method but can be loaded
       // now. So remove method from cache and do the normal look up so that the
       // implementation class gets loaded.
       fPropertyCache->Remove(cached);
     }
     TypeExtension::Pointer extension(this->Get(receiver->GetClassName()));
     IPropertyTester::Pointer extender(extension->FindTypeExtender(*this, namespaze, method, false /*receiver instanceof Class*/, forcePluginActivation));
     if (!extender.Cast<TypeExtension::CONTINUE_>().IsNull() || extender.IsNull())
     {
       QString msg("Unknown method for ");
       msg.append(receiver->GetClassName());
       IStatus::Pointer status(new ExpressionStatus(ExpressionStatus::TYPE_EXTENDER_UNKOWN_METHOD,
                                                    QString("No property tester contributes a property %1 to type %2")
                                                    .arg(namespaze + "::" + method).arg(receiver->GetClassName()),
                                                    BERRY_STATUS_LOC));
       throw CoreException(status);
     }
     result->SetPropertyTester(extender);
     fPropertyCache->Put(result);
     if (Expressions::TRACING)
     {
       BERRY_INFO << "[Type Extension] - method "
                  << typeid(receiver).name() << "#" << method
                  << " not found in cache: "
                  << (double(std::clock() - start))/(CLOCKS_PER_SEC/1000) << " ms.";
     }
     return result;
   }
 
   /* package */TypeExtension::Pointer
   TypeExtensionManager::Get(const QString& type)
   {
     TypeExtension::Pointer result(fTypeExtensionMap[type]);
     if (result.IsNull())
     {
       result = new TypeExtension(type);
       fTypeExtensionMap[type] = result;
     }
     return result;
   }
 
   QList<IPropertyTester::Pointer> TypeExtensionManager::LoadTesters(const QString& typeName)
   {
     if (fConfigurationElementMap.isEmpty())
     {
       IExtensionRegistry* registry = Platform::GetExtensionRegistry();
       QList<IConfigurationElement::Pointer> ces(
             registry->GetConfigurationElementsFor(QString("org.blueberry.core.expressions.") + fExtensionPoint));
-      for (unsigned int i= 0; i < ces.size(); i++)
+      for (int i= 0; i < ces.size(); i++)
       {
         IConfigurationElement::Pointer config(ces[i]);
         QString typeAttr = config->GetAttribute(TYPE);
         fConfigurationElementMap[typeAttr].push_back(config);
       }
     }
     //std::string typeName= type.getName();
     QList<IConfigurationElement::Pointer> typeConfigs = fConfigurationElementMap.take(typeName);
 
     QList<IPropertyTester::Pointer> result;
-    for (unsigned int i= 0; i < typeConfigs.size(); i++)
+    for (int i= 0; i < typeConfigs.size(); i++)
     {
       IConfigurationElement::Pointer config(typeConfigs[i]);
       try
       {
         IPropertyTester::Pointer descr(new PropertyTesterDescriptor(config));
         result.push_back(descr);
       }
-      catch (const CoreException& e)
+      catch (const CoreException& /*e*/)
       {
         //TODO
         //ExpressionPlugin.getDefault().getLog().log(e.getStatus());
         IPropertyTester::Pointer nullTester(new NULL_PROPERTY_TESTER_());
         result.push_back(nullTester);
       }
     }
 
     return result;
   }
 
   /*synchronized*/void TypeExtensionManager::InitializeCaches()
   {
     fPropertyCache = new PropertyCache(1000);
     fConfigurationElementMap.clear();
     fTypeExtensionMap.clear();
   }
 
   TypeExtensionManager::~TypeExtensionManager()
   {
     if (fPropertyCache) delete fPropertyCache;
   }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryTypeExtensionManager.h b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryTypeExtensionManager.h
index 98719edd2d..144bd59507 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryTypeExtensionManager.h
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryTypeExtensionManager.h
@@ -1,125 +1,125 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYTYPEEXTENSIONMANAGER_H_
 #define BERRYTYPEEXTENSIONMANAGER_H_
 
 #include "berryIPropertyTester.h"
 
 #include "berryTypeExtension.h"
 #include "berryPropertyCache.h"
 
 #include "berryProperty.h"
 
 #include <berryIConfigurationElement.h>
 
 #include <QHash>
 #include <typeinfo>
 
 namespace berry {
 
 class TypeExtensionManager { // implements IRegistryChangeListener {
 
 private:
   QString fExtensionPoint;
 
   static const QString TYPE;
 
   class NULL_PROPERTY_TESTER_ : public IPropertyTester
   {
   public:
     bool Handles(const QString&  /*namespaze*/, const QString&  /*property*/)
     {
       return false;
     }
     bool IsInstantiated()
     {
       return true;
     }
     bool IsDeclaringPluginActive()
     {
       return true;
     }
     IPropertyTester* Instantiate()
     {
       return this;
     }
-    bool Test(Object::Pointer, const QString& /*property*/,
+    bool Test(Object::ConstPointer, const QString& /*property*/,
               const QList<Object::Pointer>&  /*args*/, Object::Pointer  /*expectedValue*/)
     {
       return false;
     }
   };
 
   static const NULL_PROPERTY_TESTER_ NULL_PROPERTY_TESTER;
 
   /*
    * Map containing all already created type extension object.
    */
   QHash<QString, TypeExtension::Pointer> fTypeExtensionMap;
 
   /*
    * Table containing mapping of class name to configuration element
    */
   QHash<QString, QList<IConfigurationElement::Pointer> > fConfigurationElementMap;
 
   /*
    * A cache to give fast access to the last 1000 method invocations.
    */
   PropertyCache* fPropertyCache;
 
 public:
 
   TypeExtensionManager(const QString& extensionPoint);
   ~TypeExtensionManager();
 
-  Property::Pointer GetProperty(Object::Pointer receiver,
+  Property::Pointer GetProperty(Object::ConstPointer receiver,
                                 const QString& namespaze, const QString& method);
 
-  /*synchronized*/Property::Pointer GetProperty(Object::Pointer receiver,
+  /*synchronized*/Property::Pointer GetProperty(Object::ConstPointer receiver,
       const QString& namespaze, const QString& method, bool forcePluginActivation);
 
 protected:
 
   friend class TypeExtension;
 
   /*
    * This method doesn't need to be synchronized since it is called
    * from withing the getProperty method which is synchronized
    */
   /* package */TypeExtension::Pointer Get(const QString& type);
 
   /*
    * This method doesn't need to be synchronized since it is called
    * from withing the getProperty method which is synchronized
    */
   /* package */QList<IPropertyTester::Pointer> LoadTesters(const QString& typeName);
 
   //  public void registryChanged(IRegistryChangeEvent event) {
   //    IExtensionDelta[] deltas= event.getExtensionDeltas(ExpressionPlugin.getPluginId(), fExtensionPoint);
   //    if (deltas.length > 0) {
   //      initializeCaches();
   //    }
   //  }
 
 private:
 
   /*synchronized*/void InitializeCaches();
 };
 
 }
 
 #endif /*BERRYTYPEEXTENSIONMANAGER_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryWithExpression.cpp b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryWithExpression.cpp
index 6421880031..d863c714f3 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryWithExpression.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryWithExpression.cpp
@@ -1,99 +1,99 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryWithExpression.h"
 
 #include "berryExpressions.h"
 #include "berryEvaluationContext.h"
 #include "berryExpressionStatus.h"
 
 #include <berryIConfigurationElement.h>
 #include <berryCoreException.h>
 
 namespace berry {
 
 const QString WithExpression::ATT_VARIABLE= "variable";
 
 const uint WithExpression::HASH_INITIAL= qHash("berry::WithExpression");
 
 WithExpression::WithExpression(const IConfigurationElement::Pointer& configElement)
 {
   fVariable = configElement->GetAttribute(ATT_VARIABLE);
   Expressions::CheckAttribute(ATT_VARIABLE, fVariable);
 }
 
 WithExpression::WithExpression(Poco::XML::Element* element)
 {
   fVariable = QString::fromStdString(element->getAttribute(ATT_VARIABLE.toStdString()));
   Expressions::CheckAttribute(ATT_VARIABLE, fVariable.length() > 0 ? fVariable : QString());
 }
 
 WithExpression::WithExpression(const QString& variable)
  : fVariable(variable)
 {
 
 }
 
 bool
 WithExpression::operator==(const Object* object) const
 {
   if (const WithExpression* that = dynamic_cast<const WithExpression*>(object))
   {
     return this->fVariable == that->fVariable &&
             this->Equals(this->fExpressions, that->fExpressions);
   }
   return false;
 }
 
 EvaluationResult::ConstPointer
 WithExpression::Evaluate(IEvaluationContext* context) const
 {
-  Object::Pointer variable(context->GetVariable(fVariable));
+  Object::ConstPointer variable(context->GetVariable(fVariable));
   if (variable.IsNull())
   {
     IStatus::Pointer status(new ExpressionStatus(ExpressionStatus::VARIABLE_NOT_DEFINED,
                                                  QString("The variable %1 is not defined").arg(fVariable),
                                                  BERRY_STATUS_LOC));
     throw CoreException(status);
   }
   if (variable == IEvaluationContext::UNDEFINED_VARIABLE)
   {
     return EvaluationResult::FALSE_EVAL;
   }
   EvaluationContext::Pointer scope(new EvaluationContext(context, variable));
   return this->EvaluateAnd(scope.GetPointer());
 }
 
 void
-WithExpression::CollectExpressionInfo(ExpressionInfo* info)
+WithExpression::CollectExpressionInfo(ExpressionInfo* info) const
 {
   ExpressionInfo* other = new ExpressionInfo();
   CompositeExpression::CollectExpressionInfo(other);
   if (other->HasDefaultVariableAccess())
   {
     info->AddVariableNameAccess(fVariable);
   }
   info->MergeExceptDefaultVariable(other);
 }
 
 uint
-WithExpression::ComputeHashCode()
+WithExpression::ComputeHashCode() const
 {
   return HASH_INITIAL * HASH_FACTOR + this->HashCode(fExpressions)
   * HASH_FACTOR + qHash(fVariable);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryWithExpression.h b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryWithExpression.h
index 58947101f6..6050328ff9 100755
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryWithExpression.h
+++ b/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryWithExpression.h
@@ -1,62 +1,62 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef __BERRY_WITH_EXPRESSION_H__
 #define __BERRY_WITH_EXPRESSION_H__
 
 #include "berryCompositeExpression.h"
 
 #include "Poco/DOM/Element.h"
 
 namespace berry {
 
 struct IConfigurationElement;
 
 class WithExpression : public CompositeExpression {
 
 private:
   QString fVariable;
   static const QString ATT_VARIABLE;
 
   /**
    * The seed for the hash code for all with expressions.
    */
   static const uint HASH_INITIAL;
 
 public:
 
   WithExpression(const SmartPointer<IConfigurationElement>& configElement);
 
   WithExpression(Poco::XML::Element* element);
 
   WithExpression(const QString &variable);
 
   bool operator==(const Object* object) const;
 
   EvaluationResult::ConstPointer Evaluate(IEvaluationContext* context) const;
 
-  void CollectExpressionInfo(ExpressionInfo* info);
+  void CollectExpressionInfo(ExpressionInfo* info) const;
 
 
 protected:
 
-  uint ComputeHashCode();
+  uint ComputeHashCode() const;
 
 };
 
 } // namespace berry
 
 #endif // __BERRY_WITH_EXPRESSION_H__
diff --git a/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIJobChangeEvent.h b/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIJobChangeEvent.h
index 54e9ef7874..cd14956f9b 100644
--- a/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIJobChangeEvent.h
+++ b/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIJobChangeEvent.h
@@ -1,74 +1,74 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIJOBCHANGEEVENT_H_
 #define BERRYIJOBCHANGEEVENT_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
 
 #include <berryIStatus.h>
 
 #include <Poco/Timestamp.h>
 
 #include <org_blueberry_core_jobs_Export.h>
 
 namespace berry
 {
 
 class Job;
 
 /**
  * An event describing a change to the state of a job.
  *
  * @see IJobChangeListener
  * @noimplement This interface is not intended to be implemented by clients.
  */
 struct BERRY_JOBS IJobChangeEvent : public Object
 {
 
-  berryInterfaceMacro(IJobChangeEvent, berry);
+  berryObjectMacro(berry::IJobChangeEvent)
 
   /**
    * The amount of time in milliseconds to wait after scheduling the job before it
    * should be run, or <code>-1</code> if not applicable for this type of event.
    * This value is only applicable for the <code>scheduled</code> event.
    *
    * @return the delay time for this event
    */
   virtual Poco::Timestamp::TimeDiff GetDelay() const = 0;
 
   /**
    * The job on which this event occurred.
    *
    * @return the job for this event
    */
   virtual SmartPointer<Job> GetJob() const = 0;
 
   /**
    * The result returned by the job's run method, or <code>null</code> if
    * not applicable.  This value is only applicable for the <code>done</code> event.
    *
    * @return the status for this event
    */
   virtual IStatus::Pointer GetResult() const = 0;
 
 
 };
 
 }
 
 #endif /* BERRYIJOBCHANGEEVENT_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIJobChangeListener.cpp b/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIJobChangeListener.cpp
index 5999b261fb..fec2a93a3d 100644
--- a/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIJobChangeListener.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIJobChangeListener.cpp
@@ -1,73 +1,66 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryIJobChangeListener.h"
 
 namespace berry
 {
 
-void IJobChangeListener::Events::AddListener(
-    IJobChangeListener::Pointer listener)
+void IJobChangeListener::Events::AddListener(IJobChangeListener* listener)
 {
   if (!listener)
     return;
 
   Types types = listener->GetEventTypes();
 
   if (types & ABOUT_TO_RUN)
-    jobAboutToRun += Delegate(listener.GetPointer(),
-        &IJobChangeListener::AboutToRun);
+    jobAboutToRun += Delegate(listener, &IJobChangeListener::AboutToRun);
   if (types & AWAKE)
-    jobAwake += Delegate(listener.GetPointer(), &IJobChangeListener::Awake);
+    jobAwake += Delegate(listener, &IJobChangeListener::Awake);
   if (types & DONE)
-    jobDone += Delegate(listener.GetPointer(), &IJobChangeListener::Done);
+    jobDone += Delegate(listener, &IJobChangeListener::Done);
   if (types & RUNNING)
-    jobRunning += Delegate(listener.GetPointer(), &IJobChangeListener::Running);
+    jobRunning += Delegate(listener, &IJobChangeListener::Running);
   if (types & SCHEDULED)
-    jobScheduled += Delegate(listener.GetPointer(),
-        &IJobChangeListener::Scheduled);
+    jobScheduled += Delegate(listener, &IJobChangeListener::Scheduled);
   if (types & SLEEPING)
-    jobSleeping += Delegate(listener.GetPointer(),
-        &IJobChangeListener::Sleeping);
+    jobSleeping += Delegate(listener, &IJobChangeListener::Sleeping);
 }
 
-void IJobChangeListener::Events::RemoveListener(
-    IJobChangeListener::Pointer listener)
+void IJobChangeListener::Events::RemoveListener(IJobChangeListener* listener)
 {
   if (!listener)
     return;
 
-  jobAboutToRun -= Delegate(listener.GetPointer(),
-      &IJobChangeListener::AboutToRun);
-  jobAwake -= Delegate(listener.GetPointer(), &IJobChangeListener::Awake);
-  jobDone -= Delegate(listener.GetPointer(), &IJobChangeListener::Done);
-  jobRunning -= Delegate(listener.GetPointer(), &IJobChangeListener::Running);
-  jobScheduled -= Delegate(listener.GetPointer(),
-      &IJobChangeListener::Scheduled);
-  jobSleeping -= Delegate(listener.GetPointer(), &IJobChangeListener::Sleeping);
+  jobAboutToRun -= Delegate(listener, &IJobChangeListener::AboutToRun);
+  jobAwake -= Delegate(listener, &IJobChangeListener::Awake);
+  jobDone -= Delegate(listener, &IJobChangeListener::Done);
+  jobRunning -= Delegate(listener, &IJobChangeListener::Running);
+  jobScheduled -= Delegate(listener, &IJobChangeListener::Scheduled);
+  jobSleeping -= Delegate(listener, &IJobChangeListener::Sleeping);
 }
 
 void IJobChangeListener::Events::SetExceptionHandler(const AbstractExceptionHandler& handler)
 {
   jobAboutToRun.SetExceptionHandler(handler);
   jobAwake.SetExceptionHandler(handler);
   jobDone.SetExceptionHandler(handler);
   jobRunning.SetExceptionHandler(handler);
   jobScheduled.SetExceptionHandler(handler);
   jobSleeping.SetExceptionHandler(handler);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIJobChangeListener.h b/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIJobChangeListener.h
index f26ab13606..24ab1c42b7 100644
--- a/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIJobChangeListener.h
+++ b/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIJobChangeListener.h
@@ -1,165 +1,159 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIJOBCHANGELISTENER_H_
 #define BERRYIJOBCHANGELISTENER_H_
 
 #include "berryIJobChangeEvent.h"
 
 namespace berry
 {
 
 /**
  * Callback interface for clients interested in being notified when jobs change state.
  * <p>
  * A single job listener instance can be added either to the job manager, for notification
  * of all scheduled jobs, or to any set of individual jobs.  A single listener instance should
  * not be added to both the job manager, and to individual jobs (such a listener may
  * receive duplicate notifications).
  * </p><p>
  * Clients should not rely on the result of the <code>Job#GetState()</code>
  * method on jobs for which notification is occurring. Listeners are notified of
  * all job state changes, but whether the state change occurs before, during, or
  * after listeners are notified is unspecified.
  * </p><p>
  * Clients may implement this interface.
  * </p>
  * @see IJobManager#AddJobChangeListener(IJobChangeListener::Pointer)
  * @see IJobManager#RemoveJobChangeListener(IJobChangeListener::Pointer)
  * @see Job#AddJobChangeListener(IJobChangeListener::Pointer)
  * @see Job#GetState()
  * @see Job#RemoveJobChangeListener(IJobChangeListener::Pointer)
  */
 
-struct BERRY_JOBS IJobChangeListener: public Object
+struct BERRY_JOBS IJobChangeListener
 {
 
-berryInterfaceMacro(IJobChangeListener, berry);
+  berryObjectMacro(berry::IJobChangeListener)
 
   struct BERRY_JOBS Events
   {
 
-    typedef Message1<const IJobChangeEvent::ConstPointer> JobChangeEventType;
+    typedef Message1<const IJobChangeEvent::ConstPointer&> JobChangeEventType;
 
     enum Type
     {
       NONE = 0x00000000,
       ABOUT_TO_RUN = 0x00000001,
       AWAKE = 0x00000002,
       DONE = 0x00000004,
       RUNNING = 0x00000008,
       SCHEDULED = 0x00000010,
       SLEEPING = 0x00000020,
 
       ALL = 0xffffffff
     };
 
-    BERRY_DECLARE_FLAGS(Types, Type)
+    Q_DECLARE_FLAGS(Types, Type)
 
     JobChangeEventType jobAboutToRun;
     JobChangeEventType jobAwake;
     JobChangeEventType jobDone;
     JobChangeEventType jobRunning;
     JobChangeEventType jobScheduled;
     JobChangeEventType jobSleeping;
 
-    void AddListener(IJobChangeListener::Pointer listener);
-    void RemoveListener(IJobChangeListener::Pointer listener);
+    void AddListener(IJobChangeListener* listener);
+    void RemoveListener(IJobChangeListener* listener);
 
     void SetExceptionHandler(const AbstractExceptionHandler& handler);
 
-    typedef MessageDelegate1<IJobChangeListener, const IJobChangeEvent::ConstPointer>
+    typedef MessageDelegate1<IJobChangeListener, const IJobChangeEvent::ConstPointer&>
         Delegate;
   };
 
   virtual Events::Types GetEventTypes() = 0;
 
   /**
    * Notification that a job is about to be run. Listeners are allowed to sleep, cancel,
    * or change the priority of the job before it is started (and as a result may prevent
    * the run from actually occurring).
    *
    * @param event the event details
    */
-  virtual void AboutToRun(const IJobChangeEvent::ConstPointer /*event*/)
+  virtual void AboutToRun(const IJobChangeEvent::ConstPointer& /*event*/)
   {
   }
-  ;
 
   /**
    * Notification that a job was previously sleeping and has now been rescheduled
    * to run.
    *
    * @param event the event details
    */
-  virtual void Awake(const IJobChangeEvent::ConstPointer /*event*/)
+  virtual void Awake(const IJobChangeEvent::ConstPointer& /*event*/)
   {
   }
-  ;
 
   /**
    * Notification that a job has completed execution, either due to cancelation, successful
    * completion, or failure.  The event status object indicates how the job finished,
    * and the reason for failure, if applicable.
    *
    * @param event the event details
    */
-  virtual void Done(const IJobChangeEvent::ConstPointer /*event*/)
+  virtual void Done(const IJobChangeEvent::ConstPointer& /*event*/)
   {
   }
-  ;
 
   /**
    * Notification that a job has started running.
    *
    * @param event the event details
    */
-  virtual void Running(const IJobChangeEvent::ConstPointer /*event*/)
+  virtual void Running(const IJobChangeEvent::ConstPointer& /*event*/)
   {
   }
-  ;
 
   /**
    * Notification that a job is being added to the queue of scheduled jobs.
    * The event details includes the scheduling delay before the job should start
    * running.
    *
    * @param event the event details, including the job instance and the scheduling
    * delay
    */
-  virtual void Scheduled(const IJobChangeEvent::ConstPointer /*event*/)
+  virtual void Scheduled(const IJobChangeEvent::ConstPointer& /*event*/)
   {
   }
-  ;
 
   /**
    * Notification that a job was waiting to run and has now been put in the
    * sleeping state.
    *
    * @param event the event details
    */
-  virtual void Sleeping(const IJobChangeEvent::ConstPointer /*event*/)
+  virtual void Sleeping(const IJobChangeEvent::ConstPointer& /*event*/)
   {
   }
-  ;
 
 };
 
 }
 
-BERRY_DECLARE_OPERATORS_FOR_FLAGS(berry::IJobChangeListener::Events::Types)
+Q_DECLARE_OPERATORS_FOR_FLAGS(berry::IJobChangeListener::Events::Types)
 
 #endif /* BERRYIJOBCHANGELISTENER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIJobManager.h b/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIJobManager.h
index 1eb6c6f5d0..92e13b6778 100644
--- a/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIJobManager.h
+++ b/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIJobManager.h
@@ -1,440 +1,440 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef _BERRY_IJOBMANAGER_H
 #define _BERRY_IJOBMANAGER_H
 
 #include<string>
 
 #include <org_blueberry_core_jobs_Export.h>
 
 #include "berryJob.h"
 #include "berryProgressProvider.h"
 #include "berryIProgressMonitor.h"
 #include "berryIJobChangeListener.h"
 
 #include<Poco/Thread.h>
 
 namespace berry
 {
 
 /**
  * The job manager provides facilities for scheduling, querying, and maintaining jobs
  * and locks.  In particular, the job manager provides the following services:
  * <ul>
  * <li>Maintains a queue of jobs that are waiting to be run.  Items can be added to
  * the queue using the <code>schedule</code> method.</li>
  * <li> @todo Allows manipulation of groups of jobs called job families. }  Job families can
  * be canceled, put to sleep, or woken up atomically.  There is also a mechanism
  * for querying the set of known jobs in a given family.> </li>
  *
  * <li>Allows listeners to find out about progress on running jobs, and to find out
  * when jobs have changed states.</li>
  * <li> @todo Provides a factory for creating lock objects.  Lock objects are smart monitors
  * that have strategies for avoiding deadlock. ></li>
  *
  * <li>Provide feedback to a client that is waiting for a given job or family of jobs
  * to complete.</li>
  * </ul>
  *
  * @see Job
  * @see ILock
  *
  * @noimplement This interface is not intended to be implemented by clients.
  */
 struct BERRY_JOBS IJobManager: public Object
 {
 
-  berryInterfaceMacro(IJobManager, berry);
+  berryObjectMacro(berry::IJobManager)
 
   /**
    * A system property key indicating whether the job manager should create
    * job threads as daemon threads.  Set to <code>true</code> to force all worker
    * threads to be created as daemon threads. Set to <code>false</code> to force
    * all worker threads to be created as non-daemon threads.
    *
    * not used yet
    */
   static const std::string PROP_USE_DAEMON_THREADS ;
 
   /**
    * Registers a job listener with the job manager.
    * Has no effect if an identical listener is already registered.
    *
    * @param listener the listener to be added
    * @see #removeJobChangeListener(IJobChangeListener)
    * @see IJobChangeListener
    */
-  virtual void AddJobChangeListener(IJobChangeListener::Pointer listener) = 0;
+  virtual void AddJobChangeListener(IJobChangeListener* listener) = 0;
 
   ///**
   // * Begins applying this rule in the calling thread.  If the rule conflicts with another
   // * rule currently running in another thread, this method blocks until there are
   // * no conflicting rules.  Calls to <tt>beginRule</tt> must eventually be followed
   // * by a matching call to <tt>endRule</tt> in the same thread and with the identical
   // * rule instance.
   // * <p>
   // * Rules can be nested only if the rule for the inner <tt>beginRule</tt>
   // * is contained within the rule for the outer <tt>beginRule</tt>.  Rule containment
   // * is tested with the API method <tt>ISchedulingRule.contains</tt>.  Also, begin/end
   // * pairs must be strictly nested.  Only the rule that has most recently begun
   // * can be ended at any given time.
   // * <p>
   // * A rule of <code>null</code> can be used, but will be ignored for scheduling
   // * purposes.  The outermost non-null rule in the thread will be used for scheduling. A
   // * <code>null</code> rule that is begun must still be ended.
   // * <p>
   // * If this method is called from within a job that has a scheduling rule, the
   // * given rule must also be contained within the rule for the running job.
   // * <p>
   // * Note that <tt>endRule</tt> must be called even if <tt>beginRule</tt> fails.
   // * The recommended usage is:
   // * <pre>
   // * final ISchedulingRule rule = ...;
   // * try {
   // *   manager.beginRule(rule, monitor);
   // * } finally {
   // *   manager.endRule(rule);
   // * }
   // * </pre>
   // *
   // * @param rule the rule to begin applying in this thread, or <code>null</code>
   // * @param monitor a progress monitor, or <code>null</code> if progress
   // *    reporting and cancellation are not desired
   // * @throws IllegalArgumentException if the rule is not strictly nested within
   // *   all other rules currently active for this thread
   // * @throws OperationCanceledException if the supplied monitor reports cancelation
   // *   before the rule becomes available
   // * @see ISchedulingRule#contains(ISchedulingRule)
   // */
 
   /// virtual void BeginRule(const ISchedulingRule& rule, const IProgressMonitor& monitor) = 0;
 
   ///**
   // * Cancels all jobs in the given job family.  Jobs in the family that are currently waiting
   // * will be removed from the queue.  Sleeping jobs will be discarded without having
   // * a chance to wake up.  Currently executing jobs will be asked to cancel but there
   // * is no guarantee that they will do so.
   // *
   // * @param family the job family to cancel, or <code>null</code> to cancel all jobs
   // * @see Job#belongsTo(Object)
   // */
   /// virtual  void Cancel(const Object& family);
 
   /**
    * Returns a progress monitor that can be used to provide
    * aggregated progress feedback on a set of running jobs. A user
    * interface will typically group all jobs in a progress group together,
    * providing progress feedback for individual jobs as well as aggregated
    * progress for the entire group.  Jobs in the group may be run sequentially,
    * in parallel, or some combination of the two.
    * <p>
    * Recommended usage (this snippet runs two jobs in sequence in a
    * single progress group):
    * <pre>
    *    Job parseJob, compileJob;
    *    IProgressMonitor pm = Platform.getJobManager().createProgressGroup();
    *    try {
    *       pm.beginTask("Building", 10);
    *       parseJob.setProgressGroup(pm, 5);
    *       parseJob.schedule();
    *       compileJob.setProgressGroup(pm, 5);
    *       compileJob.schedule();
    *       parseJob.join();
    *       compileJob.join();
    *    } finally {
    *       pm.done();
    *    }
    * </pre>
    *
    * @see Job#setProgressGroup(IProgressMonitor, int)
    * @see IProgressMonitor
    * @return a progress monitor
    */
   virtual IProgressMonitor::Pointer CreateProgressGroup() = 0;
 
   ///**
   // * Returns the job that is currently running in this thread, or <code>null</code> if there
   // * is no currently running job.
   // *
   // * @return the job or <code>null</code>
   // */
   //// virtual Job CurrentJob() = 0;
 
   ///**
   // * Ends the application of a rule to the calling thread.  Calls to <tt>endRule</tt>
   // * must be preceded by a matching call to <tt>beginRule</tt> in the same thread
   // * with an identical rule instance.
   // * <p>
   // * Rules can be nested only if the rule for the inner <tt>beginRule</tt>
   // * is contained within the rule for the outer <tt>beginRule</tt>.  Also, begin/end
   // * pairs must be strictly nested.  Only the rule that has most recently begun
   // * can be ended at any given time.
   // *
   // * @param rule the rule to end applying in this thread
   // * @throws IllegalArgumentException if this method is called on a rule for which
   // * there is no matching begin, or that does not match the most recent begin.
   // * @see ISchedulingRule#contains(ISchedulingRule)
   // */
   /// virtual void EndRule(const ISchedulingRule& rule) = 0;
 
   ///**
   // * Returns all waiting, executing and sleeping jobs belonging
   // * to the given family. If no jobs are found, an empty array is returned.
   // *
   // * @param family the job family to find, or <code>null</code> to find all jobs
   // * @return the job array
   // * @see Job#belongsTo(Object)
   // */
   /// virtual Job[] Find(const Object& family) = 0;
 
   /**
    * Returns whether the job manager is currently idle.  The job manager is
    * idle if no jobs are currently running or waiting to run.
    *
    * @return <code>true</code> if the job manager is idle, and
    * <code>false</code> otherwise
    * @since 3.1
    */
   virtual bool IsIdle()= 0;
 
   /**
    * Returns whether the job manager is currently suspended.
    *
    * @return <code>true</code> if the job manager is suspended, and
    * <code>false</code> otherwise
    * @since 3.4
    * @see #suspend()
    * @see #resume()
    */
   virtual bool IsSuspended() = 0;
 
   ///**
   // * Waits until all jobs of the given family are finished.  This method will block the
   // * calling thread until all such jobs have finished executing, or until this thread is
   // * interrupted.   If there are no jobs in
   // * the family that are currently waiting, running, or sleeping, this method returns
   // * immediately.  Feedback on how the join is progressing is provided to a  progress
   // * monitor.
   // * <p>
   // * If this method is called while the job manager is suspended, only jobs
   // * that are currently running will be joined; Once there are no jobs
   // * in the family in the {@link Job#RUNNING} state, this method returns.
   // * </p>
   // * <p>
   // * Note that there is a deadlock risk when using join.  If the calling thread owns
   // * a lock or object monitor that the joined thread is waiting for, deadlock
   // * will occur. This method can also result in starvation of the current thread if
   // * another thread continues to add jobs of the given family, or if a
   // * job in the given family reschedules itself in an infinite loop.
   // * </p>
   // *
   // * @param family the job family to join, or <code>null</code> to join all jobs.
   // * @param monitor Progress monitor for reporting progress on how the
   // * wait is progressing, or <code>null</code> if no progress monitoring is required.
   // * @exception InterruptedException if this thread is interrupted while waiting
   // * @exception OperationCanceledException if the progress monitor is canceled while waiting
   // * @see Job#belongsTo(Object)
   // * @see #suspend()
   // */
   /// virtual void Join(const Object& family, const IProgressMonitor& monitor)
   ///                 throw(InterruptedException, OperationCanceledException) = 0;
   ///**
   // * Creates a new lock object.  All lock objects supplied by the job manager
   // * know about each other and will always avoid circular deadlock amongst
   // * themselves.
   // *
   // * @return the new lock object
   // */
   /// virtual ILock newLock() = 0;
 
   /**
    * Removes a job listener from the job manager.
    * Has no effect if an identical listener is not already registered.
    *
    * @param listener the listener to be removed
    * @see #addJobChangeListener(IJobChangeListener)
    * @see IJobChangeListener
    */
-  virtual void RemoveJobChangeListener(IJobChangeListener::Pointer listener) = 0;
+  virtual void RemoveJobChangeListener(IJobChangeListener* listener) = 0;
 
   ///**
   // * Resumes execution of jobs after a previous <code>suspend</code>.  All
   // * jobs that were sleeping or waiting prior to the suspension, or that were
   // * scheduled while the job manager was suspended, will now be eligible
   // * for execution.
   // * <p>
   // * Calling this method on a rule that is not suspended  has no effect.  If another
   // * thread also owns the rule at the time this method is called, then the rule will
   // * not be resumed until all threads have released the rule.
   // *
   // * @deprecated This method is not safe and should not be used.
   // * Suspending a scheduling rule violates the thread safety
   // * of clients that use scheduling rules as a mutual exclusion mechanism,
   // * and can result in concurrency problems in all clients that use the suspended rule.
   // * @see #suspend(ISchedulingRule, IProgressMonitor)
   // */
   /// virtual void Resume(const ISchedulingRule& rule) = 0;
 
   ///**
   // * Resumes execution of jobs after a previous <code>suspend</code>.  All
   // * jobs that were sleeping or waiting prior to the suspension, or that were
   // * scheduled while the job manager was suspended, will now be eligible
   // * for execution.
   // * <p>
   // * Calling <code>resume</code> when the job manager is not suspended
   // * has no effect.
   // *
   // * @see #suspend()
   // * @see #isSuspended()
   // */
   ////virtual void Resume() = 0;
 
   ///**
   // * Provides a hook that is notified whenever a thread is about to wait on a lock,
   // * or when a thread is about to release a lock.  This hook must only be set once.
   // * <p>
   // * This method is for internal use by the platform-related plug-ins.
   // * Clients should not call this method.
   // * </p>
   // * @see LockListener
   // */
   // TODO LockListener .. SetLockListener
   /// virtual void SetLockListener(const LockListener& listener) = 0;
 
   /**
    * Registers a progress provider with the job manager.  If there was a
    * provider already registered, it is replaced.
    * <p>
    * This method is intended for use by the currently executing Eclipse application.
    * Plug-ins outside the currently running application should not call this method.
    * </p>
    *
    * @param provider the new provider, or <code>null</code> if no progress
    * is needed
    */
   virtual void SetProgressProvider(ProgressProvider::Pointer) = 0;
 
   /**
    * Suspends execution of all jobs.  Jobs that are already running
    * when this method is invoked will complete as usual, but all sleeping and
    * waiting jobs will not be executed until the job manager is resumed.
    * <p>
    * The job manager will remain suspended until a subsequent call to
    * <code>resume</code>.  Further calls to <code>suspend</code>
    * when the job manager is already suspended are ignored.
    * <p>
    * All attempts to join sleeping and waiting jobs while the job manager is
    * suspended will return immediately.
    * <p>
    * Note that this very powerful function should be used with extreme caution.
    * Suspending the job manager will prevent all jobs in the system from executing,
    * which may have adverse affects on components that are relying on
    * execution of jobs. The job manager should never be suspended without intent
    * to resume execution soon afterwards.
    *
    * @see #resume()
    * @see #join(Object, IProgressMonitor)
    * @see #isSuspended()
    */
   // virtual void Suspend() = 0;
 
   ///**
   // * Defers execution of all jobs with scheduling rules that conflict with the
   // * given rule. The caller will be blocked until all currently executing jobs with
   // * conflicting rules are completed.  Conflicting jobs that are sleeping or waiting at
   // * the time this method is called will not be executed until the rule is resumed.
   // * <p>
   // * While a rule is suspended, all calls to <code>beginRule</code> and
   // * <code>endRule</code> on a suspended rule will not block the caller.
   // * The rule remains suspended until a subsequent call to
   // * <code>resume(ISchedulingRule)</code> with the identical rule instance.
   // * Further calls to <code>suspend</code> with an identical rule prior to calling
   // * <code>resume</code> are ignored.
   // * </p>
   // * <p>
   // * This method is long-running; progress and cancelation are provided by
   // * the given progress monitor. In the case of cancelation, the rule will
   // * not be suspended.
   // * </p>
   // * Note: this very powerful function should be used with extreme caution.
   // * Suspending rules will prevent jobs in the system from executing, which may
   // * have adverse effects on components that are relying on execution of jobs.
   // * The job manager should never be suspended without intent to resume
   // * execution soon afterwards. Deadlock will result if the thread responsible
   // * for resuming the rule attempts to join a suspended job.
   // *
   // * @deprecated This method is not safe and should not be used.
   // * Suspending a scheduling rule violates the thread safety
   // * of clients that use scheduling rules as a mutual exclusion mechanism,
   // * and can result in concurrency problems in all clients that use the suspended rule.
   // * @param rule The scheduling rule to suspend. Must not be <code>null</code>.
   // * @param monitor a progress monitor, or <code>null</code> if progress
   // * reporting is not desired
   // * @exception OperationCanceledException if the operation is canceled.
   // * Cancelation can occur even if no progress monitor is provided.
   // * @see #resume(ISchedulingRule)
   // */
   /// virtual void Suspend(const ISchedulingRule& rule, const IProgressMonitor& monitor) = 0;
 
   ///**
   // * Requests that all jobs in the given job family be suspended.  Jobs currently
   // * waiting to be run will be removed from the queue and moved into the
   // * <code>SLEEPING</code> state.  Jobs that have been put to sleep
   // * will remain in that state until either resumed or canceled.  This method has
   // * no effect on jobs that are not currently waiting to be run.
   // * <p>
   // * Sleeping jobs can be resumed using <code>wakeUp</code>.
   // *
   // * @param family the job family to sleep, or <code>null</code> to sleep all jobs.
   // * @see Job#belongsTo(Object)
   // */
   /// virtual void Sleep(const Object& family) = 0;
 
   ///**
   // * Transfers ownership of a scheduling rule to another thread.  The identical
   // * scheduling rule must currently be owned by the calling thread as a result of
   // * a previous call to <code>beginRule</code>.  The destination thread must
   // * not already own a scheduling rule.
   // * <p>
   // * Calling this method is equivalent to atomically calling <code>endRule</code>
   // * in the calling thread followed by an immediate <code>beginRule</code> in
   // * the destination thread.  The destination thread is responsible for subsequently
   // * calling <code>endRule</code> when it is finished using the rule.
   // * <p>
   // * This method has no effect when the destination thread is the same as the
   // * calling thread.
   // *
   // * @param rule The scheduling rule to transfer
   // * @param destinationThread The new owner for the transferred rule.
   // * @since 3.1
   // */
   /// virtual void TransferRule(const ISchedulingRule& rule, Poco::Thread* destinationThread) = 0;
 
   ///**
   // * Resumes scheduling of all sleeping jobs in the given family.  This method
   // * has no effect on jobs in the family that are not currently sleeping.
   // *
   // * @param family the job family to wake up, or <code>null</code> to wake up all jobs
   // * @see Job#belongsTo(Object)
   // */
   /// virtual void WakeUp(const Object& family) = 0;
 
 
 };
 
 }
 #endif /* IJOBMANAGER */
diff --git a/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIJobStatus.h b/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIJobStatus.h
index 8e3640a319..cc07592d94 100644
--- a/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIJobStatus.h
+++ b/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIJobStatus.h
@@ -1,45 +1,46 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 #ifndef _BERRYIJOBSTATUS_H
 #define _BERRYIJOBSTATUS_H
 
 #include "berryIStatus.h"
 #include "berryObject.h"
 #include "berryJob.h"
 
  namespace berry {
 
  /**
   * Represents status relating to the execution of jobs.
   * @see IStatus
   * @noimplement This interface is not intended to be implemented by clients.
   * @noextend This interface is not intended to be extended by clients.
   */
 
-   struct IJobStatus : public IStatus {
+struct IJobStatus : public virtual IStatus
+{
 
-   berryObjectMacro(IJobStatus);
+   berryObjectMacro(IJobStatus)
 
   /**
    * Returns the job associated with this status.
    * @return the job associated with this status
    */
     virtual Job::Pointer GetJob() = 0;
   };
 }
 
 
 #endif /*_BERRYIJOBSTATUS_H */
diff --git a/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryILock.h b/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryILock.h
index 842f11e7d5..f1400c28dc 100644
--- a/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryILock.h
+++ b/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryILock.h
@@ -1,125 +1,125 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef _BERRY_ILOCK_H_
 #define _BERRY_ILOCK_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
 
 #include "berryJobExceptions.h"
 
 namespace berry
 {
 
 /**
  * A lock is used to control access to an exclusive resource.
  * <p>
  * Locks are reentrant.  That is, they can be acquired multiple times by the same thread
  * without releasing.  Locks are only released when the number of successful acquires
  * equals the number of successful releases.
  * </p><p>
  * Locks are capable of detecting and recovering from programming errors that cause
  * circular waiting deadlocks. When a deadlock between two or more <tt>ILock</tt>
  * instances is detected, detailed debugging information is printed to the log file.  The
  * locks will then automatically recover from the deadlock by employing a release
  * and wait strategy. One thread will lose control of the locks it owns, thus breaking
  * the deadlock and  allowing other threads to proceed.  Once that thread's locks are
  * all available, it will be given exclusive access to all its locks and allowed to proceed.
  * A thread can only lose locks while it is waiting on an <tt>acquire()</tt> call.
  *
  * </p><p>
  * Successive acquire attempts by different threads are queued and serviced on
  * a first come, first served basis.
  * </p><p>
  * It is very important that acquired locks eventually get released.  Calls to release
  * should be done in a finally block to ensure they execute.  For example:
  * <pre>
  * try {
  *   lock.acquire();
  *   // ... do work here ...
  * } finally {
  *   lock.release();
  * }
  * </pre>
  * Note: although <tt>lock.acquire</tt> should never fail, it is good practice to place
  * it inside the try block anyway.  Releasing without acquiring is far less catastrophic
  * than acquiring without releasing.
  * </p>
  *
  * @see IJobManager#NewLock()
  * @noimplement This interface is not intended to be implemented by clients.
  */
 struct BERRY_JOBS ILock: public Object
 {
 
-  berryInterfaceMacro(ILock, berry);
+  berryObjectMacro(berry::ILock)
 
   /**
    * Attempts to acquire this lock.  If the lock is in use and the specified delay is
    * greater than zero, the calling thread will block until one of the following happens:
    * <ul>
    * <li>This lock is available</li>
    * <li>The thread is interrupted</li>
    * <li>The specified delay has elapsed</li>
    * </ul>
    * <p>
    * While a thread is waiting,  locks it already owns may be granted to other threads
    * if necessary to break a deadlock.  In this situation, the calling thread may be blocked
    * for longer than the specified delay.  On returning from this call, the calling thread
    * will once again have exclusive access to any other locks it owned upon entering
    * the acquire method.
    *
    * @param delay the number of milliseconds to delay
    * @return <code>true</code> if the lock was successfully acquired, and
    * <code>false</code> otherwise.
    * @exception InterruptedException if the thread was interrupted
    */
   virtual bool Acquire(long delay) throw (InterruptedException) = 0;
 
   /**
    * Acquires this lock.  If the lock is in use, the calling thread will block until the lock
    * becomes available.  If the calling thread owns several locks, it will be blocked
    * until all threads it requires become available, or until the thread is interrupted.
    * While a thread is waiting, its locks may be granted to other threads if necessary
    * to break a deadlock.  On returning from this call, the calling thread will
    * have exclusive access to this lock, and any other locks it owned upon
    * entering the acquire method.
    * <p>
    * This implementation ignores attempts to interrupt the thread.  If response to
    * interruption is needed, use the method <code>acquire(long)</code>
    */
   virtual void Acquire();
 
   /**
    * Returns the number of nested acquires on this lock that have not been released.
    * This is the number of times that release() must be called before the lock is
    * freed.
    *
    * @return the number of nested acquires that have not been released
    */
   virtual int GetDepth() = 0;
 
   /**
    * Releases this lock. Locks must only be released by the thread that currently
    * owns the lock.
    */
   virtual void Release() = 0;
 };
 
 }
 
 #endif // BERRY_ILOCK_H
diff --git a/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIProgressMonitor.h b/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIProgressMonitor.h
index b0cdbb0187..3d30144562 100644
--- a/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIProgressMonitor.h
+++ b/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIProgressMonitor.h
@@ -1,117 +1,117 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef  BERRY_IPROGRESS_MONITOR_H
 #define  BERRY_IPROGRESS_MONITOR_H
 
 #include <org_blueberry_core_jobs_Export.h>
 #include "berryObject.h"
 #include <string>
 
 namespace berry
 {
 
 struct IProgressMonitor: public Object
 {
 
-berryInterfaceMacro(IProgressMonitor, berry);
+  berryObjectMacro(berry::IProgressMonitor)
 
   /** Constant indicating an unknown amount of work. */
 
   static const int UNKNOWN = -1;
 
   /**
    * Notifies that the main task is beginning.  This must only be called once
    * on a given progress monitor instance.
    *
    * @param name the name (or description) of the main task
    * @param totalWork the total number of work units into which
    *  the main task is been subdivided. If the value is <code>UNKNOWN</code>
    *  the implementation is free to indicate progress in a way which
    *  doesn't require the total number of work units in advance.
    */
   virtual void BeginTask(const std::string& name, int totalWork) = 0;
 
   /**
    * Notifies that the work is done; that is, either the main task is completed
    * or the user canceled it. This method may be called more than once
    * (implementations should be prepared to handle this case).
    */
   virtual void Done() = 0;
 
   /**
    * Internal method to handle scaling correctly. This method
    * must not be called by a client. Clients should
    * always use the method <code>worked(int)</code>.
    *
    * @param work the amount of work done
    */
   virtual void InternalWorked(double work) = 0;
 
   /**
    * Returns whether cancellation of current operation has been requested.
    * Long-running operations should poll to see if cancellation
    * has been requested.
    *
    * @return <code>true</code> if cancellation has been requested,
    *    and <code>false</code> otherwise
    * @see #setCanceled(bool)
    */
   virtual bool IsCanceled() = 0;
 
   /**
    * Sets the cancel state to the given value.
    *
    * @param value <code>true</code> indicates that cancellation has
    *     been requested (but not necessarily acknowledged);
    *     <code>false</code> clears this flag
    * @see #isCanceled()
    */
   virtual void SetCanceled(bool value) = 0;
 
   /**
    * Sets the task name to the given value. This method is used to
    * restore the task label after a nested operation was executed.
    * Normally there is no need for clients to call this method.
    *
    * @param name the name (or description) of the main task
    * @see #beginTask
    */
   virtual void SetTaskName(const std::string& name) = 0;
 
   /**
    * Notifies that a subtask of the main task is beginning.
    * Subtasks are optional; the main task might not have subtasks.
    *
    * @param name the name (or description) of the subtask
    */
   virtual void SubTask(const std::string& name) = 0;
 
   /**
    * Notifies that a given number of work unit of the main task
    * has been completed. Note that this amount represents an
    * installment, as opposed to a cumulative amount of work done
    * to date.
    *
    * @param work a non-negative number of work units just completed
    */
   virtual void Worked(int work) = 0;
 
 };
 
 }
 
 #endif /* _BERRY_IPROGRESS_MONITOR_H */
diff --git a/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIProgressMonitorWithBlocking.h b/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIProgressMonitorWithBlocking.h
index 5af58bb1f8..8a169d6e88 100644
--- a/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIProgressMonitorWithBlocking.h
+++ b/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryIProgressMonitorWithBlocking.h
@@ -1,84 +1,84 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef _BERRY_IPROGRESSMONITORWITHBLOCKING_H
 #define _BERRY_IPROGRESSMONITORWITHBLOCKING_H
 
 #include "berryObject.h"
 #include <org_blueberry_core_jobs_Export.h>
 #include "berryIStatus.h"
 #include "berryIProgressMonitor.h"
 
 namespace berry
 {
 
 /**
  * An extension to the IProgressMonitor interface for monitors that want to
  * support feedback when an activity is blocked due to concurrent activity in
  * another thread.
  * <p>
  * When a monitor that supports this extension is passed to an operation, the
  * operation should call <code>setBlocked</code> whenever it knows that it
  * must wait for a lock that is currently held by another thread. The operation
  * should continue to check for and respond to cancellation requests while
  * blocked. When the operation is no longer blocked, it must call <code>clearBlocked</code>
  * to clear the blocked state.
  * <p>
  * This interface can be used without OSGi running.
  * </p><p>
  * Clients may implement this interface.
  * </p>
  * @see IProgressMonitor
  */
 struct BERRY_JOBS IProgressMonitorWithBlocking: public IProgressMonitor
 {
 
-  berryInterfaceMacro(IProgressMonitorWithBlocking, berry);
+  berryObjectMacro(berry::IProgressMonitorWithBlocking)
 
   /**
    * Indicates that this operation is blocked by some background activity. If
    * a running operation ever calls <code>setBlocked</code>, it must
    * eventually call <code>clearBlocked</code> before the operation
    * completes.
    * <p>
    * If the caller is blocked by a currently executing job, this method will return
    * an <code>IJobStatus</code> indicating the job that is currently blocking
    * the caller. If this blocking job is not known, this method will return a plain
    * informational <code>IStatus</code> object.
    * </p>
    *
    * @param reason an optional status object whose message describes the
    * reason why this operation is blocked, or <code>null</code> if this
    * information is not available.
    * @see #clearBlocked()
    */
    virtual void SetBlocked(IStatus::Pointer reason)= 0;
 
   /**
    * Clears the blocked state of the running operation. If a running
    * operation ever calls <code>setBlocked</code>, it must eventually call
    * <code>clearBlocked</code> before the operation completes.
    *
    * @see #setBlocked(IStatus)
    */
    virtual void  ClearBlocked() = 0;
 
 
 };
 
 }
 
 #endif /* _BERRY_IPROGRESSMONITORWITHBLOCKING_H */
diff --git a/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryISchedulingRule.h b/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryISchedulingRule.h
index 32a9e049ec..2088e32f9a 100644
--- a/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryISchedulingRule.h
+++ b/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryISchedulingRule.h
@@ -1,93 +1,93 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef _BERRY_ISCHEDULING_RULE_H_
 #define _BERRY_ISCHEDULING_RULE_H_
 
 #include <org_blueberry_core_jobs_Export.h>
 #include <berryObject.h>
 
 namespace berry
 {
 
 /**
  * Scheduling rules are used by jobs to indicate when they need exclusive access
  * to a resource.
  * @todo
  * Scheduling rules can also be applied synchronously to a thread
  * using <tt>IJobManager.beginRule(ISchedulingRule)</tt> and
  * <tt>IJobManager.endRule(ISchedulingRule)</tt>.
  *
  * The job manager guarantees that
  * no two jobs with conflicting scheduling rules will run concurrently.
  * @todo
  * Multiple rules can be applied to a given thread only if the outer rule explicitly
  * allows the nesting as specified by the <code>contains</code> method.
  *
  * <p>
  * Clients may implement this interface.
  *
  * @see Job#GetRule()
  * @see Job#SetRule(ISchedulingRule)
  * @see Job#Schedule(long)
  * @see IJobManager#BeginRule(ISchedulingRule, org.eclipse.core.runtime.IProgressMonitor)
  * @see IJobManager#EndRule(ISchedulingRule)
  */
 struct BERRY_JOBS ISchedulingRule: public Object
 {
 
-  berryInterfaceMacro(ISchedulingRule, berry);
+  berryObjectMacro(berry::ISchedulingRule)
 
   /**
    * Returns whether this scheduling rule completely contains another scheduling
    * rule.  Rules can only be nested within a thread if the inner rule is completely
    * contained within the outer rule.
    * <p>
    * Implementations of this method must obey the rules of a partial order relation
    * on the set of all scheduling rules.  In particular, implementations must be reflexive
    * (a.contains(a) is always true), antisymmetric (a.contains(b) and b.contains(a) iff
    * equals(b),
    * and transitive (if a.contains(b) and b.contains(c), then a.contains(c)).  Implementations
    * of this method must return <code>false</code> when compared to a rule they
    * know nothing about.
    *
    * @param rule the rule to check for containment
    * @return <code>true</code> if this rule contains the given rule, and
    * <code>false</code> otherwise.
    */
   virtual bool Contains(ISchedulingRule::Pointer rule) const = 0;
 
   /**
    * Returns whether this scheduling rule is compatible with another scheduling rule.
    * If <code>true</code> is returned, then no job with this rule will be run at the
    * same time as a job with the conflicting rule.  If <code>false</code> is returned,
    * then the job manager is free to run jobs with these rules at the same time.
    * <p>
    * Implementations of this method must be reflexive, symmetric, and consistent,
    * and must return <code>false</code> when compared  to a rule they know
    * nothing about.
    *
    * @param rule the rule to check for conflicts
    * @return <code>true</code> if the rule is conflicting, and <code>false</code>
    *   otherwise.
    */
   virtual bool IsConflicting(ISchedulingRule::Pointer myRule) const = 0;
 
 };
 
 }
 
 #endif // _BERRY_ISCHEDULING_RULE_H_
diff --git a/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryJob.cpp b/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryJob.cpp
index 861d1d4aaa..9f65a0c133 100644
--- a/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryJob.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryJob.cpp
@@ -1,205 +1,205 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryJob.h"
 #include "berryIJobManager.h"
 #include "internal/berryJobManager.h"
 #include "berryIStatus.h"
 #include "berryStatus.h"
 
 #include <string>
 
 namespace berry
 {
 
 
 
-const IStatus::Pointer Job::ASYNC_FINISH(new Status ( IStatus::OK_TYPE, JobManager::PI_JOBS(), 1, "") ) ;
+const IStatus::Pointer Job::ASYNC_FINISH(new Status ( IStatus::OK_TYPE, JobManager::PI_JOBS(), 1, "", BERRY_STATUS_LOC) ) ;
 
-Job::Job(std::string name) :
-  InternalJob(name)
+Job::Job(const QString& name)
+  : InternalJob(name)
 {
 }
 
 const IJobManager* Job::GetJobManager()
 {
   return ptr_manager;
 }
 
 
 bool Job::BelongsTo(Object::Pointer  /*family*/)
 {
   return false;
 }
 
 bool Job::Cancel()
 {
   return InternalJob::Cancel();
 }
 
 void Job::Done(IStatus::Pointer result)
 {
   InternalJob::Done(result);
 }
 
-std::string Job::GetName() const
+QString Job::GetName() const
 {
   return InternalJob::GetName();
 }
 
 int Job::GetPriority() const
 {
   return InternalJob::GetPriority();
 }
 
 // TODO QualifiedName muss noch implementiert werden
 // Object Job::GetProperty(QualifiedName key)
 // {
 //    return InternalJob::GetProperty(key);
 //  }
 
 
 IStatus::Pointer Job::GetResult() const
  {
     return InternalJob::GetResult();
   }
 
 ISchedulingRule::Pointer Job::GetRule() const
 {
   return InternalJob::GetRule();
 }
 
 int Job::GetState() const
 {
   return InternalJob::GetState();
 }
 
 Poco::Thread*
 Job::GetThread() const
 {
   return InternalJob::GetThread();
 }
 
 bool Job::IsBlocking()
 {
   return InternalJob::IsBlocking();
 }
 
 bool Job::IsSystem() const
 {
   return InternalJob::IsSystem();
 }
 
 bool Job::IsUser() const
 {
   return InternalJob::IsUser();
 }
 
 // TODO Join
 //void Job::Join()
 // throw (InterruptedException)
 // {
 //    InternalJob::Join();
 //  }
 
-void Job::RemoveJobChangeListener(IJobChangeListener::Pointer listener)
+void Job::RemoveJobChangeListener(IJobChangeListener* listener)
 {
   InternalJob::RemoveJobChangeListener(listener);
 }
 
 void Job::Schedule()
 {
   Poco::Timestamp::TimeDiff tmpNoDelay = 0;
   InternalJob::Schedule(tmpNoDelay);
 }
 
 void Job::Schedule(Poco::Timestamp::TimeDiff delay)
 {
   InternalJob::Schedule(delay);
 }
 
-void Job::SetName(std::string name)
+void Job::SetName(const QString& name)
 {
   InternalJob::SetName(name);
 }
 
 void Job::SetPriority(int priority)
 {
   InternalJob::SetPriority(priority);
 }
 
 void Job::SetProgressGroup(IProgressMonitor::Pointer group, int ticks)
 {
   InternalJob::SetProgressGroup(group, ticks);
 }
 
 // TODO SetProperty
 // void Job::SetProperty(QualifiedName key, Object value)
 // {
 //    InternalJob::SetProperty(key, value);
 //  }
 
 void Job::SetRule(ISchedulingRule::Pointer rule)
 {
   InternalJob::SetRule(rule);
 }
 
 void Job::SetSystem(bool value)
 {
   InternalJob::SetSystem(value);
 }
 
 void Job::SetUser(bool value)
 {
   InternalJob::SetUser(value);
 }
 
 void Job::SetThread(Poco::Thread* thread)
 {
   InternalJob::SetThread(thread);
 }
 
 bool Job::ShouldRun()
 {
   return true;
 }
 
 bool Job::ShouldSchedule()
 {
   return true;
 }
 
 bool Job::Sleep()
 {
   return InternalJob::Sleep();
 }
 
 void Job::WakeUp()
 {
   InternalJob::WakeUp(0);
 }
 
 void Job::WakeUp(long delay)
 {
   InternalJob::WakeUp(delay);
 }
 
 void Job::Canceling()
 {
   //default implementation does nothing
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryJob.h b/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryJob.h
index 8de5ca16ce..a3b9e4d373 100644
--- a/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryJob.h
+++ b/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryJob.h
@@ -1,639 +1,639 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef _BERRY_JOB_H
 #define _BERRY_JOB_H
 
 #include <Poco/Thread.h>
 
 #include <org_blueberry_core_jobs_Export.h>
 // #include "berryISchedulingRule.h"
 #include "berryJobExceptions.h"
 #include "internal/berryInternalJob.h"
 
 #include <berryObject.h>
 
 #include <string>
 
 namespace berry
 {
 
 struct IJobManager;
 
 /**
  * Jobs are units of runnable work that can be scheduled to be run with the job
  * manager.  Once a job has completed, it can be scheduled to run again (jobs are
  * reusable).
  * <p>
  * Jobs have a state that indicates what they are currently doing.  When constructed,
  * jobs start with a state value of <code>NONE</code>.  When a job is scheduled
  * to be run, it moves into the <code>WAITING</code> state.  When a job starts
  * running, it moves into the <code>RUNNING</code> state.  When execution finishes
  * (either normally or through cancellation), the state changes back to
  * <code>NONE</code>.
  * </p><p>
  * A job can also be in the <code>SLEEPING</code> state.  This happens if a user
  * calls Job.sleep() on a waiting job, or if a job is scheduled to run after a specified
  * delay.  Only jobs in the <code>WAITING</code> state can be put to sleep.
  * Sleeping jobs can be woken at any time using Job.wakeUp(), which will put the
  * job back into the <code>WAITING</code> state.
  * </p><p>
  * Jobs can be assigned a priority that is used as a hint about how the job should
  * be scheduled.  There is no guarantee that jobs of one priority will be run before
  * all jobs of lower priority.  The documentation of the various priority constants provide
  * more detail about what each priority means.  By default, jobs start in the
  * <code>LONG</code> priority class.
  *
  * @see IJobManager
  *
  */
 //TODO  struct Job: public InternalJob, public IAdaptable
 class BERRY_JOBS Job: public InternalJob
 {
 
 public:
 
    berryObjectMacro(Job);
 
   /**
    * Job status return value that is used to indicate asynchronous job completion.
    * @see Job#Run(IProgressMonitor::Pointer)
    * @see Job#Done(IStatus::Pointer)
    */
    static const IStatus::Pointer ASYNC_FINISH ;
 
   /* Job priorities */
   /**
    * Job priority constant (value 10) for interactive jobs.
    * Interactive jobs generally have priority over all other jobs.
    * Interactive jobs should be either fast running or very low on CPU
    * usage to avoid blocking other interactive jobs from running.
    *
    * @see #GetPriority()
    * @see #SetPriority(int)
    * @see #Run(IProgressMonitor::Pointer)
    */
   static const int INTERACTIVE = 10;
   /**
    * Job priority constant (value 20) for short background jobs.
    * Short background jobs are jobs that typically complete within a second,
    * but may take longer in some cases.  Short jobs are given priority
    * over all other jobs except interactive jobs.
    *
    * @see #GetPriority()
    * @see #SetPriority(int)
    * @see #Run(IProgressMonitor::Pointer)
    */
   static const int SHORT = 20;
   /**
    * Job priority constant (value 30) for long-running background jobs.
    *
    * @see #GetPriority()
    * @see #SetPriority(int)
    * @see #Run(IProgressMonitor::Pointer)
    */
   static const int LONG = 30;
   /**
    * Job priority constant (value 40) for build jobs.  Build jobs are
    * generally run after all other background jobs complete.
    *
    * @see #GetPriority()
    * @see #SetPriority(int)
    * @see #Run(IProgressMonitor)
    */
   static const int BUILD = 40;
 
   /**
    * Job priority constant (value 50) for decoration jobs.
    * Decoration jobs have lowest priority.  Decoration jobs generally
    * compute extra information that the user may be interested in seeing
    * but is generally not waiting for.
    *
    * @see #GetPriority()
    * @see #SetPriority(int)
    * @see #Run(IProgressMonitor)
    */
   static const int DECORATE = 50;
   /**
    * Job state code (value 0) indicating that a job is not
    * currently sleeping, waiting, or running (i.e., the job manager doesn't know
    * anything about the job).
    *
    * @see #GetState()
    */
   static const int NONE = 0;
   /**
    * Job state code (value 1) indicating that a job is sleeping.
    *
    * @see #Run(IProgressMonitor)
    * @see #GetState()
    */
   static const int SLEEPING = 0x01;
   /**
    * Job state code (value 2) indicating that a job is waiting to be run.
    *
    * @see #GetState()
    */
   static const int WAITING = 0x02;
   /**
    * Job state code (value 4) indicating that a job is currently running
    *
    * @see #GetState()
    */
   static const int RUNNING = 0x04;
 
   /**
    * Returns the job manager.
    *
    * @return the job manager
    */
   static const IJobManager* GetJobManager();
 
   /**
    * Creates a new job with the specified name.  The job name is a human-readable
    * value that is displayed to users.  The name does not need to be unique, but it
    * must not be <code>null</code>.
    *
    * @param name the name of the job.
    */
-  Job(std::string name);
+  Job(const QString& name);
 
   /**
    * Registers a job listener with this job
    * Has no effect if an identical listener is already registered.
    *
    * @param listener the listener to be added.
    */
-  void AddJobChangeListener(IJobChangeListener::Pointer listener);
+  void AddJobChangeListener(IJobChangeListener* listener);
 
   /**
    * Returns whether this job belongs to the given family.  Job families are
    * represented as objects that are not interpreted or specified in any way
    * by the job manager.  Thus, a job can choose to belong to any number of
    * families.
    * <p>
    * Clients may override this method.  This default implementation always returns
    * <code>false</code>.  Overriding implementations must return <code>false</code>
    * for families they do not recognize.
    * </p>
    *
    * @param family the job family identifier
    * @return <code>true</code> if this job belongs to the given family, and
    * <code>false</code> otherwise.
    */
   bool BelongsTo(Object::Pointer family);
 
   /**
    * Stops the job.  If the job is currently waiting,
    * it will be removed from the queue.  If the job is sleeping,
    * it will be discarded without having a chance to resume and its sleeping state
    * will be cleared.  If the job is currently executing, it will be asked to
    * stop but there is no guarantee that it will do so.
    *
    * @return <code>false</code> if the job is currently running (and thus may not
    * respond to cancellation), and <code>true</code> in all other cases.
    */
   bool Cancel();
 
   /**
    * Jobs that complete their execution asynchronously must indicate when they
    * are finished by calling this method.  This method must not be called by
    * a job that has not indicated that it is executing asynchronously.
    * <p>
    * This method must not be called from within the scope of a job's <code>run</code>
    * method.  Jobs should normally indicate completion by returning an appropriate
    * status from the <code>run</code> method.  Jobs that return a status of
    * <code>ASYNC_FINISH</code> from their run method must later call
    * <code>done</code> to indicate completion.
    *
    * @param result a status object indicating the result of the job's execution.
    * @see #ASYNC_FINISH
    * @see #Run(IProgressMonitor::Pointer)
    */
   void Done(IStatus::Pointer result);
 
   /**
    * Returns the human readable name of this job.  The name is never
    * <code>null</code>.
    *
    * @return the name of this job
    */
-  std::string GetName() const;
+  QString GetName() const;
 
   /**
    * Returns the priority of this job.  The priority is used as a hint when the job
    * is scheduled to be run.
    *
    * @return the priority of the job.  One of INTERACTIVE, SHORT, LONG, BUILD,
    *   or DECORATE.
    */
   int GetPriority() const;
 
   /**
    * Returns the value of the property of this job identified by the given key,
    * or <code>null</code> if this job has no such property.
    *
    * @param key the name of the property
    * @return the value of the property,
    *     or <code>null</code> if this job has no such property
    * @see #SetProperty(QualifiedName, Object)
    */
   //TODO QualifiedName GetPropertys
   ///Object GetProperty(QualifiedName key) const ;
 
   /**
    * Returns the result of this job's last run.
    *
    * @return the result of this job's last run, or <code>null</code> if this
    * job has never finished running.
    */
    IStatus::Pointer GetResult() const ;
 
   /**
    * Returns the scheduling rule for this job.  Returns <code>null</code> if this job has no
    * scheduling rule.
    *
    * @return the scheduling rule for this job, or <code>null</code>.
    * @see ISchedulingRule
    * @see #SetRule(ISchedulingRule::Pointer)
    */
   ISchedulingRule::Pointer GetRule() const;
 
   /**
    * Returns the state of the job. Result will be one of:
    * <ul>
    * <li><code>Job.RUNNING</code> - if the job is currently running.</li>
    * <li><code>Job.WAITING</code> - if the job is waiting to be run.</li>
    * <li><code>Job.SLEEPING</code> - if the job is sleeping.</li>
    * <li><code>Job.NONE</code> - in all other cases.</li>
    * </ul>
    * <p>
    * Note that job state is inherently volatile, and in most cases clients
    * cannot rely on the result of this method being valid by the time the
    * result is obtained.  For example, if <tt>getState</tt> returns
    * <tt>RUNNING</tt>,  the job may have actually completed by the
    * time the <tt>getState</tt> method returns.  All clients can infer from
    * invoking this method is that  the job was recently in the returned state.
    *
    * @return the job state
    */
   int GetState() const;
 
   /**
    * Returns the thread that this job is currently running in.
    *
    * @return the thread this job is running in, or <code>null</code>
    * if this job is not running or the thread is unknown.
    */
   Poco::Thread* GetThread() const;
 
   /**
    * Returns whether this job is blocking a higher priority non-system job from
    * starting due to a conflicting scheduling rule.  Returns <code>false</code>
    * if this job is not running, or is not blocking a higher priority non-system job.
    *
    * @return <code>true</code> if this job is blocking a higher priority non-system
    * job, and <code>false</code> otherwise.
    * @see #GetRule()
    * @see #IsSystem()
    */
   bool IsBlocking();
 
   /**
    * Returns whether this job is a system job.  System jobs are typically not
    * revealed to users in any UI presentation of jobs.  Other than their UI presentation,
    * system jobs act exactly like other jobs.  If this value is not explicitly set, jobs
    * are treated as non-system jobs.  The default value is <code>false</code>.
    *
    * @return <code>true</code> if this job is a system job, and
    * <code>false</code> otherwise.
    * @see #SetSystem(bool)
    */
   bool IsSystem() const;
 
   /**
    * Returns whether this job has been directly initiated by a UI end user.
    * These jobs may be presented differently in the UI.  The default value
    * is <code>false</code>.
    *
    * @return <code>true</code> if this job is a user-initiated job, and
    * <code>false</code> otherwise.
    * @see #SetUser(bool)
    */
   bool IsUser() const;
 
   /**
    * Waits until this job is finished.  This method will block the calling thread until the
    * job has finished executing, or until this thread has been interrupted.  If the job
    * has not been scheduled, this method returns immediately.  A job must not
    * be joined from within the scope of its run method.
    * <p>
    * If this method is called on a job that reschedules itself from within the
    * <tt>run</tt> method, the join will return at the end of the first execution.
    * In other words, join will return the first time this job exits the
    * {@link #RUNNING} state, or as soon as this job enters the {@link #NONE} state.
    * </p>
    * <p>
    * If this method is called while the job manager is suspended, this job
    * will only be joined if it is already running; if this job is waiting or sleeping,
    * this method returns immediately.
    * </p>
    * <p>
    * Note that there is a deadlock risk when using join.  If the calling thread owns
    * a lock or object monitor that the joined thread is waiting for, deadlock
    * will occur.
    * </p>
    *
    * @exception InterruptedException if this thread is interrupted while waiting
    * @see ILock
    *  @see IJobManager#Suspend()
    */
   //TODO Error Join  Problem InterruptedException
   /// void Join() ;
 
   /**
    * Removes a job listener from this job.
    * Has no effect if an identical listener is not already registered.
    *
    * @param listener the listener to be removed
    */
-  void RemoveJobChangeListener(IJobChangeListener::Pointer listener);
+  void RemoveJobChangeListener(IJobChangeListener* listener);
 
 
   /**
    * Schedules this job to be run.  The job is added to a queue of waiting
    * jobs, and will be run when it arrives at the beginning of the queue.
    * <p>
    * This is a convenience method, fully equivalent to
    * <code>Schedule(0L)</code>.
    * </p>
    * @see #Schedule(long)
    */
   void Schedule();
 
   /**
    * Schedules this job to be run after a specified delay.  The job is put in the
    * {@link #SLEEPING} state until the specified delay has elapsed, after which
    * the job is added to a queue of {@link #WAITING} jobs. Once the job arrives
    * at the beginning of the queue, it will be run at the first available opportunity.
    * </p><p>
    * Jobs of equal priority and <code>delay</code> with conflicting scheduling
    * rules are guaranteed to run in the order they are scheduled. No guarantees
    * are made about the relative execution order of jobs with unrelated or
    * <code>null</code> scheduling rules, or different priorities.
    * <p>
    * If this job is currently running, it will be rescheduled with the specified
    * delay as soon as it finishes.  If this method is called multiple times
    * while the job is running, the job will still only be rescheduled once,
    * with the most recent delay value that was provided.
    * </p><p>
    * Scheduling a job that is waiting or sleeping has no effect.
    * </p>
    *
    * @param delay a time delay in milliseconds before the job should run
    * @see ISchedulingRule
    */
   void Schedule(Poco::Timestamp::TimeDiff delay);
 
   /**
    * Changes the name of this job.  If the job is currently running, waiting,
    * or sleeping, the new job name may not take effect until the next time the
    * job is scheduled.
    * <p>
    * The job name is a human-readable value that is displayed to users.  The name
    * does not need to be unique, but it must not be <code>null</code>.
    *
    * @param name the name of the job.
    */
-  void SetName(std::string name);
+  void SetName(const QString& name);
 
   /**
    * Sets the priority of the job.  This will not affect the execution of
    * a running job, but it will affect how the job is scheduled while
    * it is waiting to be run.
    *
    * @param priority the new job priority.  One of
    * INTERACTIVE, SHORT, LONG, BUILD, or DECORATE.
    */
   void SetPriority(int priority);
 
   /**
    * Associates this job with a progress group.  Progress feedback
    * on this job's next execution will be displayed together with other
    * jobs in that group. The provided monitor must be a monitor
    * created by the method <tt>IJobManager.createProgressGroup</tt>
    * and must have at least <code>ticks</code> units of available work.
    * <p>
    * The progress group must be set before the job is scheduled.
    * The group will be used only for a single invocation of the job's
    * <tt>run</tt> method, after which any association of this job to the
    * group will be lost.
    *
    * @see IJobManager#createProgressGroup()
    * @param group The progress group to use for this job
    * @param ticks the number of work ticks allocated from the
    *    parent monitor, or {@link IProgressMonitor#UNKNOWN}
    */
   void SetProgressGroup(IProgressMonitor::Pointer group, int ticks);
 
   /**
    * Sets the value of the property of this job identified
    * by the given key. If the supplied value is <code>null</code>,
    * the property is removed from this resource.
    * <p>
    * Properties are intended to be used as a caching mechanism
    * by ISV plug-ins. They allow key-object associations to be stored with
    * a job instance.  These key-value associations are maintained in
    * memory (at all times), and the information is never discarded automatically.
    * </p><p>
    * The qualifier part of the property name must be the unique identifier
    * of the declaring plug-in (e.g. <code>"com.example.plugin"</code>).
    * </p>
    *
    * @param key the qualified name of the property
    * @param value the value of the property,
    *     or <code>null</code> if the property is to be removed
    * @see #GetProperty(QualifiedName)
    */
   //TODO QualifiedName SetProperty
   /// void SetProperty(QualifiedName key, Object value);
 
   /**
    * Sets the scheduling rule to be used when scheduling this job.  This method
    * must be called before the job is scheduled.
    *
    * @param rule the new scheduling rule, or <code>null</code> if the job
    * should have no scheduling rule
    * @see #GetRule()
    */
   void SetRule(ISchedulingRule::Pointer rule);
 
   /**
    * Sets whether or not this job is a system job.  System jobs are typically not
    * revealed to users in any UI presentation of jobs.  Other than their UI presentation,
    * system jobs act exactly like other jobs.  If this value is not explicitly set, jobs
    * are treated as non-system jobs. This method must be called before the job
    * is scheduled.
    *
    * @param value <code>true</code> if this job should be a system job, and
    * <code>false</code> otherwise.
    * @see #IsSystem()
    */
   void SetSystem(bool value);
 
   /**
    * Sets whether or not this job has been directly initiated by a UI end user.
    * These jobs may be presented differently in the UI. This method must be
    * called before the job is scheduled.
    *
    * @param value <code>true</code> if this job is a user-initiated job, and
    * <code>false</code> otherwise.
    * @see #IsUser()
    */
   void SetUser(bool value);
 
   /**
    * Sets the thread that this job is currently running in, or <code>null</code>
    * if this job is not running or the thread is unknown.
    * <p>
    * Jobs that use the {@link #ASYNC_FINISH} return code should tell
    * the job what thread it is running in.  This is used to prevent deadlocks.
    *
    * @param thread the thread that this job is running in.
    *
    * @see #ASYNC_FINISH
    * @see #Run(IProgressMonitor::Pointer)
    */
   void SetThread(Poco::Thread* thread);
 
   /**
    * Returns whether this job should be run.
    * If <code>false</code> is returned, this job will be discarded by the job manager
    * without running.
    * <p>
    * This method is called immediately prior to calling the job's
    * run method, so it can be used for last minute pre-condition checking before
    * a job is run. This method must not attempt to schedule or change the
    * state of any other job.
    * </p><p>
    * Clients may override this method.  This default implementation always returns
    * <code>true</code>.
    * </p>
    *
    * @return <code>true</code> if this job should be run
    *   and <code>false</code> otherwise
    */
   virtual bool ShouldRun();
 
   /**
    * Returns whether this job should be scheduled.
    * If <code>false</code> is returned, this job will be discarded by the job manager
    * without being added to the queue.
    * <p>
    * This method is called immediately prior to adding the job to the waiting job
    * queue.,so it can be used for last minute pre-condition checking before
    * a job is scheduled.
    * </p><p>
    * Clients may override this method.  This default implementation always returns
    * <code>true</code>.
    * </p>
    *
    * @return <code>true</code> if the job manager should schedule this job
    *   and <code>false</code> otherwise
    */
   virtual bool ShouldSchedule();
 
   /**
    * Requests that this job be suspended.  If the job is currently waiting to be run, it
    * will be removed from the queue move into the {@link #SLEEPING} state.
    * The job will remain asleep until either resumed or canceled.  If this job is not
    * currently waiting to be run, this method has no effect.
    * <p>
    * Sleeping jobs can be resumed using <code>wakeUp</code>.
    *
    * @return <code>false</code> if the job is currently running (and thus cannot
    * be put to sleep), and <code>true</code> in all other cases
    * @see #WakeUp()
    */
   bool Sleep();
 
   /**
    * Puts this job immediately into the {@link #WAITING} state so that it is
    * eligible for immediate execution. If this job is not currently sleeping,
    * the request is ignored.
    * <p>
    * This is a convenience method, fully equivalent to
    * <code>wakeUp(0L)</code>.
    * </p>
    * @see #Sleep()
    */
   void WakeUp();
 
   /**
    * Puts this job back into the {@link #WAITING} state after
    * the specified delay. This is equivalent to canceling the sleeping job and
    * rescheduling with the given delay.  If this job is not currently sleeping,
    * the request  is ignored.
    *
    * @param delay the number of milliseconds to delay
    * @see #Sleep()
    */
   void WakeUp(long delay);
 
 
 protected:
 
   /**
    * A hook method indicating that this job is running and {@link #cancel()}
    * is being called for the first time.
    * <p>
    * Subclasses may override this method to perform additional work when
    * a cancellation request is made.  This default implementation does nothing.
    */
   virtual void Canceling();
 
   /**
    * Executes this job.  Returns the result of the execution.
    * <p>
    * The provided monitor can be used to report progress and respond to
    * cancellation.  If the progress monitor has been canceled, the job
    * should finish its execution at the earliest convenience and return a result
    * status of severity {@link IStatus#CANCEL}.  The singleton
    * cancel status {@link Status#CANCEL_STATUS} can be used for
    * this purpose.  The monitor is only valid for the duration of the invocation
    * of this method.
    * <p>
    * This method must not be called directly by clients.  Clients should call
    * <code>schedule</code>, which will in turn cause this method to be called.
    * <p>
    * Jobs can optionally finish their execution asynchronously (in another thread) by
    * returning a result status of {@link #ASYNC_FINISH}.  Jobs that finish
    * asynchronously <b>must</b> specify the execution thread by calling
    * <code>setThread</code>, and must indicate when they are finished by calling
    * the method <code>done</code>.
    *
    * @param monitor the monitor to be used for reporting progress and
    * responding to cancellation. The monitor is never <code>null</code>
    * @return resulting status of the run. The result must not be <code>null</code>
    * @see #ASYNC_FINISH
    * @see #Done(IStatus)
    */
   virtual IStatus::Pointer Run(IProgressMonitor::Pointer myProgressMonitor) = 0;
 
 };
 
 }
 #endif /* BERRY_JOB_H */
diff --git a/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryJobStatus.cpp b/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryJobStatus.cpp
index 667310a9d7..ef94835299 100644
--- a/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryJobStatus.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryJobStatus.cpp
@@ -1,82 +1,37 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryJobStatus.h"
 #include "internal/berryJobManager.h"
 #include <org_blueberry_core_jobs_Export.h>
 
 namespace berry
 {
 
-JobStatus::JobStatus(const Status::Severity& serverity, Job::Pointer sptr_job,
-    const std::string& message) :
-  m_myJob(sptr_job), m_internalStatus(new Status(serverity,
-      JobManager::PI_JOBS(), 1, message))
+JobStatus::JobStatus(const Severity& severity, Job::Pointer sptr_job,
+                     const QString& message, const Status::SourceLocation& sl)
+  : Status(severity, JobManager::PI_JOBS(), 1, message, sl)
+  , m_myJob(sptr_job)
 {
 }
 
 Job::Pointer JobStatus::GetJob()
 {
   return m_myJob;
 }
 
-std::vector<IStatus::Pointer> JobStatus::GetChildren() const
-{
-  return m_internalStatus->GetChildren();
-}
-
-int JobStatus::GetCode() const
-{
-  return m_internalStatus->GetCode();
-}
-
-std::exception JobStatus::GetException() const
-{
-  return m_internalStatus->GetException();
-}
-
-std::string JobStatus::GetMessage() const
-{
-  return m_internalStatus->GetMessage();
-}
-
-std::string JobStatus::GetPlugin() const
-{
-  return m_internalStatus->GetPlugin();
-}
-
-IStatus::Severity JobStatus::GetSeverity() const
-{
-  return m_internalStatus->GetSeverity();
-}
-
-bool JobStatus::IsMultiStatus() const
-{
-  return m_internalStatus->IsMultiStatus();
-}
-
-bool JobStatus::IsOK() const
-{
-  return m_internalStatus->IsOK();
-}
-
-bool JobStatus::Matches(const Severities& severityMask) const
-{
-  return m_internalStatus->Matches(severityMask);
-}
-
 }
 
diff --git a/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryJobStatus.h b/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryJobStatus.h
index d02e8baee5..8c2035e02c 100644
--- a/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryJobStatus.h
+++ b/BlueBerry/Bundles/org.blueberry.core.jobs/src/berryJobStatus.h
@@ -1,105 +1,56 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef _BERRYJOBSTATUS_H
 #define _BERRYJOBSTATUS_H
 
 #include "berryIJobStatus.h"
 #include "berryStatus.h"
 #include "berryJob.h"
-#include <string>
 
 namespace berry {
 
-  class BERRY_JOBS JobStatus : public IJobStatus {
+class BERRY_JOBS JobStatus : public Status, public IJobStatus
+{
 
-
-  public:
+public:
 
   berryObjectMacro(JobStatus);
 
   /**
    * Creates a new job status with no interesting error code or exception.
    * @param severity
    * @param job
    * @param message
    */
-   JobStatus( const Status::Severity& severity, Job::Pointer sptr_job, const std::string& message) ;
+  JobStatus(const Severity& severity, Job::Pointer sptr_job, const QString& message,
+            const Status::SourceLocation& sl);
 
   /**
    * @see IJobStatus#GetJob()
    */
-   Job::Pointer GetJob() ;
-
-  /**
-   *  @see org.blueberry.solstice.common IStatus GetChildren()
-   */
-   std::vector<IStatus::Pointer> GetChildren() const ;
-
-  /**
-   * @see org.blueberry.solstice.common IStatus GetCode()
-   */
-   int GetCode() const ;
-
-  /**
-   *@see org.blueberry.solstice.common IStatus GetException ()
-   */
-   std::exception GetException() const ;
-
-  /**
-   * @see org.blueberry.solstice.common GetMessage ()
-   */
-   std::string GetMessage() const ;
-
-  /**
-   * @see org.blueberry.solstice.common IStatus GetPlugin()
-   */
-   std::string GetPlugin() const ;
-
-  /**
-   * @see org.blueberry.solstice.common IStatus GetSeverity ()
-   */
-   Severity GetSeverity() const ;
-
-  /**
-   * @see org.blueberry.solstice.common IsMultiStatus ()
-   */
-   bool IsMultiStatus() const ;
-
-  /**
-   * @see org.blueberry.solstice.common IStatus IsOk ()
-   */
-   bool IsOK() const ;
-
-  /**
-   * @see org.blueberry.solstice.common IStatus Matches ()
-   */
-   bool Matches(const Severities& severityMask) const ;
-
-
-  private:
-
-    Job::Pointer m_myJob ;
+  Job::Pointer GetJob();
 
-    Status::Pointer m_internalStatus ;
+private:
 
+  Job::Pointer m_myJob;
 
-  };
+};
 
 
- }
+}
 
 #endif /* _BERRYJOBSTATUS_H */
diff --git a/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryInternalJob.cpp b/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryInternalJob.cpp
index 4ff0a13771..647c99c9ab 100644
--- a/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryInternalJob.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryInternalJob.cpp
@@ -1,445 +1,449 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #define NOMINMAX
 #include "berryInternalJob.h"
 
 #include <Poco/Thread.h>
 
 #include "berryJob.h"
 #include "berryJobManager.h"
 #include "berryJobExceptions.h"
 
-#include <string>
-#include <sstream>
 #include <assert.h>
 #include <map>
 
 namespace berry
 {
 
-InternalJob::InternalJob(std::string name) :
-  jobNumber(nextJobNumber++), flags(Job::NONE), name(name), next(0),
-      previous(0), priority(Job::LONG), sptr_schedulingRule(0),
-      sptr_monitor(0), m_startTime(), waitQueueStamp(T_NONE), ptr_thread(0)
+InternalJob::InternalJob(const QString& name)
+  : jobNumber(nextJobNumber++)
+  , flags(Job::NONE)
+  , name(name)
+  , next(0)
+  , previous(0)
+  , priority(Job::LONG)
+  , sptr_schedulingRule(0)
+  , sptr_monitor(0)
+  , m_startTime()
+  , waitQueueStamp(T_NONE)
+  , ptr_thread(0)
 {
   jobEvents.SetExceptionHandler(MessageExceptionHandler<JobListeners>(&ptr_manager->m_JobListeners, &JobListeners::HandleException));
 }
 
 JobManager* const InternalJob::ptr_manager = JobManager::GetInstance();
 
 // time_variables definitions
 // implemented as TimeDiff, if needed can be used to create a Poco::Timestamp with the given value
 
 const Poco::Timestamp::TimeDiff InternalJob::T_INFINITE = std::numeric_limits<Poco::Timestamp::TimeVal>::max();
 
 // indicates if a job has a scheduling time
 // implemented as TimeDiff, if needed can be used to create a Poco::Timestamp with the given value
 const Poco::Timestamp::TimeDiff InternalJob::T_NONE = -1;
 
 
 void InternalJob::AddLast(InternalJob::Pointer entry)
 {
   InternalJob::Pointer last;
   last = this;
   //find the end of the queue
   while (last->previous)
     last = last->previous;
   //add the new entry to the end of the queue
   last->previous = entry.GetPointer();
   entry->next = last;
   entry->previous = 0;
 }
 
 bool InternalJob::operator==(const Object* otherJob) const
 {
   if (const InternalJob* temp = dynamic_cast<const InternalJob*>(otherJob))
   {
     return temp->m_startTime >= m_startTime;
   }
   else
     return false;
 }
 
 const IJobChangeListener::Events& InternalJob::GetListeners() const
 {
   return jobEvents;
 }
 
 
 IProgressMonitor::Pointer InternalJob::GetProgressMonitor() const
 {
   return sptr_monitor;
 }
 
 
 Poco::Timestamp InternalJob::GetStartTime() const
 {
   return m_startTime;
 }
 
 
 int InternalJob::InternalGetState() const
 {
   return flags & M_STATE;
 }
 
 
 void InternalJob::InternalSetPriority(int newPriority)
 {
   this->priority = newPriority;
 }
 
 
 void InternalJob::InternalSetRule(ISchedulingRule::Pointer rule)
 {
   sptr_schedulingRule = rule;
 }
 
 
 //TODO InternalSetState
 void InternalJob::InternalSetState(int i)
 {
   flags = (flags & ~M_STATE) | i;
 }
 
 
 bool InternalJob::IsAboutToRunCanceled() const
 {
   return (flags & M_ABOUT_TO_RUN_CANCELED) != 0;
 }
 
 
 bool InternalJob::IsRunCanceled() const
 {
   return (flags & M_RUN_CANCELED) != 0;
 }
 
 bool InternalJob::IsConflicting(InternalJob::Pointer otherJob) const
 {
   ISchedulingRule::Pointer otherRule = otherJob->GetRule();
   if (sptr_schedulingRule.GetPointer() == 0 || otherRule.GetPointer() == 0)
     return false;
   // TODO MultiRule: extend the IsConflicting (...) method with MultiRule
   // if one of the rules is a compound rule, it must be asked the question.
   //if (schedulingRule.GetClass() == MultiRule.class)
   //  return schedulingRule.IsConflicting(otherRule);
   return otherRule->IsConflicting(sptr_schedulingRule);
 }
 
 
 InternalJob::Pointer InternalJob::Next() const
 {
   return next;
 }
 
 
 InternalJob::Pointer InternalJob::Previous() const
 {
   return InternalJob::Pointer(previous);
 }
 
 
 InternalJob::Pointer InternalJob::Remove()
 {
   if (next != 0)
     next->SetPrevious(InternalJob::Pointer(previous));
   if (previous != 0)
     previous->SetNext(next);
   next = previous = 0;
   return InternalJob::Pointer(this);
 }
 
 
 void InternalJob::SetAboutToRunCanceled(bool value) throw (JobRuntimeException)
 {
   flags = value ? flags | M_ABOUT_TO_RUN_CANCELED : flags
       & ~M_ABOUT_TO_RUN_CANCELED;
 }
 
 void InternalJob::SetRunCanceled(bool value)
 {
   flags = value ? flags | M_RUN_CANCELED : flags & ~M_RUN_CANCELED;
 }
 
 
 void InternalJob::SetNext(InternalJob::Pointer entry)
 {
   this->next = entry;
 }
 
 
 void InternalJob::SetPrevious(InternalJob::Pointer entry)
 {
   this->previous = entry.GetPointer();
 }
 
 
 void InternalJob::SetProgressMonitor(IProgressMonitor::Pointer monitor)
 {
   sptr_monitor = monitor;
 }
 
 
 void InternalJob::SetResult(IStatus::Pointer result)
 {
   m_result = result;
 }
 
 
 
 void InternalJob::SetStartTime(Poco::Timestamp::TimeDiff time)
 {
   m_startTime = m_startTime + time;
 }
 
 void InternalJob::SetStartTime(const Poco::Timestamp& newtime)
 {
   m_startTime = newtime;
 }
 
-std::string InternalJob::ToString()
+QString InternalJob::ToString() const
 {
-  std::stringstream ss;
-  ss << GetName() << "(" << jobNumber << ")";
-  return ss.str();
+  return GetName() + "(" + QString::number(jobNumber) + ")";
 }
 
 void InternalJob::SetWaitQueueStamp(Poco::Timestamp waitQueueStamp)
 {
   this->waitQueueStamp = waitQueueStamp;
 }
 
 Poco::Timestamp InternalJob::GetWaitQueueStamp()
 {
   return waitQueueStamp;
 }
 
 int InternalJob::nextJobNumber = 0;
 
-void InternalJob::AddJobChangeListener(IJobChangeListener::Pointer listener)
+void InternalJob::AddJobChangeListener(IJobChangeListener* listener)
 {
   jobEvents.AddListener(listener);
 }
 
 bool InternalJob::BelongsTo(Object::Pointer  /*family*/)
 {
   return false;
 }
 
 bool InternalJob::Cancel()
 {
   return ptr_manager->Cancel(InternalJob::Pointer(this));
 }
 
 void InternalJob::Canceling()
 {
   //default implementation does nothing
 }
 
 void InternalJob::Done(IStatus::Pointer endResult)
 {
  ptr_manager->EndJob(InternalJob::Pointer(this),endResult, true);
 }
 
-std::string InternalJob::GetName() const
+QString InternalJob::GetName() const
 {
   return name;
 }
 
 int InternalJob::GetPriority() const
 {
   return priority;
 }
 
 
 //TODO QualifiedName GetProperty
 //Object::Pointer
 //InternalJob
 //::GetProperty(QualifiedName key) {
 //    // thread safety: (Concurrency001 - copy on write)
 //  std::map<QualifiedName, Object::Pointer> temp (properties);
 //  if (temp.empty()) return Object::Pointer(0);
 //    else return temp[key];
 //  }
 
 
 IStatus::Pointer InternalJob::GetResult() const
 {
   return m_result;
 }
 
 ISchedulingRule::Pointer InternalJob::GetRule() const
 {
   return sptr_schedulingRule;
 }
 
 int InternalJob::GetState() const
 {
   int state = flags & M_STATE;
   switch (state)
   {
   //blocked state is equivalent to waiting state for clients
   case BLOCKED:
     return Job::WAITING;
   case ABOUT_TO_RUN:
     return Job::RUNNING;
   case ABOUT_TO_SCHEDULE:
     return Job::WAITING;
   default:
     return state;
   }
 }
 
 Poco::Thread*
 InternalJob::GetThread() const
 {
   return ptr_thread;
 }
 
 bool InternalJob::IsSystem() const
 {
   return (flags & M_SYSTEM) != 0;
 }
 
 bool InternalJob::IsBlocking()
 {
   return ptr_manager->IsBlocking(InternalJob::Pointer(this));
 }
 
 bool InternalJob::IsUser() const
 {
   return (flags & M_USER) != 0;
 }
 
 
 //void
 //InternalJob
 //::Join() throws InterruptedException {
 //    manager.join(this);
 //  }
 
-void InternalJob::RemoveJobChangeListener(IJobChangeListener::Pointer listener)
+void InternalJob::RemoveJobChangeListener(IJobChangeListener* listener)
 {
   jobEvents.RemoveListener(listener);
 }
 
 void InternalJob::Schedule(Poco::Timestamp::TimeDiff delay)
 {
   if (ShouldSchedule())
     ptr_manager->Schedule(InternalJob::Pointer(this), delay, false);
 }
 
-void InternalJob::SetName(const std::string& name)
+void InternalJob::SetName(const QString& name)
 {
-  assert(!name.empty());
+  Q_ASSERT(!name.isEmpty());
   this->name = name;
 }
 
 void InternalJob::SetPriority(int newPriority)
 {
   switch (newPriority)
   {
   case Job::INTERACTIVE:
   case Job::SHORT:
   case Job::LONG:
   case Job::BUILD:
   case Job::DECORATE:
     ptr_manager->SetPriority(InternalJob::Pointer(this), newPriority);
     break;
   default:
     throw IllegalArgumentException(newPriority);
   }
 }
 
 void InternalJob::SetProgressGroup(IProgressMonitor::Pointer group, int ticks)
 {
   assert(group.GetPointer() != 0);
   InternalJob::Pointer sptr_temp(this);
   IProgressMonitor::Pointer sptr_pm = ptr_manager->CreateMonitor(sptr_temp,
       group, ticks);
   if (sptr_pm != 0)
     SetProgressMonitor(sptr_pm);
 }
 
 
 //TODO QualifiedName SetProperty
 //void
 //InternalJob
 //::SetProperty(QualifiedName key, Object value) {
 //    // thread safety: (Concurrency001 - copy on write)
 //    if (value == NULL) {
 //      if (properties == NULL)
 //        return;
 //      ObjectMap temp = (ObjectMap) properties.Clone();
 //      temp.Remove(key);
 //      if (temp.isEmpty())
 //        properties = NULL;
 //      else
 //        properties = temp;
 //    } else {
 //      ObjectMap temp = properties;
 //      if (temp == NULL)
 //        temp = new ObjectMap(5);
 //      else
 //        temp = (ObjectMap) properties.Clone();
 //      temp.Put(key, value);
 //      properties = temp;
 //    }
 //  }
 
 void InternalJob::SetRule(ISchedulingRule::Pointer rule)
 {
   ptr_manager->SetRule(InternalJob::Pointer(this), rule);
 }
 
 void InternalJob::SetSystem(bool value)
 {
   //TODO Error Exception Problem IllegalStateException
   //if (GetState() != Job.NONE)
   //throw  IllegalStateException();
   flags = value ? flags | M_SYSTEM : flags & ~M_SYSTEM;
 }
 
 void InternalJob::SetThread(Poco::Thread* thread)
 {
   ptr_thread = thread;
 }
 
 void InternalJob::SetUser(bool value)
 {
   //TODO Error Exception Problem IllegalStateException
   if (GetState() != Job::NONE)
     throw IllegalStateException();
   flags = value ? flags | M_USER : flags & ~M_USER;
 }
 
 bool InternalJob::ShouldSchedule()
 {
   return true;
 }
 
 bool InternalJob::Sleep()
 {
   return ptr_manager->Sleep(InternalJob::Pointer(this));
 }
 
 void InternalJob::WakeUp(long delay)
 {
   ptr_manager->WakeUp(InternalJob::Pointer(this), delay);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryInternalJob.h b/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryInternalJob.h
index cf3a250fc0..d86893ad91 100644
--- a/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryInternalJob.h
+++ b/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryInternalJob.h
@@ -1,467 +1,467 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRY_INTERNALJOB_H
 #define BERRY_INTERNALJOB_H
 
 #include <Poco/Thread.h>
 #include <Poco/Thread.h>
 #include <Poco/Timestamp.h>
 
 #include <org_blueberry_core_jobs_Export.h>
 
 #include "berryJobExceptions.h"
 #include "berryISchedulingRule.h"
 #include "berryIProgressMonitor.h"
 #include "berryIJobChangeListener.h"
 
 #include <berryIStatus.h>
 #include <berryStatus.h>
 #include <berryQualifiedName.h>
 
 #include <string>
 #include <map>
 #include <limits>
 
 namespace berry
 {
 
 struct JobManager;
 
 /**
  * Internal implementation class for jobs. Clients must not implement this class
  * directly.  All jobs must be subclasses of the API <code>org.blueberry_core_jobs.Job</code> class.
  */
 // struct BERRY_JOBS InternalJob: public Object, public Comparable
 
 struct BERRY_JOBS InternalJob : public Object
 {
 
   friend struct JobQueue;
   friend struct JobManager;
 
 
   berryObjectMacro(InternalJob);
 
   bool operator==(const Object* otherJob) const;
 
   /**
    * Adds an entry at the end of the list of which this item is the head.
    */
   void AddLast(InternalJob::Pointer entry);
 
   /*
    * Returns the job listeners that are only listening to this job.
    */
   const IJobChangeListener::Events& GetListeners() const;
 
   /**
    * Returns the job's progress monitor, or null if it is not running.
    */
   IProgressMonitor::Pointer GetProgressMonitor() const;
 
   /**
    * Returns the time that this job should be started, awakened, or
    * rescheduled, depending on the current state.
    * @return time in milliseconds
    */
   Poco::Timestamp GetStartTime() const;
 
   /**
    * Returns the raw job state, including internal states no exposed as API.
    */
   int InternalGetState() const;
 
   /*
    * @see Job#GetState()
    */
   int GetState() const;
 
   /**
    * @see Job#GetName()
    */
-  std::string GetName() const;
+  QString GetName() const;
 
   /*
    * @see Job#setRule(ISchedulingRule::Pointer)
    */
   void InternalSetRule(ISchedulingRule::Pointer rule);
 
   /**
    * Must be called from JobManager#setPriority
    */
   void InternalSetPriority(int newPriority);
 
   /**
    * Must be called from JobManager#ChangeState
    */
   void InternalSetState(int i);
 
   /**
    * Returns whether this job was canceled when it was about to run
    */
   bool IsAboutToRunCanceled() const;
 
   /**
    * Returns whether this job was canceled when it was running.
    */
   bool IsRunCanceled() const ;
 
   /**
    * Returns true if this job conflicts with the given job, and false otherwise.
    */
   bool IsConflicting(InternalJob::Pointer otherJob) const;
 
   /**
    * Returns the next entry (ahead of this one) in the list, or null if there is no next entry
    */
   InternalJob::Pointer Next() const;
 
   /**
    * Returns the previous entry (behind this one) in the list, or null if there is no previous entry
    */
   InternalJob::Pointer Previous() const;
 
   /**
    * Removes this entry from any list it belongs to.  Returns the receiver.
    */
   InternalJob::Pointer Remove();
 
   /*
    * @see Job#run(IProgressMonitor)
    */
   virtual IStatus::Pointer Run(IProgressMonitor::Pointer myProgressMonitor) = 0 ;
 
   /**
    * Sets whether this job was canceled when it was about to run
    */
   void SetAboutToRunCanceled(bool value) throw (JobRuntimeException);
 
   /**
    * Sets the next entry in this linked list of jobs.
    * @param entry
    */
 
   /**
    * Sets whether this job was canceled when it was running
    */
   void SetRunCanceled(bool value) ;
 
   void SetNext(InternalJob::Pointer entry);
 
   /**
    * Sets the previous entry in this linked list of jobs.
    * @param entry
    */
   void SetPrevious(InternalJob::Pointer entry);
 
   /**
    * Sets the progress monitor to use for the next execution of this job,
    * or for clearing the monitor when a job completes.
    * @param monitor a progress monitor
    */
   void SetProgressMonitor(IProgressMonitor::Pointer monitor);
 
   /**
    * Sets or clears the result of an execution of this job.
    * @param result a result status, or <code>null</code>
    */
   void SetResult(IStatus::Pointer result)  ;
 
   /**
    * Sets a time to start, wake up, or schedule this job,
    * depending on the current state
    * @param time a time in milliseconds
    */
   void SetStartTime(Poco::Timestamp::TimeDiff time);
 
   void SetStartTime(const Poco::Timestamp& newtime);
 
   /*
    * @see Job.SetThread
    */
   void SetThread(Poco::Thread* thread);
 
   /*
    * @see Job.GetThread
    */
   Poco::Thread* GetThread() const;
 
   /*
    * Prints a string-based representation of this job instance.
    * For debugging purposes only.
    */
-  std::string ToString();
+  QString ToString() const;
 
   /**
    * @param waitQueueStamp The waitQueueStamp to set.
    */
   void SetWaitQueueStamp(Poco::Timestamp waitQueueStamp);
 
   /**
    * @return Returns the waitQueueStamp.
    */
   Poco::Timestamp GetWaitQueueStamp();
 
 protected:
 
-  InternalJob(std::string name);
+  InternalJob(const QString& name);
 
   /*
-   * @see Job#AddJobListener(IJobChangeListener::Pointer)
+   * @see Job#AddJobListener(IJobChangeListener*)
    */
-  void AddJobChangeListener(IJobChangeListener::Pointer listener);
+  void AddJobChangeListener(IJobChangeListener* listener);
 
   /*
    * @see Job#BelongsTo(Object)
    */
   virtual bool BelongsTo(Object::Pointer family);
 
   /*
    * @see Job#Cancel()
    */
   bool Cancel();
 
   /*
    * @see Job#Canceling()
    */
   virtual void Canceling();
 
   /*
    *
    * @see Job#Done(IStatus:.Pointer)
    */
   void Done(IStatus::Pointer endResult);
 
 
   /*
    * @see Job#GetPriority()
    */
   int GetPriority() const;
 
   /*
    * @see Job#GetProperty
    */
   /// Object GetProperty(QualifiedName key) ;
 
   /*
    * @see Job#GetResult
    */
   IStatus::Pointer GetResult() const ;
 
   /*
    * @see Job#GetRule
    */
   ISchedulingRule::Pointer GetRule() const;
 
   /*
    * @see Job.IsSystem()
    */
   bool IsSystem() const;
 
   /*
    * @see Job.IsUser()
    */
   bool IsUser() const;
   /*
    * @see Job#Join()
    */
   /// void Join() throws InterruptedException ;
 
   /*
    * @see Job#RemoveJobListener(IJobChangeListener)
    */
-  void RemoveJobChangeListener(IJobChangeListener::Pointer listener);
+  void RemoveJobChangeListener(IJobChangeListener* listener);
 
   /*
    * @see Job#Schedule(long)
    */
   void Schedule(Poco::Timestamp::TimeDiff delay);
 
   /*
    * @see Job#SetName(std::string)
    */
-  void SetName(const std::string& name);
+  void SetName(const QString& name);
 
   /*
    * @see Job#SetPriority(int)
    */
   void SetPriority(int newPriority);
 
   /*
    * @see Job#SetProgressGroup(IProgressMonitor::Pointer, int ticks)
    */
   void SetProgressGroup(IProgressMonitor::Pointer group, int ticks);
 
   /*
    * @see Job#SetProperty(QualifiedName,Object)
    */
   /// void SetProperty(QualifiedName key, Object value) ;
 
   /* internalSetRule
    * @see Job#SetRule(ISchedulingRule::Pointer)
    */
   void SetRule(ISchedulingRule::Pointer rule);
 
   /*
    * @see Job.SetSystem
    */
   void SetSystem(bool value);
 
   /*
    * @see Job.SetUser
    */
   void SetUser(bool value);
 
   /*
    * @see Job#ShouldSchedule
    */
   virtual bool ShouldSchedule();
 
   /*
    * @see Job#Sleep()
    */
   bool Sleep();
 
   /*
    * @see Job#WakeUp(long)
    */
   void WakeUp(long delay);
 
 public:
 
   /**
    * Flag on a job indicating that it was canceled when running. This flag
    * is used to ensure that #canceling is only ever called once on a job in
    * case of recursive cancellation attempts.
    */
   static const int M_RUN_CANCELED = 0x0800;
 
   /**
    * Job state code (value 16) indicating that a job has been removed from
    * the wait queue and is about to start running. From an API point of view,
    * this is the same as RUNNING.
    */
   static const int ABOUT_TO_RUN = 0x10;
 
   /**
    * Job state code (value 32) indicating that a job has passed scheduling
    * precondition checks and is about to be added to the wait queue. From an API point of view,
    * this is the same as WAITING.
    */
   static const int ABOUT_TO_SCHEDULE = 0x20;
 
   /**
    * Job state code (value 8) indicating that a job is blocked by another currently
    * running job.  From an API point of view, this is the same as WAITING.
    */
   static const int BLOCKED = 0x08;
 
   /**
    * Start time constant indicating a job should be started at
    * a time in the infinite future, causing it to sleep forever.
    */
   static const Poco::Timestamp::TimeDiff T_INFINITE;
 
   /**
    * Start time constant indicating that the job has no start time.
    */
   static const Poco::Timestamp::TimeDiff T_NONE;
 
 private:
 
   //flag mask bits
   static const int M_STATE = 0xFF;
   static const int M_SYSTEM = 0x0100;
   static const int M_USER = 0x0200;
 
   /**
    * flag on a job indicating that it was about to run, but has been canceled
    */
   static const int M_ABOUT_TO_RUN_CANCELED = 0x0400;
 
 
   static int nextJobNumber;
 
   int jobNumber;
 
   volatile int flags;
   /// ListenerList listeners ;
 
-  std::string name;
+  QString name;
 
   /**
    * The job ahead of me in a queue or list.
    */
 
   InternalJob::Pointer next;
 
   /**
    * The job behind me in a queue or list.
    */
   InternalJob* previous;
   int priority;
   /**
    * Arbitrary properties (key,value) pairs, attached
    * to a job instance by a third party.
    */
   //std::map<QualifiedName, Object::Pointer>  properties ;
 
   IStatus::Pointer m_result;
 
   // Pointer to the ISchedulingRule belonging to the particular job
   ISchedulingRule::Pointer sptr_schedulingRule;
 
   IProgressMonitor::Pointer sptr_monitor;
 
   /**
    * If the job is waiting, this represents the time the job should start by.
    * If this job is sleeping, this represents the time the job should wake up.
    * If this job is running, this represents the delay automatic rescheduling,
    * or -1 if the job should not be rescheduled.
    */
   Poco::Timestamp m_startTime;
 
   /**
    * Stamp added when a job is added to the wait queue. Used to ensure
    * jobs in the wait queue maintain their insertion order even if they are
    * removed from the wait queue temporarily while blocked
    */
   Poco::Timestamp waitQueueStamp;
 
   /*
    * The that is currently running this job
    */
   Poco::Thread* ptr_thread;
 
   InternalJob(const Self&);
 
 protected:
 
   static JobManager* const ptr_manager;
 
   IJobChangeListener::Events jobEvents;
 
   /*
    * @see Job#isBlocking()
    */
   bool IsBlocking();
 
 };
 
 }
 
 #endif /* BERRY_INTERNALJOB_H */
diff --git a/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryJobListeners.cpp b/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryJobListeners.cpp
index 1370da582c..a80f9e9311 100644
--- a/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryJobListeners.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryJobListeners.cpp
@@ -1,159 +1,164 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryJobListeners.h"
 #include "berryJobManager.h"
 
 #include "berryJob.h"
+#include "berryOperationCanceledException.h"
+#include "berryLog.h"
 
-#include <berrySolsticeExceptions.h>
 #include <typeinfo>
 
 namespace berry
 {
 
 struct AboutToRunDoit: public JobListeners::IListenerDoit
 {
   void Notify(const IJobChangeListener::Events& events,
-      const IJobChangeEvent::ConstPointer event) const
+      const IJobChangeEvent::ConstPointer& event) const
   {
     events.jobAboutToRun(event);
   }
 };
 
 struct AwakeDoit: public JobListeners::IListenerDoit
 {
   void Notify(const IJobChangeListener::Events& events,
-      const IJobChangeEvent::ConstPointer event) const
+      const IJobChangeEvent::ConstPointer& event) const
   {
     events.jobAwake(event);
   }
 };
 
 struct DoneDoit: public JobListeners::IListenerDoit
 {
   void Notify(const IJobChangeListener::Events& events,
-      const IJobChangeEvent::ConstPointer event) const
+      const IJobChangeEvent::ConstPointer& event) const
   {
     events.jobDone(event);
   }
 };
 
 struct RunningDoit: public JobListeners::IListenerDoit
 {
   void Notify(const IJobChangeListener::Events& events,
-      const IJobChangeEvent::ConstPointer event) const
+      const IJobChangeEvent::ConstPointer& event) const
   {
     events.jobRunning(event);
   }
 };
 
 struct ScheduledDoit: public JobListeners::IListenerDoit
 {
   void Notify(const IJobChangeListener::Events& events,
-      const IJobChangeEvent::ConstPointer event) const
+      const IJobChangeEvent::ConstPointer& event) const
   {
     events.jobScheduled(event);
   }
 };
 
 struct SleepingDoit: public JobListeners::IListenerDoit
 {
   void Notify(const IJobChangeListener::Events& events,
-      const IJobChangeEvent::ConstPointer event) const
+      const IJobChangeEvent::ConstPointer& event) const
   {
     events.jobSleeping(event);
   }
 };
 
-JobListeners::JobListeners() :
-  aboutToRun(new AboutToRunDoit()), awake(new AwakeDoit()),
-      done(new DoneDoit()), running(new RunningDoit()), scheduled(
-          new ScheduledDoit()), sleeping(new SleepingDoit())
+JobListeners::JobListeners()
+  : aboutToRun(new AboutToRunDoit())
+  , awake(new AwakeDoit())
+  , done(new DoneDoit())
+  , running(new RunningDoit())
+  , scheduled(new ScheduledDoit())
+  , sleeping(new SleepingDoit())
 {
 
 }
 
 JobListeners::~JobListeners()
 {
   delete aboutToRun;
   delete awake;
   delete done;
   delete running;
   delete scheduled;
   delete sleeping;
 }
 
 JobChangeEvent::Pointer JobListeners::NewEvent(Job::Pointer job)
 {
   JobChangeEvent::Pointer instance(new JobChangeEvent());
   instance->job = job;
   return instance;
 }
 
 JobChangeEvent::Pointer JobListeners::NewEvent(Job::Pointer job, IStatus::Pointer result)
 {
   JobChangeEvent::Pointer instance(new JobChangeEvent());
   instance->job = job;
   instance->result = result;
   return instance;
 }
 
 JobChangeEvent::Pointer JobListeners::NewEvent(Job::Pointer job, Poco::Timestamp::TimeDiff delay)
 {
   JobChangeEvent::Pointer instance(new JobChangeEvent());
   instance->job = job;
   instance->delay = delay;
   return instance;
 }
 
 void JobListeners::DoNotify(const IListenerDoit* doit,
-    const IJobChangeEvent::ConstPointer event)
+    const IJobChangeEvent::ConstPointer& event)
 {
   //notify all global listeners
   doit->Notify(global, event);
 
   //notify all local listeners
   const IJobChangeListener::Events& events =
       event->GetJob().Cast<InternalJob> ()->GetListeners();
   doit->Notify(events, event);
 }
 
 void JobListeners::HandleException(const std::exception& e)
 {
   //this code is roughly copied from InternalPlatform.run(ISafeRunnable),
   //but in-lined here for performance reasons
   try
   {
     dynamic_cast<const OperationCanceledException&> (e);
     return;
-  } catch (const std::bad_cast&)
+  }
+  catch (const std::bad_cast&)
   {
     // TODO get bundle id (find a C++ way)
     //std::string pluginId = JobOSGiUtils.getDefault().getBundleId(listener);
-    std::string pluginId;
-    if (pluginId.empty())
+    QString pluginId;
+    if (pluginId.isEmpty())
       pluginId = JobManager::PI_JOBS();
-    std::string message = "Problems occurred when invoking code from plug-in: "
+    QString message = "Problems occurred when invoking code from plug-in: "
         + pluginId;
-    std::cerr << message << std::endl;
+    BERRY_ERROR << message;
     // TODO Logging
     //  RuntimeLog.log(new Status(IStatus.ERROR, pluginId, JobManager.PLUGIN_ERROR,
     //      message, e));
   }
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryJobListeners.h b/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryJobListeners.h
index f37832e7f5..948a725f8b 100644
--- a/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryJobListeners.h
+++ b/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryJobListeners.h
@@ -1,133 +1,133 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYJOBLISTENERS_H_
 #define BERRYJOBLISTENERS_H_
 
 #include "berryJobChangeEvent.h"
 #include "berryIJobChangeListener.h"
 
 namespace berry
 {
 
 /**
  * Responsible for notifying all job listeners about job lifecycle events.  Uses a
  * specialized iterator to ensure the complex iteration logic is contained in one place.
  */
 class JobListeners
 {
 
 public:
 
   struct IListenerDoit
   {
     virtual void Notify(const IJobChangeListener::Events& listener,
-        const IJobChangeEvent::ConstPointer event) const = 0;
+        const IJobChangeEvent::ConstPointer& event) const = 0;
 
     virtual ~IListenerDoit() {}
   };
 
 private:
 
   friend struct JobManager;
 
   const IListenerDoit* aboutToRun;
   const IListenerDoit* awake;
   const IListenerDoit* done;
   const IListenerDoit* running;
   const IListenerDoit* scheduled;
   const IListenerDoit* sleeping;
 
   /**
    * The global job listeners.
    */
   IJobChangeListener::Events global;
 
   /**
    * TODO Could use an instance pool to re-use old event objects
    */
   static JobChangeEvent::Pointer NewEvent(SmartPointer<Job> job);
 
   static JobChangeEvent::Pointer NewEvent(SmartPointer<Job> job,
       IStatus::Pointer result);
 
   static JobChangeEvent::Pointer NewEvent(SmartPointer<Job> job, Poco::Timestamp::TimeDiff delay);
 
 
   /**
    * Process the given doit for all global listeners and all local listeners
    * on the given job.
    */
   void DoNotify(const IListenerDoit* doit,
-      const IJobChangeEvent::ConstPointer event);
+                const IJobChangeEvent::ConstPointer& event);
 
 
 public:
 
   JobListeners();
   ~JobListeners();
 
   void HandleException(const std::exception& e);
 
-  void Add(IJobChangeListener::Pointer listener)
+  void Add(IJobChangeListener* listener)
   {
     global.AddListener(listener);
   }
 
-  void Remove(IJobChangeListener::Pointer listener)
+  void Remove(IJobChangeListener* listener)
   {
     global.RemoveListener(listener);
   }
 
   void AboutToRun(SmartPointer<Job> job)
   {
     DoNotify(aboutToRun, NewEvent(job));
   }
 
   void Awake(SmartPointer<Job> job)
   {
     DoNotify(awake, NewEvent(job));
   }
 
   void Done(SmartPointer<Job> job, IStatus::Pointer result, bool reschedule)
   {
     JobChangeEvent::Pointer event = NewEvent(job, result);
     event->reschedule = reschedule;
     DoNotify(done, event);
   }
 
   void Running(SmartPointer<Job> job)
   {
     DoNotify(running, NewEvent(job));
   }
 
   void Scheduled(SmartPointer<Job> job, Poco::Timestamp::TimeDiff delay, bool reschedule)
   {
     JobChangeEvent::Pointer event = NewEvent(job, delay);
     event->reschedule = reschedule;
     DoNotify(scheduled, event);
   }
 
   void Sleeping(SmartPointer<Job> job)
   {
     DoNotify(sleeping, NewEvent(job));
   }
 
 };
 
 }
 
 #endif /* BERRYJOBLISTENERS_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryJobManager.cpp b/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryJobManager.cpp
index cec6c6ce97..cdac6f9d98 100644
--- a/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryJobManager.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryJobManager.cpp
@@ -1,1200 +1,1205 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #define NOMINMAX
 #include "berryJobManager.h"
 
 #include "berryIProgressMonitor.h"
 #include "berryNullProgressMonitor.h"
 #include "berryIStatus.h"
 #include "berryJobStatus.h"
 
 #include <iostream>
 #include <algorithm>
 
 namespace berry
 {
 
 /**
  *  test class implementing ISchedulingRule to validate client defined rules
  */
 struct NullRule: public ISchedulingRule
 {
   bool Contains(ISchedulingRule::Pointer myRule) const;
   bool IsConflicting(ISchedulingRule::Pointer myRule) const;
 };
 
 bool NullRule::IsConflicting(ISchedulingRule::Pointer dummyRule) const
 {
   return dummyRule == this;
 }
 
 bool NullRule::Contains(ISchedulingRule::Pointer dummyRule) const
 {
   return dummyRule == this;
 }
 
 
 JobManager::JobManager() :
   sptr_testRule(new NullRule()),m_active(true), m_Pool(new WorkerPool(this)), m_sptr_progressProvider(0),
       m_JobQueueSleeping(true), m_JobQueueWaiting(false),m_suspended(false), m_waitQueueCounter(0)
 
 {
   m_JobListeners.global.SetExceptionHandler(MessageExceptionHandler<
       JobListeners> (&m_JobListeners, &JobListeners::HandleException));
 }
 
 // DEBUG VARIABLES
 
 
-const std::string& JobManager::PI_JOBS()
+const QString& JobManager::PI_JOBS()
 {
-  static std::string id("org.blueberry.core.jobs");
+  static const QString id("org.blueberry.core.jobs");
   return id;
 }
 
 bool JobManager::DEBUG = false;
 
 bool JobManager::DEBUG_BEGIN_END = false;
 
 bool JobManager::DEBUG_DEADLOCK = false;
 
 bool JobManager::DEBUG_LOCKS = false;
 
 bool JobManager::DEBUG_TIMING = false;
 
 bool JobManager::DEBUG_SHUTDOWN = false;
 
 const int JobManager::PLUGIN_ERROR = 2;
 
 JobManager*
 JobManager::GetInstance()
 {
   // we don't need to lock the creation of "instance" because GetInstance() is
   // called when statically initializing InternalJob::ptr_manager (which happens
   // in single-threaded mode)
   static JobManager instance;
   return &instance;
 }
 
 std::string JobManager::PrintState(int state)
 {
   switch (state)
   {
   case Job::NONE:
     return "NONE";
   case Job::WAITING:
     return "WAITING";
   case Job::SLEEPING:
     return "SLEEPING";
   case Job::RUNNING:
     return "RUNNING";
   case InternalJob::BLOCKED:
     return "BLOCKED";
   case InternalJob::ABOUT_TO_RUN:
     return "ABOUT_TO_RUN";
   case InternalJob::ABOUT_TO_SCHEDULE:
     return "ABOUT_TO_SCHEDULE";
   }
   return "UNKNOWN";
 }
 
 void JobManager::Shutdown()
 {
   JobManager* ptr_instance(GetInstance());
   if (ptr_instance != 0)
   {
     ptr_instance->DoShutdown();
     // ptr_instance = 0; // need to call the destructor of the static object  ..
   }
 }
 
 //void
 //JobManager
 //::Cancel(Object family) {
 //    //don't synchronize because cancel calls listeners
 //    for (Iterator it = select(family).iterator(); it.hasNext();)
 //      cancel((Job) it.next());
 //  }
 
 
 IProgressMonitor::Pointer JobManager::CreateProgressGroup()
 {
   if (m_sptr_progressProvider != 0)
     return (m_sptr_progressProvider->CreateProgressGroup());
   NullProgressMonitor::Pointer sptr_defaultProgressMonitor(
       new NullProgressMonitor);
   return sptr_defaultProgressMonitor;
 }
 
 Job*
 JobManager::CurrentJob()
 {
   //Poco::Thread* ptr_current = Poco::Thread::current();
   //if (Worker* worker = dynamic_cast<Worker*>(ptr_current) )
   //  return ((Worker) ptr_current).currentJob();
   // {
   //    Poco::ScopedLock<Poco::Mutex> lockMe (m_mutex);
   //    Poco::HashSet<InternalJob::Pointer, Object::Hash>::Iterator it ;
   //    for (it = m_running.begin(); it != m_running.end(); it ++) {
   //    Job job* = dynamic_cast<Job*> (it);
   //    if (job->GetThread() == ptr_current)
   //      return job;
   //  }
   //}
   return 0;
 }
 
 //void
 //JobManager
 //::EndRule(ISchedulingRule rule) {
 //implicitJobs.end(rule, false);
 //  }
 
 
 //Job[]
 //JobManager
 //::Find(Object family) {
 //    List members = select(family);
 //    return (Job[]) members.toArray(new Job[members.size()]);
 //  }
 //
 //    LockManager GetLockManager() {
 //    return lockManager;
 //  }
 //
 
 bool JobManager::IsIdle()
 {
   {
     Poco::ScopedLock<Poco::Mutex> m_managerLock(m_mutex);
     return m_running.empty() && m_JobQueueWaiting.IsEmpty();
   }
 }
 
 bool JobManager::IsSuspended()
 {
   {
     Poco::ScopedLock<Poco::Mutex> m_managerLock(m_mutex);
     m_suspended = true;
   }
   return m_suspended;
 
 }
 //
 //    /*
 //   * @see IJobManager#join(String, IProgressMonitor)
 //   */
 //void
 //JobManager
 //::Join(final Object family, IProgressMonitor monitor) throws InterruptedException, OperationCanceledException {
 //    monitor = monitorFor(monitor);
 //    IJobChangeListener listener = null;
 //    final Set jobs;
 //    int jobCount;
 //    Job blocking = null;
 //    synchronized (lock) {
 //      //don't join a waiting or sleeping job when suspended (deadlock risk)
 //      int states = suspended ? Job.RUNNING : Job.RUNNING | Job.WAITING | Job.SLEEPING;
 //      jobs = Collections.synchronizedSet(new HashSet(select(family, states)));
 //      jobCount = jobs.size();
 //      if (jobCount > 0) {
 //        //if there is only one blocking job, use it in the blockage callback below
 //        if (jobCount == 1)
 //          blocking = (Job) jobs.iterator().next();
 //        listener = new JobChangeAdapter() {
 //          public void done(IJobChangeEvent event) {
 //            //don't remove from list if job is being rescheduled
 //            if (!((JobChangeEvent) event).reschedule)
 //              jobs.remove(event.getJob());
 //          }
 //
 //          //update the list of jobs if new ones are added during the join
 //          public void scheduled(IJobChangeEvent event) {
 //            //don't add to list if job is being rescheduled
 //            if (((JobChangeEvent) event).reschedule)
 //              return;
 //            Job job = event.getJob();
 //            if (job.belongsTo(family))
 //              jobs.add(job);
 //          }
 //        };
 //        addJobChangeListener(listener);
 //      }
 //    }
 //    if (jobCount == 0) {
 //      //use up the monitor outside synchronized block because monitors call untrusted code
 //      monitor.beginTask(JobMessages.jobs_blocked0, 1);
 //      monitor.done();
 //      return;
 //    }
 //    //spin until all jobs are completed
 //    try {
 //      monitor.beginTask(JobMessages.jobs_blocked0, jobCount);
 //      monitor.subTask(NLS.bind(JobMessages.jobs_waitFamSub, Integer.toString(jobCount)));
 //      reportBlocked(monitor, blocking);
 //      int jobsLeft;
 //      int reportedWorkDone = 0;
 //      while ((jobsLeft = jobs.size()) > 0) {
 //        //don't let there be negative work done if new jobs have
 //        //been added since the join began
 //        int actualWorkDone = Math.max(0, jobCount - jobsLeft);
 //        if (reportedWorkDone < actualWorkDone) {
 //          monitor.worked(actualWorkDone - reportedWorkDone);
 //          reportedWorkDone = actualWorkDone;
 //          monitor.subTask(NLS.bind(JobMessages.jobs_waitFamSub, Integer.toString(jobsLeft)));
 //        }
 //        if (Thread.interrupted())
 //          throw new InterruptedException();
 //        if (monitor.isCanceled())
 //          throw new OperationCanceledException();
 //        //notify hook to service pending syncExecs before falling asleep
 //        lockManager.aboutToWait(null);
 //        Thread.sleep(100);
 //      }
 //    } finally {
 //      lockManager.aboutToRelease();
 //      removeJobChangeListener(listener);
 //      reportUnblocked(monitor);
 //      monitor.done();
 //    }
 //  }
 
 //JobManager
 //::NewLock() {
 //    return lockManager.newLock();
 //  }
 
-void JobManager::RemoveJobChangeListener(IJobChangeListener::Pointer listener)
+void JobManager::RemoveJobChangeListener(IJobChangeListener* listener)
 {
   m_JobListeners.Remove(listener);
 }
 
-void JobManager::ReportBlocked(IProgressMonitor::Pointer sptr_monitor, InternalJob::Pointer sptr_blockingJob) const {
-
+void JobManager::ReportBlocked(IProgressMonitor::Pointer sptr_monitor, InternalJob::Pointer sptr_blockingJob) const
+{
   if ( sptr_monitor.Cast<IProgressMonitorWithBlocking>() == 0 )
       return ;
 
   if (sptr_blockingJob == 0 || sptr_blockingJob->IsSystem())
-    {
-   Status::Pointer sptr_reason( new Status(IStatus::INFO_TYPE, JobManager::PI_JOBS(), 1, "the user operation is waiting for  background work to complete" ) );
-
-    }
+  {
+    Status::Pointer sptr_reason(
+          new Status(IStatus::INFO_TYPE, JobManager::PI_JOBS(), 1,
+                     "the user operation is waiting for  background work to complete",
+                     BERRY_STATUS_LOC));
+  }
   else
-    {
-   std::stringstream msg ;
-   msg << "the user operation is waiting for : " << sptr_blockingJob->GetName() << " to complete. " ;
-   JobStatus::Pointer sptr_reason(new JobStatus(IStatus::INFO_TYPE, sptr_blockingJob.Cast<Job>(), msg.str() ));
-    }
-    //  ((IProgressmonitorWithBlocking) sptr_monitor)->SetBlocked(sptr_reason);
+  {
+    QString msg = "the user operation is waiting for : " + sptr_blockingJob->GetName() +
+        " to complete. ";
+    JobStatus::Pointer sptr_reason(
+          new JobStatus(IStatus::INFO_TYPE, sptr_blockingJob.Cast<Job>(), msg,
+                        BERRY_STATUS_LOC));
   }
+  //  ((IProgressmonitorWithBlocking) sptr_monitor)->SetBlocked(sptr_reason);
+}
 
 
-void JobManager::ReportUnblocked(IProgressMonitor::Pointer sptr_monitor) const {
+void JobManager::ReportUnblocked(IProgressMonitor::Pointer sptr_monitor) const
+{
   if ( IProgressMonitorWithBlocking::Pointer sptr_monitorWithBlocking = sptr_monitor.Cast<IProgressMonitorWithBlocking>() )
-     sptr_monitorWithBlocking->ClearBlocked();
-  }
+    sptr_monitorWithBlocking->ClearBlocked();
+}
 
 
 void JobManager::Resume()
 {
   {
     Poco::ScopedLock<Poco::Mutex> lockMe(m_mutex);
     m_suspended = false;
     //poke the job pool
     m_Pool->JobQueued();
   }
 }
 
 //TODO implicit Jobs
 //void
 //JobManager
 //::Resume(ISchedulingRule rule)const {
 //    implicitJobs.resume(rule);
 //  }
 
 
 void JobManager::SetProgressProvider(ProgressProvider::Pointer provider)
 {
   m_sptr_progressProvider = provider;
 }
 
 void JobManager::SetRule(InternalJob::Pointer job,
     ISchedulingRule::Pointer sptr_rule)
 {
   Poco::ScopedLock<Poco::Mutex> m_managerLock(m_mutex);
   //cannot change the rule of a job that is already running ( GetRule is set to protected which should be
   // changed if this assert is needed
   // assert(job->GetState() == Job.NONE);
   ValidateRule(sptr_rule);
   job->InternalSetRule(sptr_rule);
 
 }
 
 //void
 //JobManager
 //::Sleep(Object family) {
 //    //don't synchronize because sleep calls listeners
 //    for (Iterator it = select(family).iterator(); it.hasNext();) {
 //      sleep((InternalJob) it.next());
 //    }
 //  }
 
 
 void JobManager::Suspend()
 {
   {
     Poco::ScopedLock<Poco::Mutex> lockMe(m_mutex);
     m_suspended = true;
   }
 }
 
 //void
 //JobManager
 //::Suspend(ISchedulingRule rule, IProgressMonitor monitor)const {
 //    Assert.isNotNull(rule);
 //    implicitJobs.suspend(rule, monitorFor(monitor));
 //  }
 
 //void
 //JobManager
 //::TransferRule(ISchedulingRule rule, Thread destinationThread) {
 //    implicitJobs.transfer(rule, destinationThread);
 //  }
 
 //void
 //JobManager
 //::SetLockListener(LockListener listener) {
 //    lockManager.setLockListener(listener);
 //  }
 
 //void
 //JobManager
 //::WakeUp(Object family) {
 //    //don't synchronize because wakeUp calls listeners
 //    for (Iterator it = select(family).iterator(); it.hasNext();) {
 //      wakeUp((InternalJob) it.next(), 0L);
 //    }
 //  }
 
-void JobManager::AddJobChangeListener(IJobChangeListener::Pointer listener)
+void JobManager::AddJobChangeListener(IJobChangeListener* listener)
 {
   m_JobListeners.Add(listener);
 }
 
 //void
 //JobManager
 //::BeginRule(ISchedulingRule rule, IProgressMonitor monitor) {
 //    validateRule(rule);
 //    implicitJobs.begin(rule, monitorFor(monitor), false);
 //  }
 //
 //  /**
 //   * For debugging purposes only
 //   */
 //std::String
 //JobManager
 //::PrintJobName(Job job) {
 //    if (job instanceof ThreadJob) {
 //      Job realJob = ((ThreadJob) job).realJob;
 //      if (realJob != null)
 //        return realJob.getClass().getName();
 //      return "ThreadJob on rule: " + job.getRule(); //$NON-NLS-1$
 //    }
 //    return job.getClass().getName();
 //  }
 //
 
 //  instance = this;
 //  initDebugOptions();
 //  synchronized (lock) {
 
 //    running = new HashSet(10);
 //  }
 //  pool.setDaemon(JobOSGiUtils.getDefault().useDaemonThreads());
 //}
 
 
 void JobManager::ChangeState(InternalJob::Pointer sptr_job, int newState)
 {
 
   bool blockedJobs = false;
   {
     Poco::ScopedLock<Poco::Mutex> m_managerLock(m_mutex);
 
     int tmp_oldState = sptr_job->InternalGetState();
     switch (tmp_oldState)
     {
     case Job::NONE:
 
     case InternalJob::ABOUT_TO_SCHEDULE:
       break;
     case InternalJob::BLOCKED:
       //remove this job from the linked list of blocked jobs
       sptr_job->Remove();
       break;
     case Job::WAITING:
       m_JobQueueWaiting.Remove(sptr_job);
 
       // assert(false, "Tried to remove a job that wasn't in the queue");
       break;
     case Job::SLEEPING:
       m_JobQueueSleeping.Remove(sptr_job);
       // assert(false, "Tried to remove a job that wasn't in the queue");
 
     case Job::RUNNING:
     case InternalJob::ABOUT_TO_RUN:
-      m_running.erase(sptr_job);
+      m_running.remove(sptr_job);
       //add any blocked jobs back to the wait queue
       InternalJob::Pointer sptr_blocked(sptr_job->Previous());
       sptr_job->Remove();
       blockedJobs = sptr_blocked != 0;
       while (sptr_blocked != 0)
       {
         InternalJob::Pointer previous = sptr_blocked->Previous();
         ChangeState(sptr_blocked, Job::WAITING);
         sptr_blocked = previous;
       }
       break;
       // default :
       // Assert.isLegal(false, "Invalid job state: " + job + ", state: " + oldState);
     }
 
     sptr_job->InternalSetState(newState);
     switch (newState)
     {
     case Job::NONE:
       sptr_job->SetStartTime(InternalJob::T_NONE);
       sptr_job->SetWaitQueueStamp(InternalJob::T_NONE);
     case InternalJob::BLOCKED:
       break;
     case Job::WAITING:
       m_JobQueueWaiting.Enqueue(sptr_job);
       break;
     case Job::SLEEPING:
       //try {
       m_JobQueueSleeping.Enqueue(sptr_job);
       //} catch (RuntimeException e) {
       //  throw new RuntimeException("Error changing from state: " + oldState);
       //}
       break;
     case Job::RUNNING:
     case InternalJob::ABOUT_TO_RUN:
       sptr_job->SetStartTime(InternalJob::T_NONE);
       sptr_job->SetWaitQueueStamp(InternalJob::T_NONE);
       m_running.insert(sptr_job);
       break;
     case InternalJob::ABOUT_TO_SCHEDULE:
       break;
       //  default :
       //    Assert.isLegal(false, "Invalid job state: " + job + ", state: " + newState);
     }
   }
 
   //notify queue outside sync block
   if (blockedJobs)
     m_Pool->JobQueued();
 }
 
 
 
 Poco::Timestamp::TimeDiff JobManager::DelayFor(int priority)
 {
   //these values may need to be tweaked based on machine speed
   switch (priority)
   {
   case Job::INTERACTIVE:
     return 0;
   case Job::SHORT:
     return 50;
   case Job::LONG:
     return 100;
   case Job::BUILD:
     return 500;
   case Job::DECORATE:
     return 1000;
   default:
     //  Assert.isTrue(false, "Job has invalid priority: " + priority); //$NON-NLS-1$
     return 0;
   }
 }
 
 
 void JobManager::DoSchedule(InternalJob::Pointer job,
     Poco::Timestamp::TimeDiff delay)
 {
   Poco::ScopedLock<Poco::Mutex> managerLock(m_mutex);
 
   //job may have been canceled already
   int state = job->InternalGetState();
   if (state != InternalJob::ABOUT_TO_SCHEDULE && state != Job::SLEEPING)
     return;
 
   //if it's a decoration job with no rule, don't run it right now if the system is busy
   if (job->GetPriority() == Job::DECORATE && job->GetRule() == 0)
   {
     Poco::Timestamp::TimeDiff tmp_minDelay = m_running.size() * 100;
     delay = std::max(delay, tmp_minDelay);
   }
   if (delay > 0)
   {
     job->SetStartTime(Poco::Timestamp() + delay * 100);
     InternalJob::Pointer sptr_job(job);
     ChangeState(sptr_job, Job::SLEEPING);
   }
   else
   {
     job->SetStartTime(Poco::Timestamp() + DelayFor(job->GetPriority()) * 100);
     job->SetWaitQueueStamp(m_waitQueueCounter++);
     InternalJob::Pointer sptr_job(job);
     ChangeState(sptr_job, Job::WAITING);
   }
 
 }
 
 void JobManager::DoShutdown()
 {
   std::vector<InternalJob::Pointer> vec_ToCancel;
   {
     Poco::ScopedLock<Poco::Mutex> LockMe(m_mutex);
     if (m_active)
     {
       m_active = false;
       //cancel all running jobs
       vec_ToCancel.assign(m_running.begin(), m_running.end());
       //clean up
       m_JobQueueSleeping.Clear();
       m_JobQueueWaiting.Clear();
       m_running.clear();
     }
   }
 
   // Give running jobs a chance to finish. Wait 0.1 seconds for up to 3 times.
   if (!vec_ToCancel.empty())
   {
     for (std::size_t i = 0; i < vec_ToCancel.size(); i++)
     {
       // cancel jobs outside sync block to avoid deadlock
       Cancel(vec_ToCancel[i]);
     }
 
     for (int waitAttempts = 0; waitAttempts < 3; waitAttempts++)
     {
       Poco::Thread::yield();
       {
         Poco::ScopedLock<Poco::Mutex> LockMe(m_mutex);
         if (m_running.empty())
           break;
       }
       if (DEBUG_SHUTDOWN)
       {
         //  JobManager.debug("Shutdown - job wait cycle #" + (waitAttempts + 1));
         std::vector<InternalJob::Pointer> vec_StillRunning;
         {
           Poco::ScopedLock<Poco::Mutex> LockMe(m_mutex);
           vec_StillRunning.assign(m_running.begin(), m_running.end());
 
           //   if (!vec_StillRunning.empty()) {
           //for (int j = 0; j < stillRunning.length; j++) {
           //  JobManager.debug("\tJob: " + printJobName(stillRunning[j])); //$NON-NLS-1$
           //}
         }
       }
       Poco::Thread::sleep(100);
       Poco::Thread::yield();
     }
     // retrieve list of the jobs that are still running
 
     {
       Poco::ScopedLock<Poco::Mutex> LockMe(m_mutex);
       vec_ToCancel.assign(m_running.begin(), m_running.end());
     }
   }
 
   if (!vec_ToCancel.empty())
   {
     /*for (int i = 0; i < vec_ToCancel.size(); i++) {*/
     //  std::string  tmp_jobName = PrintJobName(toCancel[i]);
     //        //this doesn't need to be translated because it's just being logged
     //        String msg = "Job found still running after platform shutdown.  Jobs should be canceled by the plugin that
     //        scheduled them during shutdown: " + jobName;
     //        RuntimeLog.log(new Status(IStatus.WARNING, JobManager.PI_JOBS, JobManager.PLUGIN_ERROR, msg, null));
     //
     //        // TODO the RuntimeLog.log in its current implementation won't produce a log
     //        // during this stage of shutdown. For now add a standard error output.
     //        // One the logging story is improved, the System.err output below can be removed:
     //        System.err.println(msg);
     //      }
   }
 
   m_Pool->Shutdown();
 }
 
 Job::Pointer JobManager::NextJob()
 {
   {
     Poco::ScopedLock<Poco::Mutex> managerLock(m_mutex);
 
     //do nothing if the job manager is suspended
     if (m_suspended)
       return Job::Pointer(0);
 
     // tickle the sleep queue to see if anyone wakes up
 
     Poco::Timestamp now;
     InternalJob::Pointer ptr_job = m_JobQueueSleeping.Peek();
 
     while (ptr_job != 0 && ptr_job->GetStartTime() < now)
     {
       // a job that slept to long is set a new start time and is put into the waiting queue
       ptr_job->SetStartTime(now + DelayFor(ptr_job->GetPriority()));
       ptr_job->SetWaitQueueStamp(m_waitQueueCounter++);
       InternalJob::Pointer sptr_job(ptr_job);
       ChangeState(sptr_job, Job::WAITING);
       ptr_job = m_JobQueueSleeping.Peek();
     }
     //process the wait queue until we find a job whose rules are satisfied.
     while ((ptr_job = m_JobQueueWaiting.Peek()) != 0)
     {
       InternalJob::Pointer sptr_job(ptr_job);
       InternalJob::Pointer sptr_blocker = FindBlockingJob(sptr_job);
       if (sptr_blocker == 0)
         break;
       //queue this job after the job that's blocking it
       ChangeState(sptr_job, InternalJob::BLOCKED);
       //assert job does not already belong to some other data structure
       //Assert.isTrue(job.next() == null);
       //Assert.isTrue(job.previous() == null);
       sptr_blocker->AddLast(ptr_job);
     }
     // the job to run must be in the running list before we exit
     // the sync block, otherwise two jobs with conflicting rules could start at once
     if (ptr_job != 0)
     {
       InternalJob::Pointer sptr_job(ptr_job);
       ChangeState(sptr_job, InternalJob::ABOUT_TO_RUN);
     }
 
     return ptr_job.Cast<Job> ();
 
   }
 }
 
 //TODO Job families
 //void
 //JobManager
 //::Select(List members, Object family, InternalJob firstJob, int stateMask) {
 //    if (firstJob == null)
 //      return;
 //    InternalJob job = firstJob;
 //    do {
 //      //note that job state cannot be NONE at this point
 //      if ((family == null || job.belongsTo(family)) && ((job.getState() & stateMask) != 0))
 //        members.add(job);
 //      job = job.previous();
 //    } while (job != null && job != firstJob);
 //  }
 
 //List
 //JobManager
 //::Select(Object family) {
 //    return select(family, Job.WAITING | Job.SLEEPING | Job.RUNNING);
 //  }
 
 //List
 //JobManager
 //::Select(Object family, int stateMask) {
 //    List members = new ArrayList();
 //    synchronized (lock) {
 //      if ((stateMask & Job.RUNNING) != 0) {
 //        for (Iterator it = running.iterator(); it.hasNext();) {
 //          select(members, family, (InternalJob) it.next(), stateMask);
 //        }
 //      }
 //      if ((stateMask & Job.WAITING) != 0)
 //        select(members, family, waiting.peek(), stateMask);
 //      if ((stateMask & Job.SLEEPING) != 0)
 //        select(members, family, sleeping.peek(), stateMask);
 //    }
 //    return members;
 //  }
 
 // dummy validateRule implemenation
 void JobManager::ValidateRule(ISchedulingRule::Pointer sptr_rule)
 {
   //null rule always valid
   if (sptr_rule == 0)
     return;
 
   //contains method must be reflexive
   poco_assert(sptr_rule->Contains(sptr_rule))
 ; //contains method must return false when given an unknown rule
   poco_assert(!sptr_rule->Contains(sptr_testRule));
   //isConflicting method must be reflexive
   poco_assert(sptr_rule->IsConflicting(sptr_rule));
   //isConflicting method must return false when given an unknown rule
   poco_assert(!sptr_rule->IsConflicting(sptr_testRule));
 
 }
 
 bool JobManager::Cancel(InternalJob::Pointer sptr_job)
 {
   IProgressMonitor::Pointer sptr_progressMonitor(0);
   bool runCanceling = false;
   {
     Poco::ScopedLock<Poco::Mutex> mangerMutex (m_mutex);
 
     switch (sptr_job->GetState())
     {
       case Job::NONE :
       return true;
       case Job::RUNNING :
       //cannot cancel a job that has already started (as opposed to ABOUT_TO_RUN)
       if (sptr_job->InternalGetState() == Job::RUNNING)
       {
       sptr_progressMonitor = sptr_job->GetProgressMonitor();
       runCanceling = sptr_job->IsRunCanceled();
       if(runCanceling)
           sptr_job->SetRunCanceled(true);
       break ;
       }
       //signal that the job should be canceled before it gets a chance to run
       sptr_job->SetAboutToRunCanceled(true);
       return false;
    default :
       ChangeState(sptr_job, Job::NONE);
     }
   }
   //call monitor outside sync block
   if (sptr_progressMonitor != 0)
   {
     if(runCanceling)
       {
        if (!sptr_progressMonitor->IsCanceled())
           sptr_progressMonitor->SetCanceled(true);
        sptr_job->Canceling();
 
       }
     return false;
   }
   //only notify listeners if the job was waiting or sleeping
-  m_JobListeners.Done(sptr_job.Cast<Job>(), Status::CANCEL_STATUS, false);
+  m_JobListeners.Done(sptr_job.Cast<Job>(), Status::CANCEL_STATUS(BERRY_STATUS_LOC), false);
   return true;
 }
 
 
 IProgressMonitor::Pointer JobManager::CreateMonitor(
     Job::Pointer sptr_jobToMonitor)
 {
   IProgressMonitor::Pointer sptr_monitor(0);
   if (m_sptr_progressProvider != 0)
     sptr_monitor = m_sptr_progressProvider->CreateMonitor(sptr_jobToMonitor);
   if (sptr_monitor == 0)
   {
     NullProgressMonitor::Pointer sptr_defaultMonitor(new NullProgressMonitor());
       return sptr_defaultMonitor;
    }
-    return sptr_monitor ;
+    return sptr_monitor;
 }
 
 
 IProgressMonitor::Pointer JobManager::CreateMonitor(InternalJob::Pointer sptr_job, IProgressMonitor::Pointer group, int ticks)
 {
  {
      Poco::ScopedLock<Poco::Mutex> managerLock(m_mutex);
 
     //group must be set before the job is scheduled
     //this includes the ABOUT_TO_SCHEDULE state, during which it is still
     //valid to set the progress monitor
     if (sptr_job->GetState() != Job::NONE)
     {
       IProgressMonitor::Pointer dummy(0);
       return dummy;
     }
     IProgressMonitor::Pointer sptr_monitor(0);
     if (m_sptr_progressProvider != 0)
       sptr_monitor = m_sptr_progressProvider->CreateMonitor(sptr_job.Cast<Job>() , group, ticks);
     if (sptr_monitor == 0)
     {
       // return a default NullprogressMonitor
       NullProgressMonitor::Pointer sptr_defaultMonitor(new NullProgressMonitor() );
       return sptr_defaultMonitor;
     }
 
     return sptr_monitor;
   }
 }
 
 
 void JobManager::EndJob(InternalJob::Pointer ptr_job, IStatus::Pointer result, bool notify)
 {
   Poco::Timestamp::TimeDiff rescheduleDelay(InternalJob::T_NONE);
   {
     Poco::ScopedLock<Poco::Mutex> lock ( m_mutex);
 
     //  if the job is finishing asynchronously, there is nothing more to do for now
     if (result == Job::ASYNC_FINISH)
       return;
 
     //if job is not known then it cannot be done
     if (ptr_job->GetState() == Job::NONE)
        return;
     ptr_job->SetResult(result);
     ptr_job->SetProgressMonitor(IProgressMonitor::Pointer(0));
     ptr_job->SetThread(0);
     rescheduleDelay = ptr_job->GetStartTime().epochMicroseconds();
     InternalJob::Pointer sptr_job(ptr_job);
     ChangeState(sptr_job, Job::NONE);
   }
 
   //notify listeners outside sync block
   bool reschedule = m_active && rescheduleDelay > InternalJob::T_NONE && ptr_job->ShouldSchedule();
   if (notify)
     m_JobListeners.Done(ptr_job.Cast<Job>(), result, reschedule);
   //reschedule the job if requested and we are still active
   if (reschedule)
     Schedule(ptr_job, rescheduleDelay, reschedule);
 }
 
 
 InternalJob::Pointer JobManager::FindBlockingJob(InternalJob::Pointer waitingJob)
 {
   if (waitingJob->GetRule() == 0)
   return InternalJob::Pointer(0);
 
   {
     Poco::ScopedLock<Poco::Mutex> managerLock (m_mutex);
 
     if (m_running.empty() )
     {
       InternalJob::Pointer dummy;
       return (dummy);
     }
     //check the running jobs
     bool hasBlockedJobs = false;
-    Poco::HashSet<InternalJob::Pointer, Object::Hash>::Iterator it;
+    QSet<InternalJob::Pointer>::Iterator it;
     for ( it = m_running.begin(); it != m_running.end(); it ++ )
     {
       InternalJob::Pointer sptr_job = *it ++;
       if (waitingJob->IsConflicting(sptr_job))
       return sptr_job;
       if (!hasBlockedJobs)
       hasBlockedJobs = sptr_job->Previous() != 0;
     }
     //  there are no blocked jobs, so we are done
     if (!hasBlockedJobs)
     {
       InternalJob::Pointer dummy;
       return (dummy);
     }
     //check all jobs blocked by running jobs
-    Poco::HashSet<InternalJob::Pointer, Object::Hash>::Iterator it_blocked;
+    QSet<InternalJob::Pointer>::Iterator it_blocked;
     for( it_blocked = m_running.begin(); it_blocked != m_running.end(); it_blocked ++ )
     {
       InternalJob::Pointer sptr_job = *it_blocked ++;
       while (true)
       {
         sptr_job = sptr_job->Previous();
         if (sptr_job == 0)
         break;
         if (waitingJob->IsConflicting(sptr_job))
         return sptr_job;
       }
     }
   }
 
   InternalJob::Pointer sptr_null;
   return (sptr_null);
 }
 
 bool JobManager::IsActive()
 {
   return m_active;
 }
 
 bool JobManager::IsBlocking(InternalJob::Pointer sptr_runningJob)
 {
   {
     Poco::ScopedLock<Poco::Mutex> lockMe (m_mutex);
     // if this job isn't running, it can't be blocking anyone
     if (sptr_runningJob->GetState() != Job::RUNNING)
     return false;
     // if any job is queued behind this one, it is blocked by it
     InternalJob::Pointer ptr_previous = sptr_runningJob->Previous();
     while (ptr_previous != 0)
     {
       // ignore jobs of lower priority (higher priority value means lower priority)
       if (ptr_previous->GetPriority() < sptr_runningJob->GetPriority())
       {
         if (!ptr_previous->IsSystem())
         return true;
         // TODO Implicit Jobs
         // implicit jobs should interrupt unless they act on behalf of system jobs
         // if (previous instanceof ThreadJob && ((ThreadJob) previous).shouldInterrupt())
         // return true;
       }
       ptr_previous = ptr_previous->previous;
     }
     // none found
     return false;
   }
 }
 
 //void
 //JobManager
 //::Join(InternalJob job) {
 //    final IJobChangeListener listener;
 //    final Semaphore barrier;
 //    synchronized (lock) {
 //      int state = job.getState();
 //      if (state == Job.NONE)
 //        return;
 //      //don't join a waiting or sleeping job when suspended (deadlock risk)
 //      if (suspended && state != Job.RUNNING)
 //        return;
 //      //it's an error for a job to join itself
 //      if (state == Job.RUNNING && job.getThread() == Thread.currentThread())
 //        throw new IllegalStateException("Job attempted to join itself"); //$NON-NLS-1$
 //      //the semaphore will be released when the job is done
 //      barrier = new Semaphore(null);
 //      listener = new JobChangeAdapter() {
 //        public void done(IJobChangeEvent event) {
 //          barrier.release();
 //        }
 //      };
 //      job.addJobChangeListener(listener);
 //      //compute set of all jobs that must run before this one
 //      //add a listener that removes jobs from the blocking set when they finish
 //    }
 //    //wait until listener notifies this thread.
 //    try {
 //      while (true) {
 //        //notify hook to service pending syncExecs before falling asleep
 //        lockManager.aboutToWait(job.getThread());
 //        try {
 //          if (barrier.acquire(Long.MAX_VALUE))
 //            break;
 //        } catch (InterruptedException e) {
 //          //loop and keep trying
 //        }
 //      }
 //    } finally {
 //      lockManager.aboutToRelease();
 //      job.removeJobChangeListener(listener);
 //    }
 //  }
 
 
 bool JobManager::RunNow(InternalJob::Pointer sptr_job)
 {
   {
     Poco::ScopedLock<Poco::Mutex> lockMe (m_mutex);
 
     //cannot start if there is a conflicting job
     if (FindBlockingJob(sptr_job) != 0)
     return false;
     ChangeState(sptr_job, Job::RUNNING);
     sptr_job->SetProgressMonitor(IProgressMonitor::Pointer(new NullProgressMonitor()));
     sptr_job->Run(IProgressMonitor::Pointer(0));
   }
   return true;
 }
 
 void JobManager::Schedule(InternalJob::Pointer job, Poco::Timestamp::TimeDiff delay, bool reschedule)
 {
   if (!m_active)
   throw Poco::IllegalStateException("Job manager has been shut down.");
 
   poco_assert(job); // "Job is null"
   poco_assert(delay >= 0); // "Scheduling delay is negative"
 
   {
     Poco::ScopedLock<Poco::Mutex> managerLock (m_mutex);
     //if the job is already running, set it to be rescheduled when done
     if (job->GetState() == Job::RUNNING)
     {
       job->SetStartTime(delay);
       return;
     }
     //can't schedule a job that is waiting or sleeping
     if (job->InternalGetState() != Job::NONE)
     return;
 
     //remember that we are about to schedule the job
     //to prevent multiple schedule attempts from succeeding (bug 68452)
     InternalJob::Pointer sptr_job(job);
     ChangeState(sptr_job, InternalJob::ABOUT_TO_SCHEDULE);
   }
   //notify listeners outside sync block
   m_JobListeners.Scheduled(job.Cast<Job>(), delay, reschedule);
   //schedule the job
   DoSchedule(job, delay);
   //call the pool outside sync block to avoid deadlock
   m_Pool->JobQueued();
 }
 
 bool JobManager::Sleep(InternalJob::Pointer job)
 {
   {
     Poco::ScopedLock<Poco::Mutex> lockMe (m_mutex);
     InternalJob::Pointer sptr_job(job);
     switch (job->GetState())
     {
       case Job::RUNNING :
       //cannot be paused if it is already running (as opposed to ABOUT_TO_RUN)
       if (job->InternalGetState() == Job::RUNNING)
       return false;
       //job hasn't started running yet (aboutToRun listener)
       break;
       case Job::SLEEPING :
       //update the job wake time
       job->SetStartTime(InternalJob::T_INFINITE);
       //change state again to re-shuffle the sleep queue
 
       ChangeState(sptr_job, Job::SLEEPING);
       return true;
       case Job::NONE :
       return true;
       case Job::WAITING :
       //put the job to sleep
       break;
     }
     job->SetStartTime(InternalJob::T_INFINITE);
     ChangeState(sptr_job, Job::SLEEPING);
   }
   m_JobListeners.Sleeping(job.Cast<Job>());
   return true;
 }
 
 void JobManager::SetPriority(InternalJob::Pointer job, int newPriority)
 {
   {
     Poco::ScopedLock<Poco::Mutex> lockMe (m_mutex);
     InternalJob::Pointer sptr_job(job);
     int oldPriority = job->GetPriority();
     if (oldPriority == newPriority)
     return;
     job->InternalSetPriority(newPriority);
     //if the job is waiting to run, re-shuffle the queue
     if (sptr_job->GetState() == Job::WAITING)
     {
       Poco::Timestamp oldStart = job->GetStartTime();
       job->SetStartTime(oldStart += (DelayFor(newPriority) - DelayFor(oldPriority)));
       m_JobQueueWaiting.Resort(job);
     }
   }
 }
 
 Poco::Timespan::TimeDiff JobManager::SleepHint()
 {
 
   Poco::ScopedLock<Poco::Mutex> managerLock (m_mutex);
   // wait forever if job manager is suspended
   if (m_suspended)
   return InternalJob::T_INFINITE;
   if (!m_JobQueueWaiting.IsEmpty())
   return 0;
   // return the anticipated time that the next sleeping job will wake
   InternalJob::Pointer ptr_next(0);
   ptr_next = m_JobQueueSleeping.Peek();
   if (ptr_next == 0)
   return InternalJob::T_INFINITE;
 
   Poco::Timestamp tmp_startTime = ptr_next->GetStartTime();
   Poco::Timestamp tmp_currentTime;
   Poco::Timestamp::TimeDiff timeToStart = tmp_startTime - tmp_currentTime;
 
   return timeToStart;
 }
 
 Job::Pointer JobManager::StartJob()
 {
   Job::Pointer job(0);
   while (true)
   {
     job = NextJob();
     if (!job)
     return Job::Pointer(0);
     //must perform this outside sync block because it is third party code
     bool shouldRun = job->ShouldRun();
     //check for listener veto
     if (shouldRun)
     m_JobListeners.AboutToRun(job);
     //listeners may have canceled or put the job to sleep
     bool endJob = false;
     {
       Poco::ScopedLock<Poco::Mutex> lock(m_mutex);
       InternalJob::Pointer internal = job;
       if (internal->InternalGetState() == InternalJob::ABOUT_TO_RUN)
       {
         if (shouldRun && !internal->IsAboutToRunCanceled())
         {
           internal->SetProgressMonitor(CreateMonitor(job));
           //change from ABOUT_TO_RUN to RUNNING
           internal->InternalSetState(Job::RUNNING);
           break;
         }
         internal->SetAboutToRunCanceled(false);
         endJob = true;
         //fall through and end the job below
       }
     }
     if (endJob)
     {
       //job has been vetoed or canceled, so mark it as done
-    EndJob(job,Status::CANCEL_STATUS, true);
+      EndJob(job,Status::CANCEL_STATUS(BERRY_STATUS_LOC), true);
       continue;
     }
   }
   m_JobListeners.Running(job);
   return job;
 }
 
 void JobManager::WakeUp(InternalJob::Pointer job, Poco::Timestamp::TimeDiff delay)
 {
   poco_assert(delay >= 0); // "Scheduling delay is negative"
 
   {
     Poco::ScopedLock<Poco::Mutex> m_managerLock (m_mutex);
     //cannot wake up if it is not sleeping
     if (job->GetState() != Job::SLEEPING)
     return;
     DoSchedule(job, delay);
   }
   //call the pool outside sync block to avoid deadlock
   m_Pool->JobQueued();
 
   /// IListenerExtension only notify of wake up if immediate
   if (delay == 0)
   m_JobListeners.Awake(job.Cast<Job>());
 }
 
 IProgressMonitor::Pointer JobManager::MonitorFor(IProgressMonitor::Pointer sptr_monitor)
 {
   if(sptr_monitor == 0 || sptr_monitor.Cast<NullProgressMonitor>() )
   {
     if(m_sptr_progressProvider != 0 )
     sptr_monitor = m_sptr_progressProvider->GetDefaultMonitor();
   }
   if(sptr_monitor == 0)
   {
     IProgressMonitor::Pointer sptr_nullProgressMonitor(new NullProgressMonitor());
     return sptr_nullProgressMonitor;
   }
   return sptr_monitor;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryJobManager.h b/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryJobManager.h
index 0c77a1ffa2..94dd4590a0 100644
--- a/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryJobManager.h
+++ b/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryJobManager.h
@@ -1,434 +1,435 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 //
 //
 
 #ifndef _BERRY_JOBMANAGER_H
 #define _BERRY_JOBMANAGER_H
 
 #include "berryInternalJob.h"
 #include "berryJobQueue.h"
 #include "berryWorkerPool.h"
 #include "berryJobListeners.h"
 
 #include "berryJob.h"
 #include "berryIProgressMonitorWithBlocking.h"
 #include "berryIJobManager.h"
 #include "berryISchedulingRule.h"
 
 #include <org_blueberry_core_jobs_Export.h>
 
 #include <Poco/Mutex.h>
 #include <Poco/ScopedLock.h>
 #include <Poco/HashSet.h>
 #include <Poco/Timestamp.h>
 #include <Poco/Timespan.h>
 
 #include <string>
 #include <sstream>
 #include <assert.h>
 
 namespace berry
 {
 
 /**
  * Implementation of API type IJobManager
  *
  * Implementation note: all the data structures of this class are protected
  * by a single lock object held as a private field in this class.  The JobManager
  * instance itself is not used because this class is publicly reachable, and third
  * party clients may try to synchronize on it.
  *
  * The WorkerPool class uses its own monitor for synchronizing its data
  * structures. To avoid deadlock between the two classes, the JobManager
  * must NEVER call the worker pool while its own monitor is held.
  */
 struct BERRY_JOBS JobManager: public IJobManager
 {
 
 public:
 
   friend class WorkerPool;
   friend struct InternalJob;
   friend struct NullRule;
 
 
   berryObjectMacro(JobManager);
   /**
    * The unique identifier constant of this plug-in.
    */
-  static const std::string& PI_JOBS();
+  static const QString& PI_JOBS();
 
   static bool DEBUG;
   static bool DEBUG_BEGIN_END;
   static bool DEBUG_DEADLOCK;
   static bool DEBUG_LOCKS;
   static bool DEBUG_TIMING;
   static bool DEBUG_SHUTDOWN;
 
   /**
    * Status code constant indicating an error occurred while running a plug-in.
    * For backward compatibility with Platform.PLUGIN_ERROR left at (value = 2).
    */
   static const int PLUGIN_ERROR;
 
   /// const ImplicitJobs iImplicitJobs = new ImplicitJobs(this);
 
   /**
    * The singleton job manager instance. It must be a singleton because
    * all job instances maintain a reference (as an optimization) and have no way
    * of updating it.
    */
   static JobManager* GetInstance();
 
   /**
    * For debugging purposes only
    */
   static std::string PrintState(int state);
 
   /**
    * Note that although this method is not API, clients have historically used
    * it to force jobs shutdown in cases where OSGi shutdown does not occur.
    * For this reason, this method should be considered near-API and should not
    * be changed if at all possible.
    */
   static void Shutdown();
 
   //   void Cancel(Object family) ;
 
   IProgressMonitor::Pointer CreateProgressGroup();
 
   Job* CurrentJob();
 
   //   void EndRule(ISchedulingRule rule) ;
 
   //  Job[] Find(Object family) ;
   //    LockManager GetLockManager() {
   //    return lockManager;
   //  }
 
   bool IsIdle();
 
   bool IsSuspended();
 
   //  void Join(final Object family, IProgressMonitor monitor) throws InterruptedException, OperationCanceledException );
 
 
   //   ILock NewLock() ;
 
   /**
-   *  @see IJobManager#RemoveChangeListener(IJobChangeListener::Pointer)
+   *  @see IJobManager#RemoveChangeListener(IJobChangeListener*)
    */
-  void RemoveJobChangeListener(IJobChangeListener::Pointer listener);
+  void RemoveJobChangeListener(IJobChangeListener* listener);
 
   // /**
   //* report to the progress monitor that this thread is blocked, supplying
   //* an information message, and if possible the job that is causing the blockage.
   //* important: an invocation of this method must be followed eventually be
   //* an invocation of ReportUnblocked.
   //* @param monitor the monitor to report blocking to
   //* @param BlockingJob the job that is blocking this thread, or <code>null</code>
   //* @see #Reportunblocked
   //*/
    void ReportBlocked( IProgressMonitor::Pointer monitor, InternalJob::Pointer blockingjob) const ;
 
   /**
    * Reports that this thread was blocked, but is no longer blocked and is able
    * to proceed.
    * @param monitor The monitor to report unblocking to.
    * @see #ReportBlocked
    */
   void ReportUnblocked(IProgressMonitor::Pointer monitor) const ;
   /**
    *  @have a look at IJobManager Resume
    */
   void Resume();
 
   // /**
   //  *  @have a look at IJobManager Resume
   //  */
 
   //  void Resume(ISchedulingRule::Pointer rule)const ;
 
   /**
    *  @have a look at IJobManager SetProgressProvider
    */
   void SetProgressProvider(ProgressProvider::Pointer provider);
 
   void SetRule(InternalJob::Pointer job, ISchedulingRule::Pointer rule);
 
   // /*
   //  * @see IJobManager#sleep(std::string)
   //  */
 
   //   void Sleep(Object family) ;
 
   void Suspend();
 
   /*
    * @see schedule(long)
    */
   void Schedule(InternalJob::Pointer job, Poco::Timestamp::TimeDiff delay, bool reschedule);
 
   //   void Suspend(ISchedulingRule::Pointer rule, IProgressMonitor::Pointer monitor)const ;
 
   //  void TransferRule(ISchedulingRule rule, Thread destinationThread) ;
 
   //   void SetLockListener(LockListener listener) ;
 
 
   // /**
   // * Puts a job to sleep. Returns true if the job was successfully put to sleep.
   // */
 
   //  void WakeUp(Object family) ;
 
 
-  void AddJobChangeListener(IJobChangeListener::Pointer listener);
+  void AddJobChangeListener(IJobChangeListener* listener);
 
   //  void beginRule(ISchedulingRule rule, IProgressMonitor monitor) ;
 
 
 protected:
 
   /**
    * Cancels a job
    */
   bool Cancel(InternalJob::Pointer job);
 
 
   /**
    * Returns a new progress monitor for this job, belonging to the given
    * progress group.  Returns null if it is not a valid time to set the job's group.
    */
   IProgressMonitor::Pointer CreateMonitor(InternalJob::Pointer job,
       IProgressMonitor::Pointer group, int ticks);
 
   /**
    * Indicates that a job was running, and has now finished.  Note that this method
    * can be called under OutOfMemoryError conditions and thus must be paranoid
    * about allocating objects.
    */
   /// optional Extension IStatus for implementation help have a look at the Java JobAPI
   void EndJob(InternalJob::Pointer job,IStatus::Pointer result, bool notify);
 
   /**
    * Returns a running or blocked job whose scheduling rule conflicts with the
    * scheduling rule of the given waiting job.  Returns null if there are no
    * conflicting jobs.  A job can only run if there are no running jobs and no blocked
    * jobs whose scheduling rule conflicts with its rule.
    */
   InternalJob::Pointer FindBlockingJob(InternalJob::Pointer waitingJob);
 
   /**
    * Returns whether the job manager is active (has not been shutdown).
    */
   bool IsActive();
 
   /**
    * Returns true if the given job is blocking the execution of a non-system
    * job.
    */
   bool IsBlocking(InternalJob::Pointer runningJob);
 
   //   void Join(InternalJob job) ;
 
   /**
    * Attempts to immediately start a given job.  Returns true if the job was
    * successfully started, and false if it could not be started immediately
    * due to a currently running job with a conflicting rule.  Listeners will never
    * be notified of jobs that are run in this way.
    */
   bool RunNow(InternalJob::Pointer sptr_job);
 
   /**
    * Puts a job to sleep. Returns true if the job was successfully put to sleep.
    */
   bool Sleep(InternalJob::Pointer job);
 
   /**
    * Changes a job priority.
    */
   void SetPriority(InternalJob::Pointer job, int newPriority);
 
   /**
    * Returns the estimated time in milliseconds before the next job is scheduled
    * to wake up. The result may be negative.  Returns InternalJob.T_INFINITE if
    * there are no sleeping or waiting jobs.
    */
   Poco::Timespan::TimeDiff SleepHint();
 
   /**
    * Returns the next job to be run, or null if no jobs are waiting to run.
    * The worker must call endJob when the job is finished running.
    */
   Job::Pointer StartJob();
 
   /*
    * @see Job#WakeUp(long)
    */
   void WakeUp(InternalJob::Pointer job, Poco::Timestamp::TimeDiff delay);
 
 private:
 
   JobManager();
 
   /* Poco Mutex for synchronizing purposes */
   Poco::Mutex m_mutex;
 
   // Dummy Null rule to validate SchedulingRules implemented by clients
   SmartPointer<ISchedulingRule> sptr_testRule;
 
   //   //ToDO static const ISchedulingRule nullRule = new ISchedulingRule() {
 
   //    public bool Contains(ISchedulingRule rule) ;
   //    public boolean IsConflicting(ISchedulingRule rule) ;
 
 
   /**
    * True if this manager is active, and false otherwise.  A job manager
    * starts out active, and becomes inactive if it has been shutdown
    * and not restarted.
    */
   volatile bool m_active;
 
 
   JobListeners m_JobListeners;
 
   //
   //  /**
   //   * The lock for synchronizing all activity in the job manager.  To avoid deadlock,
   //   * this lock must never be held for extended periods, and must never be
   //   * held while third party code is being called.
   //   */
   //  // private final Object lock = new Object();
   //   static const Object lock ;
   //
   //  //private LockManager lockManager = new LockManager();
   //   static const LockManger lockManager;
   /**
    * The pool of worker threads.
    */
   WorkerPool::Pointer m_Pool;
 
   ProgressProvider::Pointer m_sptr_progressProvider;
+
   /**
    * Jobs that are currently running. Should only be modified from changeState
    */
-  Poco::HashSet<InternalJob::Pointer, Object::Hash> m_running;
+  QSet<InternalJob::Pointer> m_running;
 
   /**
    * Jobs that are sleeping.  Some sleeping jobs are scheduled to wake
    * up at a given start time, while others will sleep indefinitely until woken.
    * Should only be modified from changeState
    */
   JobQueue m_JobQueueSleeping;
 
   /**
    * jobs that are waiting to be run. Should only be modified from changeState
    */
   JobQueue m_JobQueueWaiting;
   /**
    * True if this manager has been suspended, and false otherwise.  A job manager
    * starts out not suspended, and becomes suspended when <code>suspend</code>
    * is invoked. Once suspended, no jobs will start running until <code>resume</code>
    * is cancelled.
    */
   bool m_suspended;
 
   /**
    * Counter to record wait queue insertion order.
    */
   long long m_waitQueueCounter;
 
   //  /**
   //   * For debugging purposes only
   //   */
   //  const std::string PrintJobName(Job job);
 
 
   /**
    * Atomically updates the state of a job, adding or removing from the
    * necessary queues or sets.
    */
   void ChangeState(InternalJob::Pointer job, int newState);
 
   /**
    * Returns a new progress monitor for this job.  Never returns null.
    */
   IProgressMonitor::Pointer CreateMonitor(Job::Pointer sptr_jobToMonitor);
 
   /**
    * Returns the delay in milliseconds that a job with a given priority can
    * tolerate waiting.
    */
   Poco::Timestamp::TimeDiff DelayFor(int priority);
 
   /**
    * Performs the scheduling of a job.  Does not perform any notifications.
    */
   void DoSchedule(InternalJob::Pointer job, Poco::Timestamp::TimeDiff delay);
 
   /**
    * Shuts down the job manager.  Currently running jobs will be told
    * to stop, but worker threads may still continue processing.
    * (note: This implemented IJobManager.Shutdown which was removed
    * due to problems caused by premature shutdown)
    */
   void DoShutdown();
 
   //  void InitDebugOptions() ;
 
   /**
    * Removes and returns the first waiting job in the queue. Returns null if there
    * are no items waiting in the queue.  If an item is removed from the queue,
    * it is moved to the running jobs list.
    */
   Job::Pointer NextJob();
 
   /**
    * Returns a non-null progress monitor instance.  If the monitor is null,
    * returns the default monitor supplied by the progress provider, or a
    * NullProgressMonitor if no default monitor is available.
    */
   IProgressMonitor::Pointer MonitorFor(IProgressMonitor::Pointer monitor);
 
   //    /**
   //   * Adds all family members in the list of jobs to the collection
   //   */
   //  void Select(List members, Object family, InternalJob firstJob, int stateMask) ;
   //
   //  /**
   //   * Returns a list of all jobs known to the job manager that belong to the given family.
   //   */
   //  List Select(Object family) ;
   //
   //  /**
   //   * Returns a list of all jobs known to the job manager that belong to the given
   //   * family and are in one of the provided states.
   //   */
   //   List Select(Object family, int stateMask) ;
 
    /**
     * Validates that the given scheduling rule obeys the constraints of
     * scheduling rules as described in the <code>ISchedulingRule</code>
     */
   void ValidateRule(ISchedulingRule::Pointer rule);
 
 };
 
 }
 #endif /* _BERRY_TEMPLATE_H */
diff --git a/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryJobQueue.cpp b/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryJobQueue.cpp
index 1f4c11f816..4bad704441 100644
--- a/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryJobQueue.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryJobQueue.cpp
@@ -1,146 +1,146 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryJobQueue.h"
 
 // changed Java JobQueue implementation ..
 // if only one element is in the queue than  InternalJob->next and InternalJob->previous pointer are pointing to 0 and not to the Element itself
 // I think its better .. will see
 namespace berry
 {
 
 class DummyJob: public InternalJob
 {
 
 public:
 
   IStatus::Pointer Run(IProgressMonitor::Pointer)
   {
-  return Status::OK_STATUS;
+    return Status::OK_STATUS(BERRY_STATUS_LOC);
   }
 
   DummyJob() :
     InternalJob("Queue-Head")
   {
   }
 
 };
 
 JobQueue::JobQueue(bool allowConflictOvertaking) :
   dummy(new DummyJob()), m_allowConflictOvertaking(allowConflictOvertaking)
 {
   dummy->SetNext(dummy);
   dummy->SetPrevious(dummy);
 }
 
 //TODO JobQueue Constructor IStatus Implementierung
 //TODO Constructor JobQueue IStatus .. implementation
 //  public JobQueue(boolean allowConflictOvertaking) {
 //  //compareTo on dummy is never called
 //  dummy = new InternalJob("Queue-Head") {//$NON-NLS-1$
 //    public IStatus run(IProgressMonitor m) {
 //      return Status.OK_STATUS;
 //    }
 //  };
 //  dummy.setNext(dummy);
 //  dummy.setPrevious(dummy);
 //  this.allowConflictOvertaking = allowConflictOvertaking;
 //}
 
 
 bool JobQueue::CanOvertake(InternalJob::Pointer newEntry,
     InternalJob::Pointer queueEntry)
 {
   //can never go past the end of the queue
 
   if (queueEntry == dummy.GetPointer())
     return false;
   //if the new entry was already in the wait queue, ensure it is re-inserted in correct position (bug 211799)
   if (newEntry->GetWaitQueueStamp() > 0 && newEntry->GetWaitQueueStamp()
       < queueEntry->GetWaitQueueStamp())
     return true;
   //if the new entry has lower priority, there is no need to overtake the existing entry
   if ((queueEntry == newEntry))
     return false;
 
   // the new entry has higher priority, but only overtake the existing entry if the queue allows it
   InternalJob::Pointer sptr_queueEntry(queueEntry);
   return m_allowConflictOvertaking || !newEntry->IsConflicting(sptr_queueEntry);
 
 }
 
 void JobQueue::Clear()
 {
 
   dummy->SetNext(dummy);
   dummy->SetPrevious(dummy);
 
 }
 
 // notice: important that the first element in the queue is internally set as a dummy element
 InternalJob::Pointer JobQueue::Dequeue()
 {
 
   InternalJob::Pointer ptr_dummyPrevious = dummy->Previous();
   // sets previous pointer to 0 if there is only 1 Element in the queue
   if (ptr_dummyPrevious == dummy)
   {
     dummy->previous = 0;
     return dummy;
   }
   return ptr_dummyPrevious->Remove();
 }
 
 void JobQueue::Enqueue(InternalJob::Pointer newEntry)
 {
   InternalJob::Pointer tail = dummy->Next();
   //overtake lower priority jobs. Only overtake conflicting jobs if allowed to
   while (CanOvertake(newEntry, tail))
     tail = tail->Next();
   InternalJob::Pointer tailPrevious = tail->Previous();
   newEntry->SetNext(tail);
   newEntry->SetPrevious(tailPrevious);
   tailPrevious->SetNext(newEntry);
   tail->SetPrevious(newEntry);
 
 }
 
 void JobQueue::Remove(InternalJob::Pointer jobToRemove)
 {
   jobToRemove->Remove();
 }
 
 void JobQueue::Resort(InternalJob::Pointer entry)
 {
   this->Remove(entry);
   this->Enqueue(entry);
 }
 
 bool JobQueue::IsEmpty()
 {
 
   return this->dummy->next == dummy;
 }
 
 InternalJob::Pointer JobQueue::Peek()
 {
 
   return dummy->Previous() == dummy ? InternalJob::Pointer(0)
       : dummy->Previous();
 
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryWorker.cpp b/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryWorker.cpp
index 3ecdee4a77..ceb943a222 100644
--- a/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryWorker.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.jobs/src/internal/berryWorker.cpp
@@ -1,138 +1,134 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryWorker.h"
 #include "berryWorkerPool.h"
-#include <sstream>
-#include <exception>
 #include "berryJobManager.h"
+#include "berryLog.h"
 
 namespace berry
 {
 
 
 
 /************************* begin of nested JobRunnable class definition ****************************/
 
 int Worker::m_nextWorkerNumber = 0;
 
 Worker::JobRunnable::JobRunnable(Worker* currentWorker) :
   ptr_currentWorker(currentWorker)
 {
 }
 
 // not a good implementation yet .. without the IStatus it can not be checked if a job has been
 // executed correctly
 
 void Worker::JobRunnable::run()
 {
   ptr_currentWorker->setPriority(PRIO_NORMAL);
   try
   {
     while ((ptr_currentWorker->ptr_currentJob
         = ptr_currentWorker->m_wpPool.Lock()->StartJob(ptr_currentWorker)) != 0)
     {
-      IStatus::Pointer result = Status::OK_STATUS ;
+      IStatus::Pointer result = Status::OK_STATUS(BERRY_STATUS_LOC);
 
       try
      {
 
         ptr_currentWorker->ptr_currentJob->SetThread(ptr_currentWorker);
         ptr_currentWorker->ptr_currentJob->Run(ptr_currentWorker->ptr_currentJob->GetProgressMonitor());
 
        // java thread.interrupted
        throw FinallyThrowException();
 
      } catch(FinallyThrowException)
       {
          RunMethodFinallyExecution(result);
        }
 
         // provided an unspecific exception handling, if specific exceptions are added within core job executing methods
         // the specific thrown exceptions should be handled below
        catch(...)
         {
          RunMethodFinallyExecution(result);
         }
 
     }
      throw FinallyThrowException();
 
 
   } catch (FinallyThrowException&)
   {
     ptr_currentWorker->ptr_currentJob = 0;
     Worker::Pointer sptr_currentWorker(ptr_currentWorker);
     ptr_currentWorker->m_wpPool.Lock()->EndWorker(sptr_currentWorker);
   } catch (...)
   {
     ptr_currentWorker->ptr_currentJob = 0;
     Worker::Pointer sptr_currentWorker(ptr_currentWorker);
     ptr_currentWorker->m_wpPool.Lock()->EndWorker(sptr_currentWorker);
 
   }
 }
 
 void Worker::JobRunnable::RunMethodFinallyExecution(IStatus::Pointer sptr_result)
 {
 
-    //clear interrupted state for this thread
-    //Thread.interrupted();
+  //clear interrupted state for this thread
+  //Thread.interrupted();
 
-    //result must not be null
-if (sptr_result.IsNull())
+  //result must not be null
+  if (sptr_result.IsNull())
   {
-  std::runtime_error tempError("NullPointerException") ;
+    std::runtime_error tempError("NullPointerException");
     sptr_result = HandleException( ptr_currentWorker->ptr_currentJob, tempError );
   }
-   ptr_currentWorker->m_wpPool.Lock()->EndJob( ptr_currentWorker->ptr_currentJob, sptr_result );
+  ptr_currentWorker->m_wpPool.Lock()->EndJob( ptr_currentWorker->ptr_currentJob, sptr_result );
 
-    if ((sptr_result->GetSeverity() & (IStatus::ERROR_TYPE | IStatus::WARNING_TYPE)) != 0)
-          // TODO Logging  RuntimeLog.log(result);
-          std::cout << " Status after executing the job : " << sptr_result->ToString() ;
-    ptr_currentWorker->ptr_currentJob = 0;
-          //reset thread priority in case job changed it
-    ptr_currentWorker->setPriority(PRIO_NORMAL);
-
- }
+  if ((sptr_result->GetSeverity() & (IStatus::ERROR_TYPE | IStatus::WARNING_TYPE)) != 0)
+    // TODO Logging  RuntimeLog.log(result);
+    BERRY_ERROR << " Status after executing the job : " << sptr_result->ToString();
+  ptr_currentWorker->ptr_currentJob = 0;
+  //reset thread priority in case job changed it
+  ptr_currentWorker->setPriority(PRIO_NORMAL);
+}
 
 
 IStatus::Pointer Worker::JobRunnable::HandleException(InternalJob::Pointer sptr_job, const std::exception& exception)
-  {
-   std::stringstream ss;
-   ss << "An internal error occurred while executing the job: " <<  sptr_job->GetName()   ;
-    IStatus::Pointer sptr_errorStatus(new Status(IStatus::ERROR_TYPE, JobManager::PI_JOBS(), JobManager::PLUGIN_ERROR, ss.str(), exception) ) ;
-    return sptr_errorStatus ;
-  }
-
-
+{
+  QString msg = "An internal error occurred while executing the job: " + sptr_job->GetName();
+  IStatus::Pointer sptr_errorStatus(new Status(IStatus::ERROR_TYPE, JobManager::PI_JOBS(),
+                                               JobManager::PLUGIN_ERROR, msg, ctkException(exception.what()), BERRY_STATUS_LOC));
+  return sptr_errorStatus ;
+}
 
 
 /************************* end of nested JobRunnable class definition ****************************/
 
 
 Worker::Worker(WeakPointer<WorkerPool> myPool) :
   Poco::Thread("Worker-" + m_nextWorkerNumber++), m_Runnable(this), m_wpPool(
       myPool), ptr_currentJob(0)
 {
 }
 
 void Worker::Start()
 {
   Poco::Thread::start(m_Runnable);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/files.cmake b/BlueBerry/Bundles/org.blueberry.core.runtime/files.cmake
index 0245042994..4b1d810f09 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/files.cmake
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/files.cmake
@@ -1,123 +1,119 @@
 set(MOC_H_FILES
   src/berryPlugin.h
 
   src/internal/berryCTKPluginListener.h
   src/internal/berryCTKPluginActivator.h
   src/internal/berryExtensionRegistry.h
   src/internal/berryPreferencesService.h
 )
 
 set(CACHED_RESOURCE_FILES
   plugin.xml
 )
 
 set(SRC_CPP_FILES
   berryBackingStoreException.cpp
   berryContributorFactory.cpp
   berryCoreException.cpp
   berryDebugBreakpointManager.cpp
   berryDebugUtil.cpp
   berryException.cpp
   berryExtensionType.cpp
   berryIAdaptable.cpp
   berryIAdapterManager.cpp
   berryIDebugObjectListener.cpp
   berryILog.cpp
   berryIPreferences.cpp
   berryIBerryPreferences.cpp
   berryIPreferencesService.cpp
   berryListenerList.h
   berryLog.cpp
   berryMultiStatus.cpp
   berryObject.cpp
   berryObjectGeneric.h
   berryObjectList.h
   berryObjects.cpp
-  berryObjectString.h
+  berryObjectString.cpp
   berryObjectStringMap.cpp
   berryOperationCanceledException.cpp
   berryPlatform.cpp
   berryPlatformException.cpp
   berryPlatformObject.cpp
   berryPlugin.cpp
-  berryRuntime.cpp
   berrySafeRunner.cpp
   berrySmartPointer.h
-  berryStackTrace.cpp
   berryStatus.cpp
   berryWeakPointer.h
 
   # application
   application/berryIApplication.cpp
   application/berryStarter.cpp
 
   # registry
   registry/berryIConfigurationElement.cpp
   registry/berryIContributor.cpp
   registry/berryIExecutableExtension.cpp
   registry/berryIExecutableExtensionFactory.cpp
   registry/berryIExtension.cpp
   registry/berryIExtensionPoint.cpp
   registry/berryIExtensionRegistry.cpp
   registry/berryInvalidRegistryObjectException.cpp
   registry/berryIRegistryEventListener.cpp
   registry/berryRegistryConstants.cpp
 
 )
 
 set(INTERNAL_CPP_FILES
   berryAbstractPreferencesStorage.cpp
   berryCombinedEventDelta.cpp
   berryConfigurationElement.h
   berryConfigurationElement.cpp
   berryConfigurationElementAttribute.cpp
   berryConfigurationElementDescription.cpp
   berryConfigurationElementHandle.cpp
   berryCTKPluginActivator.cpp
   berryCTKPluginListener.cpp
   berryCTKPluginUtils.cpp
   berryExtension.cpp
-  #berryExtensionDelta.cpp
   berryExtensionHandle.cpp
   berryExtensionPoint.cpp
   berryExtensionPointHandle.cpp
   berryExtensionRegistry.cpp
   berryExtensionsParser.cpp
   berryHandle.cpp
   berryInternalPlatform.cpp
   berryIObjectManager.cpp
   berryIRuntimeConstants.cpp
   berryLogImpl.cpp
   berryKeyedElement.cpp
   berryKeyedHashSet.cpp
   berryPreferences.cpp
   berryPreferencesService.cpp
   berryProvisioningInfo.cpp
   berryRegistryContribution.cpp
   berryRegistryContributor.cpp
-  #berryRegistryDelta.cpp
   berryRegistryObjectFactory.cpp
   berryRegistryIndexChildren.cpp
   berryRegistryIndexElement.cpp
   berryRegistryMessages.cpp
   berryRegistryObject.cpp
   berryRegistryObjectManager.cpp
   berryRegistryObjectReferenceMap.cpp
   berryRegistryProperties.cpp
   berryRegistryStrategy.cpp
   berryRegistryTimestamp.cpp
   berryRegistrySupport.cpp
   berryTemporaryObjectManager.cpp
   berryThirdLevelConfigurationElementHandle.cpp
   berryXMLPreferencesStorage.cpp
 )
 
 set(CPP_FILES )
 
 foreach(file ${SRC_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/${file})
 endforeach(file ${SRC_CPP_FILES})
 
 foreach(file ${INTERNAL_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/internal/${file})
 endforeach(file ${INTERNAL_CPP_FILES})
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/application/berryIApplication.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/application/berryIApplication.h
index 16161f8d4e..2f48e4b33b 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/application/berryIApplication.h
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/application/berryIApplication.h
@@ -1,102 +1,98 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIAPPLICATION_H_
 #define BERRYIAPPLICATION_H_
 
 #include <org_blueberry_core_runtime_Export.h>
-#include "berryMacros.h"
 
 #include <QObject>
 
 namespace berry {
 
 /**
  * Bootstrap type for an application.  An IApplication represent executable
  * entry points into an application.  An IApplication can be configured into
  * the Platform's <code>org.blueberry.osgi.applications</code> extension-point.
  *
  * <p>
  * Clients may implement this interface.
  * </p>
- *
- * @since 1.0
  */
-struct org_blueberry_core_runtime_EXPORT IApplication {
-
-  berryManifestMacro(IApplication, berry);
+struct org_blueberry_core_runtime_EXPORT IApplication
+{
 
     /**
      * Exit object indicating normal termination
      */
     static const int EXIT_OK;
 
     /**
      * Exit object requesting platform restart
      */
     static const int EXIT_RESTART;
 
     /**
      * Exit object requesting that the command passed back be executed.  Typically
      * this is used to relaunch BlueBerry with different command line arguments.  When the executable is
      * relaunched the command line will be retrieved from the <code>BlueBerry.exitdata</code> system property.
      */
     static const int EXIT_RELAUNCH;
 
     virtual ~IApplication();
     /**
      * Starts this application with the given context and returns a result.  This
      * method must not exit until the application is finished and is ready to exit.
      * The content of the context is unchecked and should conform to the expectations of
      * the application being invoked.<p>
      *
      * Applications can return any object they like.  If an <code>Integer</code> is returned
      * it is treated as the program exit code if BlueBerry is exiting.
      * <p>
      * Note: This method is called by the platform; it is not intended
      * to be called directly by clients.
      * </p>
      * @return the return value of the application
      * @see #EXIT_OK
      * @see #EXIT_RESTART
      * @see #EXIT_RELAUNCH
      * @param context the application context to pass to the application
      * @exception Exception if there is a problem running this application.
      */
     virtual int Start() = 0;
 
     /**
      * Forces this running application to exit.  This method should wait until the
      * running application is ready to exit.  The {@link #start()}
      * should already have exited or should exit very soon after this method exits<p>
      *
      * This method is only called to force an application to exit.
      * This method will not be called if an application exits normally from
      * the {@link #start()} method.
      * <p>
      * Note: This method is called by the platform; it is not intended
      * to be called directly by clients.
      * </p>
      */
     virtual void Stop() = 0;
 
 };
 
 }
 
 Q_DECLARE_INTERFACE(berry::IApplication, "org.blueberry.IApplication")
 
 #endif /*BERRYIAPPLICATION_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryDebugBreakpointManager.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryDebugBreakpointManager.cpp
index ee6e6a2b50..065fe9910a 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryDebugBreakpointManager.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryDebugBreakpointManager.cpp
@@ -1,237 +1,237 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryDebugBreakpointManager.h"
 #include "berryDebugUtil.h"
 #include "berryObject.h"
 
 #include "berryLog.h"
 
 #include <Poco/NumberParser.h>
 #include <Poco/DOM/NodeList.h>
 #include <Poco/DOM/DOMParser.h>
 #include <Poco/DOM/Document.h>
 #include <Poco/DOM/Element.h>
 #include <Poco/DOM/DOMWriter.h>
 #include <Poco/SAX/InputSource.h>
 #include <Poco/SAX/SAXException.h>
 
 #include <Poco/FileStream.h>
 
 #include <sstream>
 
 namespace berry
 {
 
 const std::string DebugBreakpointManager::BREAKPOINTS_XML = "breakpoints.xml";
 
 const std::string DebugBreakpointManager::BREAKPOINTS_TAG = "breakpoints";
 const std::string DebugBreakpointManager::OBJECT_TAG = "object";
 const std::string DebugBreakpointManager::SMARTPOINTER_TAG = "smartpointer";
 
 const std::string DebugBreakpointManager::ID_ATTR = "id";
 const std::string DebugBreakpointManager::CLASSNAME_ATTR = "className";
 const std::string DebugBreakpointManager::OBJECTID_ATTR = "objectId";
 const std::string DebugBreakpointManager::ENABLED_ATTR = "enabled";
 
 void DebugBreakpointManager::AddSmartpointerBreakpoint(int smartPointerId,
     const Object* obj)
 {
-  BERRY_INFO << "Smartpointer breakpoint added: " << smartPointerId;
+  //BERRY_INFO << "Smartpointer breakpoint added: " << smartPointerId;
   m_SmartPointerBreakpoints[smartPointerId] = obj;
 }
 
 void DebugBreakpointManager::AddObjectBreakpoint(unsigned long objectTraceId)
 {
-  BERRY_INFO << "Object breakpoint added: " << objectTraceId;
+  //BERRY_INFO << "Object breakpoint added: " << objectTraceId;
   m_ObjectBreakpoints.insert(objectTraceId);
 }
 
 void DebugBreakpointManager::RemoveSmartpointerBreakpoint(int smartPointerId)
 {
   m_SmartPointerBreakpoints.erase(smartPointerId);
 }
 
 void DebugBreakpointManager::RemoveObjectBreakpoint(unsigned long objectTraceId)
 {
   m_ObjectBreakpoints.erase(objectTraceId);
 }
 
 const std::set<unsigned long>& DebugBreakpointManager::GetObjectBreakpoints() const
 {
   return m_ObjectBreakpoints;
 }
 
 const Poco::HashMap<int, const Object*>& DebugBreakpointManager::GetSmartPointerBreakpoints() const
 {
   return m_SmartPointerBreakpoints;
 }
 
 bool DebugBreakpointManager::BreakAtObject(unsigned long traceId) const
 {
   return m_ObjectBreakpoints.find(traceId) != m_ObjectBreakpoints.end();
 }
 
 bool DebugBreakpointManager::BreakAtSmartpointer(int spId) const
 {
   return m_SmartPointerBreakpoints.find(spId)
       != m_SmartPointerBreakpoints.end();
 }
 
 #ifdef BLUEBERRY_DEBUG_SMARTPOINTER
 void DebugBreakpointManager::SaveState(const QString& path) const
 {
   Poco::XML::Document* doc = new Poco::XML::Document();
   Poco::XML::Element* breakpoints = doc->createElement(BREAKPOINTS_TAG);
   doc->appendChild(breakpoints)->release();
 
   for (std::set<unsigned long>::const_iterator i = m_ObjectBreakpoints.begin(); i
       != m_ObjectBreakpoints.end(); ++i)
   {
     Poco::XML::Element* objectBreakpoint = doc->createElement(OBJECT_TAG);
     breakpoints->appendChild(objectBreakpoint)->release();
     std::stringstream ss;
     ss << *i;
     objectBreakpoint->setAttribute(ID_ATTR, ss.str());
 
     const Object* obj = DebugUtil::GetObject(*i);
     if (obj)
     {
-      objectBreakpoint->setAttribute(CLASSNAME_ATTR, obj->GetClassName());
+      objectBreakpoint->setAttribute(CLASSNAME_ATTR, obj->GetClassName().toStdString());
 
     }
   }
 
   for (Poco::HashMap<int, const Object*>::ConstIterator i =
       m_SmartPointerBreakpoints.begin(); i != m_SmartPointerBreakpoints.end(); ++i)
   {
     Poco::XML::Element* spBreakpoint = doc->createElement(SMARTPOINTER_TAG);
     breakpoints->appendChild(spBreakpoint)->release();
     std::stringstream ss;
     ss << i->first;
     spBreakpoint->setAttribute(ID_ATTR, ss.str());
 
     const Object* obj = i->second;
     if (i->second)
     {
-      spBreakpoint->setAttribute(CLASSNAME_ATTR, obj->GetClassName());
+      spBreakpoint->setAttribute(CLASSNAME_ATTR, obj->GetClassName().toStdString());
       ss.clear();
       ss << obj->GetTraceId();
       spBreakpoint->setAttribute(OBJECTID_ATTR, ss.str());
     }
   }
 
   Poco::FileOutputStream writer(path.toStdString());
   Poco::XML::DOMWriter out;
   out.setOptions(3); //write declaration and pretty print
   out.writeNode(writer, doc);
 
   doc->release();
 }
 #else
 void DebugBreakpointManager::SaveState(const QString& /*path*/) const
 {}
 #endif
 
 #ifdef BLUEBERRY_DEBUG_SMARTPOINTER
 void DebugBreakpointManager::RestoreState(const QString& path)
 {
   try
   {
     Poco::XML::DOMParser parser;
 
     Poco::FileInputStream reader(path.toStdString());
     Poco::XML::InputSource source(reader);
 
     //source.setSystemId(baseDir);
     Poco::XML::Document* doc = parser.parse(&source);
     Poco::XML::Element* breakpoints = doc->documentElement();
 
     if (breakpoints)
     {
       // restore object breakpoints
       Poco::XML::NodeList* elementList = breakpoints->getElementsByTagName(
           OBJECT_TAG);
       for (std::size_t i = 0; i < elementList->length(); i++)
       {
         Poco::XML::Element* elem =
             dynamic_cast<Poco::XML::Element*> (elementList->item(i));
 
         if (!elem->hasAttribute(ID_ATTR))
           continue;
 
         const std::string& attr = elem->getAttribute(ID_ATTR);
 
         int traceId = 0;
         try
         {
           traceId = Poco::NumberParser::parse(attr);
         } catch (const Poco::SyntaxException& e)
         {
           BERRY_WARN << e.displayText();
         }
 
         DebugUtil::GetBreakpointManager()->AddObjectBreakpoint(traceId);
       }
       elementList->release();
 
       // restore smartpointer breakpoints
       elementList = breakpoints->getElementsByTagName(SMARTPOINTER_TAG);
       for (std::size_t i = 0; i < elementList->length(); i++)
       {
         Poco::XML::Element* elem =
             dynamic_cast<Poco::XML::Element*> (elementList->item(i));
 
         if (!elem->hasAttribute(ID_ATTR))
           continue;
 
         const std::string& attr = elem->getAttribute(ID_ATTR);
 
         int spId = 0;
         try
         {
           spId = Poco::NumberParser::parse(attr);
         } catch (const Poco::SyntaxException& e)
         {
           BERRY_WARN << e.displayText();
         }
 
         DebugUtil::GetBreakpointManager()->AddSmartpointerBreakpoint(spId);
       }
       elementList->release();
     }
 
     doc->release();
   } catch (Poco::XML::SAXParseException& e)
   {
     BERRY_WARN << e.displayText();
   }
   catch (Poco::FileNotFoundException& /*e*/)
   {
 
   }
   catch (Poco::FileException& e)
   {
     BERRY_WARN << e.displayText();
   }
 }
 #else
 void DebugBreakpointManager::RestoreState(const QString& /*path*/)
 {
 }
 #endif
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryDebugUtil.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryDebugUtil.cpp
index ac00ceb843..65620aeac1 100755
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryDebugUtil.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryDebugUtil.cpp
@@ -1,549 +1,549 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryIDebugObjectListener.h"
 
 #include "berryDebugUtil.h"
 #include "berryObject.h"
 #include "berryLog.h"
 #include "berryPlatform.h"
 #include "berryDebugBreakpointManager.h"
 
 #include "internal/berryCTKPluginActivator.h"
 
 #include <QDir>
 #include <QDebug>
 
 #include <Poco/Bugcheck.h>
 #include <Poco/NumberParser.h>
 #include <Poco/DOM/NodeList.h>
 #include <Poco/DOM/DOMParser.h>
 #include <Poco/DOM/Document.h>
 #include <Poco/DOM/Element.h>
 #include <Poco/DOM/DOMWriter.h>
 #include <Poco/SAX/InputSource.h>
 #include <Poco/SAX/SAXException.h>
 
 #include <Poco/FileStream.h>
 
 #include <sstream>
 
 #include <numeric>
 
 namespace berry
 {
 
 static IDebugObjectListener::Events _G_ObjectEvents;
 
 const QString DebugUtil::DEBUG_UTIL_XML = "debugutil.xml";
 const QString DebugUtil::DEBUGUTIL_TAG = "debugutil";
 const QString DebugUtil::TRACEOBJECT_TAG = "traceObject";
 const QString DebugUtil::TRACECLASS_TAG = "traceClass";
 const QString DebugUtil::ID_ATTR = "id";
 const QString DebugUtil::NAME_ATTR = "name";
 
 QHash<quint32, QList<unsigned int> > DebugUtil::m_TraceIdToSmartPointerMap;
 QHash<quint32, const Object*> DebugUtil::m_TraceIdToObjectMap;
 QSet<unsigned int> DebugUtil::m_TracedObjects;
 QSet<QString> DebugUtil::m_TracedClasses;
 
 class NotClassName: public std::unary_function<const Object*, bool>
 {
 
   QString name;
 
 public:
   NotClassName(const QString& s) :
     name(s)
   {
   }
   bool operator()(const Object* entry) const
   {
     return name != entry->GetClassName();
   }
 };
 
 class AccumulateClassNames: public std::binary_function<QSet<QString>*, const Object*, QSet<QString>*>
 {
 public:
   QSet<QString>* operator()(QSet<QString>* names, const Object* entry)
   {
     names->insert(entry->GetClassName());
     return names;
   }
 };
 
 DebugBreakpointManager* DebugUtil::GetBreakpointManager()
 {
   static DebugBreakpointManager breakpointManager;
   return &breakpointManager;
 }
 
 #ifdef BLUEBERRY_DEBUG_SMARTPOINTER
 void DebugUtil::TraceObject(const Object* object)
 {
   BERRY_INFO << "Tracing enabled for: " << object->GetTraceId() << std::endl;
   m_TracedObjects.insert(object->GetTraceId());
   _G_ObjectEvents.objTracingEvent(object->GetTraceId(), true, object);
 }
 #else
 void DebugUtil::TraceObject(const Object*  /*object*/)
 {
 }
 #endif
 
 #ifdef BLUEBERRY_DEBUG_SMARTPOINTER
 void DebugUtil::TraceObject(unsigned int traceId)
 {
   BERRY_INFO << "Tracing enabled for: " << traceId << std::endl;
   m_TracedObjects.insert(traceId);
   TraceIdToObjectType::ConstIterator i = m_TraceIdToObjectMap.find(traceId);
   if (i != m_TraceIdToObjectMap.end())
     _G_ObjectEvents.objTracingEvent(traceId, true, i.value());
   else
     _G_ObjectEvents.objTracingEvent(traceId, true, 0);
 }
 #else
 void DebugUtil::TraceObject(unsigned int /*traceId*/)
 {
 }
 #endif
 
 #ifdef BLUEBERRY_DEBUG_SMARTPOINTER
 void DebugUtil::TraceClass(const QString& className)
 {
   BERRY_INFO << "Tracing enabled for: " << className << std::endl;
   m_TracedClasses.insert(className);
   //_G_ObjectEvents.objTracingEvent(object->GetTraceId(), true, object);
 }
 #else
 void DebugUtil::TraceClass(const QString&  /*className*/)
 {
 }
 #endif
 
 #ifdef BLUEBERRY_DEBUG_SMARTPOINTER
 void DebugUtil::StopTracing(unsigned int traceId)
 {
 
   BERRY_INFO << "Tracing stopped for: " << traceId << std::endl;
   m_TracedObjects.remove(traceId);
   TraceIdToObjectType::ConstIterator i = m_TraceIdToObjectMap.find(traceId);
   if (i != m_TraceIdToObjectMap.end())
     _G_ObjectEvents.objTracingEvent(traceId, false, i.value());
   else
     _G_ObjectEvents.objTracingEvent(traceId, false, 0);
 }
 #else
 void DebugUtil::StopTracing(unsigned int /*traceId*/)
 {
 }
 #endif
 
 #ifdef BLUEBERRY_DEBUG_SMARTPOINTER
 void DebugUtil::StopTracing(const Object* obj)
 {
   BERRY_INFO << "Tracing stopped for: " << obj->GetTraceId() << std::endl;
   m_TracedObjects.remove(obj->GetTraceId());
   _G_ObjectEvents.objTracingEvent(obj->GetTraceId(), false, obj);
 }
 #else
 void DebugUtil::StopTracing(const Object* /*obj*/)
 {
 }
 #endif
 
 #ifdef BLUEBERRY_DEBUG_SMARTPOINTER
 void DebugUtil::StopTracing(const QString& className)
 {
   BERRY_INFO << "Tracing stopped for: " << className << std::endl;
   m_TracedClasses.remove(className);
   //_G_ObjectEvents.objTracingEvent(obj->GetTraceId(), false, obj);
 }
 #else
 void DebugUtil::StopTracing(const QString& /*className*/)
 {
 }
 #endif
 
 #ifdef BLUEBERRY_DEBUG_SMARTPOINTER
 bool DebugUtil::IsTraced(const Object* object)
 {
   if (m_TracedObjects.find(object->GetTraceId()) != m_TracedObjects.end())
     return true;
 
   if (m_TracedClasses.find(object->GetClassName()) != m_TracedClasses.end())
       return true;
 
   return false;
 }
 #else
 bool DebugUtil::IsTraced(const Object*  /*object*/)
 {
   return false;
 }
 #endif
 
 #ifdef BLUEBERRY_DEBUG_SMARTPOINTER
 bool DebugUtil::IsTraced(unsigned int traceId)
 {
   if (m_TracedObjects.find(traceId) != m_TracedObjects.end())
     return true;
 
   TraceIdToObjectType::Iterator it = m_TraceIdToObjectMap.find(traceId);
   if (it != m_TraceIdToObjectMap.end())
   {
     if (m_TracedClasses.find(it.value()->GetClassName()) != m_TracedClasses.end())
       return true;
   }
 
   return false;
 }
 #else
 bool DebugUtil::IsTraced(unsigned int /*traceId*/)
 {
   return false;
 }
 #endif
 
 #ifdef BLUEBERRY_DEBUG_SMARTPOINTER
 bool DebugUtil::IsTraced(const QString& className)
 {
   return m_TracedClasses.find(className) != m_TracedClasses.end();
 }
 #else
 bool DebugUtil::IsTraced(const QString&  /*className*/)
 {
   return false;
 }
 #endif
 
 QSet<unsigned int> DebugUtil::GetTracedObjects()
 {
   return m_TracedObjects;
 }
 
 const Object* DebugUtil::GetObject(unsigned int traceId)
 {
   return m_TraceIdToObjectMap[traceId];
 }
 
 #ifdef BLUEBERRY_DEBUG_SMARTPOINTER
 QList<unsigned int> DebugUtil::GetSmartPointerIDs(
     const Object* objectPointer, const QList<unsigned int>& excludeList)
 {
   Q_ASSERT(objectPointer != 0);
   QList<unsigned int> ids = m_TraceIdToSmartPointerMap[objectPointer->GetTraceId()];
   for (QList<unsigned int>::const_iterator iter = excludeList.begin();
       iter != excludeList.end(); ++iter)
   ids.removeAll(*iter);
   return ids;
 }
 #else
 QList<unsigned int> DebugUtil::GetSmartPointerIDs(
     const Object* /*objectPointer*/, const QList<unsigned int>&  /*excludeList*/)
 {
   return QList<unsigned int>();
 }
 #endif
 
 QList<const Object*> DebugUtil::GetRegisteredObjects()
 {
   return m_TraceIdToObjectMap.values();
 }
 
 void DebugUtil::PrintSmartPointerIDs(const Object* objectPointer, const QList<unsigned int>& excludeList)
 {
   qDebug() << "SmartPointer IDs [ ";
   if (IsTraced(objectPointer))
   {
     QList<unsigned int> ids = GetSmartPointerIDs(objectPointer, excludeList);
     for (QList<unsigned int>::const_iterator iter = ids.begin();
         iter != ids.end(); ++iter)
     {
       qDebug() << *iter << " ";
     }
   }
   else
   {
     qDebug() << "n/a ";
   }
   qDebug() << "]\n";
 }
 
 void DebugUtil::AddObjectListener(IDebugObjectListener* listener)
 {
   _G_ObjectEvents.AddListener(listener);
 }
 
 void DebugUtil::RemoveObjectListener(IDebugObjectListener* listener)
 {
   _G_ObjectEvents.RemoveListener(listener);
 }
 
 void DebugUtil::ResetObjectSummary()
 {
   m_TraceIdToObjectMap.clear();
   m_TraceIdToSmartPointerMap.clear();
   m_TracedObjects.clear();
 }
 
 bool DebugUtil::PrintObjectSummary(bool details)
 {
   QSet<QString> names;
   std::accumulate(m_TraceIdToObjectMap.begin(), m_TraceIdToObjectMap.end(), &names, AccumulateClassNames());
 
   if (!names.isEmpty())
   {
     std::cout << std::endl << std::endl << "#########################################################" << std::endl;
     std::cout << "########     berry::Object leakage summary:     ########" << std::endl << std::endl;
 
     for (QSet<QString>::const_iterator i = names.begin();
          i != names.end(); ++i)
     {
       PrintObjectSummary(*i, details);
       if (details) std::cout << std::endl;
     }
 
     std::cout << std::endl << "#########################################################" << std::endl << std::endl;
   }
 
   return !names.isEmpty();
 }
 
 bool DebugUtil::PrintObjectSummary(const QString& className, bool details)
 {
   TraceIdToObjectType::ConstIterator endIter =
   std::remove_if(m_TraceIdToObjectMap.begin(), m_TraceIdToObjectMap.end(), NotClassName(className));
 
   qDebug() << "Class:" << className;
   if (details) std::cout << std::endl;
 
   std::size_t count = 0;
   for (TraceIdToObjectType::ConstIterator iter = m_TraceIdToObjectMap.begin();
       iter != endIter; ++iter, ++count)
   {
     if (details)
     {
       qDebug() << (*(iter.value()));
       PrintSmartPointerIDs(iter.value());
     }
   }
   qDebug() << "(" << count << " instances)\n";
   return (count!=0);
 }
 
 unsigned int& DebugUtil::GetSmartPointerCounter()
 {
   static unsigned int counter = 0;
   return counter;
 }
 
 #ifdef BLUEBERRY_DEBUG_SMARTPOINTER
 void DebugUtil::UnregisterSmartPointer(unsigned int smartPointerId, const Object* objectPointer)
 {
   poco_assert(objectPointer != 0);
 
   m_TraceIdToSmartPointerMap[objectPointer->GetTraceId()].removeAll(smartPointerId);
   _G_ObjectEvents.spDestroyedEvent(smartPointerId, objectPointer);
 }
 #else
 void DebugUtil::UnregisterSmartPointer(unsigned int  /*smartPointerId*/, const Object*  /*objectPointer*/)
 {
 }
 #endif
 
 #ifdef BLUEBERRY_DEBUG_SMARTPOINTER
 void DebugUtil::RegisterSmartPointer(unsigned int  smartPointerId, const Object* objectPointer, bool /*recordStack*/)
 {
   poco_assert(objectPointer != 0);
 
   if (m_TracedClasses.find(objectPointer->GetClassName()) != m_TracedClasses.end() ||
       m_TracedObjects.find(objectPointer->GetTraceId()) != m_TracedObjects.end())
   {
     m_TraceIdToSmartPointerMap[objectPointer->GetTraceId()].push_back(smartPointerId);
     _G_ObjectEvents.spCreatedEvent(smartPointerId, objectPointer);
   }
 
   if (GetBreakpointManager()->BreakAtSmartpointer(smartPointerId))
   poco_debugger_msg("SmartPointer Breakpoint reached");
 }
 #else
 void DebugUtil::RegisterSmartPointer(unsigned int  /*smartPointerId*/, const Object*  /*objectPointer*/, bool /*recordStack*/)
 {
 }
 #endif
 
 #ifdef BLUEBERRY_DEBUG_SMARTPOINTER
 void DebugUtil::RegisterObject(const Object* objectPointer)
 {
   m_TraceIdToObjectMap.insert(objectPointer->GetTraceId(), objectPointer);
   _G_ObjectEvents.objCreatedEvent(objectPointer);
 
   if (GetBreakpointManager()->BreakAtObject(objectPointer->GetTraceId()))
   {
     std::string msg = "SmartPointer Breakpoint reached for ";
-    msg += objectPointer->GetClassName();
+    msg += objectPointer->GetClassName().toStdString();
     poco_debugger_msg(msg.c_str());
   }
 }
 #else
 void DebugUtil::RegisterObject(const Object* /*objectPointer*/)
 {
 }
 #endif
 
 #ifdef BLUEBERRY_DEBUG_SMARTPOINTER
 void DebugUtil::UnregisterObject(const Object* objectPointer)
 {
   m_TraceIdToObjectMap.remove(objectPointer->GetTraceId());
   _G_ObjectEvents.objDestroyedEvent(objectPointer);
 }
 #else
 void DebugUtil::UnregisterObject(const Object* /*objectPointer*/)
 {
 }
 #endif
 
 bool DebugUtil::GetPersistencePath(QDir& path)
 {
   QFileInfo statePath = CTKPluginActivator::getPluginContext()->getDataFile(QString());
   path = statePath.absoluteFilePath();
   return true;
 }
 
 void DebugUtil::SaveState(const QDir& path)
 {
   QString saveFile = path.absoluteFilePath(DEBUG_UTIL_XML);
 
   Poco::XML::Document* doc = new Poco::XML::Document();
   Poco::XML::Element* debugutil = doc->createElement(DEBUGUTIL_TAG.toStdString());
   doc->appendChild(debugutil)->release();
 
   for (QSet<unsigned int>::const_iterator i = m_TracedObjects.begin();
        i != m_TracedObjects.end(); ++i)
   {
     Poco::XML::Element* traceObject = doc->createElement(TRACEOBJECT_TAG.toStdString());
     debugutil->appendChild(traceObject)->release();
     traceObject->setAttribute(ID_ATTR.toStdString(), QString::number(*i).toStdString());
   }
 
   for (QSet<QString>::const_iterator i = m_TracedClasses.begin();
        i != m_TracedClasses.end(); ++i)
   {
     Poco::XML::Element* traceClass = doc->createElement(TRACECLASS_TAG.toStdString());
     debugutil->appendChild(traceClass)->release();
     traceClass->setAttribute(NAME_ATTR.toStdString(), i->toStdString());
   }
 
   try
   {
     Poco::FileOutputStream writer(saveFile.toStdString());
     Poco::XML::DOMWriter out;
     out.setOptions(3); //write declaration and pretty print
     out.writeNode(writer, doc);
 
     doc->release();
 
     // save BreakpointManager
     QString saveBM = path.absoluteFilePath(QString::fromStdString(DebugBreakpointManager::BREAKPOINTS_XML));
     GetBreakpointManager()->SaveState(saveBM);
   }
   catch (Poco::FileException& e)
   {
     BERRY_WARN << e.displayText();
   }
 
 }
 
 void DebugUtil::RestoreState(const QDir& path)
 {
   QString restoreFile = path.absoluteFilePath(DEBUG_UTIL_XML);
 
   try
   {
     Poco::XML::DOMParser parser;
 
     Poco::FileInputStream reader(restoreFile.toStdString());
     Poco::XML::InputSource source(reader);
 
     //source.setSystemId(baseDir);
     Poco::XML::Document* doc = parser.parse(&source);
     Poco::XML::Element* debugutil = doc->documentElement();
 
     if (debugutil)
     {
       // restore traced objects
       Poco::XML::NodeList* elementList = debugutil->getElementsByTagName(TRACEOBJECT_TAG.toStdString());
       for (std::size_t i = 0; i < elementList->length(); i++)
       {
         Poco::XML::Element* elem =
         dynamic_cast<Poco::XML::Element*> (elementList->item(static_cast<unsigned long>(i)));
 
         if (!elem->hasAttribute(ID_ATTR.toStdString())) continue;
 
         const std::string& attr = elem->getAttribute(ID_ATTR.toStdString());
 
         int traceId = 0;
         try
         {
           traceId = Poco::NumberParser::parse(attr);
         }
         catch (const Poco::SyntaxException& e)
         {
           BERRY_WARN << e.displayText();
         }
 
         DebugUtil::TraceObject(traceId);
       }
       elementList->release();
 
       // restore traced classes
       elementList = debugutil->getElementsByTagName(TRACECLASS_TAG.toStdString());
       for (std::size_t i = 0; i < elementList->length(); i++)
       {
         Poco::XML::Element* elem =
         dynamic_cast<Poco::XML::Element*> (elementList->item(static_cast<unsigned long>(i)));
 
         if (!elem->hasAttribute(NAME_ATTR.toStdString())) continue;
 
         const std::string& traceClass = elem->getAttribute(NAME_ATTR.toStdString());
         if (!traceClass.empty())
           DebugUtil::TraceClass(QString::fromStdString(traceClass));
       }
       elementList->release();
     }
 
     doc->release();
   }
   catch (Poco::XML::SAXParseException& e)
   {
     BERRY_WARN << e.displayText();
   }
   catch (Poco::FileNotFoundException&)
   {
 
   }
   catch (Poco::FileException& e)
   {
     BERRY_WARN << e.displayText();
   }
 
   // restore BreakpointManager
   GetBreakpointManager()->RestoreState(path.absoluteFilePath(QString::fromStdString(DebugBreakpointManager::BREAKPOINTS_XML)));
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryFlags.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryFlags.h
deleted file mode 100755
index f5c96f3564..0000000000
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryFlags.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*===================================================================
-
-BlueBerry Platform
-
-Copyright (c) German Cancer Research Center,
-Division of Medical and Biological Informatics.
-All rights reserved.
-
-This software is distributed WITHOUT ANY WARRANTY; without
-even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.
-
-See LICENSE.txt or http://www.mitk.org for details.
-
-===================================================================*/
-
-
-#ifndef BERRYFLAGS_H_
-#define BERRYFLAGS_H_
-
-#include <org_blueberry_core_runtime_Export.h>
-
-namespace berry {
-
-class org_blueberry_core_runtime_EXPORT Flag
-{
-    int i;
-public:
-    inline Flag(int i);
-    inline operator int() const { return i; }
-};
-
-inline Flag::Flag(int ai) : i(ai) {}
-
-class org_blueberry_core_runtime_EXPORT IncompatibleFlag
-{
-    int i;
-public:
-    inline explicit IncompatibleFlag(int i);
-    inline operator int() const { return i; }
-};
-
-inline IncompatibleFlag::IncompatibleFlag(int ai) : i(ai) {}
-
-
-template<typename Enum>
-class Flags
-{
-    typedef void **Zero;
-    int i;
-public:
-    typedef Enum enum_type;
-    inline Flags(const Flags &f) : i(f.i) {}
-    inline Flags(Enum f) : i(f) {}
-    inline Flags(Zero = 0) : i(0) {}
-    inline Flags(Flag f) : i(f) {}
-
-    inline Flags &operator=(const Flags &f) { i = f.i; return *this; }
-    inline Flags &operator&=(int mask) { i &= mask; return *this; }
-    inline Flags &operator&=(unsigned int mask) { i &= mask; return *this; }
-    inline Flags &operator|=(Flags f) { i |= f.i; return *this; }
-    inline Flags &operator|=(Enum f) { i |= f; return *this; }
-    inline Flags &operator^=(Flags f) { i ^= f.i; return *this; }
-    inline Flags &operator^=(Enum f) { i ^= f; return *this; }
-
-    inline operator int() const { return i; }
-
-    inline Flags operator|(Flags f) const { Flags g; g.i = i | f.i; return g; }
-    inline Flags operator|(Enum f) const { Flags g; g.i = i | f; return g; }
-    inline Flags operator^(Flags f) const { Flags g; g.i = i ^ f.i; return g; }
-    inline Flags operator^(Enum f) const { Flags g; g.i = i ^ f; return g; }
-    inline Flags operator&(int mask) const { Flags g; g.i = i & mask; return g; }
-    inline Flags operator&(unsigned int mask) const { Flags g; g.i = i & mask; return g; }
-    inline Flags operator&(Enum f) const { Flags g; g.i = i & f; return g; }
-    inline Flags operator~() const { Flags g; g.i = ~i; return g; }
-
-    inline bool operator!() const { return !i; }
-
-    inline bool TestFlag(Enum f) const { return (i & f) == f; }
-
-};
-
-} // namespace berry
-
-#endif /* BERRYFLAGS_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIAdaptable.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIAdaptable.h
index cf9cf68b28..04cde820b9 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIAdaptable.h
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIAdaptable.h
@@ -1,77 +1,91 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef _BERRY_IADAPTABLE_H_
 #define _BERRY_IADAPTABLE_H_
 
 #include <org_blueberry_core_runtime_Export.h>
 
-#include <berryMacros.h>
 #include <berryObject.h>
 
-#include <Poco/Any.h>
+#include <berryLog.h>
+
+#include <typeinfo>
 
 namespace berry {
 
 /**
  * An interface for an adaptable object.
  * <p>
  * Adaptable objects can be dynamically extended to provide different
  * interfaces (or "adapters").  Adapters are created by adapter
  * factories, which are in turn managed by type by adapter managers.
  * </p>
  * For example,
  * <pre>
  *     IAdaptable a = [some adaptable];
  *     IFoo x = (IFoo)a.getAdapter(IFoo.class);
  *     if (x != null)
  *         [do IFoo things with x]
  * </pre>
  * <p>
  * This interface can be used without OSGi running.
  * </p><p>
  * Clients may implement this interface, or obtain a default implementation
  * of this interface by subclassing <code>PlatformObject</code>.
  * </p>
  * @see IAdapterFactory
  * @see IAdapterManager
  * @see PlatformObject
  */
-struct org_blueberry_core_runtime_EXPORT IAdaptable {
+struct org_blueberry_core_runtime_EXPORT IAdaptable
+{
 
 public:
 
-  berryNameMacro(berry::IAdaptable);
-
   /**
    * Returns an object which is an instance of the given class
    * associated with this object. Returns <code>null</code> if
    * no such object can be found.
    *
    * @param adapterType the adapter class to look up
    * @return a object castable to the given class,
    *    or <code>null</code> if this object does not
    *    have an adapter for the given class
    */
-  virtual Poco::Any GetAdapter(const QString& adapterType) = 0;
+  virtual Object* GetAdapter(const QString& adapterType) = 0;
+
+  template<class A>
+  A* GetAdapter()
+  {
+    const char* typeName = qobject_interface_iid<A*>();
+    if (typeName == NULL)
+    {
+      BERRY_WARN << "Error getting adapter for '" << Object::DemangleName(typeid(*this).name()) << "': "
+                 << "Cannot get the interface id for type '" << Object::DemangleName(typeid(A).name())
+                 << "'. It is probably missing a Q_DECLARE_INTERFACE macro in its header.";
+      return NULL;
+    }
+    return dynamic_cast<A*>(this->GetAdapter(typeName));
+  }
 
   virtual ~IAdaptable();
 
 };
 
 }  // namespace berry
 
 #endif /*_BERRY_IADAPTABLE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIAdapterManager.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIAdapterManager.h
index 4df2b65417..6c3384cb1d 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIAdapterManager.h
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIAdapterManager.h
@@ -1,278 +1,287 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIADAPTERMANAGER_H_
 #define BERRYIADAPTERMANAGER_H_
 
 #include <berryMacros.h>
 
 #include <org_blueberry_core_runtime_Export.h>
 
 #include "berryPlatformObject.h"
 #include "berryIAdapterFactory.h"
 
-#include <Poco/Any.h>
 #include <QtPlugin>
 
 #include <typeinfo>
 
 namespace berry
 {
 
 /**
  * An adapter manager maintains a registry of adapter factories. Clients
  * directly invoke methods on an adapter manager to register and unregister
  * adapters. All adaptable objects (that is, objects that implement the <code>IAdaptable</code>
  * interface) tunnel <code>IAdaptable.getAdapter</code> invocations to their
  * adapter manager's <code>IAdapterManger.getAdapter</code> method. The
  * adapter manager then forwards this request unmodified to the <code>IAdapterFactory.getAdapter</code>
  * method on one of the registered adapter factories.
  * <p>
  * Adapter factories can be registered programmatically using the <code>registerAdapters</code>
  * method.  Alternatively, they can be registered declaratively using the
  * <code>org.blueberry.core.runtime.adapters</code> extension point.  Factories registered
  * with this extension point will not be able to provide adapters until their
  * corresponding plugin has been activated.
  * <p>
  * The following code snippet shows how one might register an adapter of type
  * <code>com.example.acme.Sticky</code> on resources in the workspace.
  * <p>
  *
  * <pre>
  *  IAdapterFactory pr = new IAdapterFactory() {
  *    public Class[] getAdapterList() {
  *      return new Class[] { com.example.acme.Sticky.class };
  *    }
  *    public Object getAdapter(Object adaptableObject, Class adapterType) {
  *      IResource res = (IResource) adaptableObject;
  *      QualifiedName key = new QualifiedName(&quot;com.example.acme&quot;, &quot;sticky-note&quot;);
  *      try {
  *        com.example.acme.Sticky v = (com.example.acme.Sticky) res.getSessionProperty(key);
  *        if (v == null) {
  *          v = new com.example.acme.Sticky();
  *          res.setSessionProperty(key, v);
  *        }
  *      } catch (CoreException e) {
  *        // unable to access session property - ignore
  *      }
  *      return v;
  *    }
  *  }
  *  Platform.getAdapterManager().registerAdapters(pr, IResource.class);
  *   </pre>
  *
  * </p><p>
  * This interface can be used without OSGi running.
  * </p><p>
  * This interface is not intended to be implemented by clients.
  * </p>
  * @see IAdaptable
  * @see IAdapterFactory
  */
 struct org_blueberry_core_runtime_EXPORT IAdapterManager: public Object
 {
 
-  berryInterfaceMacro(IAdapterManager, berry);
+  berryObjectMacro(berry::IAdapterManager)
 
   /**
    * This value can be returned to indicate that no applicable adapter factory
    * was found.
    * @since org.blueberry.equinox.common 3.3
    */
   static const int NONE;
 
   /**
    * This value can be returned to indicate that an adapter factory was found,
    * but has not been loaded.
    * @since org.blueberry.equinox.common 3.3
    */
   static const int NOT_LOADED;
 
   /**
    * This value can be returned to indicate that an adapter factory is loaded.
    * @since org.blueberry.equinox.common 3.3
    */
   static const int LOADED;
 
-  /**
-   * Returns the types that can be obtained by converting <code>adaptableClass</code>
-   * via this manager. Converting means that subsequent calls to <code>getAdapter()</code>
-   * or <code>loadAdapter()</code> could result in an adapted object.
-   * <p>
-   * Note that the returned types do not guarantee that
-   * a subsequent call to <code>getAdapter</code> with the same type as an argument
-   * will return a non-null result. If the factory's plug-in has not yet been
-   * loaded, or if the factory itself returns <code>null</code>, then
-   * <code>getAdapter</code> will still return <code>null</code>.
-   * </p>
-   * @param adaptableClass the adaptable class being queried
-   * @return an array of type names that can be obtained by converting
-   * <code>adaptableClass</code> via this manager. An empty array
-   * is returned if there are none.
-   * @since 3.1
-   */
-  virtual std::vector<std::string> ComputeAdapterTypes(
-      const std::type_info& adaptableClass) = 0;
-
-  /**
-   * Returns the class search order for a given class. The search order from a
-   * class with the definition <br>
-   * <code>class X extends Y implements A, B</code><br>
-   * is as follows:
-   * <ul>
-   * <li>the target's class: X
-   * <li>X's superclasses in order to <code>Object</code>
-   * <li>a breadth-first traversal of the target class's interfaces in the
-   * order returned by <code>getInterfaces</code> (in the example, A and its
-   * superinterfaces then B and its superinterfaces) </li>
-   * </ul>
-   *
-   * @param clazz the class for which to return the class order.
-   * @return the class search order for the given class. The returned
-   * search order will minimally  contain the target class.
-   * @since 3.1
-   */
-  //public Class[] computeClassOrder(Class clazz);
-
   /**
    * Returns a Poco::Any object which contains an instance of the given name associated
    * with the given adaptable. Returns an empty Poco::Any if no such object can
    * be found.
    * <p>
    * Note that this method will never cause plug-ins to be loaded. If the
    * only suitable factory is not yet loaded, this method will return an empty Poco::Any.
    * If activation of the plug-in providing the factory is required, use the
    * <code>LoadAdapter</code> method instead.
    *
    * @param adaptable the adaptable object being queried (usually an instance
    * of <code>IAdaptable</code>)
    * @param adapterTypeName the fully qualified name of the type of adapter to look up
    * @return a Poco::Any castable to the given adapter type, or empty
    * if the given adaptable object does not have an available adapter of the
    * given type
    */
   template<typename A>
-  Poco::Any GetAdapter(A adaptable, const std::string& adapterTypeName) {
-    return this->GetAdapter(Poco::Any(adaptable), adapterTypeName, false);
+  A* GetAdapter(const Object* adaptable)
+  {
+    const char* typeName = qobject_interface_iid<A*>();
+    if (typeName == NULL)
+    {
+      BERRY_WARN << "Error getting adapter for '" << Object::DemangleName(typeid(*adaptable).name()) << "': "
+                 << "Cannot get the interface id for type '" << Object::DemangleName(typeid(A).name())
+                 << "'. It is probably missing a Q_DECLARE_INTERFACE macro in its header.";
+      return NULL;
+    }
+    return dynamic_cast<A*>(this->GetAdapter(adaptable, typeName, false));
   }
 
+  /**
+   * Returns an object which is an instance of the given class name associated
+   * with the given object. Returns <code>null</code> if no such object can
+   * be found.
+   * <p>
+   * Note that this method will never cause plug-ins to be loaded. If the
+   * only suitable factory is not yet loaded, this method will return <code>null</code>.
+   * If activation of the plug-in providing the factory is required, use the
+   * <code>loadAdapter</code> method instead.
+   *
+   * @param adaptable the adaptable object being queried (usually an instance
+   * of <code>IAdaptable</code>)
+   * @param adapterTypeName the fully qualified name of the type of adapter to look up
+   * @return an object castable to the given adapter type, or <code>null</code>
+   * if the given adaptable object does not have an available adapter of the
+   * given type
+   */
+  virtual Object* GetAdapter(const Object* adaptable, const QString& adapterTypeName) = 0;
+
   /**
    * Returns whether there is an adapter factory registered that may be able
    * to convert <code>adaptable</code> to an object of type <code>adapterTypeName</code>.
    * <p>
    * Note that a return value of <code>true</code> does not guarantee that
    * a subsequent call to <code>GetAdapter</code> with the same arguments
    * will return a non-empty result. If the factory's plug-in has not yet been
    * loaded, or if the factory itself returns nothing, then
    * <code>GetAdapter</code> will still return an empty Poco::Any.
    *
    * @param adaptable the adaptable object being queried (usually an instance
    * of <code>IAdaptable</code>)
    * @param adapterTypeName the fully qualified class name of an adapter to
    * look up
    * @return <code>true</code> if there is an adapter factory that claims
    * it can convert <code>adaptable</code> to an object of type <code>adapterType</code>,
    * and <code>false</code> otherwise.
    */
-  virtual bool HasAdapter(const std::string& adaptableType, const std::string& adapterType) = 0;
+  virtual bool HasAdapter(const Object* adaptableType, const QString& adapterType) = 0;
+
+  template<typename A>
+  int QueryAdapter(const Object* adaptable)
+  {
+    const char* typeName = qobject_interface_iid<A*>();
+    if (typeName == NULL)
+    {
+      BERRY_WARN << "Error querying adapter manager for '" << Object::DemangleName(typeid(*adaptable).name()) << "': "
+                 << "Cannot get the interface id for type '" << Object::DemangleName(typeid(A).name())
+                 << "'. It is probably missing a Q_DECLARE_INTERFACE macro in its header.";
+      return NONE;
+    }
+    return this->QueryAdapter(adaptable, typeName);
+  }
 
   /**
    * Returns a status of an adapter factory registered that may be able
    * to convert <code>adaptable</code> to an object of type <code>adapterTypeName</code>.
    * <p>
    * One of the following values can be returned:<ul>
    * <li>{@link berry::IAdapterManager::NONE} if no applicable adapter factory was found;</li>
    * <li>{@link berry::IAdapterManager::NOT_LOADED} if an adapter factory was found, but has not been loaded;</li>
    * <li>{@link berry::IAdapterManager::LOADED} if an adapter factory was found, and it is loaded.</li>
    * </ul></p>
    * @param adaptable the adaptable object being queried (usually an instance
    * of <code>IAdaptable</code>)
    * @param adapterTypeName the fully qualified class name of an adapter to
    * look up
    * @return a status of the adapter
    */
-  virtual int
-      QueryAdapter(const std::string& adaptableType, const std::string& adapterType) = 0;
+  virtual int QueryAdapter(const Object* adaptableType, const QString& adapterType) = 0;
 
   /**
    * Returns an object that is an instance of the given class name associated
    * with the given object. Returns an empty Poco::Any if no such object can
    * be found.
    * <p>
    * Note that unlike the <code>GetAdapter</code> methods, this method
    * will cause the plug-in that contributes the adapter factory to be loaded
    * if necessary. As such, this method should be used judiciously, in order
    * to avoid unnecessary plug-in activations. Most clients should avoid
    * activation by using <code>GetAdapter</code> instead.
    *
    * @param adaptable the adaptable object being queried (usually an instance
    * of <code>IAdaptable</code>)
    * @param adapterTypeName the fully qualified name of the type of adapter to look up
    * @return a Poco::Any castable to the given adapter type, or empty
    * if the given adaptable object does not have an available adapter of the
    * given type
    */
   template<typename A>
-  Poco::Any LoadAdapter(A adaptable, const std::string& adapterTypeName) {
-    return this->GetAdapter(Poco::Any(adaptable), adapterTypeName, true);
+  A* LoadAdapter(const Object* adaptable)
+  {
+    const char* typeName = qobject_interface_iid<A*>();
+    if (typeName == NULL)
+    {
+      BERRY_WARN << "Error getting adapter for '" << Object::DemangleName(typeid(*adaptable).name()) << "': "
+                 << "Cannot get the interface id for type '" << Object::DemangleName(typeid(A).name())
+                 << "'. It is probably missing a Q_DECLARE_INTERFACE macro in its header.";
+      return NULL;
+    }
+    return dynamic_cast<A*>(this->GetAdapter(adaptable, typeName, true));
   }
 
   /**
    * Registers the given adapter factory as extending objects of the given
    * type.
    *
    * @param factory the adapter factory
    * @param adaptableTypeName the fully qualified typename being extended
    * @see #UnregisterAdapters(IAdapterFactory*)
    * @see #UnregisterAdapters(IAdapterFactory*, const std::adaptableTypeName&)
    */
   virtual void RegisterAdapters(IAdapterFactory* factory,
-      const std::string& adaptableTypeName) = 0;
+                                const QString& adaptableTypeName) = 0;
 
   /**
    * Removes the given adapter factory completely from the list of registered
    * factories. Equivalent to calling <code>UnregisterAdapters(IAdapterFactory*, const std::string&)</code>
    * on all classes against which it had been explicitly registered. Does
    * nothing if the given factory is not currently registered.
    *
    * @param factory the adapter factory to remove
    * @see #RegisterAdapters(IAdapterFactory*, const std::string&)
    */
   virtual void UnregisterAdapters(IAdapterFactory* factory) = 0;
 
   /**
    * Removes the given adapter factory from the list of factories registered
    * as extending the given class. Does nothing if the given factory and type
    * combination is not registered.
    *
    * @param factory the adapter factory to remove
    * @param adaptableTypeName one of the type names against which the given factory is
    * registered
    * @see #RegisterAdapters(IAdapterFactory*, const std::string&)
    */
   virtual void UnregisterAdapters(IAdapterFactory* factory,
-      const std::string& adaptableTypeName) = 0;
+                                  const QString& adaptableTypeName) = 0;
 
-protected:
+private:
 
-  virtual Poco::Any GetAdapter(Poco::Any adaptable, const std::string& adapterType, bool force) = 0;
+  virtual Object* GetAdapter(const Object* adaptable, const QString& adapterType, bool force) = 0;
 };
 
 } // namespace berry
 
 Q_DECLARE_INTERFACE(berry::IAdapterManager, "org.blueberry.service.IAdapterManager")
 
 #endif /*BERRYIADAPTERMANAGER_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIBerryPreferences.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIBerryPreferences.h
index 676fd741a1..7e6586a608 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIBerryPreferences.h
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIBerryPreferences.h
@@ -1,48 +1,48 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 #ifndef BERRYIBERRYPREFERENCES_H_
 #define BERRYIBERRYPREFERENCES_H_
 
 #include <org_blueberry_core_runtime_Export.h>
 
 #include "berryIPreferences.h"
 #include "berryMessage.h"
 
 
 namespace berry
 {
 
   ///
   /// Like IEclipsePreferences an extension to the osgi-IPreferences
   /// to send out events when nodes or values changed in a node.
   ///
   struct org_blueberry_core_runtime_EXPORT IBerryPreferences : virtual public IPreferences
   {
-    berryInterfaceMacro(IBerryPreferences, berry);
+    berryObjectMacro(berry::IBerryPreferences)
 
     virtual ~IBerryPreferences();
 
     ///
     /// Invoked when this node was changed, that is when a property
     /// was changed or when a new child node was inserted.
     ///
     berry::Message1<const IBerryPreferences*> OnChanged;
 
   };
 
 }  // namespace berry
 
 #endif /*BERRYIBERRYPREFERENCES_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIDebugObjectListener.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIDebugObjectListener.cpp
index 55ee32485d..988c4e21cf 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIDebugObjectListener.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIDebugObjectListener.cpp
@@ -1,45 +1,49 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryIDebugObjectListener.h"
 
 namespace berry {
 
 void IDebugObjectListener::Events::AddListener(IDebugObjectListener* l)
 {
   if (l == 0) return;
 
   Types t = l->GetEventTypes();
 
   if (t & OBJECT_CREATED) objCreatedEvent += ObjDelegate(l, &IDebugObjectListener::ObjectCreated);
   if (t & OBJECT_DESTROYED) objDestroyedEvent += ObjDelegate(l, &IDebugObjectListener::ObjectDestroyed);
   if (t & OBJECT_TRACING) objTracingEvent += TraceDelegate(l, &IDebugObjectListener::ObjectTracingChanged);
   if (t & SMARTPOINTER_CREATED) spCreatedEvent += SPDelegate(l, &IDebugObjectListener::SmartPointerCreated);
   if (t & SMARTPOINTER_CREATED) spDestroyedEvent += SPDelegate(l, &IDebugObjectListener::SmartPointerDestroyed);
 }
 
 void IDebugObjectListener::Events::RemoveListener(IDebugObjectListener* l)
 {
   if (l == 0) return;
 
   objCreatedEvent -= ObjDelegate(l, &IDebugObjectListener::ObjectCreated);
   objDestroyedEvent -= ObjDelegate(l, &IDebugObjectListener::ObjectDestroyed);
   objTracingEvent -= TraceDelegate(l, &IDebugObjectListener::ObjectTracingChanged);
   spCreatedEvent -= SPDelegate(l, &IDebugObjectListener::SmartPointerCreated);
   spDestroyedEvent -= SPDelegate(l, &IDebugObjectListener::SmartPointerDestroyed);
 }
 
+IDebugObjectListener::~IDebugObjectListener()
+{
+}
+
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIDebugObjectListener.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIDebugObjectListener.h
index 8501349ea4..0c0af1e8c3 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIDebugObjectListener.h
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIDebugObjectListener.h
@@ -1,99 +1,96 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIDEBUGOBJECTLISTENER_H_
 #define BERRYIDEBUGOBJECTLISTENER_H_
 
-#include <berryObject.h>
-#include <berryMacros.h>
+#include "berryMessage.h"
 
 #include <org_blueberry_core_runtime_Export.h>
 
 namespace berry
 {
 
-struct org_blueberry_core_runtime_EXPORT IDebugObjectListener: public Object
-{
+class Object;
 
-  berryInterfaceMacro(IDebugObjectListener, berry)
+struct org_blueberry_core_runtime_EXPORT IDebugObjectListener
+{
 
   struct org_blueberry_core_runtime_EXPORT Events {
 
     enum Type {
      NONE                   = 0x00000000,
      OBJECT_CREATED         = 0x00000001,
      OBJECT_DESTROYED       = 0x00000002,
      OBJECT_TRACING         = 0x00000004,
      SMARTPOINTER_CREATED   = 0x00000008,
      SMARTPOINTER_DESTROYED = 0x00000010,
 
      ALL       = 0xffffffff
     };
 
-    BERRY_DECLARE_FLAGS(Types, Type)
+    Q_DECLARE_FLAGS(Types, Type)
 
     typedef Message1<const Object*> ObjectEventType;
     typedef Message3<unsigned int, bool, const Object*> TracingEventType;
     typedef Message2<unsigned int, const Object*> SmartPointerEventType;
 
     ObjectEventType objCreatedEvent;
     ObjectEventType objDestroyedEvent;
     TracingEventType objTracingEvent;
     SmartPointerEventType spCreatedEvent;
     SmartPointerEventType spDestroyedEvent;
 
     void AddListener(IDebugObjectListener* listener);
     void RemoveListener(IDebugObjectListener* listener);
 
     typedef MessageDelegate1<IDebugObjectListener, const Object*> ObjDelegate;
     typedef MessageDelegate3<IDebugObjectListener, unsigned int, bool, const Object*> TraceDelegate;
     typedef MessageDelegate2<IDebugObjectListener, unsigned int, const Object*> SPDelegate;
   };
 
-  virtual ~IDebugObjectListener()
-  {
-  }
+  virtual ~IDebugObjectListener();
 
   virtual Events::Types GetEventTypes() const = 0;
 
   virtual void ObjectCreated(const Object*  /*obj*/)
   {
   }
 
   virtual void ObjectDestroyed(const Object*  /*obj*/)
   {
   }
 
   virtual void ObjectTracingChanged(unsigned int  /*traceId*/, bool  /*enabled*/ = true, const Object*  /*obj*/ = 0)
   {
   }
 
   virtual void SmartPointerCreated(unsigned int  /*id*/, const Object*  /*obj*/)
   {
   }
 
   virtual void SmartPointerDestroyed(unsigned int  /*id*/, const Object*  /*obj*/)
   {
   }
 
 };
 
 }
 
-BERRY_DECLARE_OPERATORS_FOR_FLAGS(berry::IDebugObjectListener::Events::Types)
+Q_DECLARE_OPERATORS_FOR_FLAGS(berry::IDebugObjectListener::Events::Types)
 
 #endif /* BERRYIDEBUGOBJECTLISTENER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIPreferences.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIPreferences.h
index a779fb52b5..dc14cf7ea9 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIPreferences.h
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIPreferences.h
@@ -1,705 +1,705 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 #ifndef BERRYIPREFERENCES_H_
 #define BERRYIPREFERENCES_H_
 
 #include <org_blueberry_core_runtime_Export.h>
 
 #include "berryObject.h"
 #include "berryBackingStoreException.h"
 
 
 namespace berry
 {
 
   /**
    * A node in a hierarchical collection of preference data.
    *
    * <p>
    * This interface allows applications to store and retrieve user and system
    * preference data. This data is stored persistently in an
    * implementation-dependent backing store. Typical implementations include flat
    * files, OS-specific registries, directory servers and SQL databases.
    *
    * <p>
    * For each bundle, there is a separate tree of nodes for each user, and one for
    * system preferences. The precise description of "user" and "system" will vary
    * from one bundle to another. Typical information stored in the user preference
    * tree might include font choice, and color choice for a bundle which interacts
    * with the user via a servlet. Typical information stored in the system
    * preference tree might include installation data, or things like high score
    * information for a game program.
    *
    * <p>
    * Nodes in a preference tree are named in a similar fashion to directories in a
    * hierarchical file system. Every node in a preference tree has a <i>node name
    * </i> (which is not necessarily unique), a unique <i>absolute path name </i>,
    * and a path name <i>relative </i> to each ancestor including itself.
    *
    * <p>
    * The root node has a node name of the empty <code>QString</code> object ("").
    * Every other node has an arbitrary node name, specified at the time it is
    * created. The only restrictions on this name are that it cannot be the empty
    * string, and it cannot contain the slash character ('/').
    *
    * <p>
    * The root node has an absolute path name of <code>"/"</code>. Children of the
    * root node have absolute path names of <code>"/" + </code> <i>&lt;node name&gt;
    * </i>. All other nodes have absolute path names of <i>&lt;parent's absolute
    * path name&gt; </i> <code> + "/" + </code> <i>&lt;node name&gt; </i>. Note that
    * all absolute path names begin with the slash character.
    *
    * <p>
    * A node <i>n </i>'s path name relative to its ancestor <i>a </i> is simply the
    * string that must be appended to <i>a </i>'s absolute path name in order to
    * form <i>n </i>'s absolute path name, with the initial slash character (if
    * present) removed. Note that:
    * <ul>
    * <li>No relative path names begin with the slash character.
    * <li>Every node's path name relative to itself is the empty string.
    * <li>Every node's path name relative to its parent is its node name (except
    * for the root node, which does not have a parent).
    * <li>Every node's path name relative to the root is its absolute path name
    * with the initial slash character removed.
    * </ul>
    *
    * <p>
    * Note finally that:
    * <ul>
    * <li>No path name contains multiple consecutive slash characters.
    * <li>No path name with the exception of the root's absolute path name end in
    * the slash character.
    * <li>Any string that conforms to these two rules is a valid path name.
    * </ul>
    *
    * <p>
    * Each <code>Preference</code> node has zero or more properties associated with
    * it, where a property consists of a name and a value. The bundle writer is
    * free to choose any appropriate names for properties. Their values can be of
    * type <code>QString</code>,<code>long</code>,<code>int</code>,<code>bool</code>,
    * <code>std::vector<char></code>,<code>float</code>, or <code>double</code> but they can
    * always be accessed as if they were <code>QString</code> objects.
    *
    * <p>
    * All node name and property name comparisons are case-sensitive.
    *
    * <p>
    * All of the methods that modify preference data are permitted to operate
    * asynchronously; they may return immediately, and changes will eventually
    * propagate to the persistent backing store, with an implementation-dependent
    * delay. The <code>flush</code> method may be used to synchronously force updates
    * to the backing store.
    *
    * <p>
    * Implementations must automatically attempt to flush to the backing store any
    * pending updates for a bundle's preferences when the bundle is stopped or
    * otherwise ungets the IPreferences Service.
    *
    * <p>
    * The methods in this class may be invoked concurrently by multiple threads in
    * a single Java Virtual Machine (JVM) without the need for external
    * synchronization, and the results will be equivalent to some serial execution.
    * If this class is used concurrently <i>by multiple JVMs </i> that store their
    * preference data in the same backing store, the data store will not be
    * corrupted, but no other guarantees are made concerning the consistency of the
    * preference data.
    *
    *
    * @version $Revision$
    */
   struct org_blueberry_core_runtime_EXPORT IPreferences : virtual public Object
   {
-    berryInterfaceMacro(IPreferences, berry);
+    berryObjectMacro(berry::IPreferences)
 
     virtual ~IPreferences();
 
     /**
      * Associates the specified value with the specified key in this node.
      *
      * @param key key with which the specified value is to be associated.
      * @param value value to be associated with the specified key.
      * @throws NullPointerException if <code>key</code> or <code>value</code> is
      *         <code>null</code>.
      * @throws IllegalStateException if this node (or an ancestor) has been
      *         removed with the {@link #removeNode()}method.
      */
     virtual void Put(const QString& key, const QString& value) = 0;
 
     /**
      * Returns the value associated with the specified <code>key</code> in this
      * node. Returns the specified default if there is no value associated with
      * the <code>key</code>, or the backing store is inaccessible.
      *
      * @param key key whose associated value is to be returned.
      * @param def the value to be returned in the event that this node has no
      *        value associated with <code>key</code> or the backing store is
      *        inaccessible.
      * @return the value associated with <code>key</code>, or <code>def</code> if
      *         no value is associated with <code>key</code>.
      * @throws IllegalStateException if this node (or an ancestor) has been
      *         removed with the {@link #removeNode()}method.
      * @throws NullPointerException if <code>key</code> is <code>null</code>. (A
      *         <code>null</code> default <i>is </i> permitted.)
      */
     virtual QString Get(const QString& key, const QString& def) const = 0;
 
     /**
      * Removes the value associated with the specified <code>key</code> in this
      * node, if any.
      *
      * @param key key whose mapping is to be removed from this node.
      * @see #get(const QString&,const QString&)
      * @throws IllegalStateException if this node (or an ancestor) has been
      *         removed with the {@link #removeNode()}method.
      */
     virtual void Remove(const QString& key) = 0;
 
     /**
      * Removes all of the properties (key-value associations) in this node. This
      * call has no effect on any descendants of this node.
      *
      * @throws BackingStoreException if this operation cannot be completed due
      *         to a failure in the backing store, or inability to communicate
      *         with it.
      * @throws IllegalStateException if this node (or an ancestor) has been
      *         removed with the {@link #removeNode()}method.
      * @see #remove(const QString&)
      */
     virtual void Clear() = 0;
 
     /**
      * Associates a <code>QString</code> object representing the specified
      * <code>int</code> value with the specified <code>key</code> in this node. The
      * associated string is the one that would be returned if the <code>int</code>
      * value were passed to <code>Integer.toString(int)</code>. This method is
      * intended for use in conjunction with {@link #getInt}method.
      *
      * <p>
      * Implementor's note: it is <i>not </i> necessary that the property value
      * be represented by a <code>QString</code> object in the backing store. If the
      * backing store supports integer values, it is not unreasonable to use
      * them. This implementation detail is not visible through the
      * <code>IPreferences</code> API, which allows the value to be read as an
      * <code>int</code> (with <code>getInt</code> or a <code>QString</code> (with
      * <code>get</code>) type.
      *
      * @param key key with which the string form of value is to be associated.
      * @param value <code>value</code> whose string form is to be associated with
      *        <code>key</code>.
      * @throws NullPointerException if <code>key</code> is <code>null</code>.
      * @throws IllegalStateException if this node (or an ancestor) has been
      *         removed with the {@link #removeNode()}method.
      * @see #getInt(const QString&,int)
      */
     virtual void PutInt(const QString& key, int value) = 0;
 
     /**
      * Returns the <code>int</code> value represented by the <code>QString</code>
      * object associated with the specified <code>key</code> in this node. The
      * <code>QString</code> object is converted to an <code>int</code> as by
      * <code>Integer.parseInt(QString)</code>. Returns the specified default if
      * there is no value associated with the <code>key</code>, the backing store
      * is inaccessible, or if <code>Integer.parseInt(QString)</code> would throw a
      * <code>NumberFormatException</code> if the associated <code>value</code> were
      * passed. This method is intended for use in conjunction with the
      * {@link #putInt}method.
      *
      * @param key key whose associated value is to be returned as an
      *        <code>int</code>.
      * @param def the value to be returned in the event that this node has no
      *        value associated with <code>key</code> or the associated value
      *        cannot be interpreted as an <code>int</code> or the backing store is
      *        inaccessible.
      * @return the <code>int</code> value represented by the <code>QString</code>
      *         object associated with <code>key</code> in this node, or
      *         <code>def</code> if the associated value does not exist or cannot
      *         be interpreted as an <code>int</code> type.
      * @throws NullPointerException if <code>key</code> is <code>null</code>.
      * @throws IllegalStateException if this node (or an ancestor) has been
      *         removed with the {@link #removeNode()}method.
      * @see #putInt(const QString&,int)
      * @see #get(const QString&,const QString&)
      */
     virtual int GetInt(const QString& key, int def) const = 0;
 
     /**
      * Associates a <code>QString</code> object representing the specified
      * <code>long</code> value with the specified <code>key</code> in this node. The
      * associated <code>QString</code> object is the one that would be returned if
      * the <code>long</code> value were passed to <code>Long.toString(long)</code>.
      * This method is intended for use in conjunction with the {@link #getLong}
      * method.
      *
      * <p>
      * Implementor's note: it is <i>not </i> necessary that the <code>value</code>
      * be represented by a <code>QString</code> type in the backing store. If the
      * backing store supports <code>long</code> values, it is not unreasonable to
      * use them. This implementation detail is not visible through the <code>
      * IPreferences</code> API, which allows the value to be read as a
      * <code>long</code> (with <code>getLong</code> or a <code>QString</code> (with
      * <code>get</code>) type.
      *
      * @param key <code>key</code> with which the string form of <code>value</code>
      *        is to be associated.
      * @param value <code>value</code> whose string form is to be associated with
      *        <code>key</code>.
      * @throws NullPointerException if <code>key</code> is <code>null</code>.
      * @throws IllegalStateException if this node (or an ancestor) has been
      *         removed with the {@link #removeNode()}method.
      * @see #getLong(const QString&,long)
      */
     virtual void PutLong(const QString& key, long value) = 0;
 
     /**
      * Returns the <code>long</code> value represented by the <code>QString</code>
      * object associated with the specified <code>key</code> in this node. The
      * <code>QString</code> object is converted to a <code>long</code> as by
      * <code>Long.parseLong(QString)</code>. Returns the specified default if
      * there is no value associated with the <code>key</code>, the backing store
      * is inaccessible, or if <code>Long.parseLong(QString)</code> would throw a
      * <code>NumberFormatException</code> if the associated <code>value</code> were
      * passed. This method is intended for use in conjunction with the
      * {@link #putLong}method.
      *
      * @param key <code>key</code> whose associated value is to be returned as a
      *        <code>long</code> value.
      * @param def the value to be returned in the event that this node has no
      *        value associated with <code>key</code> or the associated value
      *        cannot be interpreted as a <code>long</code> type or the backing
      *        store is inaccessible.
      * @return the <code>long</code> value represented by the <code>QString</code>
      *         object associated with <code>key</code> in this node, or
      *         <code>def</code> if the associated value does not exist or cannot
      *         be interpreted as a <code>long</code> type.
      * @throws NullPointerException if <code>key</code> is <code>null</code>.
      * @throws IllegalStateException if this node (or an ancestor) has been
      *         removed with the {@link #removeNode()}method.
      * @see #putLong(const QString&,long)
      * @see #get(const QString&,const QString&)
      */
     virtual long GetLong(const QString& key, long def) const = 0;
 
     /**
      * Associates a <code>QString</code> object representing the specified
      * <code>bool</code> value with the specified key in this node. The
      * associated string is "true" if the value is <code>true</code>, and "false"
      * if it is <code>false</code>. This method is intended for use in
      * conjunction with the {@link #getBool}method.
      *
      * <p>
      * Implementor's note: it is <i>not </i> necessary that the value be
      * represented by a string in the backing store. If the backing store
      * supports <code>bool</code> values, it is not unreasonable to use them.
      * This implementation detail is not visible through the <code>IPreferences
      * </code> API, which allows the value to be read as a <code>bool</code>
      * (with <code>getBool</code>) or a <code>QString</code> (with <code>get</code>)
      * type.
      *
      * @param key <code>key</code> with which the string form of value is to be
      *        associated.
      * @param value value whose string form is to be associated with
      *        <code>key</code>.
      * @throws NullPointerException if <code>key</code> is <code>null</code>.
      * @throws IllegalStateException if this node (or an ancestor) has been
      *         removed with the {@link #removeNode()}method.
      * @see #getBool(const QString&,bool)
      * @see #get(const QString&,const QString&)
      */
     virtual void PutBool(const QString& key, bool value) = 0;
 
     /**
      * Returns the <code>bool</code> value represented by the <code>QString</code>
      * object associated with the specified <code>key</code> in this node. Valid
      * strings are "true", which represents <code>true</code>, and "false", which
      * represents <code>false</code>. Case is ignored, so, for example, "TRUE"
      * and "False" are also valid. This method is intended for use in
      * conjunction with the {@link #putBool}method.
      *
      * <p>
      * Returns the specified default if there is no value associated with the
      * <code>key</code>, the backing store is inaccessible, or if the associated
      * value is something other than "true" or "false", ignoring case.
      *
      * @param key <code>key</code> whose associated value is to be returned as a
      *        <code>bool</code>.
      * @param def the value to be returned in the event that this node has no
      *        value associated with <code>key</code> or the associated value
      *        cannot be interpreted as a <code>bool</code> or the backing store
      *        is inaccessible.
      * @return the <code>bool</code> value represented by the <code>std::string</code>
      *         object associated with <code>key</code> in this node, or
      *         <code>null</code> if the associated value does not exist or cannot
      *         be interpreted as a <code>bool</code>.
      * @throws NullPointerException if <code>key</code> is <code>null</code>.
      * @throws IllegalStateException if this node (or an ancestor) has been
      *         removed with the {@link #removeNode()}method.
      * @see #get(const QString&,const QString&)
      * @see #putBool(const QString&,bool)
      */
     virtual bool GetBool(const QString& key, bool def) const = 0;
 
     /**
      * Associates a <code>QString</code> object representing the specified
      * <code>float</code> value with the specified <code>key</code> in this node.
      * The associated <code>QString</code> object is the one that would be returned
      * if the <code>float</code> value were passed to
      * <code>Float.toString(float)</code>. This method is intended for use in
      * conjunction with the {@link #getFloat}method.
      *
      * <p>
      * Implementor's note: it is <i>not </i> necessary that the value be
      * represented by a string in the backing store. If the backing store
      * supports <code>float</code> values, it is not unreasonable to use them.
      * This implementation detail is not visible through the <code>IPreferences
      * </code> API, which allows the value to be read as a <code>float</code> (with
      * <code>getFloat</code>) or a <code>QString</code> (with <code>get</code>) type.
      *
      * @param key <code>key</code> with which the string form of value is to be
      *        associated.
      * @param value value whose string form is to be associated with
      *        <code>key</code>.
      * @throws NullPointerException if <code>key</code> is <code>null</code>.
      * @throws IllegalStateException if this node (or an ancestor) has been
      *         removed with the {@link #removeNode()}method.
      * @see #getFloat(const QString&,float)
      */
     virtual void PutFloat(const QString& key, float value) = 0;
 
     /**
      * Returns the float <code>value</code> represented by the <code>QString</code>
      * object associated with the specified <code>key</code> in this node. The
      * <code>QString</code> object is converted to a <code>float</code> value as by
      * <code>Float.parseFloat(QString)</code>. Returns the specified default if
      * there is no value associated with the <code>key</code>, the backing store
      * is inaccessible, or if <code>Float.parseFloat(QString)</code> would throw a
      * <code>NumberFormatException</code> if the associated value were passed.
      * This method is intended for use in conjunction with the {@link #putFloat}
      * method.
      *
      * @param key <code>key</code> whose associated value is to be returned as a
      *        <code>float</code> value.
      * @param def the value to be returned in the event that this node has no
      *        value associated with <code>key</code> or the associated value
      *        cannot be interpreted as a <code>float</code> type or the backing
      *        store is inaccessible.
      * @return the <code>float</code> value represented by the string associated
      *         with <code>key</code> in this node, or <code>def</code> if the
      *         associated value does not exist or cannot be interpreted as a
      *         <code>float</code> type.
      * @throws IllegalStateException if this node (or an ancestor) has been
      *         removed with the {@link #removeNode()}method.
      * @throws NullPointerException if <code>key</code> is <code>null</code>.
      * @see #putFloat(const QString&,float)
      * @see #get(const QString&,const QString&)
      */
     virtual float GetFloat(const QString& key, float def) const = 0;
 
     /**
      * Associates a <code>QString</code> object representing the specified
      * <code>double</code> value with the specified <code>key</code> in this node.
      * The associated <code>QString</code> object is the one that would be returned
      * if the <code>double</code> value were passed to
      * <code>Double.toString(double)</code>. This method is intended for use in
      * conjunction with the {@link #getDouble}method
      *
      * <p>
      * Implementor's note: it is <i>not </i> necessary that the value be
      * represented by a string in the backing store. If the backing store
      * supports <code>double</code> values, it is not unreasonable to use them.
      * This implementation detail is not visible through the <code>IPreferences
      * </code> API, which allows the value to be read as a <code>double</code> (with
      * <code>getDouble</code>) or a <code>QString</code> (with <code>get</code>)
      * type.
      *
      * @param key <code>key</code> with which the string form of value is to be
      *        associated.
      * @param value value whose string form is to be associated with
      *        <code>key</code>.
      * @throws NullPointerException if <code>key</code> is <code>null</code>.
      * @throws IllegalStateException if this node (or an ancestor) has been
      *         removed with the {@link #removeNode()}method.
      * @see #getDouble(const QString&,double)
      */
     virtual void PutDouble(const QString& key, double value) = 0;
 
     /**
      * Returns the <code>double</code> value represented by the <code>QString</code>
      * object associated with the specified <code>key</code> in this node. The
      * <code>QString</code> object is converted to a <code>double</code> value as by
      * <code>Double.parseDouble(QString)</code>. Returns the specified default if
      * there is no value associated with the <code>key</code>, the backing store
      * is inaccessible, or if <code>Double.parseDouble(QString)</code> would throw
      * a <code>NumberFormatException</code> if the associated value were passed.
      * This method is intended for use in conjunction with the
      * {@link #putDouble}method.
      *
      * @param key <code>key</code> whose associated value is to be returned as a
      *        <code>double</code> value.
      * @param def the value to be returned in the event that this node has no
      *        value associated with <code>key</code> or the associated value
      *        cannot be interpreted as a <code>double</code> type or the backing
      *        store is inaccessible.
      * @return the <code>double</code> value represented by the <code>QString</code>
      *         object associated with <code>key</code> in this node, or
      *         <code>def</code> if the associated value does not exist or cannot
      *         be interpreted as a <code>double</code> type.
      * @throws IllegalStateException if this node (or an ancestor) has been
      *         removed with the the {@link #removeNode()}method.
      * @throws NullPointerException if <code>key</code> is <code>null</code>.
      * @see #putDouble(const QString&,double)
      * @see #get(const QString&,const QString&)
      */
     virtual double GetDouble(const QString& key, double def) const = 0;
 
     /**
      * Associates a <code>QByteArray</code> object representing the specified
      * <code>QByteArray</code> with the specified <code>key</code> in this node. The
      * associated <code>QByteArray</code> object is stored in <i>Base64</i> encoding.
      * This method is intended for use in conjunction with the
      * {@link #getByteArray}method.
      *
      * @param key <code>key</code> with which the string form of <code>value</code>
      *        is to be associated.
      * @param value <code>value</code> whose string form is to be associated with
      *        <code>key</code>.
      * @throws NullPointerException if <code>key</code> or <code>value</code> is
      *         <code>null</code>.
      * @throws IllegalStateException if this node (or an ancestor) has been
      *         removed with the {@link #removeNode()}method.
      * @see #GetByteArray(const QString&,const QByteArray&)
      * @see #Get(const QString&,const QString&)
      */
     virtual void PutByteArray(const QString& key, const QByteArray& value) = 0;
 
     /**
      * Returns the <code>std::vector<char></code> value represented by the <code>QString</code>
      * object associated with the specified <code>key</code> in this node. Valid
      * <code>QString</code> objects are <i>Base64 </i> encoded binary data, as
      * defined in <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045 </a>,
      * Section 6.8, with one minor change: the string must consist solely of
      * characters from the <i>Base64 Alphabet </i>; no newline characters or
      * extraneous characters are permitted. This method is intended for use in
      * conjunction with the {@link #putByteArray}method.
      *
      * <p>
      * Returns the specified default if there is no value associated with the
      * <code>key</code>, the backing store is inaccessible, or if the associated
      * value is not a valid Base64 encoded byte array (as defined above).
      *
      * @param key <code>key</code> whose associated value is to be returned as a
      *        <code>std::vector<char></code> object.
      * @param def the value to be returned in the event that this node has no
      *        value associated with <code>key</code> or the associated value
      *        cannot be interpreted as a <code>std::vector<char></code> type, or the backing
      *        store is inaccessible.
      * @return the <code>std::vector<char></code> value represented by the <code>QString</code>
      *         object associated with <code>key</code> in this node, or
      *         <code>def</code> if the associated value does not exist or cannot
      *         be interpreted as a <code>std::vector<char></code>.
      * @throws NullPointerException if <code>key</code> is <code>null</code>. (A
      *         <code>null</code> value for <code>def</code> <i>is </i> permitted.)
      * @throws IllegalStateException if this node (or an ancestor) has been
      *         removed with the {@link #removeNode()}method.
      * @see #get(const QString&,const QString&)
      * @see #putByteArray(const QString&,std::vector<char>)
      */
     virtual QByteArray GetByteArray(const QString& key, const QByteArray& def) const = 0;
 
     /**
      * Returns all of the keys that have an associated value in this node. (The
      * returned array will be of size zero if this node has no preferences and
      * not <code>null</code>!)
      *
      * @return an array of the keys that have an associated value in this node.
      * @throws BackingStoreException if this operation cannot be completed due
      *         to a failure in the backing store, or inability to communicate
      *         with it.
      * @throws IllegalStateException if this node (or an ancestor) has been
      *         removed with the {@link #removeNode()}method.
      */
     virtual QStringList Keys() const = 0;
 
     /**
      * Returns the names of the children of this node. (The returned array will
      * be of size zero if this node has no children and not <code>null</code>!)
      *
      * @return the names of the children of this node.
      * @throws BackingStoreException if this operation cannot be completed due
      *         to a failure in the backing store, or inability to communicate
      *         with it.
      * @throws IllegalStateException if this node (or an ancestor) has been
      *         removed with the {@link #removeNode()}method.
      */
     virtual QStringList ChildrenNames() const = 0;
 
     /**
      * Returns the parent of this node, or <code>null</code> if this is the root.
      *
      * @return the parent of this node.
      * @throws IllegalStateException if this node (or an ancestor) has been
      *         removed with the {@link #removeNode()}method.
      */
     virtual IPreferences::Pointer Parent() const = 0;
 
     /**
      * Returns a named <code>IPreferences</code> object (node), creating it and any
      * of its ancestors if they do not already exist. Accepts a relative or
      * absolute pathname. Absolute pathnames (which begin with <code>'/'</code>)
      * are interpreted relative to the root of this node. Relative pathnames
      * (which begin with any character other than <code>'/'</code>) are
      * interpreted relative to this node itself. The empty string (<code>""</code>)
      * is a valid relative pathname, referring to this node itself.
      *
      * <p>
      * If the returned node did not exist prior to this call, this node and any
      * ancestors that were created by this call are not guaranteed to become
      * persistent until the <code>flush</code> method is called on the returned
      * node (or one of its descendants).
      *
      * @param pathName the path name of the <code>IPreferences</code> object to
      *        return.
      * @return the specified <code>IPreferences</code> object.
      * @throws IllegalArgumentException if the path name is invalid.
      * @throws IllegalStateException if this node (or an ancestor) has been
      *         removed with the {@link #removeNode()}method.
      * @throws NullPointerException if path name is <code>null</code>.
      * @see #flush()
      */
     virtual IPreferences::Pointer Node(const QString& pathName) = 0;
 
     /**
      * Returns true if the named node exists. Accepts a relative or absolute
      * pathname. Absolute pathnames (which begin with <code>'/'</code>) are
      * interpreted relative to the root of this node. Relative pathnames (which
      * begin with any character other than <code>'/'</code>) are interpreted
      * relative to this node itself. The pathname <code>""</code> is valid, and
      * refers to this node itself.
      *
      * <p>
      * If this node (or an ancestor) has already been removed with the
      * {@link #removeNode()}method, it <i>is </i> legal to invoke this method,
      * but only with the pathname <code>""</code>; the invocation will return
      * <code>false</code>. Thus, the idiom <code>p.nodeExists("")</code> may be
      * used to test whether <code>p</code> has been removed.
      *
      * @param pathName the path name of the node whose existence is to be
      *        checked.
      * @return true if the specified node exists.
      * @throws BackingStoreException if this operation cannot be completed due
      *         to a failure in the backing store, or inability to communicate
      *         with it.
      * @throws IllegalStateException if this node (or an ancestor) has been
      *         removed with the {@link #removeNode()}method and
      *         <code>pathname</code> is not the empty string (<code>""</code>).
      * @throws IllegalArgumentException if the path name is invalid (i.e., it
      *         contains multiple consecutive slash characters, or ends with a
      *         slash character and is more than one character long).
      */
     virtual bool NodeExists(const QString& pathName) const = 0;
 
     /**
      * Removes this node and all of its descendants, invalidating any properties
      * contained in the removed nodes. Once a node has been removed, attempting
      * any method other than <code>name()</code>,<code>absolutePath()</code> or
      * <code>nodeExists("")</code> on the corresponding <code>IPreferences</code>
      * instance will fail with an <code>IllegalStateException</code>. (The
      * methods defined on <code>Object</code> can still be invoked on a node after
      * it has been removed; they will not throw <code>IllegalStateException</code>.)
      *
      * <p>
      * The removal is not guaranteed to be persistent until the <code>flush</code>
      * method is called on the parent of this node.
      *
      * @throws IllegalStateException if this node (or an ancestor) has already
      *         been removed with the {@link #removeNode()}method.
      * @throws BackingStoreException if this operation cannot be completed due
      *         to a failure in the backing store, or inability to communicate
      *         with it.
      * @see #flush()
      */
     virtual void RemoveNode() throw(Poco::Exception, BackingStoreException) = 0;
 
     /**
      * Returns this node's name, relative to its parent.
      *
      * @return this node's name, relative to its parent.
      */
     virtual QString Name() const = 0;
 
     /**
      * Returns this node's absolute path name. Note that:
      * <ul>
      * <li>Root node - The path name of the root node is <code>"/"</code>.
      * <li>Slash at end - Path names other than that of the root node may not
      * end in slash (<code>'/'</code>).
      * <li>Unusual names -<code>"."</code> and <code>".."</code> have <i>no </i>
      * special significance in path names.
      * <li>Illegal names - The only illegal path names are those that contain
      * multiple consecutive slashes, or that end in slash and are not the root.
      * </ul>
      *
      * @return this node's absolute path name.
      */
     virtual QString AbsolutePath() const = 0;
 
     /**
      * Forces any changes in the contents of this node and its descendants to
      * the persistent store.
      *
      * <p>
      * Once this method returns successfully, it is safe to assume that all
      * changes made in the subtree rooted at this node prior to the method
      * invocation have become permanent.
      *
      * <p>
      * Implementations are free to flush changes into the persistent store at
      * any time. They do not need to wait for this method to be called.
      *
      * <p>
      * When a flush occurs on a newly created node, it is made persistent, as
      * are any ancestors (and descendants) that have yet to be made persistent.
      * Note however that any properties value changes in ancestors are <i>not
      * </i> guaranteed to be made persistent.
      *
      * @throws BackingStoreException if this operation cannot be completed due
      *         to a failure in the backing store, or inability to communicate
      *         with it.
      * @throws IllegalStateException if this node (or an ancestor) has been
      *         removed with the {@link #removeNode()}method.
      * @see #sync()
      */
     virtual void Flush() = 0;
 
     /**
      * Ensures that future reads from this node and its descendants reflect any
      * changes that were committed to the persistent store (from any VM) prior
      * to the <code>sync</code> invocation. As a side-effect, forces any changes
      * in the contents of this node and its descendants to the persistent store,
      * as if the <code>flush</code> method had been invoked on this node.
      *
      * @throws BackingStoreException if this operation cannot be completed due
      *         to a failure in the backing store, or inability to communicate
      *         with it.
      * @throws IllegalStateException if this node (or an ancestor) has been
      *         removed with the {@link #removeNode()}method.
      * @see #flush()
      */
     virtual void Sync() = 0;
   };
 
 }  // namespace berry
 
 #endif /*BERRYIPREFERENCES_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryISafeRunnable.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryISafeRunnable.h
index 6b771864ab..d5d434628b 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryISafeRunnable.h
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryISafeRunnable.h
@@ -1,102 +1,102 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYISAFERUNNABLE_H_
 #define BERRYISAFERUNNABLE_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
 
 #include <org_blueberry_core_runtime_Export.h>
 
 namespace berry
 {
 
 /**
  * Safe runnables represent blocks of code and associated exception
  * handlers.  They are typically used when a plug-in needs to call some
  * untrusted code (e.g., code contributed by another plug-in via an
  * extension).
  * <p>
  * This interface can be used without OSGi running.
  * </p><p>
  * Clients may implement this interface.
  * </p>
  * @see SafeRunner#run(ISafeRunnable)
  */
 struct org_blueberry_core_runtime_EXPORT ISafeRunnable: public Object
 {
 
-berryInterfaceMacro(ISafeRunnable, berry);
+  berryObjectMacro(berry::ISafeRunnable)
 
   /**
    * Handles an exception thrown by this runnable's <code>run</code>
    * method.  The processing done here should be specific to the
    * particular usecase for this runnable.  Generalized exception
    * processing (e.g., logging in the platform's log) is done by the
    * Platform's run mechanism.
    *
    * @param exception an exception which occurred during processing
    *    the body of this runnable (i.e., in <code>run()</code>)
    * @see SafeRunner#run(ISafeRunnable)
    */
   virtual void HandleException(const std::exception& exception) = 0;
 
   /**
    * Runs this runnable.  Any exceptions thrown from this method will
    * be passed to this runnable's <code>handleException</code>
    * method.
    *
    * @exception Exception if a problem occurred while running this method.
    *    The exception will be processed by <code>handleException</code>
    * @see SafeRunner#run(ISafeRunnable)
    */
   virtual void Run() = 0;
 };
 
 template<typename R>
 struct SafeRunnableDelegate: public ISafeRunnable
 {
   typedef void(R::*RunCallback)();
   typedef void(R::*HandleExcCallback)(const std::exception&);
 
   SafeRunnableDelegate(R* runnable, RunCallback func, HandleExcCallback handleFunc = 0) :
     m_Runnable(runnable), m_RunFunc(func), m_HandleExcFunc(handleFunc)
   {
   }
 
   void Run()
   {
     m_Runnable->*m_RunFunc();
   }
 
   void HandleException(const std::exception& exception)
   {
     if (m_HandleExcFunc)
       m_Runnable->*m_HandleExcFunc(exception);
   }
 
 private:
 
   R* m_Runnable;
   RunCallback m_RunFunc;
   HandleExcCallback m_HandleExcFunc;
 
 };
 
 }
 
 #endif /* BERRYISAFERUNNABLE_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIStatus.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIStatus.h
index 04e051e327..5407145dbb 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIStatus.h
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryIStatus.h
@@ -1,206 +1,204 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYISTATUS_H_
 #define BERRYISTATUS_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
-#include <berryFlags.h>
 
 #include <org_blueberry_core_runtime_Export.h>
 
 namespace berry
 {
 
 /**
  * A status object represents the outcome of an operation.
  * All <code>CoreException</code>s carry a status object to indicate
  * what went wrong. Status objects are also returned by methods needing
  * to provide details of failures (e.g., validation methods).
  * <p>
  * A status carries the following information:
  * <ul>
  * <li> plug-in identifier (required)</li>
  * <li> severity (required)</li>
  * <li> status code (required)</li>
  * <li> message (required) - localized to current locale</li>
  * <li> exception (optional) - for problems stemming from a failure at
  *    a lower level</li>
  * </ul>
  * Some status objects, known as multi-statuses, have other status objects
  * as children.
  * </p>
  * <p>
  * The class <code>Status</code> is the standard public implementation
  * of status objects; the subclass <code>MultiStatus</code> is the
  * implements multi-status objects.
  * </p><p>
  * This interface can be used without OSGi running.
  * </p>
  * @see MultiStatus
  * @see Status
  */
 struct org_blueberry_core_runtime_EXPORT IStatus: public Object
 {
-
-  berryInterfaceMacro(IStatus, berry);
+  berryObjectMacro(berry::IStatus)
 
   enum Severity
   {
     /** Status severity constant (value 0) indicating this status represents the nominal case.
      * This constant is also used as the status code representing the nominal case.
      */
     OK_TYPE = 0x00,
 
     /** Status type severity (bit mask, value 1) indicating this status is informational only. */
     INFO_TYPE = 0x01,
 
     /** Status type severity (bit mask, value 2) indicating this status represents a warning. */
     WARNING_TYPE = 0x02,
 
     /** Status type severity (bit mask, value 4) indicating this status represents an error. */
     ERROR_TYPE = 0x04,
 
     /** Status type severity (bit mask, value 8) indicating this status represents a cancelation. */
     CANCEL_TYPE = 0x08
   };
 
   Q_DECLARE_FLAGS(Severities, Severity)
 
   /**
    * Returns a list of status object immediately contained in this
    * multi-status, or an empty list if this is not a multi-status.
    *
    * @return an array of status objects
    * @see #isMultiStatus()
    */
   virtual QList<IStatus::Pointer> GetChildren() const = 0;
 
   /**
    * Returns the plug-in-specific status code describing the outcome.
    *
    * @return plug-in-specific status code
    */
   virtual int GetCode() const = 0;
 
   /**
    * Returns the relevant low-level exception, or <code>null</code> if none.
    * For example, when an operation fails because of a network communications
    * failure, this might return the <code>java.io.IOException</code>
    * describing the exact nature of that failure.
    *
    * @return the relevant low-level exception, or <code>null</code> if none
    */
   virtual const ctkException* GetException() const = 0;
 
   /**
    * Returns the message describing the outcome.
    * The message is localized to the current locale.
    *
    * @return a localized message
    */
   virtual QString GetMessage() const = 0;
 
   /**
    * Returns the unique identifier of the plug-in associated with this status
    * (this is the plug-in that defines the meaning of the status code).
    *
    * @return the unique identifier of the relevant plug-in
    */
   virtual QString GetPlugin() const = 0;
 
   /**
    * Returns the severity. The severities are as follows (in
    * descending order):
    * <ul>
    * <li><code>CANCEL_TYPE</code> - cancelation occurred</li>
    * <li><code>ERROR_TYPE</code> - a serious error (most severe)</li>
    * <li><code>WARNING_TYPE</code> - a warning (less severe)</li>
    * <li><code>INFO_TYPE</code> - an informational ("fyi") message (least severe)</li>
    * <li><code>OK_TYPE</code> - everything is just fine</li>
    * </ul>
    * <p>
    * The severity of a multi-status is defined to be the maximum
    * severity of any of its children, or <code>OK</code> if it has
    * no children.
    * </p>
    *
    * @return the severity: one of <code>OK_TYPE</code>, <code>ERROR_TYPE</code>,
    * <code>INFO_TYPE</code>, <code>WARNING_TYPE</code>,  or <code>CANCEL_TYPE</code>
    * @see #matches(int)
    */
   virtual Severity GetSeverity() const = 0;
 
   /**
    * Returns whether this status is a multi-status.
    * A multi-status describes the outcome of an operation
    * involving multiple operands.
    * <p>
    * The severity of a multi-status is derived from the severities
    * of its children; a multi-status with no children is
    * <code>OK_TYPE</code> by definition.
    * A multi-status carries a plug-in identifier, a status code,
    * a message, and an optional exception. Clients may treat
    * multi-status objects in a multi-status unaware way.
    * </p>
    *
    * @return <code>true</code> for a multi-status,
    *    <code>false</code> otherwise
    * @see #getChildren()
    */
   virtual bool IsMultiStatus() const = 0;
 
   /**
    * Returns whether this status indicates everything is okay
    * (neither info, warning, nor error).
    *
    * @return <code>true</code> if this status has severity
    *    <code>OK</code>, and <code>false</code> otherwise
    */
   virtual bool IsOK() const = 0;
 
   /**
    * Returns whether the severity of this status matches the given
    * severity mask. Note that a status with severity <code>OK_TYPE</code>
    * will never match; use <code>isOK</code> instead to detect
    * a status with a severity of <code>OK</code>.
    *
    * @param severityMask a mask formed by bitwise or'ing severity mask
    *    constants (<code>ERROR_TYPE</code>, <code>WARNING_TYPE</code>,
    *    <code>INFO_TYPE</code>, <code>CANCEL_TYPE</code>)
    * @return <code>true</code> if there is at least one match,
    *    <code>false</code> if there are no matches
    * @see #getSeverity()
    * @see #CANCEL_TYPE
    * @see #ERROR_TYPE
    * @see #WARNING_TYPE
    * @see #INFO_TYPE
    */
   virtual bool Matches(const Severities& severityMask) const = 0;
 
   virtual QString GetFileName() const = 0;
 
   virtual QString GetMethodName() const = 0;
 
   virtual int GetLineNumber() const = 0;
 };
 
 }
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(berry::IStatus::Severities)
 
 #endif /* BERRYISTATUS_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryLog.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryLog.cpp
index 7af536c911..15cab5a448 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryLog.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryLog.cpp
@@ -1,26 +1,26 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryLog.h"
 
 #include <QString>
 
-std::stringstream& operator<<(std::stringstream& os, const QString& str)
+std::ostream& operator<<(std::ostream& os, const QString& str)
 {
   os << str.toStdString();
   return os;
 }
 
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryLog.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryLog.h
index 0a40149d60..4a7543004a 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryLog.h
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryLog.h
@@ -1,33 +1,33 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef __BERRY_LOG_H__
 #define __BERRY_LOG_H__
 
 #include <mbilog.h>
 
 #include <org_blueberry_core_runtime_Export.h>
 
 #define BERRY_INFO MBI_INFO("BlueBerry")
 #define BERRY_WARN MBI_WARN("BlueBerry")
 #define BERRY_ERROR MBI_ERROR("BlueBerry")
 #define BERRY_FATAL MBI_FATAL("BlueBerry")
 
 #define BERRY_DEBUG MBI_DEBUG("BlueBerry")
 
-org_blueberry_core_runtime_EXPORT std::stringstream& operator<<(std::stringstream& os, const QString& str);
+org_blueberry_core_runtime_EXPORT std::ostream& operator<<(std::ostream& os, const QString& str);
 
 #endif /*__BERRY_LOG_H__*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryMacros.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryMacros.h
index 1c95e2cff2..d1b6d06d7c 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryMacros.h
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryMacros.h
@@ -1,119 +1,73 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef __BERRY_MACROS_H__
 #define __BERRY_MACROS_H__
 
 #include "berryWeakPointer.h"
 
 #include "berryExtensionType.h"
 
-#define berryNameMacro(className) \
-  virtual const char* GetClassName() const \
-  { return #className; }\
-  static const char* GetStaticClassName() \
-  { return #className; }\
-
-#define berryManifestMacro(className, namespaze) \
-  static const char* GetManifestName() \
-  { return #namespaze #className; } \
-
-#define berryObjectMacro(className) \
-  typedef className       Self; \
-  typedef berry::SmartPointer<Self> Pointer; \
-  typedef berry::SmartPointer<const Self>  ConstPointer; \
-  typedef berry::WeakPointer<Self> WeakPtr; \
-  typedef berry::WeakPointer<const Self> ConstWeakPtr; \
-  berryNameMacro(className); \
-
 
-#define berryInterfaceMacro(className, namespaze) \
-  public: \
-  berryObjectMacro(className); \
-  berryManifestMacro(className, namespaze); \
+#define berryObjectMacro(className)                      \
+  typedef className       Self;                          \
+  typedef berry::SmartPointer<Self> Pointer;             \
+  typedef berry::SmartPointer<const Self>  ConstPointer; \
+  typedef berry::WeakPointer<Self> WeakPtr;              \
+  typedef berry::WeakPointer<const Self> ConstWeakPtr;   \
+  static const char* GetStaticClassName()                \
+  { return #className; }
 
-#define berrySimpleInterfaceMacro(className, namespaze) \
-  protected: className() {} \
-  public: \
-  berryNameMacro(className); \
-  berryManifestMacro(className, namespaze); \
 
+/*
 #define berryNewMacro(x) \
 static Pointer New(void) \
 { \
   Pointer smartPtr(new x); \
   return smartPtr; \
 } \
 
 #define berryNewMacro1Param(x, type1) \
 static Pointer New(type1 param1) \
 { \
   Pointer smartPtr(new x(param1)); \
   return smartPtr; \
 } \
 
 #define berryNewMacro2Param(x, type1, type2) \
 static Pointer New(type1 param1, type2 param2) \
 { \
   Pointer smartPtr(new x(param1, param2)); \
   return smartPtr; \
 } \
 
 #define berryNewMacro3Param(x, type1, type2, type3) \
 static Pointer New(type1 param1, type2 param2, type3 param3) \
 { \
   Pointer smartPtr (new x(param1, param2, param3)); \
   return smartPtr; \
-} \
-
-#ifndef BERRY_NO_TYPESAFE_FLAGS
-
-#include "berryFlags.h"
-
-#define BERRY_DECLARE_FLAGS(_Flags, _Enum)\
-typedef berry::Flags<_Enum> _Flags;
-
-#if defined _MSC_VER && _MSC_VER < 1300
-# define BERRY_DECLARE_INCOMPATIBLE_FLAGS(_Flags)
-#else
-# define BERRY_DECLARE_INCOMPATIBLE_FLAGS(_Flags) \
-inline berry::IncompatibleFlag operator|(_Flags::enum_type f1, int f2) \
-{ return berry::IncompatibleFlag(int(f1) | f2); }
-#endif
-
-#define BERRY_DECLARE_OPERATORS_FOR_FLAGS(_Flags) \
-inline berry::Flags<_Flags::enum_type> operator|(_Flags::enum_type f1, _Flags::enum_type f2) \
-{ return berry::Flags<_Flags::enum_type>(f1) | f2; } \
-inline berry::Flags<_Flags::enum_type> operator|(_Flags::enum_type f1, berry::Flags<_Flags::enum_type> f2) \
-{ return f2 | f1; } BERRY_DECLARE_INCOMPATIBLE_FLAGS(_Flags)
-
-#else /* BERRY_NO_TYPESAFE_FLAGS */
-
-#define BERRY_DECLARE_FLAGS(_Flags, _Enum)\
-typedef uint _Flags;
-#define BERRY_DECLARE_OPERATORS_FOR_FLAGS(_Flags)
-
-#endif /* BERRY_NO_TYPESAFE_FLAGS */
+}
+*/
 
 
 #define BERRY_REGISTER_EXTENSION_CLASS(_ClassType, _PluginContext)\
 {\
   QString typeName = _PluginContext->getPlugin()->getSymbolicName();\
   typeName = (typeName + "_") + _ClassType::staticMetaObject.className();\
   ::berry::registerExtensionType<_ClassType>(typeName.toLatin1().data());\
 }
 
 #endif /*__BERRY_MACROS_H__*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryMessage.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryMessage.h
index 2f8a5d7210..ecfa0e2c67 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryMessage.h
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryMessage.h
@@ -1,1075 +1,1075 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYMESSAGE_H_
 #define BERRYMESSAGE_H_
 
 #include <vector>
 #include <Poco/Mutex.h>
 
 /**
  * Adds a Message<> variable and methods to add/remove message delegates to/from
  * this variable.
  */
-#define berryNewMessageMacro(msgHandleObject)                                                                 \
+#define berryNewMessageMacro(msgHandleObject)                                                            \
   private: Message<> m_ ## msgHandleObject ## Message;                                                   \
   public:                                                                                                \
   inline void Add ## msgHandleObject ## Listener(const MessageAbstractDelegate<>& delegate)              \
     { m_ ## msgHandleObject ## Message += delegate; }                                                    \
   inline void Remove ## msgHandleObject ## Listener(const MessageAbstractDelegate<>& delegate)           \
     { m_ ## msgHandleObject ## Message -= delegate; }                                                    \
 
 
-#define berryNewMessageWithReturnMacro(msgHandleObject, returnType)                                                 \
+#define berryNewMessageWithReturnMacro(msgHandleObject, returnType)                                            \
   private: Message<returnType> m_ ## msgHandleObject ## Message;                                               \
   public:                                                                                                      \
   inline void Add ## msgHandleObject ## Listener(const MessageAbstractDelegate<returnType>& delegate)          \
     { m_ ## msgHandleObject ## Message += delegate; }                                                          \
     inline void Remove ## msgHandleObject ## Listener(const MessageAbstractDelegate<returnType>& delegate)     \
     { m_ ## msgHandleObject ## Message -= delegate; }                                                          \
 
 
-#define berryNewMessage1Macro(msgHandleObject, type1)                                                          \
+#define berryNewMessage1Macro(msgHandleObject, type1)                                                     \
   private: Message1< type1 > m_msgHandleObject ## Message;                                                \
   public:                                                                                                 \
   void Add ## msgHandleObject ## Listener(const MessageAbstractDelegate1< type1 >& delegate)              \
     { m_ ## msgHandleObject ## Message += delegate; }                                                     \
     void Remove ## msgHandleObject ## Listener(const MessageAbstractDelegate1< type1 >& delegate)         \
     { m_ ## msgHandleObject ## Message -= delegate; }                                                     \
 
 
 namespace berry
 {
 
 template<typename A = void>
 class MessageAbstractDelegate
 {
 public:
 
   virtual ~MessageAbstractDelegate()
   {
   }
 
   virtual A Execute() = 0;
   virtual bool operator==(const MessageAbstractDelegate* cmd) = 0;
   virtual MessageAbstractDelegate* Clone() const = 0;
 };
 
 template<typename T, typename A = void>
 class MessageAbstractDelegate1
 {
 public:
 
   virtual ~MessageAbstractDelegate1()
   {
   }
 
   virtual A Execute(T t) = 0;
   virtual bool operator==(const MessageAbstractDelegate1* cmd) = 0;
   virtual MessageAbstractDelegate1* Clone() const = 0;
 };
 
 template<typename T, typename U, typename A = void>
 class MessageAbstractDelegate2
 {
 public:
 
   virtual ~MessageAbstractDelegate2()
   {
   }
 
   virtual A Execute(T t, U u) const = 0;
   virtual bool operator==(const MessageAbstractDelegate2* cmd) = 0;
   virtual MessageAbstractDelegate2* Clone() const = 0;
 };
 
 template<typename T, typename U, typename V, typename A = void>
 class MessageAbstractDelegate3
 {
 public:
 
   virtual ~MessageAbstractDelegate3()
   {
   }
 
   virtual A Execute(T t, U u, V v) const = 0;
   virtual bool operator==(const MessageAbstractDelegate3* cmd) = 0;
   virtual MessageAbstractDelegate3* Clone() const = 0;
 };
 
 template<typename T, typename U, typename V, typename W, typename A = void>
 class MessageAbstractDelegate4
 {
 public:
 
   virtual ~MessageAbstractDelegate4()
   {
   }
 
   virtual A Execute(T t, U u, V v, W w) const = 0;
   virtual bool operator==(const MessageAbstractDelegate4* cmd) = 0;
   virtual MessageAbstractDelegate4* Clone() const = 0;
 };
 
 template<class R, typename A = void>
 class MessageDelegate: public MessageAbstractDelegate<A>
 {
 public:
 
   // constructor - takes pointer to an object and pointer to a member and stores
   // them in two private variables
   MessageDelegate(R* object, A(R::*memberFunctionPointer)()) :
     m_Object(object), m_MemberFunctionPointer(memberFunctionPointer)
   {
   }
 
   virtual ~MessageDelegate()
   {
   }
 
   // override function "Call"
   virtual A Execute()
   {
     return (m_Object->*m_MemberFunctionPointer)(); // execute member function
   }
 
   bool operator==(const MessageAbstractDelegate<A>* c)
   {
     const MessageDelegate<R, A>* cmd =
         dynamic_cast<const MessageDelegate<R, A>*> (c);
     if (!cmd)
       return false;
 
     if ((void*) this->m_Object != (void*) cmd->m_Object)
       return false;
     if (this->m_MemberFunctionPointer != cmd->m_MemberFunctionPointer)
       return false;
     return true;
   }
 
   MessageAbstractDelegate<A>* Clone() const
   {
     return new MessageDelegate(m_Object, m_MemberFunctionPointer);
   }
 
 private:
   R* m_Object; // pointer to object
   A (R::*m_MemberFunctionPointer)(); // pointer to member function
 };
 
 template<class R, typename T, typename A = void>
 class MessageDelegate1: public MessageAbstractDelegate1<T, A>
 {
 public:
 
   // constructor - takes pointer to an object and pointer to a member and stores
   // them in two private variables
   MessageDelegate1(R* object, A(R::*memberFunctionPointer)(T)) :
     m_Object(object), m_MemberFunctionPointer(memberFunctionPointer)
   {
   }
 
   virtual ~MessageDelegate1()
   {
   }
 
   // override function "Call"
   virtual A Execute(T t)
   {
     return (m_Object->*m_MemberFunctionPointer)(t); // execute member function
   }
 
   bool operator==(const MessageAbstractDelegate1<T, A>* c)
   {
     const MessageDelegate1<R, T, A>* cmd = dynamic_cast<const MessageDelegate1<
         R, T, A>*> (c);
     if (!cmd)
       return false;
 
     if ((void*) this->m_Object != (void*) cmd->m_Object)
       return false;
     if (this->m_MemberFunctionPointer != cmd->m_MemberFunctionPointer)
       return false;
     return true;
   }
 
   MessageAbstractDelegate1<T, A>* Clone() const
   {
     return new MessageDelegate1(m_Object, m_MemberFunctionPointer);
   }
 
 private:
   R* m_Object; // pointer to object
   A (R::*m_MemberFunctionPointer)(T); // pointer to member function
 };
 
 template<class R, typename T, typename U, typename A = void>
 class MessageDelegate2: public MessageAbstractDelegate2<T, U, A>
 {
 public:
 
   // constructor - takes pointer to an object and pointer to a member and stores
   // them in two private variables
   MessageDelegate2(R* object, A(R::*memberFunctionPointer)(T, U)) :
     m_Object(object), m_MemberFunctionPointer(memberFunctionPointer)
   {
   }
 
   virtual ~MessageDelegate2()
   {
   }
 
   // override function "Call"
   virtual A Execute(T t, U u) const
   {
     return (m_Object->*m_MemberFunctionPointer)(t, u); // execute member function
   }
 
   bool operator==(const MessageAbstractDelegate2<T, U, A>* c)
   {
     const MessageDelegate2<R, T, U, A>* cmd =
         dynamic_cast<const MessageDelegate2<R, T, U, A>*> (c);
     if (!cmd)
       return false;
 
     if ((void*) this->m_Object != (void*) cmd->m_Object)
       return false;
     if (this->m_MemberFunctionPointer != cmd->m_MemberFunctionPointer)
       return false;
     return true;
   }
 
   MessageAbstractDelegate2<T, U, A>* Clone() const
   {
     return new MessageDelegate2(m_Object, m_MemberFunctionPointer);
   }
 
 private:
   R* m_Object; // pointer to object
   A (R::*m_MemberFunctionPointer)(T, U); // pointer to member function
 };
 
 template<class R, typename T, typename U, typename V, typename A = void>
 class MessageDelegate3: public MessageAbstractDelegate3<T, U, V, A>
 {
 public:
 
   // constructor - takes pointer to an object and pointer to a member and stores
   // them in two private variables
   MessageDelegate3(R* object, A(R::*memberFunctionPointer)(T, U, V)) :
     m_Object(object), m_MemberFunctionPointer(memberFunctionPointer)
   {
   }
 
   virtual ~MessageDelegate3()
   {
   }
 
   // override function "Call"
   virtual A Execute(T t, U u, V v) const
   {
     return (m_Object->*m_MemberFunctionPointer)(t, u, v); // execute member function
   }
 
   bool operator==(const MessageAbstractDelegate3<T, U, V, A>* c)
   {
     const MessageDelegate3<R, T, U, V, A>* cmd =
         dynamic_cast<const MessageDelegate3<R, T, U, V, A>*> (c);
     if (!cmd)
       return false;
 
     if ((void*) this->m_Object != (void*) cmd->m_Object)
       return false;
     if (this->m_MemberFunctionPointer != cmd->m_MemberFunctionPointer)
       return false;
     return true;
   }
 
   MessageAbstractDelegate3<T, U, V, A>* Clone() const
   {
     return new MessageDelegate3(m_Object, m_MemberFunctionPointer);
   }
 
 private:
   R* m_Object; // pointer to object
   A (R::*m_MemberFunctionPointer)(T, U, V); // pointer to member function
 };
 
 template<class R, typename T, typename U, typename V, typename W,
     typename A = void>
 class MessageDelegate4: public MessageAbstractDelegate4<T, U, V, W, A>
 {
 public:
 
   // constructor - takes pointer to an object and pointer to a member and stores
   // them in two private variables
   MessageDelegate4(R* object, A(R::*memberFunctionPointer)(T, U, V, W)) :
     m_Object(object), m_MemberFunctionPointer(memberFunctionPointer)
   {
   }
 
   virtual ~MessageDelegate4()
   {
   }
 
   // override function "Call"
   virtual A Execute(T t, U u, V v, W w) const
   {
     return (m_Object->*m_MemberFunctionPointer)(t, u, v, w); // execute member function
   }
 
   bool operator==(const MessageAbstractDelegate4<T, U, V, W, A>* c)
   {
     const MessageDelegate4<R, T, U, V, W, A>* cmd =
         dynamic_cast<const MessageDelegate4<R, T, U, V, W, A>*> (c);
     if (!cmd)
       return false;
 
     if ((void*) this->m_Object != (void*) cmd->m_Object)
       return false;
     if (this->m_MemberFunctionPointer != cmd->m_MemberFunctionPointer)
       return false;
     return true;
   }
 
   MessageAbstractDelegate4<T, U, V, W, A>* Clone() const
   {
     return new MessageDelegate4(m_Object, m_MemberFunctionPointer);
   }
 
 private:
   R* m_Object; // pointer to object
   A (R::*m_MemberFunctionPointer)(T, U, V, W); // pointer to member function
 };
 
 struct AbstractExceptionHandler
 {
   virtual void HandleException(const std::exception& exc) = 0;
   virtual AbstractExceptionHandler* Clone() const = 0;
 
   virtual ~AbstractExceptionHandler()
   {
   }
 };
 
 template<typename R>
 struct MessageExceptionHandler: public AbstractExceptionHandler
 {
   typedef void (R::*HandleExceptionCallback)(const std::exception&);
 
   MessageExceptionHandler(R* r, HandleExceptionCallback c) :
     m_Object(r), m_ExceptionCallback(c)
   {
   }
 
   void HandleException(const std::exception& exc)
   {
     (m_Object->*m_ExceptionCallback)(exc);
   }
 
   AbstractExceptionHandler* Clone() const
   {
     if (!m_Object) return 0;
     return new MessageExceptionHandler(m_Object, m_ExceptionCallback);
   }
 
 private:
 
   R* m_Object;
   HandleExceptionCallback m_ExceptionCallback;
 };
 
 template<typename D>
 class DelegateList
 {
 
 public:
 
   typedef D Delegate;
   typedef std::vector<Delegate*> ListType;
 
   DelegateList() :
     m_ExcHandler(0)
   {
 
   }
 
   ~DelegateList()
   {
     for (typename ListType::iterator iter = m_Delegates.begin(); iter
         != m_Delegates.end(); ++iter)
     {
       delete *iter;
     }
 
     delete m_ExcHandler;
   }
 
   void Add(const Delegate& d) const
   {
     Delegate* copy = d.Clone();
 
     Poco::FastMutex::ScopedLock lock(m_Mutex);
     for (typename ListType::iterator iter = m_Delegates.begin(); iter
         != m_Delegates.end(); ++iter)
     {
       if ((*iter)->operator==(copy))
       {
         delete copy;
         return;
       }
     }
     m_Delegates.push_back(copy);
   }
 
   void Remove(const Delegate& d) const
   {
     Poco::FastMutex::ScopedLock lock(m_Mutex);
     for (typename ListType::iterator iter = m_Delegates.begin(); iter
         != m_Delegates.end(); ++iter)
     {
       if ((*iter)->operator==(&d))
       {
         delete *iter;
         m_Delegates.erase(iter);
         return;
       }
     }
   }
 
   bool IsEmpty() const
   {
     return m_Delegates.empty();
   }
 
   template<typename Dummy>
   void Send0(Dummy) const
   {
     ListType delegates;
 
     {
       Poco::FastMutex::ScopedLock lock(m_Mutex);
       delegates.assign(m_Delegates.begin(), m_Delegates.end());
     }
 
     for (typename ListType::iterator iter = delegates.begin(); iter
         != delegates.end(); ++iter)
     {
       try
       {
         // notify each listener
         (*iter)->Execute();
       }
       catch (const std::exception& e)
       {
         if (m_ExcHandler)
         {
           m_ExcHandler->HandleException(e);
         }
         else
         {
           throw e;
         }
       }
       catch (...)
       {
         if (m_ExcHandler)
         {
           m_ExcHandler->HandleException(std::exception());
         }
         else
           throw ;
         }
       }
     }
 
     template<typename T>
     void Send1(T t) const
     {
       ListType delegates;
 
       {
         Poco::FastMutex::ScopedLock lock(m_Mutex);
         delegates.assign(m_Delegates.begin(), m_Delegates.end());
       }
 
       for (typename ListType::iterator iter = delegates.begin(); iter
           != delegates.end(); ++iter)
       {
         try
         {
           // notify each listener
           (*iter)->Execute(t);
         }
         catch (const std::exception& e)
         {
           if (m_ExcHandler)
           {
             m_ExcHandler->HandleException(e);
           }
           else
           {
             throw e;
           }
         }
         catch (...)
         {
           if (m_ExcHandler)
           {
             m_ExcHandler->HandleException(std::exception());
           }
           else throw;
         }
       }
     }
 
     template<typename T, typename U>
     void Send2(T t, U u) const
     {
       ListType delegates;
 
       {
         Poco::FastMutex::ScopedLock lock(m_Mutex);
         delegates.assign(m_Delegates.begin(), m_Delegates.end());
       }
 
       for (typename ListType::iterator iter = delegates.begin(); iter
           != delegates.end(); ++iter)
       {
         try
         {
           // notify each listener
           (*iter)->Execute(t, u);
         }
         catch (const std::exception& e)
         {
           if (m_ExcHandler)
           {
             m_ExcHandler->HandleException(e);
           }
           else
           {
             throw e;
           }
         }
         catch (...)
         {
           if (m_ExcHandler)
           {
             m_ExcHandler->HandleException(std::exception());
           }
           else throw;
         }
       }
     }
 
     template<typename T, typename U, typename V>
     void Send3(T t, U u, V v) const
     {
       ListType delegates;
 
       {
         Poco::FastMutex::ScopedLock lock(m_Mutex);
         delegates.assign(m_Delegates.begin(), m_Delegates.end());
       }
 
       for (typename ListType::iterator iter = delegates.begin(); iter
           != delegates.end(); ++iter)
       {
         try
         {
           // notify each listener
           (*iter)->Execute(t, u, v);
         }
         catch (const std::exception& e)
         {
           if (m_ExcHandler)
           {
             m_ExcHandler->HandleException(e);
           }
           else
           {
             throw e;
           }
         }
         catch (...)
         {
           if (m_ExcHandler)
           {
             m_ExcHandler->HandleException(std::exception());
           }
           else throw;
         }
       }
     }
 
     template<typename T, typename U, typename V, typename W>
     void Send4(T t, U u, V v, W w) const
     {
       ListType delegates;
 
       {
         Poco::FastMutex::ScopedLock lock(m_Mutex);
         delegates.assign(m_Delegates.begin(), m_Delegates.end());
       }
 
       for (typename ListType::iterator iter = delegates.begin(); iter
           != delegates.end(); ++iter)
       {
         try
         {
           // notify each listener
           (*iter)->Execute(t, u, v, w);
         }
         catch (const std::exception& e)
         {
           if (m_ExcHandler)
           {
             m_ExcHandler->HandleException(e);
           }
           else
           {
             throw e;
           }
         }
         catch (...)
         {
           if (m_ExcHandler)
           {
             m_ExcHandler->HandleException(std::exception());
           }
           else throw;
         }
       }
     }
 
     void SetExceptionHandler(const AbstractExceptionHandler& handler)
     {
       Poco::FastMutex::ScopedLock lock(m_Mutex);
       delete m_ExcHandler;
       m_ExcHandler = handler.Clone();
     }
 
     AbstractExceptionHandler* GetExceptionHandler() const
     {
       Poco::FastMutex::ScopedLock lock(m_Mutex);
       if (m_ExcHandler) return m_ExcHandler->Clone();
       return 0;
     }
 
     ListType GetDelegates() const
     {
       Poco::FastMutex::ScopedLock lock(m_Mutex);
       return m_Delegates;
     }
 
   private:
 
     /**
      * \brief List of listeners.
      *
      * This is declared mutable for a reason: Imagine an object that sends out notifications, e.g.
      *
      * \code
      class Database {
      public:
      Message Modified;
      };
      * \endcode
      *
      * Now imaginge someone gets a <tt>const Database</tt> object, because he/she should not write to the
      * database. He/she should anyway be able to register for notifications about changes in the database
      * -- this is why AddListener and RemoveListener are declared <tt>const</tt>. m_Listeners must be
      *  mutable so that AddListener and RemoveListener can modify it regardless of the object's constness.
      */
     mutable std::vector<Delegate*> m_Delegates;
 
     mutable AbstractExceptionHandler* m_ExcHandler;
     mutable Poco::FastMutex m_Mutex;
   };
 
   /**
    * \brief Event/message/notification class.
    *
    * This class
    * allows one class to send out messages and another class to
    * receive these message. There are subclasses for sending
    * parameters along with the messages.
    *
    * This is an implementation of the Observer pattern.
    *
    * \li There is no guarantee about the order of which observer is notified first. At the moment the observers which register first will be notified first.
    * \li Notifications are <b>synchronous</b>, by direct method calls. There is no support for asynchronous messages.
    *
    */
   // message without parameters (pure signals)
   template<typename A = void>
   class Message
   {
   public:
 
     typedef Message Self;
     typedef MessageAbstractDelegate<A> AbstractDelegate;
     typedef typename DelegateList<AbstractDelegate>::ListType ListenerList;
 
     void AddListener(const AbstractDelegate& delegate) const
     {
       delegates.Add(delegate);
     }
 
     void operator +=(const AbstractDelegate& delegate) const
     {
       this->AddListener(delegate);
     }
 
     void RemoveListener(const AbstractDelegate& delegate) const
     {
       delegates.Remove(delegate);
     }
 
     void operator -=(const AbstractDelegate& delegate) const
     {
       this->RemoveListener(delegate);
     }
 
     void Send() const
     {
       delegates.Send0(0);
     }
 
     void operator()() const
     {
       this->Send();
     }
 
     void SetExceptionHandler(const AbstractExceptionHandler& handler)
     {
       delegates.SetExceptionHandler(handler);
     }
 
     AbstractExceptionHandler* GetExceptionHandler() const
     {
       return delegates.GetExceptionHandler();
     }
 
     ListenerList GetListeners() const
     {
       return delegates.GetDelegates();
     }
 
     bool HasListeners() const
     {
       return !delegates.IsEmpty();
     }
 
     bool IsEmpty() const
     {
       return delegates.IsEmpty();
     }
 
   protected:
 
     DelegateList<AbstractDelegate> delegates;
 
   };
 
   // message with 1 parameter and return type
   template<typename T, typename A = void>
   class Message1
   {
   public:
 
     typedef Message1 Self;
     typedef MessageAbstractDelegate1<T, A> AbstractDelegate;
     typedef typename DelegateList<AbstractDelegate>::ListType ListenerList;
 
     void AddListener(const AbstractDelegate& delegate) const
     {
       delegates.Add(delegate);
     }
 
     void operator +=(const AbstractDelegate& delegate) const
     {
       this->AddListener(delegate);
     }
 
     void RemoveListener(const AbstractDelegate& delegate) const
     {
       delegates.Remove(delegate);
     }
 
     void operator -=(const AbstractDelegate& delegate) const
     {
       this->RemoveListener(delegate);
     }
 
     void Send(T t) const
     {
       delegates.Send1(t);
     }
 
     void operator()(T t) const
     {
       this->Send(t);
     }
 
     void SetExceptionHandler(const AbstractExceptionHandler& handler)
     {
       delegates.SetExceptionHandler(handler);
     }
 
     AbstractExceptionHandler* GetExceptionHandler() const
     {
       return delegates.GetExceptionHandler();
     }
 
     ListenerList GetListeners() const
     {
       return delegates.GetDelegates();
     }
 
     bool HasListeners() const
     {
       return !delegates.IsEmpty();
     }
 
     bool IsEmpty() const
     {
       return delegates.IsEmpty();
     }
 
   protected:
 
     DelegateList<AbstractDelegate> delegates;
 
   };
 
   // message with 2 parameters and return type
   template<typename T, typename U, typename A = void>
   class Message2
   {
   public:
 
     typedef Message2 Self;
     typedef MessageAbstractDelegate2<T, U, A> AbstractDelegate;
     typedef typename DelegateList<AbstractDelegate>::ListType ListenerList;
 
     void AddListener(const AbstractDelegate& delegate) const
     {
       delegates.Add(delegate);
     }
 
     void operator +=(const AbstractDelegate& delegate) const
     {
       this->AddListener(delegate);
     }
 
     void RemoveListener(const AbstractDelegate& delegate) const
     {
       delegates.Remove(delegate);
     }
 
     void operator -=(const AbstractDelegate& delegate) const
     {
       this->RemoveListener(delegate);
     }
 
     void Send(T t, U u) const
     {
       delegates.Send2(t, u);
     }
 
     void operator()(T t, U u) const
     {
       this->Send(t, u);
     }
 
     void SetExceptionHandler(const AbstractExceptionHandler& handler)
     {
       delegates.SetExceptionHandler(handler);
     }
 
     AbstractExceptionHandler* GetExceptionHandler() const
     {
       return delegates.GetExceptionHandler();
     }
 
     ListenerList GetListeners() const
     {
       return delegates.GetDelegates();
     }
 
     bool HasListeners() const
     {
       return !delegates.IsEmpty();
     }
 
     bool IsEmpty() const
     {
       return delegates.IsEmpty();
     }
 
   protected:
 
     DelegateList<AbstractDelegate> delegates;
 
   };
 
   // message with 3 parameters and return type
   template<typename T, typename U, typename V, typename A = void>
   class Message3
   {
   public:
 
     typedef Message3 Self;
     typedef MessageAbstractDelegate3<T, U, V, A> AbstractDelegate;
     typedef typename DelegateList<AbstractDelegate>::ListType ListenerList;
 
     void AddListener(const AbstractDelegate& delegate) const
     {
       delegates.Add(delegate);
     }
 
     void operator +=(const AbstractDelegate& delegate) const
     {
       this->AddListener(delegate);
     }
 
     void RemoveListener(const AbstractDelegate& delegate) const
     {
       delegates.Remove(delegate);
     }
 
     void operator -=(const AbstractDelegate& delegate) const
     {
       this->RemoveListener(delegate);
     }
 
     void Send(T t, U u, V v) const
     {
       delegates.Send3(t, u, v);
     }
 
     void operator()(T t, U u, V v) const
     {
       this->Send(t, u, v);
     }
 
     void SetExceptionHandler(const AbstractExceptionHandler& handler)
     {
       delegates.SetExceptionHandler(handler);
     }
 
     AbstractExceptionHandler* GetExceptionHandler() const
     {
       return delegates.GetExceptionHandler();
     }
 
     ListenerList GetListeners() const
     {
       return delegates.GetDelegates();
     }
 
     bool HasListeners() const
     {
       return !delegates.IsEmpty();
     }
 
     bool IsEmpty() const
     {
       return delegates.IsEmpty();
     }
 
   protected:
 
     DelegateList<AbstractDelegate> delegates;
 
   };
 
   // message with 4 parameters and return type
   template<typename T, typename U, typename V, typename W, typename A = void>
   class Message4
   {
   public:
 
     typedef Message4 Self;
     typedef MessageAbstractDelegate4<T, U, V, W, A> AbstractDelegate;
     typedef typename DelegateList<AbstractDelegate>::ListType ListenerList;
 
     void AddListener(const AbstractDelegate& delegate) const
     {
       delegates.Add(delegate);
     }
 
     void operator +=(const AbstractDelegate& delegate) const
     {
       this->AddListener(delegate);
     }
 
     void RemoveListener(const AbstractDelegate& delegate) const
     {
       delegates.Remove(delegate);
     }
 
     void operator -=(const AbstractDelegate& delegate) const
     {
       this->RemoveListener(delegate);
     }
 
     void Send(T t, U u, V v, W w) const
     {
       delegates.Send4(t, u, v, w);
     }
 
     void operator()(T t, U u, V v, W w) const
     {
       this->Send(t, u , v, w);
     }
 
     void SetExceptionHandler(const AbstractExceptionHandler& handler)
     {
       delegates.SetExceptionHandler(handler);
     }
 
     AbstractExceptionHandler* GetExceptionHandler() const
     {
       return delegates.GetExceptionHandler();
     }
 
     ListenerList GetListeners() const
     {
       return delegates.GetDelegates();
     }
 
     bool HasListeners() const
     {
       return !delegates.IsEmpty();
     }
 
     bool IsEmpty() const
     {
       return delegates.IsEmpty();
     }
 
   protected:
 
     DelegateList<AbstractDelegate> delegates;
 
   };
 
 } // namespace berry
 
 #endif /*BERRYMESSAGE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryMultiStatus.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryMultiStatus.cpp
index d4ce6517f8..206e28880d 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryMultiStatus.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryMultiStatus.cpp
@@ -1,128 +1,128 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryMultiStatus.h"
 
 #include <QTextStream>
 
 namespace berry
 {
 
 IStatus::Severity MultiStatus::GetMaxSeverity(const QList<IStatus::Pointer>& children) const
 {
   Severity maxSeverity = this->GetSeverity();
-  for (unsigned int i = 0; i < children.size(); i++)
+  for (int i = 0; i < children.size(); i++)
   {
     Q_ASSERT(children[i]);
     Severity severity = children[i]->GetSeverity();
     if (severity > maxSeverity)
     maxSeverity = severity;
   }
   return maxSeverity;
 }
 
 MultiStatus::MultiStatus(const QString& pluginId, int code,
                          const QList<IStatus::Pointer>& newChildren,
                          const QString& message, const SourceLocation& sl)
   : Status(OK_TYPE, pluginId, code, message, sl), children(newChildren)
 {
   this->SetSeverity(GetMaxSeverity(children));
 }
 
 MultiStatus::MultiStatus(const QString& pluginId, int code,
                          const QList<IStatus::Pointer>& newChildren,
                          const QString& message, const ctkException& exception,
                          const SourceLocation& sl)
   : Status(OK_TYPE, pluginId, code, message, exception, sl), children(newChildren)
 {
   this->SetSeverity(GetMaxSeverity(children));
 }
 
 MultiStatus::MultiStatus(const QString& pluginId, int code, const QString& message,
                          const SourceLocation& sl)
 : Status(OK_TYPE, pluginId, code, message, sl)
 {
 }
 
 MultiStatus::MultiStatus(const QString& pluginId, int code,
                          const QString& message, const ctkException& exception,
                          const SourceLocation& sl)
 : Status(OK_TYPE, pluginId, code, message, exception, sl)
 {
 }
 
 void MultiStatus::Add(IStatus::Pointer status)
 {
   poco_assert(status);
   children.push_back(status);
   Severity newSev = status->GetSeverity();
   if (newSev > this->GetSeverity())
   {
     this->SetSeverity(newSev);
   }
 }
 
 void MultiStatus::AddAll(IStatus::Pointer status)
 {
   Q_ASSERT(status);
   QList<IStatus::Pointer> statuses(status->GetChildren());
-  for (unsigned int i = 0; i < statuses.size(); i++)
+  for (int i = 0; i < statuses.size(); i++)
   {
     this->Add(statuses[i]);
   }
 }
 
 QList<IStatus::Pointer> MultiStatus::GetChildren() const
 {
   return children;
 }
 
 bool MultiStatus::IsMultiStatus() const
 {
   return true;
 }
 
 void MultiStatus::Merge(const IStatus::Pointer& status)
 {
   poco_assert(status);
   if (!status->IsMultiStatus())
   {
     this->Add(status);
   }
   else
   {
     this->AddAll(status);
   }
 }
 
 QString MultiStatus::ToString() const
 {
   QString str;
   QTextStream buf(&str);
   buf << Status::ToString() << " children=[";
-  for (unsigned int i = 0; i < children.size(); i++)
+  for (int i = 0; i < children.size(); i++)
   {
     if (i != 0)
     {
       buf << " ";
     }
     buf << children[i]->ToString();
   }
   buf << "]";
   return str;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryRuntime.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryNonDerivable.h
similarity index 67%
rename from BlueBerry/Bundles/org.blueberry.core.runtime/src/berryRuntime.h
rename to BlueBerry/Bundles/org.blueberry.core.runtime/src/berryNonDerivable.h
index 5d90201857..1824561762 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryRuntime.h
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryNonDerivable.h
@@ -1,33 +1,30 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
-#ifndef BERRYRUNTIME_H_
-#define BERRYRUNTIME_H_
-
-#include <string>
-
-#include <org_blueberry_core_runtime_Export.h>
+#ifndef BERRYNONDERIVABLE_H
+#define BERRYNONDERIVABLE_H
 
 namespace berry {
 
-struct org_blueberry_core_runtime_EXPORT Runtime
+class NonDerivable
 {
-  static const std::string ADAPTER_SERVICE_ID;
+protected:
+  NonDerivable() {}
 };
 
 }
 
-#endif /*BERRYRUNTIME_H_*/
+#endif // BERRYNONDERIVABLE_H
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryObject.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryObject.cpp
index 2cd40e59d0..b4289c15dd 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryObject.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryObject.cpp
@@ -1,291 +1,308 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryObject.h"
 
 #ifdef BLUEBERRY_DEBUG_SMARTPOINTER
 #include "berryDebugUtil.h"
 #endif
 
 #include "berryLog.h"
 
 #include <QDebug>
 
 #include <list>
 #include <memory>
 #include <exception>
 
 // Better name demangling for gcc
 #if __GNUC__ > 3 || ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 )
 #define GCC_USEDEMANGLE
 #endif
 
 #ifdef GCC_USEDEMANGLE
 #include <cstdlib>
 #include <cxxabi.h>
 #endif
 
+#if defined(_WIN32) && defined(NDEBUG)
+// exported from VC CRT
+extern "C"
+char * _unDName(char * outputString, const char * name, int maxStringLength,
+                void * (* pAlloc )(size_t), void (* pFree )(void *),
+                unsigned short disableFlags);
+#endif
+
 namespace berry
 {
 
 void Object::Delete()
 {
   this->UnRegister();
 }
 
+QString Object::DemangleName(const char* mangledName)
+{
+  QString name(mangledName);
+#ifdef GCC_USEDEMANGLE
+  int status;
+  char* unmangled = abi::__cxa_demangle(mangledName, 0, 0, &status);
+
+  if(status == 0)
+  {
+    name = QString(unmangled);
+    free(unmangled);
+  }
+#elif defined(_WIN32) && defined(NDEBUG)
+  char * const unmangled = _unDName(0, mangledName, 0, malloc, free, 0x2800);
+  if (unmangled)
+  {
+    name = QString(unmangled);
+    free(unmangled);
+  }
+#endif
+  return name;
+}
+
 #ifdef _WIN32
 void*
 Object
 ::operator new(size_t n)
 {
   return new char[n];
 }
 
 void*
 Object
 ::operator new[](size_t n)
 {
   return new char[n];
 }
 
 void
 Object
 ::operator delete(void* m)
 {
   delete [] (char*)m;
 }
 
 void
 Object
 ::operator delete[](void* m, size_t)
 {
   delete [] (char*)m;
 }
 #endif
 
+const char* Object::GetStaticClassName()
+{
+  return "berry::Object";
+}
+
+QString Object::GetClassName() const
+{
+  return DemangleName(typeid(*this).name());
+}
+
 QDebug Object::Print(QDebug os, Indent indent) const
 {
   os = this->PrintHeader(os, indent);
   os = this->PrintSelf(os, indent.GetNextIndent());
   return this->PrintTrailer(os, indent);
 }
 
 QString Object::ToString() const
 {
   QString str;
   QDebug ss(&str);
   this->Print(ss);
   return str;
 }
 
 uint Object::HashCode() const
 {
   return qHash(this);
 }
 
 bool Object::operator<(const Object* o) const
 {
   return this < o;
 }
 
 void Object::Register() const
 {
   m_ReferenceCount.ref();
 }
 
 void Object::UnRegister(bool del) const
 {
   if (!m_ReferenceCount.deref() && del)
   {
     delete this;
   }
 }
 
 void Object::SetReferenceCount(int ref)
 {
   QMutexLocker lock(&m_ReferenceCountLock);
   m_ReferenceCount = ref;
   if (ref == 0)
   {
     delete this;
   }
 }
 
 bool Object::operator==(const Object* o) const
 {
   return this == o;
 }
 
 #ifdef BLUEBERRY_DEBUG_SMARTPOINTER
 unsigned int Object::GetTraceId() const
 {
   return m_TraceId;
 }
 
 unsigned int& Object::GetTraceIdCounter() const
 {
   static unsigned int traceId = 0;
   return traceId;
 }
 #endif
 
 Object::Object() :
   m_ReferenceCount(0)
 {
 #ifdef BLUEBERRY_DEBUG_SMARTPOINTER
   unsigned int& id = GetTraceIdCounter();
   m_TraceId = ++id;
   DebugUtil::RegisterObject(this);
 #endif
 }
 
 Object::~Object()
 {
   /**
    * warn user if reference counting is on and the object is being referenced
    * by another object.
    */
   if (m_ReferenceCount > 0)
   {
     // A general exception safety rule is that destructors should
     // never throw.  Something is wrong with a program that reaches
     // this point anyway.  Also this is the least-derived class so the
     // whole object has been destroyed by this point anyway.  Just
     // issue a warning.
     BERRY_WARN << "WARNING: In " __FILE__ ", line " << __LINE__ << "\n"
         << this->GetClassName() << " (" << this
         << "): Trying to delete object with non-zero reference count.";
   }
 
   /**
    * notifies the registered functions that the object is being destroyed
    */
   m_DestroyMessage.Send();
 
 #ifdef BLUEBERRY_DEBUG_SMARTPOINTER
   DebugUtil::UnregisterObject(this);
 #endif
 }
 
 QDebug Object::PrintSelf(QDebug os, Indent Indent) const
 {
-#ifdef GCC_USEDEMANGLE
-  char const * mangledName = typeid(*this).name();
-  int status;
-  char* unmangled = abi::__cxa_demangle(mangledName, 0, 0, &status);
-
-  os << Indent << "RTTI typeinfo:   ";
-
-  if(status == 0)
-  {
-    os << unmangled;
-    free(unmangled);
-  }
-  else
-  {
-    os << mangledName;
-  }
-
-  os << '\n';
-#else
-  os << Indent << "RTTI typeinfo:   " << typeid( *this ).name() << '\n';
-#endif
+  QString demangledName = DemangleName(typeid(*this).name());
+  os << Indent << "RTTI typeinfo:   " << demangledName << '\n';
   os << Indent << "Reference Count: " << m_ReferenceCount << '\n';
+  return os;
 }
 
 /**
  * Define a default print header for all objects.
  */
 QDebug Object::PrintHeader(QDebug os, Indent Indent) const
 {
   os << Indent << this->GetClassName() << " (" << this << ")\n";
   return os;
 }
 
 /**
  * Define a default print trailer for all objects.
  */
 QDebug Object::PrintTrailer(QDebug os, Indent /*Indent*/) const
 {
   return os;
 }
 
 // ============== Indent related implementations ==============
 
 static const char blanks[41] = "                                        ";
 
-//Indent*
-//Indent::New()
-//{
-//  return new Self;
-//}
-
 Indent Indent::GetNextIndent()
 {
   int Indent = m_Indent + 2;
   if (Indent > 40)
   {
     Indent = 40;
   }
   return Indent;
 }
 
 QDebug operator<<(QDebug os, const berry::Indent& ind)
 {
   os.nospace() << blanks + (40 - ind.m_Indent);
   return os;
 }
 
 } // namespace berry
 
 
 QDebug operator<<(QDebug os, const berry::Object& o)
 {
   return o.Print(os);
 }
 
 QDebug operator<<(QDebug os, const berry::SmartPointer<const berry::Object>& o)
 {
   return o->Print(os);
 }
 
 QDebug operator<<(QDebug os, const berry::SmartPointer<berry::Object>& o)
 {
   return o->Print(os);
 }
 
 QTextStream& operator<<(QTextStream& os, const berry::Object& o)
 {
   os << o.ToString();
   return os;
 }
 
 QTextStream& operator<<(QTextStream& os, const berry::SmartPointer<const berry::Object>& o)
 {
   os << o->ToString();
   return os;
 }
 
 //QTextStream& operator<<(QTextStream& os, const berry::SmartPointer<berry::Object>& o)
 //{
 //  os << o->ToString();
 //  return os;
 //}
 
 uint qHash(const berry::Object& o)
 {
   return o.HashCode();
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryObject.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryObject.h
index d75ff909a2..a1ae30cbea 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryObject.h
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryObject.h
@@ -1,264 +1,241 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYOSGILIGHTOBJECT_H_
 #define BERRYOSGILIGHTOBJECT_H_
 
 #include <org_blueberry_core_runtime_Export.h>
 
 #include "berryMacros.h"
 #include "berryMessage.h"
 
 #include <berryConfig.h>
 
 #include <QString>
 #include <QMetaType>
 #include <QMutex>
 #include <QAtomicInt>
 
 #ifdef _MSC_VER
 // disable inheritance by dominance warnings
 #pragma warning( disable : 4250 4275 4251 )
 // disable warning: C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
 #pragma warning( disable : 4290 )
 #endif
 
 class QDebug;
 class QTextStream;
 
 namespace berry {
 
 class org_blueberry_core_runtime_EXPORT Indent
 {
 
 public:
 
   /** Standard class typedefs. */
   typedef Indent  Self;
 
-  /** Method for creation through the object factory. */
-  //static Self* New();
-
-  /** Destroy this instance. */
-  //void Delete() {delete this;}
-
   /** Construct the object with an initial Indentation level. */
   Indent(int ind = 0) { m_Indent=ind; }
 
-  /** Return the name of the class. */
-  //static const char *GetClassName() {return "Indent";}
-
   /**
    * Determine the next Indentation level. Keep Indenting by two until the
    * a maximum of forty spaces is reached.
    */
   Indent GetNextIndent();
 
   /** Print out the Indentation. Basically output a bunch of spaces.  */
-  friend QDebug operator<<(QDebug os, const Indent& o);
+  friend org_blueberry_core_runtime_EXPORT QDebug operator<<(QDebug os, const Indent& o);
 
 private:
 
   int m_Indent;
 };
 
 
 /** \class Object
  * \brief Light weight base class for most BlueBerry classes.
  *
  * Object is copied from itk::LightObject and is the highest
  * level base class for most BlueBerry objects. It
  * implements reference counting and the API for object printing.
  *
  */
 class org_blueberry_core_runtime_EXPORT Object
 {
 
- /**
- *  The message macro is used to create a message object as well as add / remove functions
- *  (AddDestroyListener, RemoveDestroyListener)
- *  in order to register functions which will be called when the object is destroyed.
- *  More information about the NewMessageMacro can be found in @see berryMessage.h
- *
- */
- berryNewMessageMacro(Destroy)
+private:
+
+  mutable Message<> m_DestroyMessage;
 
 public:
 
-  berryObjectMacro(Object);
-
-//  struct Hash {
-//    inline std::size_t operator()(const Self* value) const
-//    {
-//      return value->HashCode();
-//    }
-
-//    inline std::size_t operator()(Self::ConstPointer value) const
-//    {
-//      return value->HashCode();
-//    }
-
-//    inline std::size_t operator()(Self::WeakPtr value) const
-//    {
-//      try {
-//        const Self::ConstPointer sv(value.Lock());
-//        return sv->HashCode();
-//      }
-//      catch (BadWeakPointerException& /*e*/)
-//      {
-//        return 0;
-//      }
-//    }
-//  };
+  typedef Object Self;
+  typedef berry::SmartPointer<Self> Pointer;
+  typedef berry::SmartPointer<const Self>  ConstPointer;
+  typedef berry::WeakPointer<Self> WeakPtr;
+  typedef berry::WeakPointer<const Self> ConstWeakPtr;
+
+  static const char* GetStaticClassName();
+  virtual QString GetClassName() const;
 
   /** Delete an BlueBerry object. This method should always be used to delete an
    * object when the new operator was used to create it. Using the C
    * delete method will not work with reference counting.  */
   virtual void Delete();
 
 
 #ifdef _WIN32
   /** Used to avoid dll boundary problems.  */
   void* operator new(size_t);
   void* operator new[](size_t);
   void operator delete(void*);
   void operator delete[](void*, size_t);
 #endif
 
+  static QString DemangleName(const char* typeName);
+
   /**
    * Cause the object to print itself out. This is usually used to provide
    * detailed information about the object's state. It just calls the
    * header/self/trailer virtual print methods, which can be overriden by
    * subclasses.
    */
   QDebug Print(QDebug os, Indent Indent=0) const;
 
   /**
    * Returns a string representation of this object. The default
    * implementation returns an empty string.
    */
   virtual QString ToString() const;
 
   /**
    * Returns a hash code value for the object.
    */
   virtual uint HashCode() const;
 
   /**
    * Override this method to implement a specific "less than" operator
    * for associative STL containers.
    */
   virtual bool operator<(const Object*) const;
 
   /** Increase the reference count (mark as used by another object).  */
   void Register() const;
 
   /** Decrease the reference count (release by another object).
    * Set del to false if you do not want the object to be deleted if
    * the reference count is zero (use with care!) */
   void UnRegister(bool del = true) const;
 
   /** Gets the reference count on this object. */
   int GetReferenceCount() const
   { return m_ReferenceCount; }
 
   /** Sets the reference count on this object. This is a dangerous
    * method, use it with care. */
   void SetReferenceCount(int);
 
+  inline void AddDestroyListener(const MessageAbstractDelegate<>& delegate) const
+  { m_DestroyMessage += delegate; }
+  inline void RemoveDestroyListener(const MessageAbstractDelegate<>& delegate) const
+  { m_DestroyMessage -= delegate; }
+
+
   /**
    * A generic comparison method. Override this method in subclasses and
    * cast to your derived class to provide a more detailed comparison.
    */
   virtual bool operator==(const Object*) const;
 
 #ifdef BLUEBERRY_DEBUG_SMARTPOINTER
   unsigned int GetTraceId() const;
 private:
   unsigned int m_TraceId;
   unsigned int& GetTraceIdCounter() const;
 public:
 #endif
 
 protected:
 
-  friend class QScopedPointerObjectDeleter;
+  friend struct QScopedPointerObjectDeleter;
 
   Object();
   virtual ~Object();
 
   /**
    * Methods invoked by Print() to print information about the object
    * including superclasses. Typically not called by the user (use Print()
    * instead) but used in the hierarchical print process to combine the
    * output of several classes.
    */
   virtual QDebug PrintSelf(QDebug os, Indent indent) const;
   virtual QDebug PrintHeader(QDebug os, Indent indent) const;
   virtual QDebug PrintTrailer(QDebug os, Indent indent) const;
 
   /** Number of uses of this object by other objects. */
   mutable QAtomicInt m_ReferenceCount;
 
   /** Mutex lock to protect modification to the reference count */
   mutable QMutex m_ReferenceCountLock;
 
 private:
 
   Object(const Self&); //purposely not implemented
   void operator=(const Self&); //purposely not implemented
 
 };
 
 // A custom deleter for QScopedPointer
 // berry::Object instances in a QScopedPointer should have reference count one,
 // such that they are not accidentally deleted when a temporary smart pointer
 // pointing to it goes out of scope. This deleter fixes the reference count and
 // always deletes the instance. Use a berry::SmartPointer if the lifetime should
 // exceed the one of the pointer.
 struct QScopedPointerObjectDeleter
 {
   static inline void cleanup(Object* obj)
   {
     if (obj == NULL) return;
     obj->UnRegister(false);
     delete obj;
   }
 };
 
 org_blueberry_core_runtime_EXPORT QDebug operator<<(QDebug os, const berry::Indent& o);
 
 }
 
 /**
  * This operator allows all subclasses of Object to be printed via QDebug <<.
  * It in turn invokes the Print method, which in turn will invoke the
  * PrintSelf method that all objects should define, if they have anything
  * interesting to print out.
  */
 org_blueberry_core_runtime_EXPORT QDebug operator<<(QDebug os, const berry::Object& o);
 org_blueberry_core_runtime_EXPORT QDebug operator<<(QDebug os, const berry::SmartPointer<const berry::Object>& o);
 org_blueberry_core_runtime_EXPORT QDebug operator<<(QDebug os, const berry::SmartPointer<berry::Object>& o);
 
 org_blueberry_core_runtime_EXPORT QTextStream& operator<<(QTextStream& os, const berry::Object& o);
 org_blueberry_core_runtime_EXPORT QTextStream& operator<<(QTextStream& os, const berry::SmartPointer<const berry::Object>& o);
 //org_blueberry_core_runtime_EXPORT QTextStream& operator<<(QTextStream& os, const berry::SmartPointer<berry::Object>& o);
 
 Q_DECLARE_METATYPE(berry::Object::Pointer)
 
 org_blueberry_core_runtime_EXPORT uint qHash(const berry::Object& o);
 
 #endif /*BERRYOSGILIGHTOBJECT_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryObjectGeneric.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryObjectGeneric.h
index 1a44329390..9bf2b664cd 100755
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryObjectGeneric.h
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryObjectGeneric.h
@@ -1,113 +1,113 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYOBJECTGENERIC_H_
 #define BERRYOBJECTGENERIC_H_
 
 #include <sstream>
 #include <org_blueberry_core_runtime_Export.h>
 #include "berryMacros.h"
 #include "berryObject.h"
 
 namespace berry {
 
 template <typename T>
 class org_blueberry_core_runtime_EXPORT ObjectGeneric : public Object
 {
   public:
 
     berryObjectMacro(ObjectGeneric);
 
     typedef T ValueType;
 
     ObjectGeneric() : m_Value(0) {}
     ObjectGeneric(T x) : m_Value(x) {}
     //ObjectGeneric(const Self& o) { m_Value = o.m_Value; }
 
     virtual ~ObjectGeneric()
     {
     }
 
     void SetValue(T val) {
       m_Value = val;
     }
 
     T GetValue() const {
       return m_Value;
     }
 
     bool operator==(const Object* o) const
     {
       if(const Self* other = dynamic_cast<const Self*>(o))
         return (this->m_Value == other->m_Value);
 
       return false;
     }
 
     virtual std::string GetValueAsString() const
     {
       std::stringstream myStr;
       std::locale originalLocale = myStr.getloc();
       std::locale C("C");
       myStr.imbue(C);
       myStr << GetValue() ;
       myStr.imbue(originalLocale);
       return myStr.str();
     }
 
     virtual bool Assignable(Object::ConstPointer other) const
     {
       return other.Cast<const Self>() != 0;
     }
 
     virtual void Assign(Object::ConstPointer other)
     {
       ConstPointer specOther = other.Cast<const Self>();
 
       if (specOther && this->m_Value != specOther->m_Value)
       {
         this->m_Value = specOther->m_Value;
       }
     }
 
   protected:
 
     T m_Value;
 };
 
 
 } // namespace berry
 
 /**
  * Generates a specialized subclass of berry::ObjectGeneric.
  * This way, GetClassName() returns the value provided by ObjectName.
  * Please see berryObjects.h for examples
  * @param ObjectName the name of the instantiation of ObjectGeneric
  * @param Type the value type
  */
-#define berrySpecializeGenericObject(ObjectName,Type,DefaultValue)  \
-class org_blueberry_core_runtime_EXPORT ObjectName: public ::berry::ObjectGeneric< Type >           \
+#define berrySpecializeGenericObject(ObjectName,Type,DefaultValue)   \
+class org_blueberry_core_runtime_EXPORT ObjectName: public ::berry::ObjectGeneric< Type > \
 {                                                                    \
 public:                                                              \
   berryObjectMacro(ObjectName);                                      \
-  ObjectName() : ::berry::ObjectGeneric< Type >(DefaultValue) { }                           \
-  ObjectName(Type x) : ::berry::ObjectGeneric<Type>(x) {}                     \
-  /*ObjectName(const ObjectName& o) : ObjectGeneric< Type >(o) {} */ \
+  ObjectName() : ::berry::ObjectGeneric< Type >(DefaultValue) { }    \
+  ObjectName(Type x) : ::berry::ObjectGeneric<Type>(x) {}            \
+  QString ToString() const { QString txt; QTextStream ts(&txt); ts << m_Value; return txt; } \
 };
 
 
 #endif /* BERRYOBJECTGENERIC_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryObjectString.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryObjectString.cpp
new file mode 100644
index 0000000000..235ccb5ea6
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryObjectString.cpp
@@ -0,0 +1,57 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berryObjectString.h"
+
+namespace berry {
+
+ObjectString::ObjectString()
+{}
+
+ObjectString::ObjectString(const QString& s)
+  : QString(s)
+{}
+
+bool ObjectString::operator==(const Object* other) const
+{
+  if (const ObjectString* otherStr = dynamic_cast<const ObjectString*>(other))
+  {
+    return QString::operator ==(*otherStr);
+  }
+  return false;
+}
+
+bool ObjectString::operator==(const QString& other) const
+{
+  return QString::operator==(other);
+}
+
+QString ObjectString::ToString() const
+{
+  return *this;
+}
+
+ObjectString::~ObjectString()
+{
+}
+
+berry::ObjectString &berry::ObjectString::operator =(const QString &other)
+{
+  QString::operator =(other);
+  return *this;
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryObjectString.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryObjectString.h
index 25a2d7c6a0..e289bb4e86 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryObjectString.h
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryObjectString.h
@@ -1,41 +1,53 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
-#ifndef BERRYOSGISTRING_H_
-#define BERRYOSGISTRING_H_
+#ifndef BERRYOBJECTSTRING_H_
+#define BERRYOBJECTSTRING_H_
 
 #include "berryMacros.h"
+#include "berryObject.h"
 
 #include <QString>
 
+#include <org_blueberry_core_runtime_Export.h>
+
 namespace berry {
 
-class ObjectString : public QString, public Object
+class org_blueberry_core_runtime_EXPORT ObjectString : public QString, public Object
 {
 
 public:
 
   berryObjectMacro(berry::ObjectString)
 
-  ObjectString() {}
-  ObjectString(const QString& s) : QString(s) {}
+  ObjectString();
+  ObjectString(const QString& s);
+
+  ~ObjectString();
+
+  bool operator==(const Object* other) const;
+
+  bool operator==(const QString& other) const;
+
+  ObjectString& operator=(const QString& other);
+
+  QString ToString() const;
 
-  ~ObjectString() {}
 };
 
 }
 
-#endif /*BERRYOSGISTRING_H_*/
+#endif /*BERRYOBJECTSTRING_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryPlatformObject.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryPlatformObject.cpp
index 56782d9449..459d37d793 100755
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryPlatformObject.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryPlatformObject.cpp
@@ -1,43 +1,41 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryPlatformObject.h"
 
 #include "berryPlatform.h"
 #include "berryIAdapterManager.h"
 
 namespace berry {
 
 PlatformObject::PlatformObject()
- : Object()
 {
-
 }
 
-Poco::Any PlatformObject::GetAdapter(const std::string& adapter)
+Object* PlatformObject::GetAdapter(const QString& adapter)
 {
   IAdapterManager* adapterManager = Platform::GetAdapterManager();
   if (adapterManager)
   {
-    return adapterManager->GetAdapter(Object::Pointer(this), adapter);
+    return adapterManager->GetAdapter(this, adapter);
   }
   else
   {
-    return Poco::Any();
+    return NULL;
   }
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryPlatformObject.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryPlatformObject.h
index 88534d9f11..ceaeb41b66 100755
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryPlatformObject.h
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryPlatformObject.h
@@ -1,84 +1,84 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYPLATFORMOBJECT_H_
 #define BERRYPLATFORMOBJECT_H_
 
 #include <org_blueberry_core_runtime_Export.h>
 
 #include <berryObject.h>
 
 #include "berryIAdaptable.h"
 
 namespace berry {
 
 /**
  * An abstract superclass implementing the <code>IAdaptable</code>
  * interface. <code>getAdapter</code> invocations are directed
  * to the platform's adapter manager.
  * <p>
  * Note: In situations where it would be awkward to subclass this
  * class, the same affect can be achieved simply by implementing
  * the <code>IAdaptable</code> interface and explicitly forwarding
  * the <code>getAdapter</code> request to the platform's
  * adapater manager. The method would look like:
  * <pre>
  *     public Object getAdapter(Class adapter) {
  *         return Platform.getAdapterManager().getAdapter(this, adapter);
  *     }
  * </pre>
  * </p>
  * <p>
  * Clients may subclass.
  * </p>
  *
  * @see Platform#getAdapterManager
  */
-class org_blueberry_core_runtime_EXPORT PlatformObject : public Object, public IAdaptable {
+class org_blueberry_core_runtime_EXPORT PlatformObject : public virtual Object, public IAdaptable {
 
 public:
 
   berryObjectMacro(berry::PlatformObject);
 
   /**
    * Constructs a new platform object.
    */
   PlatformObject();
 
   /**
    * Returns an object which is an instance of the given class
    * associated with this object. Returns <code>null</code> if
    * no such object can be found.
    * <p>
    * This implementation of the method declared by <code>IAdaptable</code>
    * passes the request along to the platform's adapter manager; roughly
    * <code>Platform.getAdapterManager().getAdapter(this, adapter)</code>.
    * Subclasses may override this method (however, if they do so, they
    * should invoke the method on their superclass to ensure that the
    * Platform's adapter manager is consulted).
    * </p>
    *
    * @see IAdaptable#getAdapter
    * @see Platform#getAdapterManager
    */
-  Poco::Any GetAdapter(const std::string& adapter);
+  Object* GetAdapter(const QString& adapter);
 
 };
 
 }
 
 #endif /* BERRYPLATFORMOBJECT_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryStackTrace.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryStackTrace.cpp
deleted file mode 100755
index 19c1a0eece..0000000000
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryStackTrace.cpp
+++ /dev/null
@@ -1,804 +0,0 @@
-/*===================================================================
-
-BlueBerry Platform
-
-Copyright (c) German Cancer Research Center,
-Division of Medical and Biological Informatics.
-All rights reserved.
-
-This software is distributed WITHOUT ANY WARRANTY; without
-even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.
-
-See LICENSE.txt or http://www.mitk.org for details.
-
-===================================================================*/
-/*************************************************************************
- *
- * $Id$
- *
- * Copyright (c) 1998 by Bjorn Reese <breese@mail1.stofanet.dk>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
- * CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.
- *
- ************************************************************************
- *
- * 1999/08/19 - breese
- *  - Cleaned up the interface
- *
- * 1999/08/06 - breese
- *  - Added U_STACK_TRACE for HP/UX
- *
- * 1999/01/24 - breese
- *  - Added GCC_DumpStack
- *
- * 1998/12/21 - breese
- *  - Fixed include files and arguments for waitpid()
- *  - Made an AIX workaround for waitpid() exiting with EINTR
- *  - Added a missing 'quit' command for OSF dbx
- *
- ************************************************************************/
-
-#if defined(unix) || defined(__unix) || defined(__xlC__)
-# define PLATFORM_UNIX
-#elif defined(WIN32) || defined(_WIN32)
-# define PLATFORM_WIN32
-#endif
-
-#if defined(_AIX) || defined(__xlC__)
-# define PLATFORM_AIX
-#elif defined(__FreeBSD__)
-# define PLATFORM_FREEBSD
-#elif defined(hpux) || defined(__hpux) || defined(_HPUX_SOURCE)
-# define PLATFORM_HPUX
-#elif defined(sgi) || defined(mips) || defined(_SGI_SOURCE)
-# define PLATFORM_IRIX
-#elif defined(__osf__)
-# define PLATFORM_OSF
-#elif defined(M_I386) || defined(_SCO_DS) || defined(_SCO_C_DIALECT)
-# define PLATFORM_SCO
-#elif defined(sun) || defined(__sun__) || defined(__SUNPRO_C)
-# if defined(__SVR4) || defined(__svr4__)
-#  define PLATFORM_SOLARIS
-# endif
-#endif
-
-/* ANSI C includes */
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <limits.h>
-#include <errno.h>
-#include <signal.h>
-#if defined(PLATFORM_UNIX)
-# include <unistd.h>
-# include <sys/types.h>
-# include <sys/wait.h>
-# if defined(PLATFORM_IRIX) && defined(USE_BUILTIN)
-/* Compile with -DUSE_BUILTIN and -lexc */
-#  include <libexc.h>
-# elif defined(PLATFORM_HPUX) && defined(USE_BUILTIN)
-/* Compile with -DUSE_BUILTIN and -lcl */
-extern void U_STACK_TRACE(void);
-# endif
-#endif
-
-#ifndef STDIN_FILENO
-# define STDIN_FILENO 0
-# define STDOUT_FILENO 1
-# define STDERR_FILENO 2
-#endif // STDIN_FILENO
-
-#include "berryStackTrace.h"
-
-#ifndef FALSE
-# define FALSE (0 == 1)
-# define TRUE (! FALSE)
-#endif
-
-#define SYS_ERROR -1
-
-#ifndef EXIT_SUCCESS
-# define EXIT_SUCCESS 0
-#endif
-#ifndef EXIT_FAILURE
-# define EXIT_FAILURE 1
-#endif
-
-#define MAX_BUFFER_SIZE 512
-#if defined(__GNUC__)
-/* Change the code if ADDRESSLIST_SIZE is increased */
-# define ADDRESSLIST_SIZE 20
-#endif
-
-/*************************************************************************
- * Globals
- *
- * We cannot pass custom arguments to signal handlers so we store
- * them as global variables (but limit their scope to this file.)
- */
-static const char *global_progname;
-static int global_output = STDOUT_FILENO;
-
-
-#if defined(PLATFORM_UNIX)
-/*************************************************************************
- * my_pclose [private]
- */
-static void my_pclose(int fd, int pid)
-{
-  close(fd);
-  /* Make sure the the child process has terminated */
-  (void)kill(pid, SIGTERM);
-}
-
-/*************************************************************************
- * my_popen [private]
- */
-static int my_popen(const char *command, pid_t *pid)
-{
-  int rc;
-  int pipefd[2];
-
-  rc = pipe(pipefd);
-  if (SYS_ERROR != rc)
-    {
-      *pid = fork();
-      switch (*pid)
-  {
-  case SYS_ERROR:
-    rc = SYS_ERROR;
-    close(pipefd[0]);
-    close(pipefd[1]);
-    break;
-
-  case 0: /* Child */
-    close(pipefd[0]);
-    close(STDOUT_FILENO);
-    close(STDERR_FILENO);
-    dup2(pipefd[1], STDOUT_FILENO);
-    dup2(pipefd[1], STDERR_FILENO);
-    /*
-     * The System() call assumes that /bin/sh is
-     * always available, and so will we.
-     */
-    execl("/bin/sh", "/bin/sh", "-c", command, NULL);
-    _exit(EXIT_FAILURE);
-    break;
-
-  default: /* Parent */
-    close(pipefd[1]);
-    rc = pipefd[0];
-    break;
-  } /* switch */
-    }
-  return rc;
-}
-
-/*************************************************************************
- * my_getline [private]
- */
-static int my_getline(int fd, char *buffer, int max)
-{
-  char c;
-  int i = 0;
-
-  do {
-    if (read(fd, &c, 1) < 1)
-      return 0;
-    if (i < max)
-      buffer[i++] = c;
-  } while (c != '\n');
-  buffer[i] = (char)0;
-  return i;
-}
-
-/*************************************************************************
- * GCC_DumpStack [private]
- *
- *
- * This code is still experimental.
- *
- * Stackbased arrays are used to prevent allocating from the heap.
- * Warning: sprintf/sscanf are not ASync safe. They were used for
- *  convenience.
- *
- * 'nm' is used because it is most widespread
- *  GNU:     nm [-B]
- *  Solaris: nm -x -p
- *  IRIX:    nm -x -B  (but __builtin_return_address() always returns NULL)
- *  AIX:     nm -x -B
- *  OSF/1:   nm -B
- *  SCO/OpenServer: nm -x -p
- *  HP/UX    nm -x -p
- */
-
-#if defined(__GNUC__) && defined(USE_BUILTIN)
-
-typedef struct {
-  unsigned long realAddress;
-  unsigned long closestAddress;
-  char name[MAX_BUFFER_SIZE + 1];
-  char type;
-} address_T;
-
-
-static void GCC_DumpStack(void)
-{
-  int i;
-  void *p = &p; /* dummy start value */
-  address_T syms[ADDRESSLIST_SIZE + 1];
-  char buffer[MAX_BUFFER_SIZE];
-  int fd;
-  pid_t pid;
-  unsigned long addr;
-  unsigned long highestAddress;
-  unsigned long lowestAddress;
-  char type;
-  char *pname;
-  char name[MAX_BUFFER_SIZE];
-  int number;
-
-  for (i = 0; p; i++)
-    {
-      /*
-       * This is based on code by Steve Coleman <steve.colemanjhuapl.edu>
-       *
-       * __builtin_return_address() only accepts a constant as argument.
-       */
-      switch (i)
-  {
-  case 0:
-          if (__builtin_frame_address(0))
-    p = __builtin_return_address(0);
-    else p = NULL;
-    break;
-  case 1:
-    if (__builtin_frame_address(1))
-    p = __builtin_return_address(1);
-    else p = NULL;
-    break;
-  case 2:
-    if (__builtin_frame_address(2))
-    p = __builtin_return_address(2);
-    else p = NULL;
-    break;
-  case 3:
-    if (__builtin_frame_address(3))
-    p = __builtin_return_address(3);
-    else p = NULL;
-    break;
-  case 4:
-    if (__builtin_frame_address(4))
-    p = __builtin_return_address(4);
-    else p = NULL;
-    break;
-  case 5:
-    if (__builtin_frame_address(5))
-    p = __builtin_return_address(5);
-    else p = NULL;
-    break;
-  case 6:
-    if (__builtin_frame_address(6))
-    p = __builtin_return_address(6);
-    else p = NULL;
-    break;
-  case 7:
-    if (__builtin_frame_address(7))
-    p = __builtin_return_address(7);
-    else p = NULL;
-    break;
-  case 8:
-    if (__builtin_frame_address(8))
-    p = __builtin_return_address(8);
-    else p = NULL;
-    break;
-  case 9:
-    if (__builtin_frame_address(9))
-    p = __builtin_return_address(9);
-    else p = NULL;
-    break;
-  case 10:
-    if (__builtin_frame_address(10))
-    p = __builtin_return_address(10);
-    else p = NULL;
-    break;
-  case 11:
-    if (__builtin_frame_address(11))
-    p = __builtin_return_address(11);
-    else p = NULL;
-    break;
-  case 12:
-    if (__builtin_frame_address(12))
-    p = __builtin_return_address(12);
-    else p = NULL;
-    break;
-  case 13:
-    if (__builtin_frame_address(13))
-    p = __builtin_return_address(13);
-    else p = NULL;
-    break;
-  case 14:
-    if (__builtin_frame_address(14))
-    p = __builtin_return_address(14);
-    else p = NULL;
-    break;
-  case 15:
-    if (__builtin_frame_address(15))
-    p = __builtin_return_address(15);
-    else p = NULL;
-    break;
-  case 16:
-    if (__builtin_frame_address(16))
-    p = __builtin_return_address(16);
-    else p = NULL;
-    break;
-  case 17:
-    if (__builtin_frame_address(17))
-    p = __builtin_return_address(17);
-    else p = NULL;
-    break;
-  case 18:
-    if (__builtin_frame_address(18))
-    p = __builtin_return_address(18);
-    else p = NULL;
-    break;
-  case 19:
-    if (__builtin_frame_address(19))
-    p = __builtin_return_address(19);
-    else p = NULL;
-    break;
-  default:
-    /* Change ADDRESSLIST_SIZE if more are added */
-    p = NULL;
-    break;
-  }
-      if ((p) && (i < ADDRESSLIST_SIZE))
-  {
-    syms[i].realAddress = (unsigned long)p;
-    syms[i].closestAddress = 0;
-    syms[i].name[0] = (char)0;
-    syms[i].type = ' ';
-  }
-      else
-  {
-    syms[i].realAddress = 0;
-    break; /* for */
-  }
-    } /* for */
-
-
-  /* First find out if we are using GNU or vendor nm */
-  number = 0;
-  strcpy(buffer, "nm -V 2>/dev/null | grep GNU | wc -l");
-  fd = my_popen(buffer, &pid);
-  if (SYS_ERROR != fd)
-    {
-      if (my_getline(fd, buffer, sizeof(buffer)))
-  {
-    sscanf(buffer, "%d", &number);
-  }
-      my_pclose(fd, pid);
-    }
-  if (number == 0) /* vendor nm */
-    {
-# if defined(PLATFORM_SOLARIS) || defined(PLATFORM_SCO) || defined(PLATFORM_HPUX)
-      strcpy(buffer, "nm -x -p ");
-# elif defined(PLATFORM_AIX) || defined(PLATFORM_IRIX) || defined(PLATFORM_OSF)
-      strcpy(buffer, "nm -x -B ");
-# else
-      strcpy(buffer, "nm -B ");
-# endif
-    }
-  else /* GNU nm */
-    strcpy(buffer, "nm -B ");
-  strcat(buffer, global_progname);
-
-  lowestAddress = ULONG_MAX;
-  highestAddress = 0;
-  fd = my_popen(buffer, &pid);
-  if (SYS_ERROR != fd)
-    {
-      while (my_getline(fd, buffer, sizeof(buffer)))
-  {
-    if (buffer[0] == '\n')
-      continue;
-    if (3 == sscanf(buffer, "%lx %c %s", &addr, &type, name))
-      {
-        if ((type == 't') || type == 'T')
-    {
-      if (addr == 0)
-        continue; /* while */
-      if (addr < lowestAddress)
-        lowestAddress = addr;
-      if (addr > highestAddress)
-        highestAddress = addr;
-      for (i = 0; syms[i].realAddress != 0; i++)
-        {
-          if ((addr <= syms[i].realAddress) &&
-        (addr > syms[i].closestAddress))
-      {
-        syms[i].closestAddress = addr;
-        strncpy(syms[i].name, name, MAX_BUFFER_SIZE);
-        syms[i].name[MAX_BUFFER_SIZE] = (char)0;
-        syms[i].type = type;
-      }
-        }
-    }
-      }
-  }
-      my_pclose(fd, pid);
-
-      for (i = 0; syms[i].realAddress != 0; i++)
-  {
-    if ((syms[i].name[0] == (char)0) ||
-        (syms[i].realAddress <= lowestAddress) ||
-        (syms[i].realAddress >= highestAddress))
-      {
-        sprintf(buffer, "[%d] 0x%08lx ???\n", i, syms[i].realAddress);
-      }
-    else
-      {
-        sprintf(buffer, "[%d] 0x%08lx <%s + 0x%lx> %c\n",
-          i,
-          syms[i].realAddress,
-          syms[i].name,
-          syms[i].realAddress - syms[i].closestAddress,
-          syms[i].type);
-      }
-    write(global_output, buffer, strlen(buffer));
-  }
-    }
-}
-#endif
-
-/*************************************************************************
- * DumpStack [private]
- */
-static int DumpStack(char *format, ...)
-{
-  int gotSomething = FALSE;
-  int fd;
-  pid_t pid;
-  int status = EXIT_FAILURE;
-  int rc;
-  va_list args;
-  char *buffer;
-  char cmd[MAX_BUFFER_SIZE];
-  char buf[MAX_BUFFER_SIZE];
-
-  /*
-   * Please note that vsprintf() is not ASync safe (ie. cannot safely
-   * be used from a signal handler.) If this proves to be a problem
-   * then the cmd string can be built by more basic functions such as
-   * strcpy, strcat, and a homemade integer-to-ascii function.
-   */
-  va_start(args, format);
-  vsprintf(cmd, format, args);
-  va_end(args);
-
-  fd = my_popen(cmd, &pid);
-  if (SYS_ERROR != fd)
-  {
-    /*
-       * Wait for the child to exit. This must be done
-       * to make the debugger attach successfully.
-       * The output from the debugger is buffered on
-       * the pipe.
-       *
-       * AIX needs the looping hack
-       */
-    do
-    {
-      rc = waitpid(pid, &status, 0);
-    }
-    while ((SYS_ERROR == rc) && (EINTR == errno));
-
-    if ((WIFEXITED(status)) && (WEXITSTATUS(status) == EXIT_SUCCESS))
-    {
-      while (my_getline(fd, buf, sizeof(buf)))
-      {
-        buffer = buf;
-        if (! gotSomething)
-        {
-          size_t written = 0;
-          written += write(global_output, "Output from ",
-                           strlen("Output from "));
-          strtok(cmd, " ");
-          written += write(global_output, cmd, strlen(cmd));
-          written += write(global_output, "\n", strlen("\n"));
-          if (written) gotSomething = TRUE;
-        }
-        if ('\n' == buf[strlen(buf)-1])
-        {
-          buf[strlen(buf)-1] = (char)0;
-        }
-        size_t written = 0;
-        written += write(global_output, buffer, strlen(buffer));
-        written += write(global_output, "\n", strlen("\n"));
-        if (written != strlen(buffer) + strlen("\n"))
-        {
-          gotSomething = FALSE;
-        }
-      }
-    }
-    my_pclose(fd, pid);
-  }
-  return gotSomething;
-}
-#endif /* PLATFORM_UNIX */
-
-/*************************************************************************
- * StackTrace
- */
-void StackTrace(void)
-{
-#if defined(PLATFORM_UNIX)
-  /*
-   * In general dbx seems to do a better job than gdb.
-   *
-   * Different dbx implementations require different flags/commands.
-   */
-
-# if defined(PLATFORM_AIX)
-
-  if (DumpStack("dbx -a %d 2>/dev/null <<EOF\n"
-    "where\n"
-    "detach\n"
-    "EOF\n",
-    (int)getpid()))
-    return;
-
-  if (DumpStack("gdb -q %s %d 2>/dev/null <<EOF\n"
-    "set prompt\n"
-    "where\n"
-    "detach\n"
-    "quit\n"
-    "EOF\n",
-    global_progname, (int)getpid()))
-    return;
-
-# elif defined(PLATFORM_FREEBSD)
-
-  /*
-   * FreeBSD insists on sending a SIGSTOP to the process we
-   * attach to, so we let the debugger send a SIGCONT to that
-   * process after we have detached.
-   */
-  if (DumpStack("gdb -q %s %d 2>/dev/null <<EOF\n"
-    "set prompt\n"
-    "where\n"
-    "detach\n"
-    "shell kill -CONT %d\n"
-    "quit\n"
-    "EOF\n",
-    global_progname, (int)getpid(), (int)getpid()))
-    return;
-
-# elif defined(PLATFORM_HPUX)
-
-  /*
-   * HP decided to call their debugger xdb.
-   *
-   * This does not seem to work properly yet. The debugger says
-   * "Note: Stack traces may not be possible until you are
-   *  stopped in user code." on HP-UX 09.01
-   *
-   * -L = line-oriented interface.
-   * "T [depth]" gives a stacktrace with local variables.
-   * The final "y" is confirmation to the quit command.
-   */
-
-  if (DumpStack("xdb -P %d -L %s 2>&1 <<EOF\n"
-    "T 50\n"
-    "q\ny\n"
-    "EOF\n",
-    (int)getpid(), global_progname))
-    return;
-
-  if (DumpStack("gdb -q %s %d 2>/dev/null <<EOF\n"
-    "set prompt\n"
-    "where\n"
-    "detach\n"
-    "quit\n"
-    "EOF\n",
-    global_progname, (int)getpid()))
-    return;
-
-#  if defined(PLATFORM_HPUX) && defined(USE_BUILTIN)
-  U_STACK_TRACE();
-  return;
-#  endif
-
-# elif defined(PLATFORM_IRIX)
-
-  /*
-   * "set $page=0" drops hold mode
-   * "dump ." displays the contents of the variables
-   */
-  if (DumpStack("dbx -p %d 2>/dev/null <<EOF\n"
-    "set \\$page=0\n"
-    "where\n"
-#  if !defined(__GNUC__)
-    /* gcc does not generate this information */
-    "dump .\n"
-#  endif
-    "detach\n"
-    "EOF\n",
-    (int)getpid()))
-    return;
-
-#  if defined(USE_BUILTIN)
-  if (trace_back_stack_and_print())
-    return;
-#  endif
-
-  if (DumpStack("gdb -q %s %d 2>/dev/null <<EOF\n"
-    "set prompt\n"
-    "echo --- Stacktrace\\n\n"
-    "where\n"
-    "echo --- Symbols\\n\n"
-    "frame 5\n"      /* Skip signal handler frames */
-    "set \\$x = 50\n"
-    "while (\\$x)\n" /* Print local variables for each frame */
-    "info locals\n"
-    "up\n"
-    "set \\$x--\n"
-    "end\n"
-    "echo ---\\n\n"
-    "detach\n"
-    "quit\n"
-    "EOF\n",
-    global_progname, (int)getpid()))
-    return;
-
-# elif defined(PLATFORM_OSF)
-
-  if (DumpStack("dbx -pid %d %s 2>/dev/null <<EOF\n"
-    "where\n"
-    "detach\n"
-    "quit\n"
-    "EOF\n",
-    (int)getpid(), global_progname))
-    return;
-
-  if (DumpStack("gdb -q %s %d 2>/dev/null <<EOF\n"
-    "set prompt\n"
-    "where\n"
-    "detach\n"
-    "quit\n"
-    "EOF\n",
-    global_progname, (int)getpid()))
-    return;
-
-# elif defined(PLATFORM_SCO)
-
-  /*
-   * SCO OpenServer dbx is like a catch-22. The 'detach' command
-   * depends on whether ptrace(S) support detaching or not. If it
-   * is supported then 'detach' must be used, otherwise the process
-   * will be killed upon dbx exit. If it isn't supported then 'detach'
-   * will cause the process to be killed. We do not want it to be
-   * killed.
-   *
-   * Out of two evils, the omission of 'detach' was chosen because
-   * it worked on our system.
-   */
-  if (DumpStack("dbx %s %d 2>/dev/null <<EOF\n"
-    "where\n"
-    "quit\nEOF\n",
-    global_progname, (int)getpid()))
-    return;
-
-  if (DumpStack("gdb -q %s %d 2>/dev/null <<EOF\n"
-    "set prompt\n"
-    "where\n"
-    "detach\n"
-    "quit\n"
-    "EOF\n",
-    global_progname, (int)getpid()))
-    return;
-
-# elif defined(PLATFORM_SOLARIS)
-
-  if (DumpStack("dbx %s %d 2>/dev/null <<EOF\n"
-    "where\n"
-    "detach\n"
-    "EOF\n",
-    global_progname, (int)getpid()))
-    return;
-
-  if (DumpStack("gdb -q %s %d 2>/dev/null <<EOF\n"
-    "set prompt\n"
-    "echo --- Stacktrace\\n\n"
-    "where\n"
-    "echo --- Symbols\\n\n"
-    "frame 5\n"      /* Skip signal handler frames */
-    "set \\$x = 50\n"
-    "while (\\$x)\n" /* Print local variables for each frame */
-    "info locals\n"
-    "up\n"
-    "set \\$x--\n"
-    "end\n"
-    "echo ---\\n\n"
-    "detach\n"
-    "quit\n"
-    "EOF\n",
-    global_progname, (int)getpid()))
-    return;
-
-  if (DumpStack("/usr/proc/bin/pstack %d",
-    (int)getpid()))
-    return;
-
-  /*
-   * Other Unices (AIX, HPUX, SCO) also have adb, but
-   * they seem unable to attach to a running process.
-   */
-  if (DumpStack("adb %s 2>&1 <<EOF\n"
-    "0t%d:A\n" /* Attach to pid */
-    "\\$c\n"   /* print stacktrace */
-    ":R\n"     /* Detach */
-    "\\$q\n"   /* Quit */
-    "EOF\n",
-    global_progname, (int)getpid()))
-    return;
-
-# else /* All other Unix platforms */
-
-  /*
-   * TODO: SCO/UnixWare 7 must be something like (not tested)
-   *  debug -i c <pid> <<EOF\nstack -f 4\nquit\nEOF\n
-   */
-
-#  if !defined(__GNUC__)
-  char line1[] = "dbx %s %d 2>/dev/null <<EOF\n"
-                 "where\n"
-                 "detach\n"
-                 "EOF\n",
-    if ( DumpStack( line1, global_progname, (int)getpid()) )
-    return;
-#  endif
-
-  char line2[] = "gdb -q %s %d 2>/dev/null <<EOF\n"
-                "set prompt\n"
-                "echo --- Stacktrace\\n\n"
-                "where\n"
-                "detach\n"
-                "quit\n"
-                "EOF\n";
-   if ( DumpStack( line2, global_progname, (int)getpid()))
-    return;
-
-# endif
-
-# if defined(__GNUC__) && defined(USE_BUILTIN)
-
-  GCC_DumpStack();
-
-# endif
-
-  (void) write(global_output,
-    "No debugger found\n", strlen("No debugger found\n"));
-
-#elif defined(PLATFORM_WIN32)
-  /* Use StackWalk() */
-#endif
-}
-
-/*************************************************************************
- * StackTraceInit
- */
-void StackTraceInit(const char *in_name, int in_handle)
-{
-  global_progname = in_name;
-  global_output = (in_handle == -1) ? STDOUT_FILENO : in_handle;
-}
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryStackTrace.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryStackTrace.h
deleted file mode 100755
index e66f4e0f04..0000000000
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryStackTrace.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*===================================================================
-
-BlueBerry Platform
-
-Copyright (c) German Cancer Research Center,
-Division of Medical and Biological Informatics.
-All rights reserved.
-
-This software is distributed WITHOUT ANY WARRANTY; without
-even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.
-
-See LICENSE.txt or http://www.mitk.org for details.
-
-===================================================================*/
-/*************************************************************************
- *
- * $Id$
- *
- * Copyright (c) 1998 by Bjorn Reese <breese@mail1.stofanet.dk>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
- * CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.
- *
- ************************************************************************
- *
- * Purpose:
- *  To generate a stacktrace of a program.
- *
- * Description:
- *  If a debugger is located on the machine we will try this first,
- *  as it usually give better information than built-in methods.
- *  The debugger needs the name of the program to be able to attach
- *  to it, so this must be passed to StackTraceInit(). The second
- *  argument is a filedescriptor that StackTrace() writes to. If this
- *  argument is -1 then standard output will be used.
- *
- * Compilation:
- *  Some platforms have a built-in method to generate stacktraces, but
- *  they are usually located in some non-standard library. The following
- *  are supported:
- *
- *   IRIX    Compile with -DUSE_BUILTIN and -lexc
- *   HP/UX   Compile with -DUSE_BUILTIN and -lcl
- *   GCC     Compile with -DUSE_BUILTIN
- *
- ************************************************************************/
-
-#ifndef H_DEBUG_STACKTRACE
-#define H_DEBUG_STACKTRACE
-
-void StackTrace(void);
-void StackTraceInit(const char *progname, int handle);
-
-#endif /* H_DEBUG_STACKTRACE */
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryStatus.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryStatus.h
index 6f7972aff9..93cd3b2dee 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryStatus.h
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryStatus.h
@@ -1,259 +1,259 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYSTATUS_H_
 #define BERRYSTATUS_H_
 
 #include "berryIStatus.h"
 
 #include <org_blueberry_core_runtime_Export.h>
 
 namespace berry {
 
 /**
  * A concrete status implementation, suitable either for
  * instantiating or subclassing.
  * <p>
  * This class can be used without OSGi running.
  * </p>
  */
-class org_blueberry_core_runtime_EXPORT Status : public IStatus
+class org_blueberry_core_runtime_EXPORT Status : public virtual IStatus
 {
 
 public:
 
   struct SourceLocation {
 
     SourceLocation(const QString& fileName = QString(), const QString& methodName = QString(), int lineNumber = 0)
       : fileName(fileName), methodName(methodName), lineNumber(lineNumber)
     {}
 
     const QString fileName;
     const QString methodName;
     const int lineNumber;
   };
 
 private:
 
   /**
    * The severity. One of
    * <ul>
    * <li><code>CANCEL</code></li>
    * <li><code>ERROR</code></li>
    * <li><code>WARNING</code></li>
    * <li><code>INFO</code></li>
    * <li>or <code>OK</code> (0)</li>
    * </ul>
    */
   Severity severity;
 
   /** Unique identifier of plug-in.
    */
   QString pluginId;
 
   /** Plug-in-specific status code.
    */
   int code;
 
   /** Message, localized to the current locale.
    */
   QString message;
 
   /** Wrapped exception, or <code>null</code> if none.
    */
   ctkException* exception;
 
   /** Constant to avoid generating garbage.
    */
   static const QList<IStatus::Pointer> theEmptyStatusArray;
 
   SourceLocation sourceLocation;
 
 public:
 
   /**
    * A standard OK status with an "ok"  message.
    */
   static const IStatus::Pointer OK_STATUS(const SourceLocation& sl);
   /**
    * A standard CANCEL status with no message.
    */
   static const IStatus::Pointer CANCEL_STATUS(const SourceLocation& sl);
 
   /**
    * Creates a new status object.  The created status has no children.
    *
    * @param severity the severity; one of <code>OK</code>, <code>ERROR</code>,
    * <code>INFO</code>, <code>WARNING</code>,  or <code>CANCEL</code>
    * @param pluginId the unique identifier of the relevant plug-in
    * @param code the plug-in-specific status code, or <code>OK</code>
    * @param message a human-readable message, localized to the
    *    current locale
    */
   Status(const Severity& severity, const QString& pluginId, int code, const QString& message,
          const SourceLocation& sl);
 
   /**
    * Creates a new status object.  The created status has no children.
    *
    * @param severity the severity; one of <code>OK</code>, <code>ERROR</code>,
    * <code>INFO</code>, <code>WARNING</code>,  or <code>CANCEL</code>
    * @param pluginId the unique identifier of the relevant plug-in
    * @param code the plug-in-specific status code, or <code>OK</code>
    * @param message a human-readable message, localized to the
    *    current locale
    * @param exception a low-level exception.
    */
   Status(const Severity& severity, const QString& pluginId, int code, const QString& message,
          const ctkException& exc, const SourceLocation& sl);
 
   /**
    * Simplified constructor of a new status object; assumes that code is <code>OK</code>.
    * The created status has no children.
    *
    * @param severity the severity; one of <code>OK</code>, <code>ERROR</code>,
    * <code>INFO</code>, <code>WARNING</code>,  or <code>CANCEL</code>
    * @param pluginId the unique identifier of the relevant plug-in
    * @param message a human-readable message, localized to the
    *    current locale
    */
   Status(const Severity& severity, const QString& pluginId, const QString& message,
          const SourceLocation& sl);
 
   /**
    * Simplified constructor of a new status object; assumes that code is <code>OK</code>.
    * The created status has no children.
    *
    * @param severity the severity; one of <code>OK</code>, <code>ERROR</code>,
    * <code>INFO</code>, <code>WARNING</code>,  or <code>CANCEL</code>
    * @param pluginId the unique identifier of the relevant plug-in
    * @param message a human-readable message, localized to the
    *    current locale
    * @param exception a low-level exception.
    */
   Status(const Severity& severity, const QString& pluginId, const QString& message,
          const ctkException& exc, const SourceLocation& sl);
 
   /*
    * Implements the corresponding method on <code>IStatus</code>.
    */
   QList<IStatus::Pointer> GetChildren() const;
 
   /*
    * Implements the corresponding method on <code>IStatus</code>.
    */
   int GetCode() const;
 
   /*
    * Implements the corresponding method on <code>IStatus</code>.
    */
   const ctkException* GetException() const;
 
   /*
    * Implements the corresponding method on <code>IStatus</code>.
    */
   QString GetMessage() const;
 
   /*
    * Implements the corresponding method on <code>IStatus</code>.
    */
   QString GetPlugin() const;
 
   /*
    * Implements the corresponding method on <code>IStatus</code>.
    */
   Severity GetSeverity() const;
 
   /*
    * Implements the corresponding method on <code>IStatus</code>.
    */
   bool IsMultiStatus() const;
 
   /*
    * Implements the corresponding method on <code>IStatus</code>.
    */
   bool IsOK() const;
 
   /*
    * Implements the corresponding method on <code>IStatus</code>.
    */
   bool Matches(const Severities& severityMask) const;
 
   QString GetFileName() const;
 
   QString GetMethodName() const;
 
   int GetLineNumber() const;
 
 
 protected:
 
   /**
    * Sets the status code.
    *
    * @param code the plug-in-specific status code, or <code>OK</code>
    */
   virtual void SetCode(int code);
 
   /**
    * Sets the exception.
    *
    * @param exception a low-level exception, or <code>null</code> if not
    *    applicable
    */
   virtual void SetException(const ctkException& exception);
 
   /**
    * Sets the message. If null is passed, message is set to an empty
    * string.
    *
    * @param message a human-readable message, localized to the
    *    current locale
    */
   virtual void SetMessage(const QString& message);
 
   /**
    * Sets the plug-in id.
    *
    * @param pluginId the unique identifier of the relevant plug-in
    */
   virtual void SetPlugin(const QString& pluginId);
 
   /**
    * Sets the severity.
    *
    * @param severity the severity; one of <code>OK</code>, <code>ERROR</code>,
    * <code>INFO</code>, <code>WARNING</code>,  or <code>CANCEL</code>
    */
   virtual void SetSeverity(const Severity& severity);
 
 
 public:
 
   /**
    * Returns a string representation of the status, suitable
    * for debugging purposes only.
    */
   QString ToString() const;
 
 };
 
 }
 
 #define BERRY_STATUS_LOC berry::Status::SourceLocation(__FILE__, __FUNCTION__, __LINE__)
 
 #endif /* BERRYSTATUS_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryBundle.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryBundle.cpp
deleted file mode 100644
index 409b20c608..0000000000
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryBundle.cpp
+++ /dev/null
@@ -1,318 +0,0 @@
-/*===================================================================
-
-BlueBerry Platform
-
-Copyright (c) German Cancer Research Center,
-Division of Medical and Biological Informatics.
-All rights reserved.
-
-This software is distributed WITHOUT ANY WARRANTY; without
-even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.
-
-See LICENSE.txt or http://www.mitk.org for details.
-
-===================================================================*/
-
-#include "berryLog.h"
-
-#include "Poco/Exception.h"
-
-#include "berryBundle.h"
-#include "berryInternalPlatform.h"
-#include "berryBundleLoader.h"
-#include "berryBundleManifest.h"
-#include "berryIBundleActivator.h"
-#include "berryIBundleContext.h"
-#include "berryPlatformException.h"
-
-#include <ctkPluginContext.h>
-
-#include <iostream>
-
-namespace berry {
-
-Bundle::Bundle(BundleLoader& loader, IBundleStorage::Pointer storage, bool initialize) :
-  m_BundleLoader(loader)
-{
-  {
-    Poco::Mutex::ScopedLock lock(m_Mutex);
-    m_Storage = storage;
-  }
-
-  if (initialize)
-  {
-    init();
-  }
-}
-
-void Bundle::init()
-{
-  Poco::Mutex::ScopedLock lock(m_Mutex);
-  try
-  {
-    this->LoadManifest();
-    m_State = BUNDLE_INSTALLED;
-  }
-  catch (Poco::FileException& exc)
-  {
-    BERRY_ERROR << "Exception: " << exc.displayText() << std::endl;
-    m_State = BUNDLE_UNINSTALLED;
-  }
-}
-
-Bundle::~Bundle()
-{
-
-}
-
-bool Bundle::operator==(const Object* o) const
-{
-  if (const IBundle* bundle = dynamic_cast<const IBundle*>(o))
-    return this->GetSymbolicName() == bundle->GetSymbolicName();
-
-  return false;
-}
-
-IBundleActivator*
-Bundle::GetActivator() const
-{
-  Poco::Mutex::ScopedLock lock(m_Mutex);
-  if (m_State == BUNDLE_ACTIVE)
-    return m_Activator;
-
-  return 0;
-}
-
-const std::string&
-Bundle::GetActivatorClass() const
-{
-  return m_Manifest->GetActivatorClass();
-}
-
-const std::string&
-Bundle::GetActivatorLibrary() const
-{
-  return m_Manifest->GetActivatorLibrary();
-}
-
-const std::string&
-Bundle::GetCopyright() const
-{
-  return m_Manifest->GetCopyright();
-}
-
-const std::string&
-Bundle::GetVendor() const
-{
-  return m_Manifest->GetVendor();
-}
-
-IBundleManifest::ActivationPolicy
-Bundle::GetActivationPolicy() const
-{
-  return m_Manifest->GetActivationPolicy();
-}
-
-std::istream*
-Bundle::GetLocalizedResource(const std::string& name) const
-{
-  return m_Storage->GetResource(name);
-}
-
-std::istream*
-Bundle::GetResource(const std::string& name) const
-{
-  return m_Storage->GetResource(name);
-}
-
-bool
-Bundle::IsActive() const
-{
-  return m_State == BUNDLE_ACTIVE;
-}
-
-bool
-Bundle::IsResolved() const
-{
-  return m_State == BUNDLE_RESOLVED || m_State == BUNDLE_STARTING ||
-          m_State == BUNDLE_ACTIVE || m_State == BUNDLE_STOPPING;
-}
-
-bool
-Bundle::IsStarted() const
-{
-  return m_State == BUNDLE_STARTING || m_State == BUNDLE_ACTIVE ||
-          m_State == BUNDLE_STOPPING;
-}
-
-bool Bundle::IsSystemBundle() const
-{
-  return m_Manifest->IsSystemBundle();
-}
-
-const IBundleManifest&
-Bundle::GetManifest() const
-{
-  return *m_Manifest;
-}
-
-const std::string&
-Bundle::GetName() const
-{
-  return m_Manifest->GetName();
-}
-
-const Poco::Path
-Bundle::GetPath() const
-{
-  return m_Storage->GetPath();
-}
-
-IBundleStorage&
-Bundle::GetStorage()
-{
-  return *m_Storage;
-}
-
-// const Version& GetVersion() const;
-
-const IBundleManifest::Dependencies&
-Bundle::GetRequiredBundles() const
-{
-  return m_Manifest->GetRequiredBundles();
-}
-
-void
-Bundle::Resolve()
-{
-  if (m_State == BUNDLE_INSTALLED)
-  {
-    ctkPluginContext* context = InternalPlatform::GetInstance()->GetCTKPluginFrameworkContext();
-
-    //const BundleManifest::Dependencies& dependencies =;
-    IBundleManifest::Dependencies::const_iterator iter;
-    for (iter =  this->GetRequiredBundles().begin(); iter !=  this->GetRequiredBundles().end(); ++iter)
-    {
-      //BERRY_INFO << "Checking dependency:" << iter->symbolicName << ";\n";
-      IBundle::Pointer bundle = m_BundleLoader.FindBundle(iter->symbolicName);
-      if (bundle.IsNull())
-      {
-        // Check if we have a CTK Plugin dependency
-        bool resolved = false;
-        if (context)
-        {
-          QString symbolicName = QString::fromStdString(iter->symbolicName);
-          foreach (QSharedPointer<ctkPlugin> plugin, context->getPlugins())
-          {
-            if (plugin->getSymbolicName() == symbolicName)
-            {
-              resolved = true;
-              break;
-            }
-          }
-        }
-
-        if (!resolved)
-        {
-          throw BundleResolveException(QString("The bundle ") + QString::fromStdString(this->GetSymbolicName()) + " depends on missing bundle: " + QString::fromStdString(iter->symbolicName));
-        }
-      }
-      else if (!bundle->IsResolved())
-      {
-        bundle->Resolve();
-      }
-    }
-    m_State = BUNDLE_RESOLVED;
-  }
-}
-
-void
-Bundle::Start()
-{
-  if (m_State == BUNDLE_RESOLVED)
-  {
-    Poco::Mutex::ScopedLock lock(m_Mutex);
-
-    m_State = BUNDLE_STARTING;
-//    BundleEvent starting(this, BundleEvent::EV_BUNDLE_STARTING);
-//    this->GetEvents().bundleStarting(this, starting);
-    BERRY_INFO(InternalPlatform::GetInstance()->ConsoleLog()) << "Bundle " << this->GetSymbolicName() << " is starting";
-    m_Activator->Start(m_BundleLoader.GetContextForBundle(IBundle::Pointer(this)));
-
-    m_State = BUNDLE_ACTIVE;
-//    BundleEvent started(this, BundleEvent::EV_BUNDLE_STARTED);
-//    this->GetEvents().bundleStarted(this, started);
-//    BERRY_INFO << "Bundle " << this->GetSymbolicName() << " is active";
-  }
-  else
-  {
-    throw BundleStateException(QString("Bundle ") + QString::fromStdString(this->GetSymbolicName()) +
-        " could not be started, because it is not in state RESOLVED.");
-  }
-}
-
-void
-Bundle::Stop()
-{
-  throw Poco::NotImplementedException("Bundle::Stop() not implemented yet");
-}
-
-Bundle::State
-Bundle::GetState() const
-{
-  return m_State;
-}
-
-std::string
-Bundle::GetStateString() const
-{
-  switch (this->GetState())
-  {
-  case BUNDLE_INSTALLED:
-  return "Installed";
-  case BUNDLE_UNINSTALLED:
-    return "Uninstalled";
-  case BUNDLE_RESOLVED:
-    return "Resolved";
-  case BUNDLE_STARTING:
-    return "Starting";
-  case BUNDLE_ACTIVE:
-    return "Active";
-  case BUNDLE_STOPPING:
-    return "Stopping";
-  default: throw BundleStateException("The bundle is not in a valid state");
-  }
-}
-
-//BundleEvents&
-//Bundle::GetEvents()
-//{
-//  return m_BundleLoader.GetEvents();
-//}
-
-const std::string&
-Bundle::GetSymbolicName() const
-{
-  return m_Manifest->GetSymbolicName();
-}
-
-void
-Bundle::LoadManifest()
-{
-  std::istream* istr = m_Storage->GetResource("META-INF/MANIFEST.MF");
-  if (!istr)
-    throw Poco::FileNotFoundException("Could not load META-INF/MANIFEST.MF from " + m_Storage->GetPath().toString());
-
-  m_Manifest = new BundleManifest(istr);
-  delete istr;
-}
-
-void
-Bundle::SetActivator(IBundleActivator* activator)
-{
-  Poco::Mutex::ScopedLock lock(m_Mutex);
-  m_Activator = activator;
-}
-
-}
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryBundle.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryBundle.h
deleted file mode 100644
index 56be4b28d5..0000000000
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryBundle.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*===================================================================
-
-BlueBerry Platform
-
-Copyright (c) German Cancer Research Center,
-Division of Medical and Biological Informatics.
-All rights reserved.
-
-This software is distributed WITHOUT ANY WARRANTY; without
-even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.
-
-See LICENSE.txt or http://www.mitk.org for details.
-
-===================================================================*/
-
-#ifndef BERRYBUNDLE_H_
-#define BERRYBUNDLE_H_
-
-#include "Poco/Path.h"
-#include "Poco/Mutex.h"
-
-#include "berryIBundle.h"
-#include "berryIBundleStorage.h"
-
-namespace berry {
-
-class BundleLoader;
-
-class Bundle : public IBundle
-{
-
-public:
-
-  berryObjectMacro(Bundle);
-
-  Bundle(BundleLoader& loader, IBundleStorage::Pointer storage, bool init = true);
-   ~Bundle();
-
-  void init();
-
-  IBundleActivator* GetActivator() const;
-  const std::string& GetActivatorClass() const;
-  const std::string& GetActivatorLibrary() const;
-
-  const std::string& GetCopyright() const;
-  const std::string& GetVendor() const;
-
-  IBundleManifest::ActivationPolicy GetActivationPolicy() const;
-
-  std::istream* GetLocalizedResource(const std::string& name) const;
-  std::istream* GetResource(const std::string& name) const;
-
-  bool IsActive() const;
-  bool IsResolved() const;
-  bool IsStarted() const;
-  bool IsSystemBundle() const;
-
-  const IBundleManifest& GetManifest() const;
-  const std::string& GetName() const;
-  const Poco::Path GetPath() const;
-  IBundleStorage& GetStorage();
-  // const Version& GetVersion() const;
-
-  const IBundleManifest::Dependencies& GetRequiredBundles() const;
-
-  void Resolve();
-
-  void Start();
-  void Stop();
-
-  State GetState() const;
-  std::string GetStateString() const;
-
-  //BundleEvents& GetEvents();
-
-  const std::string& GetSymbolicName() const;
-
-  virtual void LoadManifest();
-  void SetActivator(IBundleActivator* activator);
-
-  bool operator==(const Object* o) const;
-
-protected:
-
-  IBundleManifest::Pointer m_Manifest;
-  IBundleStorage::Pointer m_Storage;
-  BundleLoader& m_BundleLoader;
-
-  IBundleActivator* m_Activator;
-  State m_State;
-
-  mutable Poco::Mutex m_Mutex;
-};
-
-}  // namespace berry
-
-#endif /*BERRYBUNDLE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryBundleContext.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryBundleContext.cpp
deleted file mode 100644
index 644d41a85e..0000000000
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryBundleContext.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/*===================================================================
-
-BlueBerry Platform
-
-Copyright (c) German Cancer Research Center,
-Division of Medical and Biological Informatics.
-All rights reserved.
-
-This software is distributed WITHOUT ANY WARRANTY; without
-even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.
-
-See LICENSE.txt or http://www.mitk.org for details.
-
-===================================================================*/
-
-#include "berryBundleContext.h"
-
-#include "berryBundle.h"
-#include "berryBundleLoader.h"
-
-namespace berry {
-
-BundleContext::BundleContext(BundleLoader& loader, IBundle::Pointer bundle,
-                  const Poco::Path& persistencyDir) :
-   m_BundleLoader(loader),m_Bundle(bundle), m_PersistencyDir(persistencyDir)
-{
-
-}
-
-BundleContext::~BundleContext()
-{
-
-}
-
-bool BundleContext::operator==(const Object* o) const
-{
-  if (const IBundleContext* context = dynamic_cast<const IBundleContext*>(o))
-    return this->GetThisBundle() == context->GetThisBundle();
-
-  return false;
-}
-
-void BundleContext::RegisterService(const std::string& id, Service::Pointer service) const
-{
-  Platform::GetServiceRegistry().RegisterService(id, service);
-}
-
-IBundleContext::Pointer
-BundleContext::GetContextForBundle(IBundle::ConstPointer bundle) const
-{
-  return m_BundleLoader.GetContextForBundle(bundle);
-}
-
-//BundleEvents&
-//BundleContext::GetEvents() const
-//{
-//  return m_BundleLoader.GetEvents();
-//}
-
-IBundle::ConstPointer
-BundleContext::FindBundle(const std::string& name) const
-{
-  return m_BundleLoader.FindBundle(name);
-}
-
-void
-BundleContext::ListBundles(std::vector<IBundle::Pointer>& bundles) const
-{
-  for (BundleLoader::BundleMap::const_iterator i = m_BundleLoader.m_BundleMap.begin();
-      i != m_BundleLoader.m_BundleMap.end(); ++i)
-  {
-    if (i.value().m_Bundle)
-    {
-      bundles.push_back(i.value().m_Bundle);
-    }
-  }
-}
-
-Poco::Logger&
-BundleContext::GetLogger() const
-{
-  return m_BundleLoader.GetLogger();
-}
-
-Poco::Path
-BundleContext::GetPathForLibrary(const std::string& libraryName) const
-{
-  return m_BundleLoader.GetPathForLibrary(libraryName);
-}
-
-Poco::Path
-BundleContext::GetPersistentDirectory() const
-{
-  return m_PersistencyDir;
-}
-
-IBundle::Pointer
-BundleContext::GetThisBundle() const
-{
-  return m_Bundle;
-}
-
-void
-BundleContext::InitPersistency(const std::string& /*persistencyPath*/)
-{
-
-}
-
-}
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryBundleContext.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryBundleContext.h
deleted file mode 100644
index e4a3f9a600..0000000000
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryBundleContext.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*===================================================================
-
-BlueBerry Platform
-
-Copyright (c) German Cancer Research Center,
-Division of Medical and Biological Informatics.
-All rights reserved.
-
-This software is distributed WITHOUT ANY WARRANTY; without
-even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.
-
-See LICENSE.txt or http://www.mitk.org for details.
-
-===================================================================*/
-
-#ifndef BERRYBUNDLECONTEXT_H_
-#define BERRYBUNDLECONTEXT_H_
-
-#include "berryIBundleContext.h"
-#include "berryBundleLoader.h"
-
-namespace berry {
-
-class BundleContext : public IBundleContext
-{
-
-public:
-
-  berryObjectMacro(BundleContext);
-
-  BundleContext(BundleLoader& loader, SmartPointer<IBundle> bundle,
-                  const Poco::Path& persistencyDir);
-
-  ~BundleContext();
-
-  IBundleContext::Pointer GetContextForBundle(SmartPointer<const IBundle> bundle) const;
-
-  //BundleEvents& GetEvents() const;
-
-  SmartPointer<const IBundle> FindBundle(const std::string& name) const;
-
-  void ListBundles(std::vector<SmartPointer<IBundle> >& bundles) const;
-
-  Poco::Logger& GetLogger() const;
-
-  // Logger& GetLogger() const;
-
-  Poco::Path GetPathForLibrary(const std::string& libraryName) const;
-
-  Poco::Path GetPersistentDirectory() const;
-
-  void RegisterService(const std::string& id, Service::Pointer service) const;
-
-  SmartPointer<IBundle> GetThisBundle() const;
-
-  void InitPersistency(const std::string& persistencyPath);
-
-  //static std::string GetLoggerName(const Bundle* bundle);
-
-  bool operator==(const Object* o) const;
-
-private:
-  BundleLoader& m_BundleLoader;
-  SmartPointer<IBundle> m_Bundle;
-  const Poco::Path m_PersistencyDir;
-};
-
-}  // namespace berry
-
-#endif /*BERRYBUNDLECONTEXT_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryBundleDirectory.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryBundleDirectory.cpp
deleted file mode 100644
index a68bd156c6..0000000000
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryBundleDirectory.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*===================================================================
-
-BlueBerry Platform
-
-Copyright (c) German Cancer Research Center,
-Division of Medical and Biological Informatics.
-All rights reserved.
-
-This software is distributed WITHOUT ANY WARRANTY; without
-even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.
-
-See LICENSE.txt or http://www.mitk.org for details.
-
-===================================================================*/
-
-#include "berryLog.h"
-
-#include "berryBundleDirectory.h"
-#include "berryInternalPlatform.h"
-
-#include <iostream>
-
-#include "Poco/Exception.h"
-#include "Poco/FileStream.h"
-#include "Poco/Path.h"
-#include "Poco/File.h"
-
-namespace berry {
-
-BundleDirectory::BundleDirectory(const Path& path) :
-   m_RootPath(path)
-{
-  //Path manifestPath(m_RootPath);
-  //manifestPath.append(Path("META-INF/manifest.mf"));
-}
-
-BundleDirectory::~BundleDirectory()
-{
-
-}
-
-bool BundleDirectory::operator==(const Object* o) const
-{
-  if (const IBundleStorage* dir = dynamic_cast<const IBundleStorage*>(o))
-    return this->GetPath().toString() == dir->GetPath().toString();
-
-  return false;
-}
-
-std::istream*
-BundleDirectory::GetResource(const std::string& path) const
-{
-  Poco::Path resPath(m_RootPath);
-  std::string resStr = resPath.append(Path(path)).toString();
-  //BERRY_INFO << "Getting resource: " << resStr << std::endl;
-  try {
-    return new Poco::FileInputStream(resStr);
-  }
-  catch (...)
-  {}
-  return 0;
-}
-
-void
-BundleDirectory::List(const std::string& path, std::vector<std::string>& files,
-    bool quiet) const
-{
-  try
-  {
-    Poco::Path fullPath(m_RootPath);
-    fullPath.append(path);
-    Poco::File file(fullPath);
-    file.list(files);
-  }
-  catch (Poco::FileNotFoundException& exc)
-  {
-    if (!quiet)
-    {
-      BERRY_WARN << "Warning: " << exc.displayText() << std::endl;
-      throw exc;
-    }
-  }
-  catch (const Poco::PathNotFoundException& exc)
-  {
-    if (!quiet)
-    {
-      BERRY_WARN << "Warning: " << exc.displayText() << std::endl;
-      throw exc;
-    }
-  }
-}
-
-bool BundleDirectory::IsDirectory(const std::string& path) const
-{
-  Poco::Path fullPath(m_RootPath);
-  fullPath.append(path);
-  Poco::File file(fullPath.makeDirectory());
-  //BERRY_INFO(InternalPlatform::GetInstance()->ConsoleLog()) <<
-  //  "Testing " << file.path() << " for directory: " <<
-  //  (file.exists() && file.isDirectory() ? "true" : "false") << std::endl;
-  return file.exists() && file.isDirectory();
-}
-
-Path
-BundleDirectory::GetPath() const
-{
-  return m_RootPath;
-}
-
-Path BundleDirectory::BuildPath(const std::string& path) const
-{
-  Poco::Path tmp(m_RootPath);
-  return tmp.append(Path(path));
-}
-
-}
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryBundleDirectory.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryBundleDirectory.h
deleted file mode 100644
index 611fdf604c..0000000000
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryBundleDirectory.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*===================================================================
-
-BlueBerry Platform
-
-Copyright (c) German Cancer Research Center,
-Division of Medical and Biological Informatics.
-All rights reserved.
-
-This software is distributed WITHOUT ANY WARRANTY; without
-even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.
-
-See LICENSE.txt or http://www.mitk.org for details.
-
-===================================================================*/
-
-#ifndef BERRYBUNDLEDIRECTORY_H_
-#define BERRYBUNDLEDIRECTORY_H_
-
-#include <Poco/Path.h>
-
-#include "berryIBundleStorage.h"
-
-
-namespace berry {
-
-using namespace Poco;
-
-class BundleDirectory : public IBundleStorage
-{
-
-private:
-  Path m_RootPath;
-
-public:
-
-  berryObjectMacro(BundleDirectory);
-
-  BundleDirectory(const Path& path);
-  virtual ~BundleDirectory();
-
-  std::istream* GetResource(const std::string& path) const;
-  void List(const std::string& path, std::vector<std::string>& files, bool quiet = true) const;
-  bool IsDirectory(const std::string& path) const;
-  Path GetPath() const;
-
-  Path BuildPath(const std::string& path) const;
-
-  bool operator==(const Object* o) const;
-};
-
-}  // namespace berry
-
-#endif /*BERRYBUNDLEDIRECTORY_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryBundleManifest.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryBundleManifest.cpp
deleted file mode 100644
index 17de758e19..0000000000
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryBundleManifest.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-/*===================================================================
-
-BlueBerry Platform
-
-Copyright (c) German Cancer Research Center,
-Division of Medical and Biological Informatics.
-All rights reserved.
-
-This software is distributed WITHOUT ANY WARRANTY; without
-even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.
-
-See LICENSE.txt or http://www.mitk.org for details.
-
-===================================================================*/
-
-#include "berryBundleManifest.h"
-
-#include "Poco/AutoPtr.h"
-#include "Poco/StringTokenizer.h"
-#include "Poco/Util/PropertyFileConfiguration.h"
-
-#include <iostream>
-
-namespace berry {
-
-BundleManifest::BundleManifest(std::istream* istr)
-: POLICY_EAGER("eager"), POLICY_LAZY("lazy")
-{
-  this->ParseManifest(istr);
-}
-
-BundleManifest::~BundleManifest()
-{
-
-}
-
-bool BundleManifest::operator==(const Object* o) const
-{
-  if (const IBundleManifest* manifest = dynamic_cast<const IBundleManifest*>(o))
-    return this->GetSymbolicName() == manifest->GetSymbolicName();
-
-  return false;
-}
-
-const std::string&
-BundleManifest::GetActivatorClass() const
-{
-  return m_Activator;
-}
-
-const std::string&
-BundleManifest::GetActivatorLibrary() const
-{
-  return m_ActivatorLibrary;
-}
-
-const std::string&
-BundleManifest::GetCopyright() const
-{
-  return m_Copyright;
-}
-
-IBundleManifest::ActivationPolicy
-BundleManifest::GetActivationPolicy() const
-{
-  return m_ActivationPolicy;
-}
-
-bool
-BundleManifest::IsSystemBundle() const
-{
-  return m_SystemBundle;
-}
-
-const std::string&
-BundleManifest::GetName() const
-{
-  return m_Name;
-}
-
-const BundleManifest::Dependencies&
-BundleManifest::GetRequiredBundles() const
-{
-  return m_Dependencies;
-}
-
-const std::string&
-BundleManifest::GetSymbolicName() const
-{
-  return m_SymbolicName;
-}
-
-const std::string&
-BundleManifest::GetVendor() const
-{
-  return m_Vendor;
-}
-
-//const Version& GetVersion() const;
-
-void
-BundleManifest::ParseActivator(const std::string& activator)
-{
-  Poco::StringTokenizer tokenizer(activator, ";",
-      Poco::StringTokenizer::TOK_IGNORE_EMPTY | Poco::StringTokenizer::TOK_TRIM);
-
-  if (tokenizer.count() == 0)
-  {
-    m_Activator = "";
-    m_ActivatorLibrary = "";
-    return;
-  }
-
-  m_Activator = tokenizer[0];
-  m_Activator = activator;
-
-  m_ActivatorLibrary = "";
-  if (tokenizer.count() > 1)
-  {
-    Poco::StringTokenizer tokenizer2(tokenizer[1], "=",
-        Poco::StringTokenizer::TOK_IGNORE_EMPTY | Poco::StringTokenizer::TOK_TRIM);
-
-    if (tokenizer2.count() == 2 && tokenizer2[0] == "library")
-    {
-      m_ActivatorLibrary = tokenizer[1];
-    }
-  }
-
-}
-
-void
-BundleManifest::ParseManifest(std::istream* istr)
-{
-  //BERRY_INFO << "Start parsing manifest\n";
-  Poco::AutoPtr<Poco::Util::PropertyFileConfiguration> config(new Poco::Util::PropertyFileConfiguration(*istr));
-
-  if (config->hasProperty(BUNDLE_ACTIVATOR))
-      this->ParseActivator(config->getString(BUNDLE_ACTIVATOR));
-  else
-  {
-    m_Activator = "";
-    m_ActivatorLibrary = "";
-  }
-
-
-  m_Copyright = config->getString(BUNDLE_COPYRIGHT, "");
-  m_ActivationPolicy = (config->getString(BUNDLE_ACTIVATION_POLICY, POLICY_LAZY) == POLICY_EAGER) ? EAGER : LAZY ;
-  m_Name = config->getString(BUNDLE_NAME, "");
-  m_SymbolicName = config->getString(BUNDLE_SYMBOLICNAME, "");
-  m_Vendor = config->getString(BUNDLE_VENDOR, "");
-  m_ManifestVersion = config->getString(MANIFEST_VERSION, "1.0");
-  m_SystemBundle = config->getBool(SYSTEM_BUNDLE, false);
-
-  if (config->hasProperty(REQUIRE_BUNDLE))
-    this->ParseRequiredBundles(config->getString(REQUIRE_BUNDLE));
-
-}
-
-void
-BundleManifest::ParseRequiredBundles(const std::string& requiredBundles)
-{
-  Poco::StringTokenizer tokenizer(requiredBundles, ",",
-        Poco::StringTokenizer::TOK_IGNORE_EMPTY | Poco::StringTokenizer::TOK_TRIM);
-
-  Poco::StringTokenizer::Iterator iter;
-  for (iter = tokenizer.begin(); iter != tokenizer.end(); iter++)
-  {
-    Poco::StringTokenizer tokenizer2(*iter, ";",
-       Poco::StringTokenizer::TOK_IGNORE_EMPTY | Poco::StringTokenizer::TOK_TRIM);
-    Dependency dep;
-    dep.symbolicName = tokenizer2[0];
-    m_Dependencies.push_back(dep);
-  }
-}
-
-} // namespace berry
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryBundleManifest.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryBundleManifest.h
deleted file mode 100644
index 5e727b5f59..0000000000
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryBundleManifest.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*===================================================================
-
-BlueBerry Platform
-
-Copyright (c) German Cancer Research Center,
-Division of Medical and Biological Informatics.
-All rights reserved.
-
-This software is distributed WITHOUT ANY WARRANTY; without
-even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.
-
-See LICENSE.txt or http://www.mitk.org for details.
-
-===================================================================*/
-
-#ifndef BERRYBUNDLEMANIFEST_H_
-#define BERRYBUNDLEMANIFEST_H_
-
-#include "berryIBundleManifest.h"
-
-
-namespace berry {
-
-class BundleManifest : public IBundleManifest
-{
-
-public:
-
-  berryObjectMacro(BundleManifest);
-
-  BundleManifest(std::istream* istr);
-  ~BundleManifest();
-
-  const std::string& GetActivatorClass() const;
-  const std::string& GetActivatorLibrary() const;
-  const std::string& GetCopyright() const;
-  ActivationPolicy GetActivationPolicy() const;
-  bool IsSystemBundle() const;
-  const std::string& GetName() const;
-  const IBundleManifest::Dependencies& GetRequiredBundles() const;
-  const std::string& GetSymbolicName() const;
-  const std::string& GetVendor() const;
-  //const Version& GetVersion() const;
-
-  bool operator==(const Object* o) const;
-
-private:
-
-  const std::string POLICY_EAGER;
-  const std::string POLICY_LAZY;
-
-  void ParseActivator(const std::string& activator);
-  void ParseManifest(std::istream* istr);
-  void ParseRequiredBundles(const std::string& requiredBundles);
-
-  IBundleManifest::Dependencies m_Dependencies;
-  std::string m_ActivatorLibrary;
-
-  std::string m_Activator;
-  std::string m_Copyright;
-  ActivationPolicy m_ActivationPolicy;
-  std::string m_Name;
-  std::string m_SymbolicName;
-  std::string m_Vendor;
-  std::string m_Version;
-  std::string m_ManifestVersion;
-  bool m_SystemBundle;
-  std::string m_RequireBundle;
-};
-
-}  // namespace berry
-
-#endif /*BERRYBUNDLEMANIFEST_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryCTKPluginActivator.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryCTKPluginActivator.cpp
index 0101264a6c..991041e7a6 100755
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryCTKPluginActivator.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryCTKPluginActivator.cpp
@@ -1,217 +1,221 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+
 #include "berryCTKPluginActivator.h"
 
 #include "berryPlatform.h"
 #include "berryInternalPlatform.h"
 //#include "berryCTKPluginListener_p.h"
 #include "berryPreferencesService.h"
 #include "berryExtensionRegistry.h"
 #include "berryRegistryConstants.h"
 #include "berryRegistryProperties.h"
 #include "berryRegistryStrategy.h"
 
 #include <QCoreApplication>
 #include <QtPlugin>
 
 #include <QDebug>
 
 namespace berry {
 
 ctkPluginContext* org_blueberry_core_runtime_Activator::context = 0;
 
 void org_blueberry_core_runtime_Activator::start(ctkPluginContext* context)
 {
   this->context = context;
 
   RegistryProperties::SetContext(context);
   //ProcessCommandLine();
   this->startRegistry();
 
   preferencesService.reset(new PreferencesService(context->getDataFile("").absolutePath()));
   prefServiceReg = context->registerService<IPreferencesService>(preferencesService.data());
 
 //  // register a listener to catch new plugin installations/resolutions.
 //  pluginListener.reset(new CTKPluginListener(m_ExtensionPointService));
 //  context->connectPluginListener(pluginListener.data(), SLOT(pluginChanged(ctkPluginEvent)), Qt::DirectConnection);
 
 //  // populate the registry with all the currently installed plugins.
 //  // There is a small window here while processPlugins is being
 //  // called where the pluginListener may receive a ctkPluginEvent
 //  // to add/remove a plugin from the registry.  This is ok since
 //  // the registry is a synchronized object and will not add the
 //  // same bundle twice.
 //  pluginListener->processPlugins(context->getPlugins());
 }
 
 void org_blueberry_core_runtime_Activator::stop(ctkPluginContext* context)
 {
   Q_UNUSED(context)
 
   //pluginListener.reset();
 
   //Platform::GetServiceRegistry().UnRegisterService(IExtensionPointService::SERVICE_ID);
 
   prefServiceReg.unregister();
   preferencesService->ShutDown();
   preferencesService.reset();
   prefServiceReg = 0;
 
   this->stopRegistry();
   RegistryProperties::SetContext(NULL);
 
   this->context = 0;
 }
 
 ctkPluginContext* org_blueberry_core_runtime_Activator::getPluginContext()
 {
   return context;
 }
 
 #if defined(Q_OS_LINUX) || defined(Q_OS_DARWIN) || defined(Q_CC_MINGW)
 
 #include <dlfcn.h>
 QString org_blueberry_core_runtime_Activator::getPluginId(void *symbol)
 {
   if (symbol == NULL) return QString();
 
   Dl_info info = {0,0,0,0};
   if(dladdr(symbol, &info) == 0)
   {
     return QString();
   }
   else if(info.dli_fname)
   {
     QFile soPath(info.dli_fname);
     int index = soPath.fileName().lastIndexOf('.');
     QString pluginId = soPath.fileName().left(index);
     if (pluginId.startsWith("lib"))
       pluginId = pluginId.mid(3);
     return pluginId.replace('_', '.');
   }
   return QString();
 }
 
+#elif defined(Q_CC_MSVC)
+
+#include <ctkBackTrace.h>
+#include <windows.h>
+#include <dbghelp.h>
+QString org_blueberry_core_runtime_Activator::getPluginId(void *symbol)
+{
+  if (symbol == NULL) return QString();
+
+  if (ctk::DebugSymInitialize())
+  {
+    std::vector<char> moduleBuffer(sizeof(IMAGEHLP_MODULE64));
+    PIMAGEHLP_MODULE64 pModuleInfo = (PIMAGEHLP_MODULE64)&moduleBuffer.front();
+    pModuleInfo->SizeOfStruct = sizeof(IMAGEHLP_MODULE64);
+    if (SymGetModuleInfo64(GetCurrentProcess(), (DWORD64)symbol, pModuleInfo))
+    {
+      QString pluginId = pModuleInfo->ModuleName;
+      return pluginId.replace('_', '.');
+    }
+  }
+  return QString();
+}
+
+#endif
+
+org_blueberry_core_runtime_Activator::org_blueberry_core_runtime_Activator()
+  : userRegistryKey(new QObject())
+  , masterRegistryKey(new QObject())
+{
+}
+
+org_blueberry_core_runtime_Activator::~org_blueberry_core_runtime_Activator()
+{
+}
+
 void org_blueberry_core_runtime_Activator::startRegistry()
 {
   // see if the customer suppressed the creation of default registry
   QString property = context->getProperty(RegistryConstants::PROP_DEFAULT_REGISTRY).toString();
   if (property.compare("false", Qt::CaseInsensitive) == 0) return;
 
   // check to see if we need to use null as a userToken
   if (context->getProperty(RegistryConstants::PROP_REGISTRY_NULL_USER_TOKEN).toString().compare("true", Qt::CaseInsensitive) == 0)
   {
     userRegistryKey.reset(0);
   }
 
   // Determine primary and alternative registry locations. BlueBerry extension registry cache
   // can be found in one of the two locations:
   // a) in the local configuration area (standard location passed in by the platform) -> priority
   // b) in the shared configuration area (typically, shared install is used)
   QList<QString> registryLocations;
   QList<bool> readOnlyLocations;
 
   RegistryStrategy* strategy = NULL;
   //Location configuration = OSGIUtils.getDefault().getConfigurationLocation();
   QString configuration = context->getDataFile("").absoluteFilePath();
   if (configuration.isEmpty())
   {
     RegistryProperties::SetProperty(RegistryConstants::PROP_NO_REGISTRY_CACHE, "true");
     RegistryProperties::SetProperty(RegistryConstants::PROP_NO_LAZY_CACHE_LOADING, "true");
     strategy = new RegistryStrategy(QList<QString>(), QList<bool>(), masterRegistryKey.data());
   }
   else
   {
     //File primaryDir = new File(configuration.getURL().getPath() + '/' + STORAGE_DIR);
     //bool primaryReadOnly = configuration.isReadOnly();
     QString primaryDir = configuration;
     bool primaryReadOnly = false;
 
     //Location parentLocation = configuration.getParentLocation();
     QString parentLocation;
     if (!parentLocation.isEmpty())
     {
 //      File secondaryDir = new File(parentLocation.getURL().getFile() + '/' + IRegistryConstants.RUNTIME_NAME);
 //      registryLocations << primaryDir << secondaryDir;
 //      readOnlyLocations << primaryReadOnly <<  true; // secondary BlueBerry location is always read only
     }
     else
     {
       registryLocations << primaryDir;
       readOnlyLocations << primaryReadOnly;
     }
     strategy = new RegistryStrategy(registryLocations, readOnlyLocations, masterRegistryKey.data());
   }
 
   ExtensionRegistry* registry = new ExtensionRegistry(strategy, masterRegistryKey.data(), userRegistryKey.data());
   defaultRegistry.reset(registry);
 
   registryServiceReg = context->registerService<IExtensionRegistry>(registry);
   //commandRegistration = EquinoxUtils.registerCommandProvider(Activator.getContext());
 }
 
 void org_blueberry_core_runtime_Activator::stopRegistry()
 {
   if (!defaultRegistry.isNull())
   {
     registryServiceReg.unregister();
     defaultRegistry->Stop(masterRegistryKey.data());
   }
 //  if (!commandRegistration.isNull())
 //  {
 //    commandRegistration.unregister();
 //  }
 }
 
-#elif defined(Q_CC_MSVC)
-
-#include <ctkBackTrace.h>
-#include <windows.h>
-#include <dbghelp.h>
-QString org_blueberry_core_runtime_Activator::getPluginId(void *symbol)
-{
-  if (symbol == NULL) return QString();
-
-  if (ctk::DebugSymInitialize())
-  {
-    std::vector<char> moduleBuffer(sizeof(IMAGEHLP_MODULE64));
-    PIMAGEHLP_MODULE64 pModuleInfo = (PIMAGEHLP_MODULE64)&moduleBuffer.front();
-    pModuleInfo->SizeOfStruct = sizeof(IMAGEHLP_MODULE64);
-    if (SymGetModuleInfo64(GetCurrentProcess(), (DWORD64)symbol, pModuleInfo))
-    {
-      QString pluginId = pModuleInfo->ModuleName;
-      return pluginId.replace('_', '.');
-    }
-  }
-  return QString();
-}
-
-#endif
-
-org_blueberry_core_runtime_Activator::org_blueberry_core_runtime_Activator()
-  : userRegistryKey(new QObject())
-  , masterRegistryKey(new QObject())
-{
-}
-
-org_blueberry_core_runtime_Activator::~org_blueberry_core_runtime_Activator()
-{
-}
-
 }
 
 Q_EXPORT_PLUGIN2(org_blueberry_core_runtime, berry::org_blueberry_core_runtime_Activator)
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryCTKPluginActivator.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryCTKPluginActivator.h
index b60a8d1de3..cedb78f70d 100755
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryCTKPluginActivator.h
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryCTKPluginActivator.h
@@ -1,81 +1,81 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYCTKPLUGINACTIVATOR_H
 #define BERRYCTKPLUGINACTIVATOR_H
 
 #include <ctkPluginActivator.h>
 
 #include <QObject>
 
 #include <berrySmartPointer.h>
 
 
 namespace berry {
 
 //class CTKPluginListener;
 class PreferencesService;
-class IExtensionRegistry;
+struct IExtensionRegistry;
 
 class org_blueberry_core_runtime_Activator : public QObject, public ctkPluginActivator
 {
   Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
   Q_PLUGIN_METADATA(IID "org_blueberry_osgi")
 #endif
   Q_INTERFACES(ctkPluginActivator)
 
 public:
 
   org_blueberry_core_runtime_Activator();
   ~org_blueberry_core_runtime_Activator();
 
   void start(ctkPluginContext* context);
   void stop(ctkPluginContext* context);
 
   static ctkPluginContext* getPluginContext();
 
   /**
    * Returns the plug-in id of the plug-in that contains the provided symbol, or
    * a null QString if the plug-in could not be determined.
    */
   static QString getPluginId(void* symbol);
 
 private:
 
   void startRegistry();
   void stopRegistry();
 
   static ctkPluginContext* context;
 
   //QScopedPointer<CTKPluginListener> pluginListener;
 
   QScopedPointer<PreferencesService> preferencesService;
   ctkServiceRegistration prefServiceReg;
 
   QScopedPointer<IExtensionRegistry> defaultRegistry;
   ctkServiceRegistration registryServiceReg;
 
   QScopedPointer<QObject> userRegistryKey;
   QScopedPointer<QObject> masterRegistryKey;
 
 };
 
 typedef org_blueberry_core_runtime_Activator CTKPluginActivator;
 
 }
 
 #endif // BERRYCTKPLUGINACTIVATOR_H
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryCTKPluginListener.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryCTKPluginListener.cpp
index f2a17f5dee..3d5ac88a07 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryCTKPluginListener.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryCTKPluginListener.cpp
@@ -1,150 +1,150 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #include "berryCTKPluginListener.h"
 #include "berryExtensionRegistry.h"
 #include "berryRegistryStrategy.h"
 #include "berryIContributor.h"
 #include "berryContributorFactory.h"
 
 #include <ctkPlugin.h>
 
 #include <QSet>
 #include <QStringList>
 #include <QBuffer>
 
 const QString berry::CTKPluginListener::PLUGIN_MANIFEST = "plugin.xml";
 
 namespace berry {
 
 CTKPluginListener::CTKPluginListener(ExtensionRegistry* registry, QObject* key, RegistryStrategy* strategy)
   : registry(registry), strategy(strategy), token(key)
 {
   currentStateStamp << 0;
 }
 
 void CTKPluginListener::ProcessPlugins(const QList<QSharedPointer<ctkPlugin> >& plugins)
 {
   // sort the plugins according to their dependencies
   //const QList<QSharedPointer<ctkPlugin> > sortedPlugins = sortPlugins(plugins);
 
   foreach (QSharedPointer<ctkPlugin> plugin, plugins)
   {
     if (IsPluginResolved(plugin))
       AddPlugin(plugin);
     else
       RemovePlugin(plugin);
   }
 }
 
 void CTKPluginListener::PluginChanged(const ctkPluginEvent& event)
 {
   /* Only should listen for RESOLVED and UNRESOLVED events.
    *
    * When a plugin is updated the Framework will publish an UNRESOLVED and
    * then a RESOLVED event which should cause the plugin to be removed
    * and then added back into the registry.
    *
    * When a plugin is uninstalled the Framework should publish an UNRESOLVED
    * event and then an UNINSTALLED event so the plugin will have been removed
    * by the UNRESOLVED event before the UNINSTALLED event is published.
    */
   QSharedPointer<ctkPlugin> plugin = event.getPlugin();
   switch (event.getType())
   {
   case ctkPluginEvent::RESOLVED :
   {
     {
       QMutexLocker l(&mutex);
       long newStateStamp = registry->ComputeState();
       if (currentStateStamp[0] != newStateStamp)
       {
         // new state stamp
         currentStateStamp[0] = newStateStamp;
       }
     }
     AddPlugin(plugin);
     break;
   }
   case ctkPluginEvent::UNRESOLVED :
       RemovePlugin(plugin);
       break;
+  default: break;
   }
 }
 
 bool CTKPluginListener::IsPluginResolved(QSharedPointer<ctkPlugin> plugin)
 {
   return (plugin->getState() & (ctkPlugin::RESOLVED | ctkPlugin::ACTIVE | ctkPlugin::STARTING | ctkPlugin::STOPPING)) != 0;
 }
 
 void CTKPluginListener::RemovePlugin(QSharedPointer<ctkPlugin> plugin)
 {
   long timestamp = 0;
   if (strategy->CheckContributionsTimestamp())
   {
     QString pluginManifest = GetExtensionPath(plugin);
     if (!pluginManifest.isEmpty())
     {
       timestamp = strategy->GetExtendedTimestamp(plugin, pluginManifest);
     }
   }
   registry->Remove(QString::number(plugin->getPluginId()), timestamp);
 }
 
 QString CTKPluginListener::GetExtensionPath(QSharedPointer<ctkPlugin> plugin)
 {
   // bail out if system plugin
   if (plugin->getPluginId() == 0)
     return QString();
   // bail out if the plugin does not have a symbolic name
   if (plugin->getSymbolicName().isEmpty())
     return QString();
 
   return PLUGIN_MANIFEST;
 }
 
 void CTKPluginListener::AddPlugin(QSharedPointer<ctkPlugin> plugin)
 {
   // if the given plugin already exists in the registry then return.
   // note that this does not work for update cases.
   IContributor::Pointer contributor = ContributorFactory::CreateContributor(plugin);
   if (registry->HasContributor(contributor))
   {
     return;
   }
 
   QString pluginManifest = GetExtensionPath(plugin);
   if (pluginManifest.isEmpty())
     return;
 
   QByteArray ba = plugin->getResource(pluginManifest);
   if (ba.isEmpty())
     return;
 
   long timestamp = 0;
   if (strategy->CheckContributionsTimestamp())
   {
     timestamp = strategy->GetExtendedTimestamp(plugin, pluginManifest);
   }
 
   QBuffer buffer(&ba);
-  //buffer.open(QIODevice::ReadOnly);
   registry->AddContribution(&buffer, contributor, true, pluginManifest, NULL, token, timestamp);
 }
 
 }
 
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryCTKPluginUtils.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryCTKPluginUtils.cpp
index 1fd7880031..0559118d62 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryCTKPluginUtils.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryCTKPluginUtils.cpp
@@ -1,120 +1,120 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryCTKPluginUtils.h"
 
 #include "berryCTKPluginActivator.h"
 #include "berryIRuntimeConstants.h"
 
 #include "berryLog.h"
 
 #include <ctkServiceTracker.h>
 
 namespace berry {
 
 const QString CTKPluginUtils::PROP_CONFIG_AREA = "blueberry.configuration.area";
 const QString CTKPluginUtils::PROP_INSTANCE_AREA = "blueberry.instance.area";
 
 
 CTKPluginUtils::CTKPluginUtils()
 {
   InitServices();
 }
 
 void CTKPluginUtils::InitServices()
 {
   ctkPluginContext* context = org_blueberry_core_runtime_Activator::getPluginContext();
   if (context == NULL)
   {
     //RuntimeLog.log(new Status(IStatus.ERROR, RegistryMessages.OWNER_NAME, 0, RegistryMessages.bundle_not_activated, null));
     BERRY_ERROR << "The plugin " << IRuntimeConstants::PI_RUNTIME() << " was not activated.";
     return;
   }
 
   //debugTracker = new ServiceTracker(context, DebugOptions.class.getName(), null);
   //debugTracker.open();
 
   // locations
   //const QString FILTER_PREFIX = "(&(objectClass=org.blueberry.service.datalocation.Location)(type=";
 //  Filter filter = null;
 //  try {
 //    filter = context.createFilter(FILTER_PREFIX + PROP_CONFIG_AREA + "))"); //$NON-NLS-1$
 //  } catch (InvalidSyntaxException e) {
 //    // ignore this.  It should never happen as we have tested the above format.
 //  }
 //  configurationLocationTracker = new ServiceTracker(context, filter, null);
 //  configurationLocationTracker.open();
 
 }
 
 CTKPluginUtils* CTKPluginUtils::GetDefault()
 {
   static CTKPluginUtils singleton;
   return &singleton;
 }
 
 void CTKPluginUtils::CloseServices()
 {
 //  if (!debugTracker.isNull())
 //  {
 //    debugTracker->close();
 //    debugTracker.reset();
 //  }
 //  if (!configurationLocationTracker.isNull())
 //  {
 //    configurationLocationTracker->close();
 //    configurationLocationTracker.reset();
 //  }
 }
 
-bool CTKPluginUtils::GetBoolDebugOption(const QString& option, bool defaultValue) const
+bool CTKPluginUtils::GetBoolDebugOption(const QString& /*option*/, bool defaultValue) const
 {
 //  if (debugTracker == null) {
 //    RuntimeLog.log(new Status(IStatus.ERROR, RegistryMessages.OWNER_NAME, 0, RegistryMessages.bundle_not_activated, null));
 //    return defaultValue;
 //  }
 //  DebugOptions options = (DebugOptions) debugTracker.getService();
 //  if (options != null) {
 //    String value = options.getOption(option);
 //    if (value != null)
 //      return value.equalsIgnoreCase("true"); //$NON-NLS-1$
 //  }
   return defaultValue;
 }
 
 QSharedPointer<ctkPlugin> CTKPluginUtils::GetPlugin(const QString& pluginName)
 {
   QList<QSharedPointer<ctkPlugin> > plugins = org_blueberry_core_runtime_Activator::getPluginContext()->getPlugins();
   //Return the first plugin matching the plugin name and which is not installed or uninstalled
   foreach (QSharedPointer<ctkPlugin> plugin, plugins)
   {
     if (plugin->getSymbolicName() == pluginName &&
         (plugin->getState() & (ctkPlugin::INSTALLED | ctkPlugin::UNINSTALLED)) == 0)
     {
       return plugin;
     }
   }
   return QSharedPointer<ctkPlugin>();
 }
 
 //Location CTKPluginUtils::GetConfigurationLocation() const
 //{
 //  if (configurationLocationTracker == null)
 //    return null;
 //  return (Location) configurationLocationTracker.getService();
 //}
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryCodeCache.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryCodeCache.cpp
deleted file mode 100644
index 0555e60866..0000000000
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryCodeCache.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/*===================================================================
-
-BlueBerry Platform
-
-Copyright (c) German Cancer Research Center,
-Division of Medical and Biological Informatics.
-All rights reserved.
-
-This software is distributed WITHOUT ANY WARRANTY; without
-even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.
-
-See LICENSE.txt or http://www.mitk.org for details.
-
-===================================================================*/
-
-#include "berryLog.h"
-
-#include "berryCodeCache.h"
-#include "berryInternalPlatform.h"
-
-#include "Poco/Path.h"
-#include "Poco/SharedLibrary.h"
-
-#include <fstream>
-#include <iostream>
-#include <algorithm>
-
-namespace berry {
-
-CodeCache::CodeCache(const std::string& path) : m_CachePath(path)
-{
-  BERRY_INFO(InternalPlatform::GetInstance()->ConsoleLog()) << "Creating CodeCache with path: " << path << std::endl;
-  if (!m_CachePath.exists())
-  {
-    m_CachePath.createDirectories();
-  }
-
-}
-
-CodeCache::~CodeCache()
-{
-
-}
-
-void
-CodeCache::Clear()
-{
-  if (m_CachePath.exists())
-  {
-    BERRY_INFO(InternalPlatform::GetInstance()->ConsoleLog()) << "Clearing code cache\n";
-    std::vector<Poco::File> files;
-    m_CachePath.list(files);
-    for (std::vector<Poco::File>::iterator iter = files.begin(); iter != files.end(); ++iter)
-    {
-      iter->remove(true);
-    }
-  }
-}
-
-bool
-CodeCache::HasLibrary(const std::string& name)
-{
-  //BERRY_INFO << "HasLibrary checks for: " << name;
-
-  std::vector<std::string> files;
-  m_CachePath.list(files);
-
-  std::string libName(name);
-  //libName.append(Poco::SharedLibrary::suffix());
-
-  std::vector<std::string>::iterator iter;
-  for (iter = files.begin(); iter != files.end(); iter++)
-  {
-    if ((*iter) == libName) {
-      //BERRY_INFO << " FOUND\n";
-      return true;
-    }
-  }
-
-  //BERRY_INFO << " NOT FOUND\n";
-  return false;
-}
-
-void
-CodeCache::InstallLibrary(const std::string& name, std::istream& istr)
-{
-  //BERRY_INFO << "Installing library " << name << " to " << this->GetPathForLibrary(name).toString() << std::endl;
-  std::ofstream ostr(this->GetPathForLibrary(name).toString().c_str(), std::ios::binary | std::ios::trunc);
-
-  ostr << istr.rdbuf();
-}
-
-void
-CodeCache::InstallLibrary(const std::string& name, const Poco::File& path)
-{
-  //BERRY_INFO << "Registering library " << name << " in " << path.path() << std::endl;
-  m_LibPaths.insert(std::make_pair(name, path));
-}
-
-void
-CodeCache::UnInstallLibrary(const std::string& name)
-{
-  std::map<std::string, Poco::File>::iterator iter = m_LibPaths.find(name);
-
-  if (iter == m_LibPaths.end())
-  {
-    Poco::File(this->GetPathForLibrary(name)).remove();
-  }
-  else
-  {
-    m_LibPaths.erase(name);
-  }
-}
-
-Poco::Path
-CodeCache::GetPathForLibrary(const std::string& name)
-{
-  // We instructed cmake to replace "." with "_" in library names
-  // since they are also used for defines (for Windows dll import/export
-  // stuff) and . is bad in identifiers.
-  // Hence we must replace all "." with "_" here too
-  std::string libName(name);
-  std::replace(libName.begin(), libName.end(), '.', '_');
-
-  //BERRY_INFO << "Getting path for library: " << libName << std::endl;
-  if (m_LibPaths.find(libName) != m_LibPaths.end())
-  {
-    return Poco::Path(m_LibPaths[libName].path(), libName + Poco::SharedLibrary::suffix());
-  }
-  else
-  {
-    return Poco::Path(m_CachePath.path(), libName + Poco::SharedLibrary::suffix());
-  }
-}
-
-}
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryCodeCache.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryCodeCache.h
deleted file mode 100644
index b4060bd499..0000000000
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryCodeCache.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*===================================================================
-
-BlueBerry Platform
-
-Copyright (c) German Cancer Research Center,
-Division of Medical and Biological Informatics.
-All rights reserved.
-
-This software is distributed WITHOUT ANY WARRANTY; without
-even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.
-
-See LICENSE.txt or http://www.mitk.org for details.
-
-===================================================================*/
-
-#ifndef BERRYCODECACHE_H_
-#define BERRYCODECACHE_H_
-
-#include <string>
-#include <iostream>
-#include <map>
-
-#include "Poco/File.h"
-#include "Poco/Path.h"
-
-namespace berry {
-
-class CodeCache
-{
-public:
-  CodeCache(const std::string& path);
-  virtual ~CodeCache();
-
-  void Clear();
-
-  /**
-   * Checks if the library with name name is installed
-   *
-   * @param name The name of the library without the library suffix
-   * @return true if the library is installed, false otherwise
-   */
-  bool HasLibrary(const std::string& name);
-
-  /**
-   * Installs a library in the plugin cache directory under the name name.
-   * This is used to copy libraries from Zip files, network locations etc.
-   * into the local cache directory.
-   *
-   * @param name The name of the library without the library suffix
-   * @param istr The binary input stream representing the library to be installed
-   */
-  void InstallLibrary(const std::string& name, std::istream& istr);
-
-  /**
-   * Installs the library name. The method only registers a library under the
-   * name name in the path path (no files or copied).
-   *
-   * @param name The name of the library without the library suffix
-   * @param path The path to the library
-   */
-  void InstallLibrary(const std::string& name, const Poco::File& path);
-
-  /**
-   * If the library with name name has been copied into the local
-   * cache directory, it will be deleted. Otherwise, the library will become
-   * unknown to the CodeCache.
-   *
-   * @param name The name of the library without the library suffix
-   */
-  void UnInstallLibrary(const std::string& name);
-
-  Poco::Path GetPathForLibrary(const std::string& name);
-
-private:
-  Poco::File m_CachePath;
-
-  std::map<std::string, Poco::File> m_LibPaths;
-};
-
-}
-
-#endif /*BERRYCODECACHE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryCombinedEventDelta.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryCombinedEventDelta.cpp
index 7d0bc8040a..0e43f0c16d 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryCombinedEventDelta.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryCombinedEventDelta.cpp
@@ -1,205 +1,206 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryCombinedEventDelta.h"
 #include "berryExtensionPoint.h"
 #include "berryExtensionPointHandle.h"
 #include "berryIExtensionPoint.h"
 #include "berryExtensionHandle.h"
 #include "berryIExtension.h"
 #include "berryIObjectManager.h"
 
 #include <QSharedData>
 
 namespace berry {
 
 struct CombinedEventDeltaData : public QSharedData
 {
   const bool addition; // true: objects were added; false: objects were removed
 
   // the object manager from which all the objects contained in this delta will be found
   SmartPointer<IObjectManager> objectManager;
 
   QHash<QString, QList<int> > extensionsByID; // extension point ID -> List of Integer extensions IDs
   QHash<QString, QList<int> > extPointsByID; // extension point ID -> List of Integer extension point IDs
 
   QList<int> allExtensions; // List of Integer IDs
   QList<int> allExtensionPoints; // List if Integer IDs
 
   CombinedEventDeltaData(bool addition)
     : addition(addition), objectManager(0)
   {
   }
 
   QList<int>& GetExtensionsBucket(const QString& id)
   {
     return extensionsByID[id];
   }
 
   QList<int>& GetExtPointsBucket(const QString& id)
   {
     return extPointsByID[id];
   }
 
   QList<int>& GetExtPointsGlobal()
   {
     return allExtensionPoints;
   }
 
   QList<int>& GetExtensionsGlobal()
   {
     return allExtensions;
   }
 };
 
 CombinedEventDelta::CombinedEventDelta(bool addition)
   : d(new CombinedEventDeltaData(addition))
 {
 }
 
 CombinedEventDelta::CombinedEventDelta()
 {
 }
 
 CombinedEventDelta::CombinedEventDelta(const CombinedEventDelta &other)
   : d(other.d)
 {
 }
 
 CombinedEventDelta::~CombinedEventDelta()
 {
 
 }
 
 CombinedEventDelta &CombinedEventDelta::operator =(const CombinedEventDelta &other)
 {
   d = other.d;
+  return *this;
 }
 
 void CombinedEventDelta::Reset()
 {
   d.reset();
 }
 
 bool CombinedEventDelta::IsNull() const
 {
   return !d;
 }
 
 CombinedEventDelta CombinedEventDelta::RecordAddition()
 {
   return CombinedEventDelta(true);
 }
 
 CombinedEventDelta CombinedEventDelta::RecordRemoval()
 {
   return CombinedEventDelta(false);
 }
 
 bool CombinedEventDelta::IsAddition() const
 {
   return d->addition;
 }
 
 bool CombinedEventDelta::IsRemoval() const
 {
   return !d->addition;
 }
 
 void CombinedEventDelta::SetObjectManager(const SmartPointer<IObjectManager>& manager)
 {
   d->objectManager = manager;
 }
 
 SmartPointer<IObjectManager> CombinedEventDelta::GetObjectManager() const
 {
   return d->objectManager;
 }
 
 void CombinedEventDelta::RememberExtensionPoint(const SmartPointer<ExtensionPoint>& extensionPoint)
 {
   QString bucketId = extensionPoint->GetUniqueIdentifier();
   int extPt = extensionPoint->GetObjectId();
   d->GetExtPointsBucket(bucketId).push_back(extPt);
   d->GetExtPointsGlobal().push_back(extPt);
 }
 
 void CombinedEventDelta::RememberExtension(const SmartPointer<ExtensionPoint>& extensionPoint, int ext)
 {
   QString bucketId = extensionPoint->GetUniqueIdentifier();
 
   d->GetExtensionsBucket(bucketId).push_back(ext);
   d->GetExtensionsGlobal().push_back(ext);
 }
 
 void CombinedEventDelta::RememberExtensions(const SmartPointer<ExtensionPoint>& extensionPoint,
                                             const QList<int>& exts)
 {
   for (int i = 0; i < exts.size(); ++i)
     RememberExtension(extensionPoint, exts[i]);
 }
 
 QList<SmartPointer<IExtensionPoint> > CombinedEventDelta::GetExtensionPoints(const QString& id) const
 {
   QList<int> extensionPoints;
   if (!id.isEmpty() && !d->extPointsByID.isEmpty())
   {
     extensionPoints = d->extPointsByID[id];
   }
   else if (id.isEmpty())
   {
     extensionPoints = d->allExtensionPoints;
   }
 
   if (extensionPoints.isEmpty()) // no changes that fit the filter
     return QList<IExtensionPoint::Pointer>();
 
   QList<IExtensionPoint::Pointer> result;
   for (int i = 0; i < extensionPoints.size(); ++i)
   {
     int extPt = extensionPoints[i];
     IExtensionPoint::Pointer extensionPoint(new ExtensionPointHandle(d->objectManager, extPt));
     result.push_back(extensionPoint);
   }
   return result;
 }
 
 QList<SmartPointer<IExtension> > CombinedEventDelta::GetExtensions(const QString& id) const
 {
   QList<int> extensions;
   if (!id.isEmpty() && !d->extensionsByID.isEmpty())
   {
     extensions = d->extensionsByID[id];
   }
   else if (id.isEmpty())
   {
     extensions = d->allExtensions;
   }
 
   if (extensions.isEmpty()) // no changes that fit the filter
     return QList<IExtension::Pointer>();
 
   QList<IExtension::Pointer> result;
   for (int i = 0; i < extensions.size(); ++i)
   {
     int ext = extensions[i];
     IExtension::Pointer extension(new ExtensionHandle(d->objectManager, ext));
     result.push_back(extension);
   }
   return result;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryConfigurationElement.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryConfigurationElement.cpp
index 1cd6f369fd..23faeb6f50 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryConfigurationElement.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryConfigurationElement.cpp
@@ -1,315 +1,315 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryConfigurationElement.h"
 
 #include "berryIExecutableExtension.h"
 #include "berryIExecutableExtensionFactory.h"
 #include "berryConfigurationElementHandle.h"
 #include "berryStatus.h"
 #include "berryRegistryMessages.h"
 #include "berryRegistryConstants.h"
 #include "berryCoreException.h"
 #include "berryExtensionRegistry.h"
 #include "berryRegistryObjectManager.h"
 #include "berryRegistryContributor.h"
 #include "berryObjectString.h"
 #include "berryObjectStringMap.h"
 
 #include <QRegExp>
 
 namespace berry {
 
 ConfigurationElement::ConfigurationElement(ExtensionRegistry* registry, bool persist)
   : RegistryObject(registry, persist)
 {
 }
 
 ConfigurationElement::ConfigurationElement(int self, const QString& contributorId,
                                            const QString& name, const QList<QString>& propertiesAndValue,
                                            const QList<int>& children, int extraDataOffset, int parent,
                                            short parentType, ExtensionRegistry* registry, bool persist)
   : RegistryObject(registry, persist), parentId(parent), parentType(parentType),
     propertiesAndValue(propertiesAndValue), name(name), contributorId(contributorId)
 {
   SetObjectId(self);
   SetRawChildren(children);
   SetExtraDataOffset(extraDataOffset);
 }
 
 void ConfigurationElement::ThrowException(const QString& message, const ctkException& exc)
 {
   IStatus::Pointer status(new Status(IStatus::ERROR_TYPE, RegistryMessages::OWNER_NAME,
                                      RegistryConstants::PLUGIN_ERROR, message, exc,
                                      BERRY_STATUS_LOC));
   throw CoreException(status);
 }
 
 void ConfigurationElement::ThrowException(const QString &message)
 {
   IStatus::Pointer status(new Status(IStatus::ERROR_TYPE, RegistryMessages::OWNER_NAME,
                                      RegistryConstants::PLUGIN_ERROR, message,
                                      BERRY_STATUS_LOC));
   throw CoreException(status);
 }
 
 QString ConfigurationElement::GetValue() const
 {
   return GetValueAsIs();
 }
 
 QString ConfigurationElement::GetValueAsIs() const
 {
   if (!propertiesAndValue.empty() && propertiesAndValue.size() % 2 == 1)
     return propertiesAndValue.back();
   return QString();
 }
 
 QString ConfigurationElement::GetAttributeAsIs(const QString& attrName) const
 {
   if (propertiesAndValue.size() <= 1)
     return QString();
   int size = propertiesAndValue.size() - (propertiesAndValue.size() % 2);
   for (int i = 0; i < size; i += 2)
   {
     if (propertiesAndValue[i] == attrName)
       return propertiesAndValue[i + 1];
   }
   return QString();
 }
 
 QList<QString> ConfigurationElement::GetAttributeNames() const
 {
   if (propertiesAndValue.size() <= 1)
     return QList<QString>();
 
   QList<QString> result;
   int size = propertiesAndValue.size() / 2;
   for (int i = 0; i < size; i++)
   {
     result.push_back(propertiesAndValue[i * 2]);
   }
   return result;
 }
 
 void ConfigurationElement::SetProperties(const QList<QString>& value)
 {
   propertiesAndValue = value;
 }
 
 QList<QString> ConfigurationElement::GetPropertiesAndValue() const
 {
   return propertiesAndValue;
 }
 
 void ConfigurationElement::SetValue(const QString& value)
 {
   if (propertiesAndValue.empty())
   {
     propertiesAndValue.push_back(value);
     return;
   }
   if (propertiesAndValue.size() % 2 == 1)
   {
     propertiesAndValue[propertiesAndValue.size() - 1] = value;
     return;
   }
   propertiesAndValue.push_back(value);
 }
 
 void ConfigurationElement::SetContributorId(const QString& id)
 {
   contributorId = id;
 }
 
 QString ConfigurationElement::GetContributorId() const
 {
   return contributorId;
 }
 
 void ConfigurationElement::SetParentId(int objectId)
 {
   parentId = objectId;
 }
 
 QString ConfigurationElement::GetName() const
 {
   return name;
 }
 
 void ConfigurationElement::SetName(const QString& name)
 {
   this->name = name;
 }
 
 void ConfigurationElement::SetParentType(short type)
 {
   parentType = type;
 }
 
 QObject* ConfigurationElement::CreateExecutableExtension(const QString& attributeName)
 {
   QString prop;
   QString executable;
   QString contributorName;
   QString className;
   Object::Pointer initData;
   int i = 0;
 
   if (!attributeName.isEmpty())
   {
     prop = GetAttribute(attributeName);
   }
   else
   {
     // property not specified, try as element value
     prop = GetValue().trimmed();
   }
 
   if (prop.isEmpty())
   {
     // property not defined, try as a child element
     QList<ConfigurationElement::Pointer> exec = GetChildren(attributeName);
     if (!exec.empty())
     {
       ConfigurationElement::Pointer element = exec[0]; // assumes single definition
       contributorName = element->GetAttribute("plugin");
       className = element->GetAttribute("class");
       QList<ConfigurationElement::Pointer> parms = element->GetChildren("parameter");
       if (!parms.empty())
       {
         QHash<QString,QString> initParms;
         for (i = 0; i < parms.size(); i++)
         {
           QString pname = parms[i]->GetAttribute("name");
           if (!pname.isEmpty())
             initParms.insert(pname, parms[i]->GetAttribute("value"));
         }
         if (!initParms.isEmpty())
           initData = new ObjectStringMap(initParms);
       }
     }
     else
     {
       // specified name is not a simple attribute nor child element
       ThrowException(QString("Executable extension definition for \"%1\" not found.").arg(attributeName));
     }
   }
   else
   {
     // simple property or element value, parse it into its components
     i = prop.indexOf(QRegExp("[^:]:[^:]"));
     if (i != -1)
     {
       executable = prop.left(i+1).trimmed();
       initData = new ObjectString(prop.mid(i + 2).trimmed());
     }
     else
     {
       executable = prop;
     }
 
     i = executable.indexOf('/');
     if (i != -1)
     {
       contributorName = executable.left(i).trimmed();
       className = executable.mid(i + 1).trimmed();
     }
     else
     {
       className = executable;
     }
   }
 
   // create a new instance
   RegistryContributor::Pointer defaultContributor = registry->GetObjectManager()->GetContributor(contributorId);
   QObject* result = registry->CreateExecutableExtension(defaultContributor, className, contributorName);
 
   // Check if we have extension adapter and initialize;
   // Make the call even if the initialization string is null
   try
   {
     // We need to take into account both "old" and "new" style executable extensions
     if (IExecutableExtension* execExt = qobject_cast<IExecutableExtension*>(result))
     {
       ConfigurationElementHandle::Pointer confElementHandle(new ConfigurationElementHandle(
                                                               registry->GetObjectManager(), GetObjectId()));
       execExt->SetInitializationData(confElementHandle, attributeName, initData);
     }
   }
   catch (const CoreException& ce)
   {
     // user code threw exception
     throw ce;
   }
   catch (const ctkException& te)
   {
     // user code caused exception
     ThrowException(QString("Plug-in \"%1\" was unable to execute setInitializationData on an instance of \"%2\".")
                    .arg(GetContributor()->GetName()).arg(className), te);
   }
 
   // Deal with executable extension factories.
   if (IExecutableExtensionFactory* execExtFactory = qobject_cast<IExecutableExtensionFactory*>(result))
   {
     result = execExtFactory->Create();
   }
 
   return result;
 }
 
-QString ConfigurationElement::GetAttribute(const QString& attrName, const QLocale& locale) const
+QString ConfigurationElement::GetAttribute(const QString& attrName, const QLocale& /*locale*/) const
 {
   registry->LogMultiLangError();
   return GetAttribute(attrName);
 }
 
-QString ConfigurationElement::GetValue(const QLocale& locale) const
+QString ConfigurationElement::GetValue(const QLocale& /*locale*/) const
 {
   registry->LogMultiLangError();
   return GetValue();
 }
 
 QString ConfigurationElement::GetAttribute(const QString& attrName) const
 {
   return GetAttributeAsIs(attrName);
 }
 
 QList<ConfigurationElement::Pointer> ConfigurationElement::GetChildren(const QString& childrenName) const
 {
   QList<ConfigurationElement::Pointer> result;
   if (GetRawChildren().empty())
     return result;
 
   RegistryObjectManager::Pointer objectManager = registry->GetObjectManager();
   for (int i = 0; i < children.size(); i++)
   {
     ConfigurationElement::Pointer toTest = objectManager->GetObject(
           children[i], NoExtraData() ? RegistryObjectManager::CONFIGURATION_ELEMENT : RegistryObjectManager::THIRDLEVEL_CONFIGURATION_ELEMENT).Cast<ConfigurationElement>();
     if (toTest->name == childrenName)
     {
       result.push_back(toTest);
     }
   }
   return result;
 }
 
 SmartPointer<IContributor> ConfigurationElement::GetContributor() const
 {
   return registry->GetObjectManager()->GetContributor(contributorId);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryConfigurationElementHandle.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryConfigurationElementHandle.cpp
index 94d1c00fe3..6d01c7b088 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryConfigurationElementHandle.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryConfigurationElementHandle.cpp
@@ -1,202 +1,202 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryConfigurationElementHandle.h"
 #include "berryConfigurationElement.h"
 #include "berryCoreException.h"
 #include "berryExtensionRegistry.h"
 #include "berryExtensionHandle.h"
 #include "berryIContributor.h"
 #include "berryIExtension.h"
 #include "berryInvalidRegistryObjectException.h"
 #include "berryRegistryObjectManager.h"
 #include "berryRegistryMessages.h"
 #include "berryRegistryConstants.h"
 #include "berryStatus.h"
 
 namespace berry {
 
 ConfigurationElementHandle::ConfigurationElementHandle(const SmartPointer<const IObjectManager>& objectManager, int id)
   : Handle(objectManager, id)
 {
 }
 
 ConfigurationElementHandle::ConfigurationElementHandle(const IObjectManager *objectManager, int id)
   : Handle(objectManager, id)
 {
 }
 
 QString ConfigurationElementHandle::GetAttribute(const QString& propertyName) const
 {
   return GetConfigurationElement()->GetAttribute(propertyName);
 }
 
 QString ConfigurationElementHandle::GetAttribute(const QString& attrName, const QLocale& locale) const
 {
   return GetConfigurationElement()->GetAttribute(attrName, locale);
 }
 
 QList<QString> ConfigurationElementHandle::GetAttributeNames() const
 {
   return GetConfigurationElement()->GetAttributeNames();
 }
 
 QList<IConfigurationElement::Pointer> ConfigurationElementHandle::GetChildren() const
 {
   ConfigurationElement::Pointer actualCe = GetConfigurationElement();
   QList<IConfigurationElement::Pointer> result;
   if (actualCe->NoExtraData())
   {
     foreach(Handle::Pointer handle,
             objectManager->GetHandles(actualCe->GetRawChildren(), RegistryObjectManager::CONFIGURATION_ELEMENT))
     {
       result.push_back(handle.Cast<IConfigurationElement>());
     }
     return result;
   }
   foreach(Handle::Pointer handle,
           objectManager->GetHandles(actualCe->GetRawChildren(), RegistryObjectManager::THIRDLEVEL_CONFIGURATION_ELEMENT))
   {
     result.push_back(handle.Cast<IConfigurationElement>());
   }
   return result;
 }
 
 QObject* ConfigurationElementHandle::CreateExecutableExtension(const QString& propertyName) const
 {
   try
   {
     return GetConfigurationElement()->CreateExecutableExtension(propertyName);
   }
   catch (const InvalidRegistryObjectException& e)
   {
     Status::Pointer status(new Status(IStatus::ERROR_TYPE, RegistryMessages::OWNER_NAME,
                                       RegistryConstants::PLUGIN_ERROR, "Invalid registry object",
                                       e, BERRY_STATUS_LOC));
     if (const RegistryObjectManager* regObjMgr = dynamic_cast<const RegistryObjectManager*>(objectManager))
     {
       regObjMgr->GetRegistry()->Log(status);
     }
     throw CoreException(status);
   }
 }
 
 QString ConfigurationElementHandle::GetAttributeAsIs(const QString& name) const
 {
   return GetConfigurationElement()->GetAttributeAsIs(name);
 }
 
 QList<IConfigurationElement::Pointer> ConfigurationElementHandle::GetChildren(const QString& name) const
 {
   QList<IConfigurationElement::Pointer> result;
   ConfigurationElement::Pointer actualCE = GetConfigurationElement();
   QList<RegistryObject::Pointer> children =
       objectManager->GetObjects(actualCE->GetRawChildren(),
                                actualCE->NoExtraData() ? RegistryObjectManager::CONFIGURATION_ELEMENT : RegistryObjectManager::THIRDLEVEL_CONFIGURATION_ELEMENT);
   if (children.empty())
   {
     return result;
   }
 
   for (int i = 0; i < children.size(); i++)
   {
     ConfigurationElement::Pointer ce = children[i].Cast<ConfigurationElement>();
     if (ce->GetName() == name)
     {
       result.push_back(objectManager->GetHandle(ce->GetObjectId(),
                                                 actualCE->NoExtraData() ? RegistryObjectManager::CONFIGURATION_ELEMENT : RegistryObjectManager::THIRDLEVEL_CONFIGURATION_ELEMENT).Cast<IConfigurationElement>());
     }
   }
   return result;
 }
 
 SmartPointer<IExtension> ConfigurationElementHandle::GetDeclaringExtension() const
 {
   Object::ConstPointer result(this);
   while (!((result = result.Cast<const ConfigurationElementHandle>()->GetParent()).Cast<const ExtensionHandle>()))
   {
     /*do nothing*/
   }
   IExtension::Pointer extension(const_cast<IExtension*>(result.Cast<const IExtension>().GetPointer()));
   return extension;
 }
 
 QString ConfigurationElementHandle::GetName() const
 {
   return GetConfigurationElement()->GetName();
 }
 
 SmartPointer<Object> ConfigurationElementHandle::GetParent() const
 {
   ConfigurationElement::Pointer actualCe = GetConfigurationElement();
   return objectManager->GetHandle(actualCe->parentId, actualCe->parentType);
 }
 
 QString ConfigurationElementHandle::GetValue() const
 {
   return GetConfigurationElement()->GetValue();
 }
 
 QString ConfigurationElementHandle::GetValue(const QLocale& locale) const
 {
   return GetConfigurationElement()->GetValue(locale);
 }
 
 QString ConfigurationElementHandle::GetValueAsIs() const
 {
   return GetConfigurationElement()->GetValueAsIs();
 }
 
 SmartPointer<RegistryObject> ConfigurationElementHandle::GetObject() const
 {
   return GetConfigurationElement();
 }
 
 QString ConfigurationElementHandle::GetNamespaceIdentifier() const
 {
   // namespace name is determined by the contributing extension
   return GetDeclaringExtension()->GetNamespaceIdentifier();
 }
 
 SmartPointer<IContributor> ConfigurationElementHandle::GetContributor() const
 {
   return GetConfigurationElement()->GetContributor();
 }
 
 bool ConfigurationElementHandle::IsValid() const
 {
   try
   {
     GetConfigurationElement();
   }
-  catch (const InvalidRegistryObjectException& e)
+  catch (const InvalidRegistryObjectException& /*e*/)
   {
     return false;
   }
   return true;
 }
 
 SmartPointer<ConfigurationElement> ConfigurationElementHandle::GetConfigurationElement() const
 {
   return objectManager->GetObject(GetId(), RegistryObjectManager::CONFIGURATION_ELEMENT).Cast<ConfigurationElement>();
 }
 
 bool ConfigurationElementHandle::ShouldPersist() const
 {
   return GetConfigurationElement()->ShouldPersist();
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtension.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtension.cpp
index d7a5635817..265978b2bb 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtension.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtension.cpp
@@ -1,143 +1,143 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryExtension.h"
 
 #include "berryExtensionRegistry.h"
 #include "berryRegistryContributor.h"
 #include "berryRegistryObjectManager.h"
 
 namespace berry
 {
 
 const int Extension::LABEL = 0; //The human readable name of the extension
 const int Extension::XPT_NAME = 1; // The fully qualified name of the extension point to which this extension is attached to
 const int Extension::CONTRIBUTOR_ID = 2; // ID of the actual contributor of this extension
 const int Extension::EXTRA_SIZE = 3;
 
 QList<QString> Extension::GetExtraData() const
 {
   //The extension has been created by parsing, or does not have any extra data
   if (NoExtraData())
   {
     return extraInformation;
   }
 
 //  //The extension has been loaded from the cache.
 //  if (extraInformation.empty())
 //  {
 //    extraInformation = registry->GetTableReader()->LoadExtensionExtraData(GetExtraDataOffset());
 //  }
   return extraInformation;
 }
 
 Extension::Extension(ExtensionRegistry* registry, bool persist)
   : RegistryObject(registry, persist)
 {
   for (int i = 0; i < EXTRA_SIZE; ++i)
     extraInformation << QString();
 }
 
 Extension::Extension(int self, const QString& simpleId, const QString& namespaze,
           const QList<int>& children, int extraData,
           ExtensionRegistry* registry, bool persist)
   : RegistryObject(registry, persist), simpleId(simpleId), namespaceIdentifier(namespaze)
 {
   for (int i = 0; i < EXTRA_SIZE; ++i)
     extraInformation << QString();
 
   SetObjectId(self);
   SetRawChildren(children);
   SetExtraDataOffset(extraData);
 }
 
 QString Extension::GetExtensionPointIdentifier() const
 {
   return GetExtraData()[XPT_NAME];
 }
 
 QString Extension::GetSimpleIdentifier() const
 {
   return simpleId;
 }
 
 QString Extension::GetUniqueIdentifier() const
 {
   return simpleId.isEmpty() ? QString() : this->GetNamespaceIdentifier() + '.' + simpleId;
 }
 
 void Extension::SetExtensionPointIdentifier(const QString& value)
 {
   extraInformation[XPT_NAME] = value;
 }
 
 void Extension::SetSimpleIdentifier(const QString& value)
 {
   simpleId = value;
 }
 
 QString Extension::GetLabel() const
 {
   return GetExtraData()[LABEL];
 }
 
 void Extension::SetLabel(const QString& value)
 {
   extraInformation[LABEL] = value;
 }
 
 QString Extension::GetContributorId() const
 {
   return GetExtraData()[CONTRIBUTOR_ID];
 }
 
 void Extension::SetContributorId(const QString& value)
 {
   extraInformation[CONTRIBUTOR_ID] = value;
 }
 
 void Extension::SetNamespaceIdentifier(const QString& value)
 {
   namespaceIdentifier = value;
 }
 
 QString Extension::GetLabelAsIs() const
 {
   return GetExtraData()[LABEL];
 }
 
-QString Extension::GetLabel(const QLocale& locale) const
+QString Extension::GetLabel(const QLocale& /*locale*/) const
 {
   registry->LogMultiLangError();
   return GetLabel();
 }
 
 SmartPointer<IContributor> Extension::GetContributor() const
 {
   return registry->GetObjectManager()->GetContributor(GetContributorId());
 }
 
 QString Extension::GetNamespaceIdentifier() const
 {
   return namespaceIdentifier;
 }
 
 QString Extension::ToString() const
 {
   return GetUniqueIdentifier() + " -> " + GetExtensionPointIdentifier();
 }
 
 } // namespace berry
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtensionDelta.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtensionDelta.cpp
deleted file mode 100644
index 1eacdada75..0000000000
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtensionDelta.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/*===================================================================
-
-BlueBerry Platform
-
-Copyright (c) German Cancer Research Center,
-Division of Medical and Biological Informatics.
-All rights reserved.
-
-This software is distributed WITHOUT ANY WARRANTY; without
-even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.
-
-See LICENSE.txt or http://www.mitk.org for details.
-
-===================================================================*/
-
-#include "berryExtensionDelta.h"
-
-#include "berryExtensionHandle.h"
-#include "berryExtensionPointHandle.h"
-#include "berryIObjectManager.h"
-#include "berryRegistryDelta.h"
-
-namespace berry {
-
-class ExtensionDeltaData : public QSharedData
-{
-public:
-
-  ExtensionDeltaData()
-    : kind(ExtensionDelta::ADDED), extension(0), extensionPoint(0), containingDelta(NULL)
-  {
-  }
-
-  QString GetKindString() const
-  {
-    switch (kind)
-    {
-    case ExtensionDelta::ADDED :
-      return "ADDED";
-    case ExtensionDelta::REMOVED :
-      return "REMOVED";
-    }
-    return "UNKNOWN";
-  }
-
-  ExtensionDelta::Kind kind;
-  int extension;
-  int extensionPoint;
-  RegistryDelta* containingDelta;
-};
-
-ExtensionDelta::ExtensionDelta()
-  : d(new ExtensionDeltaData)
-{
-}
-
-ExtensionDelta::ExtensionDelta(const ExtensionDelta &other)
-  : d(other.d)
-{
-}
-
-ExtensionDelta::~ExtensionDelta()
-{
-}
-
-ExtensionDelta &ExtensionDelta::operator =(const ExtensionDelta &other)
-{
-  d = other.d;
-  return *this;
-}
-
-bool ExtensionDelta::operator ==(const ExtensionDelta &other) const
-{
-  return d == other.d;
-}
-
-uint ExtensionDelta::GetHashCode() const
-{
-  return qHash(d.constData());
-}
-
-void ExtensionDelta::SetContainingDelta(RegistryDelta* containingDelta)
-{
-  d->containingDelta = containingDelta;
-}
-
-int ExtensionDelta::GetExtensionId() const
-{
-  return d->extension;
-}
-
-int ExtensionDelta::GetExtensionPointId() const
-{
-  return d->extensionPoint;
-}
-
-SmartPointer<IExtensionPoint> ExtensionDelta::GetExtensionPoint() const
-{
-  IExtensionPoint::Pointer xp(new ExtensionPointHandle(d->containingDelta->GetObjectManager(),
-                                                       d->extensionPoint));
-  return xp;
-}
-
-void ExtensionDelta::SetExtensionPoint(int extensionPoint)
-{
-  d->extensionPoint = extensionPoint;
-}
-
-ExtensionDelta::Kind ExtensionDelta::GetKind() const
-{
-  return d->kind;
-}
-
-SmartPointer<IExtension> ExtensionDelta::GetExtension() const
-{
-  IExtension::Pointer ext(new ExtensionHandle(d->containingDelta->GetObjectManager(),
-                                              d->extension));
-  return ext;
-}
-
-void ExtensionDelta::SetExtension(int extension)
-{
-  d->extension = extension;
-}
-
-void ExtensionDelta::SetKind(Kind kind) const
-{
-  d->kind = kind;
-}
-
-QString ExtensionDelta::ToString() const
-{
-  return "\n\t\t" + GetExtensionPoint()->GetUniqueIdentifier() + " - " +
-      GetExtension()->GetNamespaceIdentifier() + '.' + GetExtension()->GetSimpleIdentifier() +
-      " (" + d->GetKindString() + ")";
-}
-
-}
-
-uint qHash(const berry::ExtensionDelta& delta)
-{
-  return delta.GetHashCode();
-}
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtensionDelta.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtensionDelta.h
deleted file mode 100644
index 639761d59f..0000000000
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtensionDelta.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*===================================================================
-
-BlueBerry Platform
-
-Copyright (c) German Cancer Research Center,
-Division of Medical and Biological Informatics.
-All rights reserved.
-
-This software is distributed WITHOUT ANY WARRANTY; without
-even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.
-
-See LICENSE.txt or http://www.mitk.org for details.
-
-===================================================================*/
-
-#ifndef BERRYEXTENSIONDELTA_H
-#define BERRYEXTENSIONDELTA_H
-
-#include <QExplicitlySharedDataPointer>
-
-namespace berry {
-
-template<class T> class SmartPointer;
-
-struct IExtension;
-struct IExtensionPoint;
-
-class ExtensionDeltaData;
-class RegistryDelta;
-
-class ExtensionDelta
-{
-
-public:
-
-  enum Kind {
-    /**
-     * Delta kind constant indicating that an extension has been added to an
-     * extension point.
-     * @see ExtensionDelta#getKind()
-     */
-    ADDED = 1,
-
-    /**
-     * Delta kind constant indicating that an extension has been removed from an
-     * extension point.
-     * @see ExtensionDelta#getKind()
-     */
-    REMOVED = 2
-  };
-
-  ExtensionDelta();
-  ExtensionDelta(const ExtensionDelta& other);
-
-  ~ExtensionDelta();
-
-  ExtensionDelta& operator=(const ExtensionDelta& other);
-
-  bool operator==(const ExtensionDelta& other) const;
-
-  uint GetHashCode() const;
-
-  void SetContainingDelta(RegistryDelta* containingDelta);
-
-  int GetExtensionId() const;
-
-  int GetExtensionPointId() const;
-
-  /**
-   * Returns the affected extension point.
-   *
-   * @return the affected extension point
-   */
-  SmartPointer<IExtensionPoint> GetExtensionPoint() const;
-
-  void SetExtensionPoint(int extensionPoint);
-
-  /**
-   * The kind of this extension delta.
-   *
-   * @return the kind of change this delta represents
-   * @see #ADDED
-   * @see #REMOVED
-   */
-  Kind GetKind() const;
-
-  /**
-   * Returns the affected extension.
-   *
-   * @return the affected extension
-   */
-  SmartPointer<IExtension> GetExtension() const;
-
-  void SetExtension(int extension);
-
-  void SetKind(Kind kind) const;
-
-  QString ToString() const;
-
-private:
-
-  QExplicitlySharedDataPointer<ExtensionDeltaData> d;
-
-};
-
-}
-
-uint qHash(const berry::ExtensionDelta& delta);
-
-#endif // BERRYEXTENSIONDELTA_H
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtensionHandle.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtensionHandle.cpp
index 9106cb2299..193838a93a 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtensionHandle.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtensionHandle.cpp
@@ -1,121 +1,121 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryExtensionHandle.h"
 #include "berryExtension.h"
 #include "berryIConfigurationElement.h"
 #include "berryIContributor.h"
 #include "berryRegistryObjectManager.h"
 #include "berryInvalidRegistryObjectException.h"
 
 namespace berry {
 
 ExtensionHandle::ExtensionHandle(const SmartPointer<const IObjectManager> &objectManager, int id)
   : Handle(objectManager, id)
 {
 }
 
 ExtensionHandle::ExtensionHandle(const IObjectManager *objectManager, int id)
   : Handle(objectManager, id)
 {
 }
 
 QString ExtensionHandle::GetNamespaceIdentifier() const
 {
   return GetExtension()->GetNamespaceIdentifier();
 }
 
 SmartPointer<IContributor> ExtensionHandle::GetContributor() const
 {
   return GetExtension()->GetContributor();
 }
 
 QString ExtensionHandle::GetExtensionPointUniqueIdentifier() const
 {
   return GetExtension()->GetExtensionPointIdentifier();
 }
 
 QString ExtensionHandle::GetLabel() const
 {
   return GetExtension()->GetLabel();
 }
 
 QString ExtensionHandle::GetLabelAsIs() const
 {
   return GetExtension()->GetLabelAsIs();
 }
 
 QString ExtensionHandle::GetLabel(const QLocale& locale) const
 {
   return GetExtension()->GetLabel(locale);
 }
 
 QString ExtensionHandle::GetSimpleIdentifier() const
 {
   return GetExtension()->GetSimpleIdentifier();
 }
 
 QString ExtensionHandle::GetUniqueIdentifier() const
 {
   return GetExtension()->GetUniqueIdentifier();
 }
 
 QList<SmartPointer<IConfigurationElement> > ExtensionHandle::GetConfigurationElements() const
 {
   QList<Handle::Pointer> handles = objectManager->GetHandles(GetExtension()->GetRawChildren(),
                                                              RegistryObjectManager::CONFIGURATION_ELEMENT);
   QList<IConfigurationElement::Pointer> result;
   foreach (Handle::Pointer handle, handles)
   {
     result.push_back(handle.Cast<IConfigurationElement>());
   }
   return result;
 }
 
 bool ExtensionHandle::IsValid() const
 {
   try
   {
     GetExtension();
   }
-  catch (const InvalidRegistryObjectException& e)
+  catch (const InvalidRegistryObjectException& /*e*/)
   {
     return false;
   }
   return true;
 }
 
 SmartPointer<Extension> ExtensionHandle::GetExtension() const
 {
   return objectManager->GetObject(GetId(), RegistryObjectManager::EXTENSION).Cast<Extension>();
 }
 
 bool ExtensionHandle::ShouldPersist() const
 {
   return GetExtension()->ShouldPersist();
 }
 
 QString ExtensionHandle::GetContributorId() const
 {
   return GetExtension()->GetContributorId();
 }
 
 SmartPointer<RegistryObject> ExtensionHandle::GetObject() const
 {
   return GetExtension();
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtensionPoint.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtensionPoint.cpp
index f9b784dfdd..b11cda4ddc 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtensionPoint.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtensionPoint.cpp
@@ -1,145 +1,145 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryExtensionPoint.h"
 
 #include "berryExtensionRegistry.h"
 #include "berryRegistryContributor.h"
 #include "berryRegistryObjectManager.h"
 
 #include <QDir>
 
 namespace berry {
 
 const int ExtensionPoint::LABEL = 0; //The human readable name for the extension point
 const int ExtensionPoint::SCHEMA = 1; //The schema of the extension point
 const int ExtensionPoint::QUALIFIED_NAME = 2; //The fully qualified name of the extension point
 const int ExtensionPoint::NAMESPACE = 3; //The name of the namespace of the extension point
 const int ExtensionPoint::CONTRIBUTOR_ID = 4; //The ID of the actual contributor of the extension point
 const int ExtensionPoint::EXTRA_SIZE = 5;
 
 QList<QString> ExtensionPoint::GetExtraData() const
 {
   //The extension point has been created by parsing, or does not have any extra data
   if (NoExtraData())
   { //When this is true, the extraInformation is always a String[]. This happens when the object is created by the parser.
     return extraInformation;
   }
 
 //  //The extension point has been loaded from the cache.
 //  if (extraInformation.empty())
 //  {
 //    extraInformation = registry->GetTableReader()->LoadExtensionPointExtraData(GetExtraDataOffset());
 //  }
   return extraInformation;
 }
 
 ExtensionPoint::ExtensionPoint(ExtensionRegistry* registry, bool persist)
   : RegistryObject(registry, persist)
 {
   for (int i = 0; i < EXTRA_SIZE; ++i)
     extraInformation << QString();
 }
 
 ExtensionPoint::ExtensionPoint(int self, const QList<int>& children, int dataOffset,
                ExtensionRegistry* registry, bool persist)
   : RegistryObject(registry, persist)
 {
   for (int i = 0; i < EXTRA_SIZE; ++i)
     extraInformation << QString();
 
   SetObjectId(self);
   SetRawChildren(children);
   SetExtraDataOffset(dataOffset);
 }
 
 QString ExtensionPoint::GetSimpleIdentifier() const
 {
   return GetUniqueIdentifier().mid(GetUniqueIdentifier().lastIndexOf('.') + 1);
 }
 
 QString ExtensionPoint::GetSchemaReference() const
 {
   return QDir::fromNativeSeparators(GetExtraData()[SCHEMA]);
 }
 
 QString ExtensionPoint::GetLabel() const
 {
   return GetExtraData()[LABEL];
 }
 
 QString ExtensionPoint::GetUniqueIdentifier() const
 {
   return GetExtraData()[QUALIFIED_NAME];
 }
 
 QString ExtensionPoint::GetNamespace() const
 {
   return GetExtraData()[NAMESPACE];
 }
 
 QString ExtensionPoint::GetContributorId() const
 {
   return GetExtraData()[CONTRIBUTOR_ID];
 }
 
 void ExtensionPoint::SetSchema(const QString& value)
 {
   extraInformation[SCHEMA] = value;
 }
 
 void ExtensionPoint::SetLabel(const QString& value)
 {
   extraInformation[LABEL] = value;
 }
 
 void ExtensionPoint::SetUniqueIdentifier(const QString& value)
 {
   extraInformation[QUALIFIED_NAME] = value;
 }
 
 void ExtensionPoint::SetNamespace(const QString& value)
 {
   extraInformation[NAMESPACE] = value;
 }
 
 void ExtensionPoint::SetContributorId(const QString id)
 {
   extraInformation[CONTRIBUTOR_ID] = id;
 }
 
 QString ExtensionPoint::GetLabelAsIs() const
 {
   return GetExtraData()[LABEL];
 }
 
-QString ExtensionPoint::GetLabel(const QLocale& locale)
+QString ExtensionPoint::GetLabel(const QLocale& /*locale*/)
 {
   registry->LogMultiLangError();
   return GetLabel();
 }
 
 SmartPointer<IContributor> ExtensionPoint::GetContributor() const
 {
   return registry->GetObjectManager()->GetContributor(GetContributorId());
 }
 
 QString ExtensionPoint::ToString() const
 {
   return GetUniqueIdentifier();
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtensionPointHandle.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtensionPointHandle.cpp
index bebf692a8f..0b8892987a 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtensionPointHandle.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtensionPointHandle.cpp
@@ -1,159 +1,159 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryExtensionPointHandle.h"
 
 #include "berryIExtension.h"
 #include "berryExtension.h"
 #include "berryIObjectManager.h"
 #include "berryIConfigurationElement.h"
 #include "berryIContributor.h"
 #include "berryInvalidRegistryObjectException.h"
 #include "berryExtensionPoint.h"
 #include "berryRegistryObjectManager.h"
 
 namespace berry {
 
 ExtensionPointHandle::ExtensionPointHandle(const SmartPointer<const IObjectManager>& objectManager, int id)
   : Handle(objectManager, id)
 {
 }
 
 ExtensionPointHandle::ExtensionPointHandle(const IObjectManager *objectManager, int id)
   : Handle(objectManager, id)
 {
 }
 
 QList<SmartPointer<IExtension> > ExtensionPointHandle::GetExtensions() const
 {
   QList<Handle::Pointer> handles =
       objectManager->GetHandles(GetExtensionPoint()->GetRawChildren(), RegistryObjectManager::EXTENSION);
 
   QList<IExtension::Pointer> result;
   foreach(Handle::Pointer handle, handles)
   {
     result.push_back(handle.Cast<IExtension>());
   }
   return result;
 }
 
 QString ExtensionPointHandle::GetNamespaceIdentifier() const
 {
   return GetExtensionPoint()->GetNamespace();
 }
 
 SmartPointer<IContributor> ExtensionPointHandle::GetContributor() const
 {
   return GetExtensionPoint()->GetContributor();
 }
 
 SmartPointer<IExtension> ExtensionPointHandle::GetExtension(const QString& extensionId) const
 {
   if (extensionId.isEmpty())
     return IExtension::Pointer();
 
   QList<int> children = GetExtensionPoint()->GetRawChildren();
   for (int i = 0; i < children.size(); i++)
   {
     // Here we directly get the object because it avoids the creation of
     // garbage and because we'll need the object anyway to compare the value
     if (extensionId ==
         objectManager->GetObject(children[i], RegistryObjectManager::EXTENSION).Cast<Extension>()->GetUniqueIdentifier())
       return objectManager->GetHandle(children[i], RegistryObjectManager::EXTENSION).Cast<IExtension>();
   }
   return IExtension::Pointer();
 }
 
 QList<SmartPointer<IConfigurationElement> > ExtensionPointHandle::GetConfigurationElements() const
 {
   //get the actual extension objects since we'll need to get the configuration elements information.
   QList<SmartPointer<RegistryObject> > tmpExtensions = objectManager->GetObjects(GetExtensionPoint()->GetRawChildren(),
                                                                             RegistryObjectManager::EXTENSION);
   if (tmpExtensions.empty())
     return QList<IConfigurationElement::Pointer>();
 
   QList<IConfigurationElement::Pointer> result;
   for (int i = 0; i < tmpExtensions.size(); ++i)
   {
     QList<Handle::Pointer> handles = objectManager->GetHandles(tmpExtensions[i]->GetRawChildren(),
                                                                RegistryObjectManager::CONFIGURATION_ELEMENT);
     for (int j = 0; j < handles.size(); ++j)
     {
       result.push_back(handles[j].Cast<IConfigurationElement>());
     }
   }
   return result;
 }
 
 QString ExtensionPointHandle::GetLabelAsIs() const
 {
   return GetExtensionPoint()->GetLabelAsIs();
 }
 
 QString ExtensionPointHandle::GetLabel() const
 {
   return GetExtensionPoint()->GetLabel();
 }
 
 QString ExtensionPointHandle::GetLabel(const QLocale& locale) const
 {
   return GetExtensionPoint()->GetLabel(locale);
 }
 
 QString ExtensionPointHandle::GetSchemaReference() const
 {
   return GetExtensionPoint()->GetSchemaReference();
 }
 
 QString ExtensionPointHandle::GetSimpleIdentifier() const
 {
   return GetExtensionPoint()->GetSimpleIdentifier();
 }
 
 QString ExtensionPointHandle::GetUniqueIdentifier() const
 {
   return GetExtensionPoint()->GetUniqueIdentifier();
 }
 
 bool ExtensionPointHandle::IsValid() const
 {
   try
   {
     GetExtensionPoint();
   }
-  catch (const InvalidRegistryObjectException& e)
+  catch (const InvalidRegistryObjectException& /*e*/)
   {
     return false;
   }
   return true;
 }
 
 bool ExtensionPointHandle::ShouldPersist() const
 {
   return GetExtensionPoint()->ShouldPersist();
 }
 
 SmartPointer<RegistryObject> ExtensionPointHandle::GetObject() const
 {
   return GetExtensionPoint();
 }
 
 SmartPointer<ExtensionPoint> ExtensionPointHandle::GetExtensionPoint() const
 {
   return objectManager->GetObject(GetId(), RegistryObjectManager::EXTENSION_POINT).Cast<ExtensionPoint>();
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtensionRegistry.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtensionRegistry.cpp
index 5182bcd951..03ba36eaf7 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtensionRegistry.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtensionRegistry.cpp
@@ -1,1338 +1,1338 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #include "berryExtensionRegistry.h"
 
 #include "berryCombinedEventDelta.h"
 #include "berryConfigurationElement.h"
 #include "berryConfigurationElementAttribute.h"
 #include "berryConfigurationElementDescription.h"
 #include "berryExtension.h"
 #include "berryExtensionHandle.h"
 #include "berryExtensionPoint.h"
 #include "berryExtensionPointHandle.h"
 #include "berryExtensionsParser.h"
 #include "berryIConfigurationElement.h"
 #include "berryIExtension.h"
 #include "berryIExtensionPoint.h"
 #include "berryMultiStatus.h"
 #include "berryPlatform.h"
 #include "berryRegistryConstants.h"
 #include "berryRegistryContribution.h"
 #include "berryRegistryContributor.h"
 #include "berryRegistryMessages.h"
 #include "berryRegistryObjectFactory.h"
 #include "berryRegistryObjectManager.h"
 #include "berryRegistryProperties.h"
 #include "berryRegistryStrategy.h"
 #include "berryStatus.h"
 
 #include <QThread>
 #include <QTime>
 
 namespace berry {
 
 struct ExtensionRegistry::ListenerInfo {
   QString filter;
   IRegistryEventListener* listener;
 
   ListenerInfo(IRegistryEventListener* listener, const QString& filter)
     : filter(filter), listener(listener)
   {
   }
 
   /**
    * Used by ListenerList to ensure uniqueness.
    */
   bool operator==(const ListenerInfo& another) const
   {
     return another.listener == this->listener;
   }
 
 };
 
 void ExtensionRegistry::Add(const SmartPointer<RegistryContribution> &element)
 {
   QWriteLocker l(&access);
   eventDelta = CombinedEventDelta::RecordAddition();
   BasicAdd(element, true);
   FireRegistryChangeEvent();
   eventDelta.Reset();
 }
 
 QString ExtensionRegistry::AddExtension(int extension)
 {
   Extension::Pointer addedExtension = registryObjects->GetObject(extension, RegistryObjectManager::EXTENSION).Cast<Extension>();
   QString extensionPointToAddTo = addedExtension->GetExtensionPointIdentifier();
   ExtensionPoint::Pointer extPoint = registryObjects->GetExtensionPointObject(extensionPointToAddTo);
   //orphan extension
   if (extPoint.IsNull())
   {
     registryObjects->AddOrphan(extensionPointToAddTo, extension);
     return QString();
   }
   // otherwise, link them
   QList<int> newExtensions = extPoint->GetRawChildren();
   newExtensions.push_back(extension);
   Link(extPoint, newExtensions);
   if (!eventDelta.IsNull())
     eventDelta.RememberExtension(extPoint, extension);
   return extPoint->GetNamespace();
   //return RecordChange(extPoint, extension, ExtensionDelta::ADDED);
 }
 
 QString ExtensionRegistry::AddExtensionPoint(int extPoint)
 {
   ExtensionPoint::Pointer extensionPoint = registryObjects->GetObject(extPoint, RegistryObjectManager::EXTENSION_POINT).Cast<ExtensionPoint>();
   if (!eventDelta.IsNull())
     eventDelta.RememberExtensionPoint(extensionPoint);
   QList<int> orphans = registryObjects->RemoveOrphans(extensionPoint->GetUniqueIdentifier());
   if (orphans.empty())
     return QString();
   Link(extensionPoint, orphans);
   if (!eventDelta.IsNull())
     eventDelta.RememberExtensions(extensionPoint, orphans);
   return extensionPoint->GetNamespace();
   //return RecordChange(extensionPoint, orphans, ExtensionDelta::ADDED);
 }
 
 QSet<QString> ExtensionRegistry::AddExtensionsAndExtensionPoints(const SmartPointer<RegistryContribution>& element)
 {
   // now add and resolve extensions and extension points
   QSet<QString> affectedNamespaces;
   QList<int> extPoints = element->GetExtensionPoints();
   for (int i = 0; i < extPoints.size(); i++)
   {
     QString namespaze = this->AddExtensionPoint(extPoints[i]);
     if (!namespaze.isEmpty())
       affectedNamespaces.insert(namespaze);
   }
   QList<int> extensions = element->GetExtensions();
   for (int i = 0; i < extensions.size(); i++)
   {
     QString namespaze = this->AddExtension(extensions[i]);
     if (!namespaze.isEmpty())
       affectedNamespaces.insert(namespaze);
   }
   return affectedNamespaces;
 }
 
 void ExtensionRegistry::AddListenerInternal(IRegistryEventListener* listener, const QString& filter)
 {
   listeners.Add(ListenerInfo(listener, filter));
 }
 
 void ExtensionRegistry::BasicAdd(const SmartPointer<RegistryContribution>& element, bool link)
 {
   registryObjects->AddContribution(element);
   if (!link)
     return;
   AddExtensionsAndExtensionPoints(element);
   SetObjectManagers(registryObjects->CreateDelegatingObjectManager(
                       registryObjects->GetAssociatedObjects(element->GetContributorId())));
 }
 
 void ExtensionRegistry::SetObjectManagers(const SmartPointer<IObjectManager>& manager)
 {
   if (!eventDelta.IsNull())
     eventDelta.SetObjectManager(manager);
 }
 
 void ExtensionRegistry::BasicRemove(const QString& contributorId)
 {
   // ignore anonymous namespaces
   RemoveExtensionsAndExtensionPoints(contributorId);
   QHash<int, RegistryObject::Pointer> associatedObjects = registryObjects->GetAssociatedObjects(contributorId);
   registryObjects->RemoveObjects(associatedObjects);
   registryObjects->AddNavigableObjects(associatedObjects); // put the complete set of navigable objects
   SetObjectManagers(registryObjects->CreateDelegatingObjectManager(associatedObjects));
 
   registryObjects->RemoveContribution(contributorId);
   registryObjects->RemoveContributor(contributorId);
 }
 
 void ExtensionRegistry::FireRegistryChangeEvent()
 {
   // if there is nothing to say, just bail out
   if (listeners.IsEmpty())
   {
     return;
   }
   // for thread safety, create tmp collections
   QList<ListenerInfo> tmpListeners = listeners.GetListeners();
   // do the notification asynchronously
   //strategy->ScheduleChangeEvent(tmpListeners, tmpDeltas, this);
   this->ScheduleChangeEvent(tmpListeners, eventDelta);
 }
 
 //RegistryDelta ExtensionRegistry::GetDelta(const QString& namespaze) const
 //{
 //  // is there a delta for the plug-in?
 //  RegistryDelta existingDelta = deltas.value(namespaze);
 //  if (existingDelta != null)
 //    return existingDelta;
 
 //  //if not, create one
 //  RegistryDelta delta = new RegistryDelta();
 //  deltas.put(namespace, delta);
 //  return delta;
 //}
 
 void ExtensionRegistry::Link(const SmartPointer<ExtensionPoint>& extPoint, const QList<int>& extensions)
 {
   extPoint->SetRawChildren(extensions);
   registryObjects->Add(extPoint, true);
 }
 
 //QString ExtensionRegistry::RecordChange(const SmartPointer<ExtensionPoint>& extPoint, int extension, int kind)
 //{
 //  // avoid computing deltas when there are no listeners
 //  if (listeners.isEmpty())
 //    return QString();
 //  ExtensionDelta extensionDelta = new ExtensionDelta();
 //  extensionDelta.setExtension(extension);
 //  extensionDelta.setExtensionPoint(extPoint.getObjectId());
 //  extensionDelta.setKind(kind);
 //  getDelta(extPoint.getNamespace()).addExtensionDelta(extensionDelta);
 //  return extPoint.getNamespace();
 //}
 
 //QString ExtensionRegistry::RecordChange(const SmartPointer<ExtensionPoint>& extPoint, const QList<int>& extensions, int kind)
 //{
 //  if (listeners.isEmpty())
 //    return null;
 //    QString namespace = extPoint.getNamespace();
 //  if (extensions == null || extensions.length == 0)
 //    return namespace;
 //  RegistryDelta pluginDelta = getDelta(extPoint.getNamespace());
 //  for (int i = 0; i < extensions.length; i++) {
 //    ExtensionDelta extensionDelta = new ExtensionDelta();
 //    extensionDelta.setExtension(extensions[i]);
 //    extensionDelta.setExtensionPoint(extPoint.getObjectId());
 //    extensionDelta.setKind(kind);
 //    pluginDelta.addExtensionDelta(extensionDelta);
 //  }
 //  return namespace;
 //}
 
 QString ExtensionRegistry::RemoveExtension(int extensionId)
 {
   Extension::Pointer extension = registryObjects->GetObject(extensionId, RegistryObjectManager::EXTENSION).Cast<Extension>();
   registryObjects->RemoveExtensionFromNamespaceIndex(extensionId, extension->GetNamespaceIdentifier());
   QString xptName = extension->GetExtensionPointIdentifier();
   ExtensionPoint::Pointer extPoint = registryObjects->GetExtensionPointObject(xptName);
   if (extPoint.IsNull())
   {
     registryObjects->RemoveOrphan(xptName, extensionId);
     return QString();
   }
   // otherwise, unlink the extension from the extension point
   QList<int> existingExtensions = extPoint->GetRawChildren();
   QList<int> newExtensions;
   if (existingExtensions.size() > 1)
   {
     for (int i = 0; i < existingExtensions.size(); ++i)
       if (existingExtensions[i] != extension->GetObjectId())
         newExtensions.push_back(existingExtensions[i]);
   }
   Link(extPoint, newExtensions);
   if (!eventDelta.IsNull())
     eventDelta.RememberExtension(extPoint, extensionId);
   return extPoint->GetNamespace();
   //return recordChange(extPoint, extension.getObjectId(), IExtensionDelta.REMOVED);
 }
 
 QString ExtensionRegistry::RemoveExtensionPoint(int extPoint)
 {
   ExtensionPoint::Pointer extensionPoint = registryObjects->GetObject(
         extPoint, RegistryObjectManager::EXTENSION_POINT).Cast<ExtensionPoint>();
   registryObjects->RemoveExtensionPointFromNamespaceIndex(extPoint, extensionPoint->GetNamespace());
   QList<int> existingExtensions = extensionPoint->GetRawChildren();
   if (!existingExtensions.empty())
   {
     registryObjects->AddOrphans(extensionPoint->GetUniqueIdentifier(), existingExtensions);
     Link(extensionPoint, QList<int>());
   }
   if (!eventDelta.IsNull())
   {
     eventDelta.RememberExtensionPoint(extensionPoint);
     eventDelta.RememberExtensions(extensionPoint, existingExtensions);
   }
   return extensionPoint->GetNamespace();
   //return recordChange(extensionPoint, existingExtensions, IExtensionDelta.REMOVED);
 }
 
 QSet<QString> ExtensionRegistry::RemoveExtensionsAndExtensionPoints(const QString& contributorId)
 {
   QSet<QString> affectedNamespaces;
   QList<int> extensions = registryObjects->GetExtensionsFrom(contributorId);
   for (int i = 0; i < extensions.size(); i++)
   {
     QString namespaze = this->RemoveExtension(extensions[i]);
     if (!namespaze.isEmpty())
       affectedNamespaces.insert(namespaze);
   }
 
   // remove extension points
   QList<int> extPoints = registryObjects->GetExtensionPointsFrom(contributorId);
   for (int i = 0; i < extPoints.size(); i++)
   {
     QString namespaze = this->RemoveExtensionPoint(extPoints[i]);
     if (!namespaze.isEmpty())
       affectedNamespaces.insert(namespaze);
   }
   return affectedNamespaces;
 }
 
 struct ExtensionRegistry::QueueElement
 {
   QList<ListenerInfo> listenerInfos;
   CombinedEventDelta scheduledDelta;
 
   QueueElement()
   {
   }
 
   QueueElement(const QList<ListenerInfo>& infos, const CombinedEventDelta& delta)
     : listenerInfos(infos), scheduledDelta(delta)
   {
   }
 };
 
 class ExtensionRegistry::RegistryEventThread : public QThread
 {
 
 private:
 
   QAtomicInt stop;
   ExtensionRegistry* registry;
   Queue& queue;
 
 public:
 
   RegistryEventThread(ExtensionRegistry* registry, Queue& queue)
     : stop(0), registry(registry), queue(queue)
   {
     this->setObjectName("Extension Registry Event Dispatcher");
   }
 
   void interrupt()
   {
     stop.fetchAndStoreOrdered(1);
   }
 
   void run()
   {
     while (!stop.fetchAndAddOrdered(0))
     {
       QueueElement element;
       {
         Queue::Locker l(&queue);
         while (queue.empty())
           queue.wait();
         element = queue.takeFirst();
       }
       registry->ProcessChangeEvent(element.listenerInfos, element.scheduledDelta);
     }
   }
 };
 
 bool ExtensionRegistry::CheckReadWriteAccess(QObject* key, bool persist) const
   {
   if (masterToken == key)
     return true;
   if (userToken == key && !persist)
     return true;
   return false;
 }
 
 void ExtensionRegistry::LogError(const QString& owner, const QString& contributionName, const ctkException& e)
 {
   QString message = QString("Could not parse XML contribution for \"%1\". Any contributed extensions "
                             "and extension points will be ignored.").arg(QString(owner) + "/" + contributionName);
   IStatus::Pointer status(new Status(IStatus::ERROR_TYPE, RegistryMessages::OWNER_NAME, 0, message, e, BERRY_STATUS_LOC));
   Log(status);
 }
 
 void ExtensionRegistry::CreateExtensionData(const QString& contributorId,
                                             const ConfigurationElementDescription& description,
                                             const SmartPointer<RegistryObject>& parent, bool persist)
 {
   ConfigurationElement::Pointer currentConfigurationElement = GetElementFactory()->CreateConfigurationElement(persist);
   currentConfigurationElement->SetContributorId(contributorId);
   currentConfigurationElement->SetName(description.GetName());
 
   QList<ConfigurationElementAttribute> descriptionProperties = description.GetAttributes();
 
   QList<QString> properties;
   if (!descriptionProperties.empty())
   {
     for (int i = 0; i < descriptionProperties.size(); i++)
     {
       properties.push_back(descriptionProperties[i].GetName());
       properties.push_back(Translate(descriptionProperties[i].GetValue(), NULL));
     }
   }
   currentConfigurationElement->SetProperties(properties);
 
   QString value = description.GetValue();
   if (!value.isEmpty())
     currentConfigurationElement->SetValue(value);
 
   GetObjectManager()->Add(currentConfigurationElement, true);
 
   // process children
   QList<ConfigurationElementDescription> children = description.GetChildren();
   if (!children.empty())
   {
     for (int i = 0; i < children.size(); i++)
     {
       CreateExtensionData(contributorId, children[i], currentConfigurationElement, persist);
     }
   }
 
   QList<int> newValues = parent->GetRawChildren();
   newValues.push_back(currentConfigurationElement->GetObjectId());
   parent->SetRawChildren(newValues);
   currentConfigurationElement->SetParentId(parent->GetObjectId());
   currentConfigurationElement->SetParentType(parent.Cast<ConfigurationElement>() ?
                                                RegistryObjectManager::CONFIGURATION_ELEMENT :
                                                RegistryObjectManager::EXTENSION);
 }
 
 bool ExtensionRegistry::RemoveObject(const SmartPointer<RegistryObject>& registryObject,
                   bool isExtensionPoint, QObject* token)
 {
   if (!CheckReadWriteAccess(token, registryObject->ShouldPersist()))
     throw ctkInvalidArgumentException("Unauthorized access to the ExtensionRegistry.removeExtension() method. Check if proper access token is supplied.");
   int id = registryObject->GetObjectId();
 
   QWriteLocker l(&access);
   eventDelta = CombinedEventDelta::RecordRemoval();
   if (isExtensionPoint)
   {
     RemoveExtensionPoint(id);
   }
   else
   {
     RemoveExtension(id);
   }
   QHash<int, RegistryObject::Pointer> removed;
   removed.insert(id, registryObject);
   // There is some asymmetry between extension and extension point removal. Removing extension point makes
   // extensions "orphans" but does not remove them. As a result, only extensions needs to be processed.
   if (!isExtensionPoint)
   {
     registryObjects->AddAssociatedObjects(removed, registryObject);
   }
   registryObjects->RemoveObjects(removed);
   registryObjects->AddNavigableObjects(removed);
   IObjectManager::Pointer manager = registryObjects->CreateDelegatingObjectManager(removed);
   //GetDelta(namespaze)->SetObjectManager(manager);
   //eventDelta->SetObjectManager(manager);
 
   registryObjects->UnlinkChildFromContributions(id);
   FireRegistryChangeEvent();
   eventDelta.Reset();
   return true;
 }
 
-void ExtensionRegistry::SetFileManager(const QString& cacheBase, bool isCacheReadOnly)
+void ExtensionRegistry::SetFileManager(const QString& /*cacheBase*/, bool /*isCacheReadOnly*/)
 {
 //  if (cacheStorageManager != NULL)
 //    cacheStorageManager->Close(); // close existing file manager first
 
 //  if (cacheBase != null) {
 //    cacheStorageManager = new StorageManager(cacheBase, isCacheReadOnly ? "none" : null, isCacheReadOnly); //$NON-NLS-1$
 //    try {
 //      cacheStorageManager.open(!isCacheReadOnly);
 //    } catch (IOException e) {
 //      // Ignore the exception. The registry will be rebuilt from source.
 //    }
 //  }
 }
 
 void ExtensionRegistry::EnterRead()
 {
   access.lockForRead();
 }
 
 void ExtensionRegistry::ExitRead()
 {
   access.unlock();
 }
 
 void ExtensionRegistry::SetElementFactory()
 {
   if (isMultiLanguage)
   {
     throw ctkRuntimeException("Multi-language registry not supported yet.");
     //theRegistryObjectFactory = new RegistryObjectFactoryMulti(this);
   }
   else
   {
     theRegistryObjectFactory.reset(new RegistryObjectFactory(this));
   }
 }
 
 //TableReader ExtensionRegistry::getTableReader() const
 //{
 //  return theTableReader;
 //}
 
 bool ExtensionRegistry::CheckCache()
 {
 //  for (int index = 0; index < strategy.getLocationsLength(); index++) {
 //    File possibleCacheLocation = strategy.getStorage(index);
 //    if (possibleCacheLocation == null)
 //      break; // bail out on the first null
 //    setFileManager(possibleCacheLocation, strategy.isCacheReadOnly(index));
 //    if (cacheStorageManager != null) {
 //      // check this new location:
 //      File cacheFile = null;
 //      try {
 //        cacheFile = cacheStorageManager.lookup(TableReader.getTestFileName(), false);
 //      } catch (IOException e) {
 //        //Ignore the exception. The registry will be rebuilt from the xml files.
 //      }
 //      if (cacheFile != null && cacheFile.isFile())
 //        return true; // found the appropriate location
 //    }
 //  }
   return false;
 }
 
 void ExtensionRegistry::StopChangeEventScheduler()
 {
   if (!eventThread.isNull())
   {
     Queue::Locker l(&queue);
     eventThread->interrupt();
     eventThread->wait();
     eventThread.reset();
   }
 }
 
 SmartPointer<RegistryObjectManager> ExtensionRegistry::GetObjectManager() const
 {
   return registryObjects;
 }
 
 void ExtensionRegistry::AddListener(IRegistryEventListener* listener, const QString& extensionPointId)
 {
   AddListenerInternal(listener, extensionPointId);
 }
 
 QList<SmartPointer<IConfigurationElement> > ExtensionRegistry::GetConfigurationElementsFor(const QString& extensionPointId) const
 {
   // this is just a convenience API - no need to do any sync'ing here
   int lastdot = extensionPointId.lastIndexOf('.');
   if (lastdot == -1)
   {
     QList<IConfigurationElement::Pointer>();
   }
   return GetConfigurationElementsFor(extensionPointId.left(lastdot), extensionPointId.mid(lastdot + 1));
 }
 
 QList<SmartPointer<IConfigurationElement> > ExtensionRegistry::GetConfigurationElementsFor(const QString& pluginId,
                                                                         const QString& extensionPointSimpleId) const
 {
   // this is just a convenience API - no need to do any sync'ing here
   IExtensionPoint::Pointer extPoint = this->GetExtensionPoint(pluginId, extensionPointSimpleId);
   if (extPoint.IsNull())
     return QList<IConfigurationElement::Pointer>();
   return extPoint->GetConfigurationElements();
 }
 
 QList<SmartPointer<IConfigurationElement> > ExtensionRegistry::GetConfigurationElementsFor(const QString& pluginId,
                                                                         const QString& extensionPointName,
                                                                         const QString& extensionId) const
 {
   // this is just a convenience API - no need to do any sync'ing here
   IExtension::Pointer extension = this->GetExtension(pluginId, extensionPointName, extensionId);
   if (extension.IsNull())
     return QList<IConfigurationElement::Pointer>();
   return extension->GetConfigurationElements();
 }
 
 SmartPointer<IExtension> ExtensionRegistry::GetExtension(const QString& extensionId) const
 {
   if (extensionId.isEmpty())
     return IExtension::Pointer();
   int lastdot = extensionId.lastIndexOf('.');
   if (lastdot == -1)
     return IExtension::Pointer();
   QString namespaze = extensionId.left(lastdot);
 
   QList<ExtensionHandle::Pointer> extensions;
   {
     QReadLocker l(&access);
     extensions = registryObjects->GetExtensionsFromNamespace(namespaze);
   }
 
   for (int i = 0; i < extensions.size(); i++)
   {
     ExtensionHandle::Pointer suspect = extensions[i];
     if (extensionId == suspect->GetUniqueIdentifier())
       return suspect;
   }
   return IExtension::Pointer();
 }
 
 SmartPointer<IExtension> ExtensionRegistry::GetExtension(const QString& extensionPointId, const QString& extensionId) const
 {
   // this is just a convenience API - no need to do any sync'ing here
   int lastdot = extensionPointId.lastIndexOf('.');
   if (lastdot == -1)
     return IExtension::Pointer();
   return GetExtension(extensionPointId.left(lastdot), extensionPointId.mid(lastdot + 1), extensionId);
 }
 
 SmartPointer<IExtension> ExtensionRegistry::GetExtension(const QString& pluginId,
                                       const QString& extensionPointName,
                                       const QString& extensionId) const
 {
   // this is just a convenience API - no need to do any sync'ing here
   IExtensionPoint::Pointer extPoint = GetExtensionPoint(pluginId, extensionPointName);
   if (extPoint.IsNotNull())
     return extPoint->GetExtension(extensionId);
   return IExtension::Pointer();
 }
 
 SmartPointer<IExtensionPoint> ExtensionRegistry::GetExtensionPoint(const QString& xptUniqueId) const
 {
   QReadLocker l(&access);
   return registryObjects->GetExtensionPointHandle(xptUniqueId);
 }
 
 SmartPointer<IExtensionPoint> ExtensionRegistry::GetExtensionPoint(const QString& elementName, const QString& xpt) const
 {
   QReadLocker l(&access);
   return registryObjects->GetExtensionPointHandle(elementName + '.' + xpt);
 }
 
 QList<SmartPointer<IExtensionPoint> > ExtensionRegistry::GetExtensionPoints() const
 {
   QList<ExtensionPointHandle::Pointer> handles;
   {
     QReadLocker l(&access);
     handles = registryObjects->GetExtensionPointsHandles();
   }
   QList<IExtensionPoint::Pointer> result;
   foreach(ExtensionPointHandle::Pointer handle, handles)
   {
     result.push_back(handle);
   }
   return result;
 }
 
 QList<SmartPointer<IExtensionPoint> > ExtensionRegistry::GetExtensionPoints(const QString& namespaceName) const
 {
   QList<ExtensionPointHandle::Pointer> handles;
   {
     QReadLocker l(&access);
     handles = registryObjects->GetExtensionPointsFromNamespace(namespaceName);
   }
   QList<IExtensionPoint::Pointer> result;
   foreach(ExtensionPointHandle::Pointer handle, handles)
   {
     result.push_back(handle);
   }
   return result;
 }
 
 QList<SmartPointer<IExtension> > ExtensionRegistry::GetExtensions(const QString& namespaceName) const
 {
   QList<ExtensionHandle::Pointer> handles;
   {
     QReadLocker l(&access);
     handles = registryObjects->GetExtensionsFromNamespace(namespaceName);
   }
   QList<IExtension::Pointer> result;
   foreach (ExtensionHandle::Pointer handle, handles)
   {
     result.push_back(handle);
   }
   return result;
 }
 
 QList<SmartPointer<IExtension> > ExtensionRegistry::GetExtensions(const SmartPointer<IContributor>& contributor) const
 {
   RegistryContributor::Pointer regContributor = contributor.Cast<RegistryContributor>();
   if (regContributor.IsNull())
     throw ctkInvalidArgumentException("Contributor must be a RegistryContributor."); // should never happen
 
   QString contributorId = regContributor->GetActualId();
 
   QList<ExtensionHandle::Pointer> handles;
   {
     QReadLocker l(&access);
     handles = registryObjects->GetExtensionsFromContributor(contributorId);
   }
   QList<IExtension::Pointer> result;
   foreach (ExtensionHandle::Pointer handle, handles)
   {
     result.push_back(handle);
   }
   return result;
 }
 
 QList<SmartPointer<IExtensionPoint> > ExtensionRegistry::GetExtensionPoints(const SmartPointer<IContributor>& contributor) const
 {
   RegistryContributor::Pointer regContributor = contributor.Cast<RegistryContributor>();
   if (regContributor.IsNull())
     throw ctkInvalidArgumentException("Contributor must be a RegistryContributor."); // should never happen
 
   QString contributorId = regContributor->GetActualId();
 
   QList<ExtensionPointHandle::Pointer> handles;
   {
     QReadLocker l(&access);
     handles = registryObjects->GetExtensionPointsFromContributor(contributorId);
   }
   QList<IExtensionPoint::Pointer> result;
   foreach (ExtensionPointHandle::Pointer handle, handles)
   {
     result.push_back(handle);
   }
   return result;
 }
 
 QList<QString> ExtensionRegistry::GetNamespaces() const
 {
   QReadLocker l(&access);
   QList<KeyedElement::Pointer> namespaceElements = registryObjects->GetNamespacesIndex().Elements();
   QList<QString> namespaceNames;
   for (int i = 0; i < namespaceElements.size(); i++)
   {
     namespaceNames.push_back(namespaceElements[i]->GetKey());
   }
   return namespaceNames;
 }
 
 bool ExtensionRegistry::HasContributor(const SmartPointer<IContributor>& contributor) const
 {
   RegistryContributor::Pointer regContributor = contributor.Cast<RegistryContributor>();
   if (regContributor.IsNull())
     throw ctkInvalidArgumentException("Contributor must be a RegistryContributor."); // should never happen
 
   QString contributorId = regContributor->GetActualId();
   return HasContributor(contributorId);
 }
 
 bool ExtensionRegistry::HasContributor(const QString& contributorId) const
 {
   QReadLocker l(&access);
   return registryObjects->HasContribution(contributorId);
 }
 
 void ExtensionRegistry::Remove(const QString& removedContributorId, long timestamp)
 {
   Remove(removedContributorId);
   if (timestamp != 0)
     aggregatedTimestamp.Remove(timestamp);
 }
 
 void ExtensionRegistry::RemoveContributor(const SmartPointer<IContributor>& contributor, QObject* key)
 {
   RegistryContributor::Pointer regContributor = contributor.Cast<RegistryContributor>();
   if (regContributor.IsNull())
     throw ctkInvalidArgumentException("Contributor must be a RegistryContributor."); // should never happen
 
   if (!CheckReadWriteAccess(key, true))
     throw ctkInvalidArgumentException("Unauthorized access to the ExtensionRegistry.removeContributor() method. Check if proper access token is supplied.");
   QString contributorId = regContributor->GetActualId();
   Remove(contributorId);
 }
 
 void ExtensionRegistry::Remove(const QString& removedContributorId)
 {
   QWriteLocker l(&access);
   eventDelta = CombinedEventDelta::RecordRemoval();
   BasicRemove(removedContributorId);
   FireRegistryChangeEvent();
   eventDelta.Reset();
 }
 
 void ExtensionRegistry::RemoveListener(IRegistryEventListener* listener)
 {
   listeners.Remove(ListenerInfo(listener, QString()));
 }
 
 ExtensionRegistry::ExtensionRegistry(RegistryStrategy* registryStrategy, QObject* masterToken, QObject* userToken)
   : registryObjects(NULL), isMultiLanguage(false), mlErrorLogged(false), eventThread(NULL)
 {
   isMultiLanguage = RegistryProperties::GetProperty(RegistryConstants::PROP_MULTI_LANGUAGE) == "true";
 
   if (registryStrategy != NULL)
     strategy.reset(registryStrategy);
   else
     strategy.reset(new RegistryStrategy(QList<QString>(), QList<bool>(), NULL));
 
   this->masterToken = masterToken;
   this->userToken = userToken;
   registryObjects = new RegistryObjectManager(this);
 
   bool isRegistryFilledFromCache = false; // indicates if registry was able to use cache to populate it's content
 
   if (strategy->CacheUse())
   {
     // Try to read the registry from the cache first. If that fails, create a new registry
     QTime timer;
     if (Debug())
       timer.start();
 
     //The cache is made of several files, find the real names of these other files. If all files are found, try to initialize the objectManager
     if (CheckCache())
     {
       // TODO Registry Cache
 //      try {
 //        theTableReader.setTableFile(cacheStorageManager.lookup(TableReader.TABLE, false));
 //        theTableReader.setExtraDataFile(cacheStorageManager.lookup(TableReader.EXTRA, false));
 //        theTableReader.setMainDataFile(cacheStorageManager.lookup(TableReader.MAIN, false));
 //        theTableReader.setContributionsFile(cacheStorageManager.lookup(TableReader.CONTRIBUTIONS, false));
 //        theTableReader.setContributorsFile(cacheStorageManager.lookup(TableReader.CONTRIBUTORS, false));
 //        theTableReader.setNamespacesFile(cacheStorageManager.lookup(TableReader.NAMESPACES, false));
 //        theTableReader.setOrphansFile(cacheStorageManager.lookup(TableReader.ORPHANS, false));
 //        long timestamp = strategy.getContributionsTimestamp();
 //        isRegistryFilledFromCache = registryObjects.init(timestamp);
 //        if (isRegistryFilledFromCache)
 //          aggregatedTimestamp.set(timestamp);
 //      } catch (IOException e) {
 //        // The registry will be rebuilt from the xml files. Make sure to clear anything filled
 //        // from cache so that we won't have partially filled items.
 //        isRegistryFilledFromCache = false;
 //        clearRegistryCache();
 //        log(new Status(IStatus.ERROR, RegistryMessages.OWNER_NAME, 0, RegistryMessages.registry_bad_cache, e));
 //      }
     }
 
 //    if (!isRegistryFilledFromCache)
 //    {
 //      // set cache storage manager to a first writable location
 //      for (int index = 0; index < strategy.getLocationsLength(); index++) {
 //        if (!strategy.isCacheReadOnly(index)) {
 //          setFileManager(strategy.getStorage(index), false);
 //          break;
 //        }
 //      }
 //    }
 
     if (Debug() && isRegistryFilledFromCache)
       BERRY_INFO << "Reading registry cache: " << timer.elapsed() << "ms";
 
     if (Debug())
     {
       if (!isRegistryFilledFromCache)
         BERRY_INFO << "Reloading registry from manifest files...";
       else
         BERRY_INFO << "Using registry cache...";
     }
   }
 
   if (DebugEvents())
   {
     struct DebugRegistryListener : public IRegistryEventListener
     {
       void Added(const QList<IExtension::Pointer>& extensions)
       {
         BERRY_INFO << "Registry extensions ADDED:";
         foreach(IExtension::Pointer extension, extensions)
         {
           BERRY_INFO << "\t" << extension->GetExtensionPointUniqueIdentifier() << " - "
                      << extension->GetNamespaceIdentifier() << "." << extension->GetSimpleIdentifier();
         }
       }
 
       void Removed(const QList<IExtension::Pointer>& extensions)
       {
         BERRY_INFO << "Registry extensions REMOVED:";
         foreach(IExtension::Pointer extension, extensions)
         {
           BERRY_INFO << "\t" << extension->GetExtensionPointUniqueIdentifier() << " - "
                      << extension->GetNamespaceIdentifier() << "." << extension->GetSimpleIdentifier();
         }
       }
 
       void Added(const QList<IExtensionPoint::Pointer>& extensionPoints)
       {
         BERRY_INFO << "Registry extension-points ADDED:";
         foreach(IExtensionPoint::Pointer extensionPoint, extensionPoints)
         {
           BERRY_INFO << "\t" << extensionPoint->GetUniqueIdentifier();
         }
       }
 
       void Removed(const QList<IExtensionPoint::Pointer>& extensionPoints)
       {
         BERRY_INFO << "Registry extension-points REMOVED:";
         foreach(IExtensionPoint::Pointer extensionPoint, extensionPoints)
         {
           BERRY_INFO << "\t" << extensionPoint->GetUniqueIdentifier();
         }
       }
     };
 
     debugRegistryListener.reset(new DebugRegistryListener());
     AddListener(debugRegistryListener.data());
   }
 
   // Do extra start processing if specified in the registry strategy
   strategy->OnStart(this, isRegistryFilledFromCache);
 }
 
 ExtensionRegistry::~ExtensionRegistry()
 {
 }
 
-void ExtensionRegistry::Stop(QObject* key)
+void ExtensionRegistry::Stop(QObject* /*key*/)
 {
   // If the registry creator specified a key token, check that the key mathches it
   // (it is assumed that registry owner keeps the key to prevent unautorized accesss).
   if (masterToken != NULL && masterToken != NULL)
   {
     throw ctkInvalidArgumentException("Unauthorized access to the ExtensionRegistry.stop() method. Check if proper access token is supplied."); //$NON-NLS-1$
   }
 
   // Do extra stop processing if specified in the registry strategy
   strategy->OnStop(this);
 
   StopChangeEventScheduler();
 
 //  if (cacheStorageManager == NULL)
 //    return;
 
 //  if (!registryObjects.isDirty() || cacheStorageManager.isReadOnly()) {
 //    cacheStorageManager.close();
 //    theTableReader.close();
 //    return;
 //  }
 
 //  File tableFile = null;
 //  File mainFile = null;
 //  File extraFile = null;
 //  File contributionsFile = null;
 //  File contributorsFile = null;
 //  File namespacesFile = null;
 //  File orphansFile = null;
 
 //  TableWriter theTableWriter = new TableWriter(this);
 
 //  try {
 //    cacheStorageManager.lookup(TableReader.TABLE, true);
 //    cacheStorageManager.lookup(TableReader.MAIN, true);
 //    cacheStorageManager.lookup(TableReader.EXTRA, true);
 //    cacheStorageManager.lookup(TableReader.CONTRIBUTIONS, true);
 //    cacheStorageManager.lookup(TableReader.CONTRIBUTORS, true);
 //    cacheStorageManager.lookup(TableReader.NAMESPACES, true);
 //    cacheStorageManager.lookup(TableReader.ORPHANS, true);
 //    tableFile = File.createTempFile(TableReader.TABLE, ".new", cacheStorageManager.getBase()); //$NON-NLS-1$
 //    mainFile = File.createTempFile(TableReader.MAIN, ".new", cacheStorageManager.getBase()); //$NON-NLS-1$
 //    extraFile = File.createTempFile(TableReader.EXTRA, ".new", cacheStorageManager.getBase()); //$NON-NLS-1$
 //    contributionsFile = File.createTempFile(TableReader.CONTRIBUTIONS, ".new", cacheStorageManager.getBase()); //$NON-NLS-1$
 //    contributorsFile = File.createTempFile(TableReader.CONTRIBUTORS, ".new", cacheStorageManager.getBase()); //$NON-NLS-1$
 //    namespacesFile = File.createTempFile(TableReader.NAMESPACES, ".new", cacheStorageManager.getBase()); //$NON-NLS-1$
 //    orphansFile = File.createTempFile(TableReader.ORPHANS, ".new", cacheStorageManager.getBase()); //$NON-NLS-1$
 //    theTableWriter.setTableFile(tableFile);
 //    theTableWriter.setExtraDataFile(extraFile);
 //    theTableWriter.setMainDataFile(mainFile);
 //    theTableWriter.setContributionsFile(contributionsFile);
 //    theTableWriter.setContributorsFile(contributorsFile);
 //    theTableWriter.setNamespacesFile(namespacesFile);
 //    theTableWriter.setOrphansFile(orphansFile);
 //  } catch (IOException e) {
 //    cacheStorageManager.close();
 //    return; //Ignore the exception since we can recompute the cache
 //  }
 //  try {
 //    long timestamp;
 //    // A bit of backward compatibility: if registry was modified, but timestamp was not,
 //    // it means that the new timestamp tracking mechanism was not used. In this case
 //    // explicitly obtain timestamps for all contributions. Note that this logic
 //    // maintains a problem described in the bug 104267 for contributions that
 //    // don't use the timestamp tracking mechanism.
 //    if (aggregatedTimestamp.isModifed())
 //      timestamp = aggregatedTimestamp.getContentsTimestamp(); // use timestamp tracking
 //    else
 //      timestamp = strategy.getContributionsTimestamp(); // use legacy approach
 
 //    if (theTableWriter.saveCache(registryObjects, timestamp))
 //      cacheStorageManager.update(new   QString[] {TableReader.TABLE, TableReader.MAIN, TableReader.EXTRA, TableReader.CONTRIBUTIONS, TableReader.CONTRIBUTORS, TableReader.NAMESPACES, TableReader.ORPHANS}, new   QString[] {tableFile.getName(), mainFile.getName(), extraFile.getName(), contributionsFile.getName(), contributorsFile.getName(), namespacesFile.getName(), orphansFile.getName()});
 //  } catch (IOException e) {
 //    //Ignore the exception since we can recompute the cache
 //  }
 //  theTableReader.close();
 //  cacheStorageManager.close();
 }
 
 void ExtensionRegistry::ClearRegistryCache()
 {
 //  QString[] keys = new   QString[] {TableReader.TABLE, TableReader.MAIN, TableReader.EXTRA, TableReader.CONTRIBUTIONS, TableReader.ORPHANS};
 //  for (int i = 0; i < keys.length; i++)
 //    try {
 //      cacheStorageManager.remove(keys[i]);
 //    } catch (IOException e) {
 //      log(new Status(IStatus.ERROR, RegistryMessages.OWNER_NAME, IStatus.ERROR, RegistryMessages.meta_registryCacheReadProblems, e));
 //    }
   aggregatedTimestamp.Reset();
 }
 
 RegistryObjectFactory* ExtensionRegistry::GetElementFactory()
 {
   if (theRegistryObjectFactory.isNull())
     SetElementFactory();
   return theRegistryObjectFactory.data();
 }
 
 void ExtensionRegistry::Log(const SmartPointer<IStatus>& status) const
 {
   strategy->Log(status);
 }
 
 QString ExtensionRegistry::Translate(const QString& key, QTranslator* resources) const
 {
   if (isMultiLanguage)
     return key;
   return strategy->Translate(key, resources);
 }
 
 bool ExtensionRegistry::Debug() const
 {
   return strategy->Debug();
 }
 
 bool ExtensionRegistry::DebugEvents() const
 {
   return strategy->DebugRegistryEvents();
 }
 
 bool ExtensionRegistry::UseLazyCacheLoading() const
 {
   return strategy->CacheLazyLoading();
 }
 
 long ExtensionRegistry::ComputeState() const
 {
   return strategy->GetContainerTimestamp();
 }
 
 QObject* ExtensionRegistry::CreateExecutableExtension(const SmartPointer<RegistryContributor>& defaultContributor,
                                                       const QString& className, const QString& requestedContributorName)
 {
   return strategy->CreateExecutableExtension(defaultContributor, className, requestedContributorName);
 }
 
 void ExtensionRegistry::ProcessChangeEvent(
     const QList<ListenerInfo>& listenerInfos, const CombinedEventDelta& scheduledDelta)
 {
   for (int i = 0; i < listenerInfos.size(); i++)
   {
     const ListenerInfo& listenerInfo = listenerInfos[i];
 
     IRegistryEventListener* extensionListener = listenerInfo.listener;
     QList<IExtension::Pointer> extensions = scheduledDelta.GetExtensions(listenerInfo.filter);
     QList<IExtensionPoint::Pointer> extensionPoints = scheduledDelta.GetExtensionPoints(listenerInfo.filter);
 
     // notification order - on addition: extension points; then extensions
     if (scheduledDelta.IsAddition())
     {
       if (!extensionPoints.empty())
         extensionListener->Added(extensionPoints);
       if (!extensions.empty())
         extensionListener->Added(extensions);
     }
     else
     { // on removal: extensions; then extension points
       if (!extensions.empty())
         extensionListener->Removed(extensions);
       if (!extensionPoints.empty())
         extensionListener->Removed(extensionPoints);
     }
   }
   IObjectManager::Pointer manager = scheduledDelta.GetObjectManager();
   if (manager.IsNotNull())
     manager->Close();
 }
 
 void ExtensionRegistry::ScheduleChangeEvent(const QList<ListenerInfo>& listenerInfos,
                                             const CombinedEventDelta& scheduledDelta)
 {
   QueueElement newElement(listenerInfos, scheduledDelta);
   if (eventThread.isNull())
   {
     eventThread.reset(new RegistryEventThread(this, queue));
     eventThread->start();
   }
 
   {
     Queue::Locker l(&queue);
     queue.push_back(newElement);
     queue.notify();
   }
 }
 
 bool ExtensionRegistry::AddContribution(QIODevice* is, const SmartPointer<IContributor>& contributor,
                                         bool persist, const QString& contributionName,
                                         QTranslator* translationBundle, QObject* key, long timestamp)
 {
   bool result = AddContribution(is, contributor, persist, contributionName, translationBundle, key);
   if (timestamp != 0)
     aggregatedTimestamp.Add(timestamp);
   return result;
 }
 
 bool ExtensionRegistry::AddContribution(QIODevice* is, const SmartPointer<IContributor>& contributor, bool persist,
                      const QString& contributionName, QTranslator* translationBundle, QObject* key)
 {
   if (!CheckReadWriteAccess(key, persist))
     throw ctkInvalidArgumentException("Unauthorized access to the ExtensionRegistry::AddContribution() method. Check if proper access token is supplied.");
 
   RegistryContributor::Pointer internalContributor = contributor.Cast<RegistryContributor>();
   registryObjects->AddContributor(internalContributor); // only adds a contributor if it is not already present
 
   QString ownerName = internalContributor->GetActualName();
   QString message = QString("Problems parsing plug-in manifest for: \"%1\".").arg(ownerName);
   MultiStatus::Pointer problems(new MultiStatus(RegistryMessages::OWNER_NAME,
                                                 ExtensionsParser::PARSE_PROBLEM, message, BERRY_STATUS_LOC));
   ExtensionsParser parser(problems, this);
   RegistryContribution::Pointer contribution =
       GetElementFactory()->CreateContribution(internalContributor->GetActualId(), persist);
 
   try
   {
     QXmlInputSource xmlInput(is);
     bool success = parser.parseManifest(strategy->GetXMLParser(), &xmlInput, contributionName,
                                         GetObjectManager().GetPointer(), contribution, translationBundle);
     int status = problems->GetSeverity();
     if (status != IStatus::OK_TYPE || !success)
     {
       Log(problems);
       if (status == IStatus::ERROR_TYPE || status == IStatus::CANCEL_TYPE || !success)
         return false;
     }
   }
   catch (const ctkException& e)
   {
     LogError(ownerName, contributionName, e);
     return false;
   }
 
   Add(contribution); // the add() method does synchronization
   return true;
 }
 
 bool ExtensionRegistry::AddExtensionPoint(const QString& identifier, const SmartPointer<IContributor>& contributor,
                        bool persist, const QString& label, const QString& schemaReference, QObject* token)
 {
   if (!CheckReadWriteAccess(token, persist))
     throw ctkInvalidArgumentException("Unauthorized access to the ExtensionRegistry::AddExtensionPoint() method. Check if proper access token is supplied.");
 
   RegistryContributor::Pointer internalContributor = contributor.Cast<RegistryContributor>();
   registryObjects->AddContributor(internalContributor); // only adds a contributor if it is not already present
   QString contributorId = internalContributor->GetActualId();
 
   // Extension point Id might not be null
   if (identifier.isEmpty())
   {
     QString message = QString("Missing ID for the extension point \"%1\". Element ignored.").arg(label);
     IStatus::Pointer status(new Status(IStatus::ERROR_TYPE, RegistryMessages::OWNER_NAME, 0, message, BERRY_STATUS_LOC));
     Log(status);
   }
 
   // addition wraps in a contribution
   RegistryContribution::Pointer contribution = GetElementFactory()->CreateContribution(contributorId, persist);
   ExtensionPoint::Pointer currentExtPoint = GetElementFactory()->CreateExtensionPoint(persist);
 
   QString uniqueId;
   QString namespaceName;
   int simpleIdStart = identifier.lastIndexOf('.');
   if (simpleIdStart == -1)
   {
     namespaceName = contribution->GetDefaultNamespace();
     uniqueId = namespaceName + '.' + identifier;
   }
   else
   {
     namespaceName = identifier.left(simpleIdStart);
     uniqueId = identifier;
   }
   currentExtPoint->SetUniqueIdentifier(uniqueId);
   currentExtPoint->SetNamespace(namespaceName);
   QString labelNLS = Translate(label, NULL);
   currentExtPoint->SetLabel(labelNLS);
   currentExtPoint->SetSchema(schemaReference);
 
   if (!GetObjectManager()->AddExtensionPoint(currentExtPoint, true))
   {
     if (Debug())
     {
       QString msg = QString("Ignored duplicate extension point \"%1\" supplied by \"%2\".").arg(uniqueId).arg(contribution->GetDefaultNamespace());
       IStatus::Pointer status(new Status(IStatus::ERROR_TYPE, RegistryMessages::OWNER_NAME, 0, msg, BERRY_STATUS_LOC));
       Log(status);
     }
     return false;
   }
 
   currentExtPoint->SetContributorId(contributorId);
 
   // array format: {Number of extension points, Number of extensions, Extension Id}
   QList<int> contributionChildren;
   // Put the extension points into this namespace
   contributionChildren.push_back(1);
   contributionChildren.push_back(0);
   contributionChildren.push_back(currentExtPoint->GetObjectId());
 
   contribution->SetRawChildren(contributionChildren);
 
   Add(contribution);
   return true;
 }
 
 bool ExtensionRegistry::AddExtension(const QString& identifier, const SmartPointer<IContributor>& contributor,
                   bool persist, const QString& label, const QString& extensionPointId,
                   const ConfigurationElementDescription& configurationElements, QObject* token)
 {
   if (!CheckReadWriteAccess(token, persist))
     throw ctkInvalidArgumentException("Unauthorized access to the ExtensionRegistry::AddExtensionPoint() method. Check if proper access token is supplied.");
 
   // prepare namespace information
   RegistryContributor::Pointer internalContributor = contributor.Cast<RegistryContributor>();
   registryObjects->AddContributor(internalContributor); // only adds a contributor if it is not already present
   QString contributorId = internalContributor->GetActualId();
 
   // addition wraps in a contribution
   RegistryContribution::Pointer contribution = GetElementFactory()->CreateContribution(contributorId, persist);
   Extension::Pointer currentExtension = GetElementFactory()->CreateExtension(persist);
 
   QString simpleId;
   QString namespaceName;
   int simpleIdStart = identifier.lastIndexOf('.');
   if (simpleIdStart != -1)
   {
     simpleId = identifier.mid(simpleIdStart + 1);
     namespaceName = identifier.left(simpleIdStart);
   }
   else
   {
     simpleId = identifier;
     namespaceName = contribution->GetDefaultNamespace();
   }
   currentExtension->SetSimpleIdentifier(simpleId);
   currentExtension->SetNamespaceIdentifier(namespaceName);
 
   QString extensionLabelNLS = Translate(label, NULL);
   currentExtension->SetLabel(extensionLabelNLS);
 
     QString targetExtensionPointId;
   if (extensionPointId.indexOf('.') == -1) // No dots -> namespace name added at the start
     targetExtensionPointId = contribution->GetDefaultNamespace() + '.' + extensionPointId;
   else
     targetExtensionPointId = extensionPointId;
   currentExtension->SetExtensionPointIdentifier(targetExtensionPointId);
 
   // if we have an Id specified, check for duplicates. Only issue warning if duplicate found
   // as it might still work fine - depending on the access pattern.
   if (!simpleId.isNull() && Debug())
   {
     QString uniqueId = namespaceName + '.' + simpleId;
     IExtension::Pointer existingExtension = GetExtension(uniqueId);
     if (existingExtension.IsNotNull())
     {
       QString currentSupplier = contribution->GetDefaultNamespace();
       QString existingSupplier = existingExtension->GetContributor()->GetName();
       QString msg = QString("Extensions supplied by \"%1\" and \"%2\" have the same Id: \"%3\".")
           .arg(currentSupplier).arg(existingSupplier).arg(uniqueId);
       IStatus::Pointer status(new Status(IStatus::WARNING_TYPE, RegistryMessages::OWNER_NAME, 0, msg, BERRY_STATUS_LOC));
       Log(status);
       return false;
     }
   }
 
   GetObjectManager()->Add(currentExtension, true);
 
   CreateExtensionData(contributorId, configurationElements, currentExtension, persist);
 
   currentExtension->SetContributorId(contributorId);
 
   QList<int> contributionChildren;
 
   contributionChildren.push_back(0);
   contributionChildren.push_back(1);
   contributionChildren.push_back(currentExtension->GetObjectId());
   contribution->SetRawChildren(contributionChildren);
 
   Add(contribution);
   return true;
 }
 
 bool ExtensionRegistry::RemoveExtension(const SmartPointer<IExtension>& extension, QObject* token)
 {
   ExtensionHandle::Pointer handle = extension.Cast<ExtensionHandle>();
   if (handle.IsNull())
     return false;
   return RemoveObject(handle->GetObject(), false, token);
 }
 
 bool ExtensionRegistry::RemoveExtensionPoint(const SmartPointer<IExtensionPoint>& extensionPoint, QObject* token)
 {
   ExtensionPointHandle::Pointer handle = extensionPoint.Cast<ExtensionPointHandle>();
   if (handle.IsNull())
     return false;
   return RemoveObject(handle->GetObject(), true, token);
 }
 
 QList<SmartPointer<IContributor> > ExtensionRegistry::GetAllContributors() const
 {
   QList<IContributor::Pointer> result;
 
   QReadLocker l(&access);
   foreach(RegistryContributor::Pointer contributor, registryObjects->GetContributors().values())
   {
     result.push_back(contributor);
   }
   return result;
 }
 
 bool ExtensionRegistry::IsMultiLanguage() const
 {
   return isMultiLanguage;
 }
 
 QList<QString> ExtensionRegistry::Translate(const QList<QString>& nonTranslated, const SmartPointer<IContributor>& contributor,
                          const QLocale& locale) const
 {
   return strategy->Translate(nonTranslated, contributor, locale);
 }
 
 QLocale ExtensionRegistry::GetLocale() const
 {
   return strategy->GetLocale();
 }
 
 void ExtensionRegistry::LogMultiLangError() const
 {
   if (mlErrorLogged) // only log this error ones
     return;
 
   IStatus::Pointer status(new Status(IStatus::ERROR_TYPE, RegistryMessages::OWNER_NAME, 0,
                                      QString("The requested multi-language operation is not enabled. See runtime option \"")
                                      + Platform::ARG_REGISTRY_MULTI_LANGUAGE + "\".", ctkInvalidArgumentException(""), BERRY_STATUS_LOC));
   Log(status);
   mlErrorLogged = true;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtensionsParser.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtensionsParser.cpp
index f6224724d6..a68da1ce53 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtensionsParser.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryExtensionsParser.cpp
@@ -1,643 +1,643 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryExtensionsParser.h"
 
 #include "berryConfigurationElement.h"
 #include "berryExtension.h"
 #include "berryExtensionPoint.h"
 #include "berryExtensionRegistry.h"
 #include "berryIContributor.h"
 #include "berryIExtension.h"
 #include "berryLog.h"
 #include "berryMultiStatus.h"
 #include "berryRegistryContribution.h"
 #include "berryRegistryMessages.h"
 #include "berryRegistryObject.h"
 #include "berryRegistryObjectFactory.h"
 #include "berryRegistryObjectManager.h"
 
 #include <QTime>
 
 namespace berry {
 
 long ExtensionsParser::cumulativeTime = 0;
 
 // Valid States
 const int ExtensionsParser::IGNORED_ELEMENT_STATE = 0;
 const int ExtensionsParser::INITIAL_STATE = 1;
 const int ExtensionsParser::PLUGIN_STATE = 2;
 const int ExtensionsParser::PLUGIN_EXTENSION_POINT_STATE = 5;
 const int ExtensionsParser::PLUGIN_EXTENSION_STATE = 6;
 const int ExtensionsParser::CONFIGURATION_ELEMENT_STATE = 10;
 
 const int ExtensionsParser::EXTENSION_POINT_INDEX = 0;
 const int ExtensionsParser::EXTENSION_INDEX = 1;
 const int ExtensionsParser::LAST_INDEX = 1;
 
 const int ExtensionsParser::PARSE_PROBLEM = 1;
 
 const QString ExtensionsParser::PLUGIN = "plugin";
 const QString ExtensionsParser::PLUGIN_ID = "id";
 const QString ExtensionsParser::PLUGIN_NAME = "name";
 const QString ExtensionsParser::BUNDLE_UID = "id";
 
 const QString ExtensionsParser::EXTENSION_POINT = "extension-point";
 const QString ExtensionsParser::EXTENSION_POINT_NAME = "name";
 const QString ExtensionsParser::EXTENSION_POINT_ID = "id";
 const QString ExtensionsParser::EXTENSION_POINT_SCHEMA = "schema";
 
 const QString ExtensionsParser::EXTENSION = "extension";
 const QString ExtensionsParser::EXTENSION_NAME = "name";
 const QString ExtensionsParser::EXTENSION_ID = "id";
 const QString ExtensionsParser::EXTENSION_TARGET = "point";
 
 const QString ExtensionsParser::ELEMENT = "element";
 const QString ExtensionsParser::ELEMENT_NAME = "name";
 const QString ExtensionsParser::ELEMENT_VALUE = "value";
 
 const QString ExtensionsParser::PROPERTY = "property";
 const QString ExtensionsParser::PROPERTY_NAME = "name";
 const QString ExtensionsParser::PROPERTY_VALUE = "value";
 
 
 ExtensionsParser::ExtensionsParser(const SmartPointer<MultiStatus>& status, ExtensionRegistry* registry)
   : locator(NULL), extractNamespaces(true), status(status),
     registry(registry), resources(NULL), objectManager(NULL)
 {
 }
 
 void ExtensionsParser::setDocumentLocator(QXmlLocator* locator)
 {
   this->locator = locator;
 }
 
 bool ExtensionsParser::characters(const QString& ch)
 {
   int state = stateStack.back();
   if (state != CONFIGURATION_ELEMENT_STATE)
     return true;
   if (state == CONFIGURATION_ELEMENT_STATE)
   {
     // Accept character data within an element, is when it is
     // part of a configuration element (i.e. an element within an EXTENSION element
     ConfigurationElement::Pointer currentConfigElement = objectStack.back().Cast<ConfigurationElement>();
     if (configurationElementValue.isNull())
     {
       if (!ch.trimmed().isEmpty())
       {
         configurationElementValue = ch;
       }
     }
     else
     {
       configurationElementValue.append(ch);
     }
     if (!configurationElementValue.isEmpty())
       currentConfigElement->SetValue(configurationElementValue);
   }
   return true;
 }
 
-bool ExtensionsParser::endElement(const QString& uri, const QString& elementName, const QString& /*qName*/)
+bool ExtensionsParser::endElement(const QString& /*uri*/, const QString& elementName, const QString& /*qName*/)
 {
   switch (stateStack.back())
   {
   case IGNORED_ELEMENT_STATE :
   {
     stateStack.pop();
     return true;
   }
   case INITIAL_STATE :
   {
     // shouldn't get here
     internalError(QString("Element/end element mismatch for element \"%1\".").arg(elementName));
     return false;
   }
   case PLUGIN_STATE :
   {
     stateStack.pop();
 
     QList<RegistryObject::Pointer>& extensionPoints = scratchVectors[EXTENSION_POINT_INDEX];
     QList<RegistryObject::Pointer>& extensions = scratchVectors[EXTENSION_INDEX];
     QList<int> namespaceChildren;
     namespaceChildren.push_back(0);
     namespaceChildren.push_back(0);
     // Put the extension points into this namespace
     if (extensionPoints.size() > 0)
     {
       namespaceChildren[RegistryContribution::EXTENSION_POINT] = extensionPoints.size();
       for (int i = 0; i < extensionPoints.size(); ++i)
       {
         namespaceChildren.push_back(extensionPoints[i]->GetObjectId());
       }
       extensionPoints.clear();
     }
 
     // Put the extensions into this namespace too
     if (extensions.size() > 0)
     {
       namespaceChildren[RegistryContribution::EXTENSION] = extensions.size();
       for (int i = 0; i < extensions.size(); ++i)
       {
         namespaceChildren.push_back(extensions[i]->GetObjectId());
       }
       extensions.clear();
     }
     contribution->SetRawChildren(namespaceChildren);
     return true;
   }
   case PLUGIN_EXTENSION_POINT_STATE :
   {
     if (elementName == EXTENSION_POINT)
     {
       stateStack.pop();
     }
     return true;
   }
   case PLUGIN_EXTENSION_STATE :
   {
     if (elementName == EXTENSION)
     {
       stateStack.pop();
       // Finish up extension object
       Extension::Pointer currentExtension = objectStack.pop().Cast<Extension>();
       if (currentExtension->GetNamespaceIdentifier().isEmpty())
         currentExtension->SetNamespaceIdentifier(contribution->GetDefaultNamespace());
       currentExtension->SetContributorId(contribution->GetContributorId());
       scratchVectors[EXTENSION_INDEX].push_back(currentExtension);
     }
     return true;
   }
   case CONFIGURATION_ELEMENT_STATE :
   {
     // We don't care what the element name was
     stateStack.pop();
     // Now finish up the configuration element object
     configurationElementValue.clear();
     ConfigurationElement::Pointer currentConfigElement = objectStack.pop().Cast<ConfigurationElement>();
 
     QString value = currentConfigElement->GetValueAsIs();
     if (!value.isEmpty())
     {
       currentConfigElement->SetValue(translate(value).trimmed());
     }
 
     RegistryObject::Pointer parent = objectStack.back().Cast<RegistryObject>();
     // Want to add this configuration element to the subelements of an extension
     QList<int> newValues = parent->GetRawChildren();
     newValues.push_back(currentConfigElement->GetObjectId());
     parent->SetRawChildren(newValues);
     currentConfigElement->SetParentId(parent->GetObjectId());
     currentConfigElement->SetParentType(parent.Cast<ConfigurationElement>() ?
                                           RegistryObjectManager::CONFIGURATION_ELEMENT : RegistryObjectManager::EXTENSION);
     return true;
   }
   default:
     // should never get here
     return false;
   }
 }
 
 bool ExtensionsParser::error(const QXmlParseException& ex)
 {
   logStatus(ex);
   return true;
 }
 
 bool ExtensionsParser::fatalError(const QXmlParseException& ex)
 {
   cleanup();
   logStatus(ex);
   return false;
 }
 
 bool
 ExtensionsParser::parseManifest(QXmlReader* reader, QXmlInputSource* in,
                                 const QString& manifestName, RegistryObjectManager* registryObjects,
                                 const SmartPointer<RegistryContribution>& currentNamespace,
                                 QTranslator* translator)
 {
   QTime start;
   this->resources = translator;
   this->objectManager = registryObjects;
   //initialize the parser with this object
   this->contribution = currentNamespace;
   if (registry->Debug())
     start.start();
 
   if (reader == NULL)
   {
     cumulativeTime += start.elapsed();
     throw ctkInvalidArgumentException("XML Reader not available");
   }
 
   locationName = manifestName;
   reader->setContentHandler(this);
   reader->setDeclHandler(this);
   reader->setDTDHandler(this);
   reader->setEntityResolver(this);
   reader->setErrorHandler(this);
   reader->setLexicalHandler(this);
   bool success  = reader->parse(in);
 
   if (registry->Debug())
   {
     cumulativeTime += start.elapsed();
     BERRY_INFO << "Cumulative parse time so far : " << cumulativeTime;
   }
 
   return success;
 }
 
 bool ExtensionsParser::startDocument()
 {
   stateStack.push(INITIAL_STATE);
   for (int i = 0; i <= LAST_INDEX; i++)
   {
     scratchVectors[i].clear();
   }
   return true;
 }
 
-bool ExtensionsParser::startElement(const QString& uri, const QString& elementName,
-                                    const QString& qName, const QXmlAttributes& attributes)
+bool ExtensionsParser::startElement(const QString& /*uri*/, const QString& elementName,
+                                    const QString& /*qName*/, const QXmlAttributes& attributes)
 {
   switch (stateStack.back())
   {
   case INITIAL_STATE :
     handleInitialState(elementName, attributes);
     break;
   case PLUGIN_STATE :
     handlePluginState(elementName, attributes);
     break;
   case PLUGIN_EXTENSION_POINT_STATE :
     handleExtensionPointState(elementName);
     break;
   case PLUGIN_EXTENSION_STATE :
   case CONFIGURATION_ELEMENT_STATE :
     handleExtensionState(elementName, attributes);
     break;
   default :
     stateStack.push(IGNORED_ELEMENT_STATE);
     internalError(QString("Unknown element \"%1\", found at the top level, ignored.").arg(elementName));
   }
   return true;
 }
 
 bool ExtensionsParser::warning(const QXmlParseException& ex)
 {
   logStatus(ex);
   return true;
 }
 
 void ExtensionsParser::error(const SmartPointer<IStatus>& error)
 {
   status->Add(error);
 }
 
 void ExtensionsParser::cleanup()
 {
   foreach (RegistryObject::Pointer object, addedRegistryObjects)
   {
     if (ExtensionPoint::Pointer extPoint = object.Cast<ExtensionPoint>())
     {
       QString id = extPoint->GetUniqueIdentifier();
       objectManager->RemoveExtensionPoint(id);
     }
     else
     {
       objectManager->Remove(object->GetObjectId(), true);
     }
   }
 }
 
 void ExtensionsParser::handleExtensionPointState(const QString& elementName)
 {
   // We ignore all elements under extension points (if there are any)
   stateStack.push(IGNORED_ELEMENT_STATE);
   unknownElement(EXTENSION_POINT, elementName);
 }
 
 void ExtensionsParser::handleExtensionState(const QString& elementName, const QXmlAttributes& attributes)
 {
   // You need to change the state here even though we will be executing the same
   // code for ExtensionState and ConfigurationElementState.  We ignore the name
   // of the element for ConfigurationElements.  When we are wrapping up, we will
   // want to add each configuration element object to the subElements vector of
   // its parent configuration element object.  However, the first configuration
   // element object we created (the last one we pop off the stack) will need to
   // be added to a vector in the extension object called _configuration.
   stateStack.push(CONFIGURATION_ELEMENT_STATE);
 
   configurationElementValue.clear();
 
   // create a new Configuration Element and push it onto the object stack
   ConfigurationElement::Pointer currentConfigurationElement =
       registry->GetElementFactory()->CreateConfigurationElement(contribution->ShouldPersist());
   currentConfigurationElement->SetContributorId(contribution->GetContributorId());
   objectStack.push(currentConfigurationElement);
   currentConfigurationElement->SetName(elementName);
 
   // Processing the attributes of a configuration element involves creating
   // a new configuration property for each attribute and populating the configuration
   // property with the name/value pair of the attribute.  Note there will be one
   // configuration property for each attribute
   parseConfigurationElementAttributes(attributes);
   objectManager->Add(currentConfigurationElement, true);
   addedRegistryObjects.push_back(currentConfigurationElement);
 }
 
-void ExtensionsParser::handleInitialState(const QString& elementName, const QXmlAttributes& attributes)
+void ExtensionsParser::handleInitialState(const QString& /*elementName*/, const QXmlAttributes& /*attributes*/)
 {
   // new manifests should have the plugin (or fragment) element empty
   stateStack.push(PLUGIN_STATE);
   objectStack.push(contribution);
 }
 
 void ExtensionsParser::handlePluginState(const QString& elementName, const QXmlAttributes& attributes)
 {
   if (elementName == EXTENSION_POINT)
   {
     stateStack.push(PLUGIN_EXTENSION_POINT_STATE);
     parseExtensionPointAttributes(attributes);
     return;
   }
   if (elementName == EXTENSION)
   {
     stateStack.push(PLUGIN_EXTENSION_STATE);
     parseExtensionAttributes(attributes);
     return;
   }
 
   // If we get to this point, the element name is one we don't currently accept.
   // Set the state to indicate that this element will be ignored
   stateStack.push(IGNORED_ELEMENT_STATE);
   unknownElement(PLUGIN, elementName);
 }
 
 void ExtensionsParser::logStatus(const QXmlParseException& ex)
 {
   QString name = ex.systemId();
   if (name.isEmpty())
     name = locationName;
 
   if (!name.isEmpty())
     name = name.mid(1 + name.lastIndexOf("/"));
 
   QString msg;
   if (name.isEmpty())
     msg = QString("Parsing error: \"%1\"").arg(ex.message());
   else
     msg = QString("Parsing error in \"%1\" [line %2, column %3]: \"%4\".").arg(name)
         .arg(ex.lineNumber()).arg(ex.columnNumber()).arg(ex.message());
   IStatus::Pointer status(new Status(IStatus::WARNING_TYPE, RegistryMessages::OWNER_NAME,
                                      PARSE_PROBLEM, msg, BERRY_STATUS_LOC));
   error(status);
 }
 
 void ExtensionsParser::parseConfigurationElementAttributes(const QXmlAttributes& attributes)
 {
   ConfigurationElement::Pointer parentConfigurationElement =
       objectStack.back().Cast<ConfigurationElement>();
 
   // process attributes
   int len = attributes.length();
   if (len == 0)
   {
     parentConfigurationElement->SetProperties(QList<QString>());
     return;
   }
   QList<QString> properties;
   for (int i = 0; i < len; i++)
   {
     properties.push_back(attributes.localName(i));
     properties.push_back(translate(attributes.value(i)));
   }
   parentConfigurationElement->SetProperties(properties);
 }
 
 void ExtensionsParser::parseExtensionAttributes(const QXmlAttributes& attributes)
 {
   Extension::Pointer currentExtension = registry->GetElementFactory()->CreateExtension(contribution->ShouldPersist());
   objectStack.push(currentExtension);
 
   QString simpleId;
   QString namespaceName;
   // Process Attributes
   int len = attributes.length();
   for (int i = 0; i < len; i++)
   {
     QString attrName = attributes.localName(i);
     QString attrValue = attributes.value(i).trimmed();
 
     if (attrName == EXTENSION_NAME)
       currentExtension->SetLabel(translate(attrValue));
     else if (attrName == EXTENSION_ID)
     {
       int simpleIdStart = attrValue.lastIndexOf('.');
       if ((simpleIdStart != -1) && extractNamespaces)
       {
         simpleId = attrValue.mid(simpleIdStart + 1);
         namespaceName = attrValue.left(simpleIdStart);
       }
       else
       {
         simpleId = attrValue;
         namespaceName = contribution->GetDefaultNamespace();
       }
       currentExtension->SetSimpleIdentifier(simpleId);
       currentExtension->SetNamespaceIdentifier(namespaceName);
     }
     else if (attrName == EXTENSION_TARGET)
     {
       // check if point is specified as a simple or qualified name
       QString targetName;
       if (attrValue.lastIndexOf('.') == -1)
       {
         QString baseId = contribution->GetDefaultNamespace();
         targetName = baseId + '.' + attrValue;
       }
       else
       {
         targetName = attrValue;
       }
       currentExtension->SetExtensionPointIdentifier(targetName);
     }
     else
     {
       unknownAttribute(attrName, EXTENSION);
     }
   }
   if (currentExtension->GetExtensionPointIdentifier().isEmpty())
   {
     missingAttribute(EXTENSION_TARGET, EXTENSION);
     stateStack.pop();
     stateStack.push(IGNORED_ELEMENT_STATE);
     objectStack.pop();
     return;
   }
   // if we have an Id specified, check for duplicates. Only issue warning (not error) if duplicate found
   // as it might still work fine - depending on the access pattern.
   if (!simpleId.isEmpty() && registry->Debug())
   {
     QString uniqueId = namespaceName + '.' + simpleId;
     IExtension::Pointer existingExtension = registry->GetExtension(uniqueId);
     if (existingExtension.IsNotNull())
     {
       QString currentSupplier = contribution->GetDefaultNamespace();
       QString existingSupplier = existingExtension->GetContributor()->GetName();
       QString msg = QString("Extensions supplied by \"%1\" and \"%2\" have the same Id: \"%3\".")
           .arg(currentSupplier).arg(existingSupplier).arg(uniqueId);
       IStatus::Pointer status(new Status(IStatus::WARNING_TYPE, RegistryMessages::OWNER_NAME, 0,
                                          msg, BERRY_STATUS_LOC));
       registry->Log(status);
     }
     else if (!processedExtensionIds.isEmpty())
     { // check elements in this contribution
       foreach (QString processedId, processedExtensionIds)
       {
         if (uniqueId == processedId)
         {
           QString currentSupplier = contribution->GetDefaultNamespace();
           QString existingSupplier = currentSupplier;
           QString msg = QString("Extensions supplied by \"%1\" and \"%2\" have the same Id: \"%3\".")
               .arg(currentSupplier).arg(existingSupplier).arg(uniqueId);
           IStatus::Pointer status(new Status(IStatus::WARNING_TYPE, RegistryMessages::OWNER_NAME, 0,
                                              msg, BERRY_STATUS_LOC));
           registry->Log(status);
           break;
         }
       }
     }
     processedExtensionIds.push_back(uniqueId);
   }
 
   objectManager->Add(currentExtension, true);
   addedRegistryObjects.push_back(currentExtension);
 }
 
 void ExtensionsParser::missingAttribute(const QString& attribute, const QString& element)
 {
   if (locator == NULL)
     internalError(QString("Missing \"%1\" attribute in \"%2\" element. Element ignored.").arg(attribute).arg(element));
   else
     internalError(QString("Missing \"%1\" attribute in \"%2\" element (line: %3). Element ignored.")
                   .arg(attribute).arg(element).arg(locator->lineNumber()));
 }
 
 void ExtensionsParser::unknownAttribute(const QString& attribute, const QString& element)
 {
   if (locator == NULL)
     internalError(QString("Unknown attribute \"%1\" for element \"%2\" ignored.").arg(attribute).arg(element));
   else
     internalError(QString("Unknown attribute \"%1\" for element \"%2\" ignored (line: %3).")
                   .arg(attribute).arg(element).arg(locator->lineNumber()));
 }
 
 void ExtensionsParser::unknownElement(const QString& parent, const QString& element)
 {
   if (locator == NULL)
     internalError(QString("Unknown element \"%1\", found within a \"%2\", ignored.").arg(element).arg(parent));
   else
     internalError(QString("Unknown element \"%1\", found within a \"%2\", ignored (line: %3).")
                   .arg(element).arg(parent).arg(locator->lineNumber()));
 }
 
 void ExtensionsParser::parseExtensionPointAttributes(const QXmlAttributes& attributes)
 {
   ExtensionPoint::Pointer currentExtPoint =
       registry->GetElementFactory()->CreateExtensionPoint(contribution->ShouldPersist());
 
   // Process Attributes
   int len = attributes.length();
   for (int i = 0; i < len; i++)
   {
     QString attrName = attributes.localName(i);
     QString attrValue = attributes.value(i).trimmed();
 
     if (attrName == EXTENSION_POINT_NAME)
       currentExtPoint->SetLabel(translate(attrValue));
     else if (attrName == EXTENSION_POINT_ID)
     {
       QString uniqueId;
       QString namespaceName;
       int simpleIdStart = attrValue.lastIndexOf('.');
       if (simpleIdStart != -1 && extractNamespaces)
       {
         namespaceName = attrValue.left(simpleIdStart);
         uniqueId = attrValue;
       }
       else
       {
         namespaceName = contribution->GetDefaultNamespace();
         uniqueId = namespaceName + '.' + attrValue;
       }
       currentExtPoint->SetUniqueIdentifier(uniqueId);
       currentExtPoint->SetNamespace(namespaceName);
 
     }
     else if (attrName == EXTENSION_POINT_SCHEMA)
       currentExtPoint->SetSchema(attrValue);
     else
       unknownAttribute(attrName, EXTENSION_POINT);
   }
   if (currentExtPoint->GetSimpleIdentifier().isEmpty() || currentExtPoint->GetLabel().isEmpty())
   {
     QString attribute = currentExtPoint->GetSimpleIdentifier().isEmpty() ? EXTENSION_POINT_ID : EXTENSION_POINT_NAME;
     missingAttribute(attribute, EXTENSION_POINT);
     stateStack.pop();
     stateStack.push(IGNORED_ELEMENT_STATE);
     return;
   }
   if (!objectManager->AddExtensionPoint(currentExtPoint, true))
   {
     // avoid adding extension point second time as it might cause
     // extensions associated with the existing extension point to
     // become inaccessible.
     if (registry->Debug())
     {
       QString msg = QString("Ignored duplicate extension point \"%1\" supplied by \"%2\".")
           .arg(currentExtPoint->GetUniqueIdentifier()).arg(contribution->GetDefaultNamespace());
       IStatus::Pointer status(new Status(IStatus::ERROR_TYPE, RegistryMessages::OWNER_NAME, 0, msg, BERRY_STATUS_LOC));
       registry->Log(status);
     }
     stateStack.pop();
     stateStack.push(IGNORED_ELEMENT_STATE);
     return;
   }
   if (currentExtPoint->GetNamespace().isEmpty())
     currentExtPoint->SetNamespace(contribution->GetDefaultNamespace());
   currentExtPoint->SetContributorId(contribution->GetContributorId());
   addedRegistryObjects.push_back(currentExtPoint);
 
   // Now populate the the vector just below us on the objectStack with this extension point
   scratchVectors[EXTENSION_POINT_INDEX].push_back(currentExtPoint);
 }
 
 void ExtensionsParser::internalError(const QString& message)
 {
   IStatus::Pointer status(new Status(IStatus::WARNING_TYPE, RegistryMessages::OWNER_NAME,
                                      PARSE_PROBLEM, message, BERRY_STATUS_LOC));
   error(status);
 }
 
 QString ExtensionsParser::translate(const QString& key) const
 {
   return registry->Translate(key, resources);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryIObjectManager.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryIObjectManager.h
index c33cef2fc1..2d9f29fd49 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryIObjectManager.h
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryIObjectManager.h
@@ -1,45 +1,45 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIOBJECTMANAGER_H
 #define BERRYIOBJECTMANAGER_H
 
 #include <berryObject.h>
 
 namespace berry {
 
 class Handle;
 class RegistryObject;
 
 struct IObjectManager : public Object
 {
-  berryInterfaceMacro(IObjectManager, berry)
+  berryObjectMacro(berry::IObjectManager)
 
   virtual ~IObjectManager();
 
   virtual SmartPointer<Handle> GetHandle(int id, short type) const = 0;
 
   virtual QList<SmartPointer<Handle> > GetHandles(const QList<int>& ids, short type) const = 0;
 
   virtual SmartPointer<RegistryObject> GetObject(int id, short type) const = 0;
 
   virtual QList<SmartPointer<RegistryObject> > GetObjects(const QList<int>& values, short type) const = 0;
 
   virtual void Close() = 0;
 };
 
 }
 #endif // BERRYIOBJECTMANAGER_H
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryInternalPlatform.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryInternalPlatform.cpp
index 3e0635e3e8..1e4f10f13a 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryInternalPlatform.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryInternalPlatform.cpp
@@ -1,593 +1,597 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+
 #include "berryInternalPlatform.h"
 #include "berryLog.h"
 
 #include <Poco/Exception.h>
 #include <Poco/File.h>
 #include <Poco/FileStream.h>
 #include <Poco/AutoPtr.h>
 #include <Poco/Util/PropertyFileConfiguration.h>
 #include <Poco/StringTokenizer.h>
 #include <Poco/Util/HelpFormatter.h>
 #include <Poco/Util/OptionException.h>
 
 #include <ctkPluginFrameworkLauncher.h>
 #include <ctkPluginFrameworkFactory.h>
 #include <ctkPluginFramework.h>
 #include <ctkPluginContext.h>
 #include <ctkPlugin.h>
 #include <ctkPluginException.h>
 
 #include <iostream>
 
 #include "berryPlatform.h"
 #include "berryPlatformException.h"
 #include "berryDebugUtil.h"
 //#include "event/berryPlatformEvents.h"
 //#include "berryPlatformLogChannel.h"
 #include "berryProvisioningInfo.h"
 #include "berryCTKPluginActivator.h"
 #include "berryLogImpl.h"
 
 #include <berryIPreferencesService.h>
 #include <berryIExtensionRegistry.h>
 
 #include <QCoreApplication>
 #include <QDesktopServices>
 #include <QDebug>
 
 namespace berry {
 
 Poco::Mutex InternalPlatform::m_Mutex;
 
 InternalPlatform::InternalPlatform()
   : m_Initialized(false)
   , m_Running(false)
   , m_ConsoleLog(false)
   , m_PlatformLogger(0)
   , m_ctkPluginFrameworkFactory(0)
 {
 }
 
 InternalPlatform::~InternalPlatform()
 {
 
 }
 
 InternalPlatform* InternalPlatform::GetInstance()
 {
   Poco::Mutex::ScopedLock lock(m_Mutex);
   static InternalPlatform instance;
   return &instance;
 }
 
 bool InternalPlatform::ConsoleLog() const
 {
   return m_ConsoleLog;
 }
 
 ctkPluginContext* InternalPlatform::GetCTKPluginFrameworkContext() const
 {
   if (m_ctkPluginFrameworkFactory)
   {
     return m_ctkPluginFrameworkFactory->getFramework()->getPluginContext();
   }
   return 0;
 }
 
 IAdapterManager* InternalPlatform::GetAdapterManager() const
 {
   AssertInitialized();
   return NULL;
 }
 
 void InternalPlatform::Initialize(int& argc, char** argv, Poco::Util::AbstractConfiguration* config)
 {
   // initialization
   Poco::Mutex::ScopedLock lock(m_Mutex);
 
   m_Argc = &argc;
   m_Argv = argv;
 
   try
   {
     this->init(argc, argv);
   }
   catch (const Poco::Util::UnknownOptionException& e)
   {
     BERRY_WARN << e.displayText();
   }
   this->loadConfiguration();
   if (config)
   {
     this->config().add(config, 50, false);
   }
 
   m_ConsoleLog = this->GetConfiguration().hasProperty(Platform::ARG_CONSOLELOG.toStdString());
 
   m_ConfigPath.setPath(QString::fromStdString(this->GetConfiguration().getString("application.configDir")));
   m_InstancePath.setPath(QString::fromStdString(this->GetConfiguration().getString("application.dir")));
   try
   {
     m_InstallPath.setPath(QString::fromStdString(this->GetConfiguration().getString(Platform::ARG_HOME.toStdString())));
   }
   catch (Poco::NotFoundException& )
   {
     m_InstallPath = m_InstancePath;
   }
 
   if (this->GetConfiguration().hasProperty(Platform::ARG_STORAGE_DIR.toStdString()))
   {
     QString dataLocation = QString::fromStdString(this->GetConfiguration().getString(Platform::ARG_STORAGE_DIR.toStdString(), ""));
     if (dataLocation.at(dataLocation.size()-1) != '/')
     {
       dataLocation += '/';
     }
     m_UserPath.setPath(dataLocation);
   }
   else
   {
     // Append a hash value of the absolute path of the executable to the data location.
     // This allows to start the same application from different build or install trees.
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     QString dataLocation = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + '_';
 #else
     QString dataLocation = QDesktopServices::storageLocation(QDesktopServices::DataLocation) + '_';
 #endif
     dataLocation += QString::number(qHash(QCoreApplication::applicationDirPath())) + "/";
     m_UserPath.setPath(dataLocation);
   }
   BERRY_INFO(m_ConsoleLog) << "Framework storage dir: " << m_UserPath.absolutePath();
 
   QFileInfo userFile(m_UserPath.absolutePath());
 
   if (!QDir().mkpath(userFile.absoluteFilePath()) || !userFile.isWritable())
   {
     QString tmpPath = QDir::temp().absoluteFilePath(QString::fromStdString(this->commandName()));
     BERRY_WARN << "Storage dir " << userFile.absoluteFilePath() << " is not writable. Falling back to temporary path " << tmpPath;
     QDir().mkpath(tmpPath);
     userFile.setFile(tmpPath);
   }
 
   // Initialize the CTK Plugin Framework
   ctkProperties fwProps;
   fwProps.insert(ctkPluginConstants::FRAMEWORK_STORAGE, userFile.absoluteFilePath());
   if (this->GetConfiguration().hasProperty(Platform::ARG_CLEAN.toStdString()))
   {
     fwProps.insert(ctkPluginConstants::FRAMEWORK_STORAGE_CLEAN, ctkPluginConstants::FRAMEWORK_STORAGE_CLEAN_ONFIRSTINIT);
   }
   if (this->GetConfiguration().hasProperty(Platform::ARG_CONSOLELOG.toStdString()))
   {
     fwProps.insert("org.commontk.pluginfw.debug.framework", true);
     fwProps.insert("org.commontk.pluginfw.debug.errors", true);
     fwProps.insert("org.commontk.pluginfw.debug.pluginfw", true);
     fwProps.insert("org.commontk.pluginfw.debug.lazy_activation", true);
     fwProps.insert("org.commontk.pluginfw.debug.resolve", true);
   }
   if (this->GetConfiguration().hasProperty(Platform::ARG_PRELOAD_LIBRARY.toStdString()))
   {
     QString preloadLibs = QString::fromStdString(this->GetConfiguration().getString(Platform::ARG_PRELOAD_LIBRARY.toStdString()));
     fwProps.insert(ctkPluginConstants::FRAMEWORK_PRELOAD_LIBRARIES, preloadLibs.split(',', QString::SkipEmptyParts));
   }
   m_ctkPluginFrameworkFactory = new ctkPluginFrameworkFactory(fwProps);
   QSharedPointer<ctkPluginFramework> pfw = m_ctkPluginFrameworkFactory->getFramework();
   pfw->init();
   ctkPluginContext* pfwContext = pfw->getPluginContext();
 
   // FIXME: This is a quick-fix for Bug 16224 - Umlaut and other special characters in install/binary path
   // Assumption : linux provides utf8, windows provides ascii encoded argv lists
 #ifdef Q_OS_WIN
   QString provisioningFile = QString::fromStdString(this->GetConfiguration().getString(Platform::ARG_PROVISIONING.toStdString()));
 #else
   QString provisioningFile = QString::fromUtf8(this->GetConfiguration().getString(Platform::ARG_PROVISIONING.toStdString()));
 #endif
   if (!provisioningFile.isEmpty())
   {
     BERRY_INFO(m_ConsoleLog) << "Using provisioning file: " << provisioningFile;
     ProvisioningInfo provInfo(provisioningFile);
     // it can still happen, that the encoding is not compatible with the fromUtf8 function ( i.e. when manipulating the LANG variable
     // in such case, the QStringList in provInfo is empty which we can easily check for
     if( provInfo.getPluginDirs().empty() )
     {
       BERRY_ERROR << "Cannot search for provisioning file, the retrieved directory list is empty.\n" <<
                      "This can occur if there are some special (non-ascii) characters in the install path.";
       throw berry::PlatformException("No provisioning file specified. Terminating...");
     }
     foreach(QString pluginPath, provInfo.getPluginDirs())
     {
       ctkPluginFrameworkLauncher::addSearchPath(pluginPath);
     }
 
     bool forcePluginOverwrite = this->GetConfiguration().hasOption(Platform::ARG_FORCE_PLUGIN_INSTALL.toStdString());
     QList<QUrl> pluginsToStart = provInfo.getPluginsToStart();
     foreach(QUrl pluginUrl, provInfo.getPluginsToInstall())
     {
       if (forcePluginOverwrite)
       {
         uninstallPugin(pluginUrl, pfwContext);
       }
       try
       {
         BERRY_INFO(m_ConsoleLog) << "Installing CTK plug-in from: " << pluginUrl.toString().toStdString();
         QSharedPointer<ctkPlugin> plugin = pfwContext->installPlugin(pluginUrl);
         if (pluginsToStart.contains(pluginUrl))
         {
           m_CTKPluginsToStart << plugin->getPluginId();
         }
       }
       catch (const ctkPluginException& e)
       {
         QString errorMsg;
         QDebug dbg(&errorMsg);
         dbg << e.printStackTrace();
         BERRY_ERROR << qPrintable(errorMsg);
       }
     }
   }
   else
   {
     BERRY_INFO << "No provisioning file set.";
   }
 
   m_BaseStatePath.setPath(m_UserPath.absolutePath() + "/bb-metadata/bb-plugins");
 
   QString logPath(m_UserPath.absoluteFilePath(QString::fromStdString(this->commandName()) + ".log"));
   m_PlatformLogChannel = new Poco::SimpleFileChannel(logPath.toStdString());
   m_PlatformLogger = &Poco::Logger::create("PlatformLogger", m_PlatformLogChannel, Poco::Message::PRIO_TRACE);
 
   m_Initialized = true;
 
 #ifdef BLUEBERRY_DEBUG_SMARTPOINTER
   DebugUtil::RestoreState(m_UserPath);
 #endif
 
 }
 
 void InternalPlatform::uninstallPugin(const QUrl& pluginUrl, ctkPluginContext* pfwContext)
 {
   QFileInfo libInfo(pluginUrl.toLocalFile());
   QString libName = libInfo.baseName();
   if (libName.startsWith("lib"))
   {
     libName = libName.mid(3);
   }
   QString symbolicName = libName.replace('_', '.');
 
   foreach(QSharedPointer<ctkPlugin> plugin, pfwContext->getPlugins())
   {
     if (plugin->getSymbolicName() == symbolicName &&
         plugin->getLocation() != pluginUrl.toString())
     {
       BERRY_WARN << "A plug-in with the symbolic name " << symbolicName.toStdString() <<
                     " but different location is already installed. Trying to uninstall " << plugin->getLocation().toStdString();
       plugin->uninstall();
       return;
     }
   }
 }
 
 void InternalPlatform::Launch()
 {
   AssertInitialized();
 
   if (m_Running) return;
 
   m_Running = true;
 
   this->run();
 }
 
 void InternalPlatform::Shutdown()
 {
   QSharedPointer<ctkPluginFramework> ctkPluginFW;
 
   {
     Poco::Mutex::ScopedLock lock(m_Mutex);
     AssertInitialized();
     DebugUtil::SaveState(m_UserPath);
     ctkPluginFW = m_ctkPluginFrameworkFactory->getFramework();
     m_Initialized = false;
   }
 
   ctkPluginFW->stop();
 
   this->uninitialize();
 
   // wait 10 seconds for the CTK plugin framework to stop
   ctkPluginFW->waitForStop(10000);
 }
 
 
 void InternalPlatform::AssertInitialized() const
 {
   if (!m_Initialized)
     throw Poco::SystemException("The Platform has not been initialized yet!");
 }
 
 IExtensionRegistry* InternalPlatform::GetExtensionRegistry()
 {
   if (m_RegistryTracker.isNull())
   {
     m_RegistryTracker.reset(new ctkServiceTracker<berry::IExtensionRegistry*>(berry::CTKPluginActivator::getPluginContext()));
     m_RegistryTracker->open();
   }
   return m_RegistryTracker->getService();
 }
 
 IPreferencesService *InternalPlatform::GetPreferencesService()
 {
   if (m_PreferencesTracker.isNull())
   {
     m_PreferencesTracker.reset(new ctkServiceTracker<berry::IPreferencesService*>(berry::CTKPluginActivator::getPluginContext()));
     m_PreferencesTracker->open();
   }
   return m_PreferencesTracker->getService();
 }
 
 QDir InternalPlatform::GetConfigurationPath()
 {
   return m_ConfigPath;
 }
 
 QDir InternalPlatform::GetInstallPath()
 {
   return m_InstallPath;
 }
 
 QDir InternalPlatform::GetInstancePath()
 {
   return m_InstancePath;
 }
 
 bool InternalPlatform::GetStatePath(QDir& statePath, const QSharedPointer<ctkPlugin>& plugin, bool create)
 {
   QFileInfo tmpStatePath(m_BaseStatePath.absoluteFilePath(plugin->getSymbolicName()));
   if (tmpStatePath.exists())
   {
     if (tmpStatePath.isDir() && tmpStatePath.isWritable() && tmpStatePath.isReadable())
     {
       statePath.setPath(tmpStatePath.absoluteFilePath());
       return true;
     }
     else
     {
       return false;
     }
   }
   else if (create)
   {
     bool created = statePath.mkpath(tmpStatePath.absoluteFilePath());
     if (created)
     {
       statePath.setPath(tmpStatePath.absoluteFilePath());
       return true;
     }
     return false;
   }
   return false;
 }
 
 //PlatformEvents& InternalPlatform::GetEvents()
 //{
 //  return m_Events;
 //}
 
 QDir InternalPlatform::GetUserPath()
 {
   return m_UserPath;
 }
 
 ILog *InternalPlatform::GetLog(const QSharedPointer<ctkPlugin> &plugin) const
 {
   LogImpl* result = m_Logs.value(plugin->getPluginId());
   if (result != NULL)
     return result;
 
 //  ExtendedLogService logService = (ExtendedLogService) extendedLogTracker.getService();
 //  Logger logger = logService == null ? null : logService.getLogger(bundle, PlatformLogWriter.EQUINOX_LOGGER_NAME);
 //  result = new Log(bundle, logger);
 //  ExtendedLogReaderService logReader = (ExtendedLogReaderService) logReaderTracker.getService();
 //  logReader.addLogListener(result, result);
 //  logs.put(bundle, result);
 //  return result;
 
   result = new LogImpl(plugin);
   m_Logs.insert(plugin->getPluginId(), result);
   return result;
 }
 
 bool InternalPlatform::IsRunning() const
 {
   Poco::Mutex::ScopedLock lock(m_Mutex);
   return (m_Initialized && m_Running);
 }
 
 QSharedPointer<ctkPlugin> InternalPlatform::GetPlugin(const QString &symbolicName)
 {
   QList<QSharedPointer<ctkPlugin> > plugins =
       InternalPlatform::GetInstance()->GetCTKPluginFrameworkContext()->getPlugins();
 
   QSharedPointer<ctkPlugin> res(0);
   foreach(QSharedPointer<ctkPlugin> plugin, plugins)
   {
     if ((plugin->getState() & (ctkPlugin::INSTALLED | ctkPlugin::UNINSTALLED)) == 0 &&
         plugin->getSymbolicName() == symbolicName)
     {
       if (res.isNull())
       {
         res = plugin;
       }
       else if (res->getVersion().compare(plugin->getVersion()) < 0)
       {
         res = plugin;
       }
     }
   }
   return res;
 }
 
 QList<QSharedPointer<ctkPlugin> > InternalPlatform::GetPlugins(const QString &symbolicName, const QString &version)
 {
   QList<QSharedPointer<ctkPlugin> > plugins =
       InternalPlatform::GetInstance()->GetCTKPluginFrameworkContext()->getPlugins();
 
   QMap<ctkVersion, QSharedPointer<ctkPlugin> > selected;
   ctkVersion versionObj(version);
   foreach(QSharedPointer<ctkPlugin> plugin, plugins)
   {
     if ((plugin->getState() & (ctkPlugin::INSTALLED | ctkPlugin::UNINSTALLED)) == 0 &&
         plugin->getSymbolicName() == symbolicName)
     {
       if (plugin->getVersion().compare(versionObj) > -1)
       {
         selected.insert(plugin->getVersion(), plugin);
       }
     }
   }
   QList<QSharedPointer<ctkPlugin> > sortedPlugins = selected.values();
   QList<QSharedPointer<ctkPlugin> > reversePlugins;
   qCopyBackward(sortedPlugins.begin(), sortedPlugins.end(), reversePlugins.end());
   return reversePlugins;
 }
 
 Poco::Logger* InternalPlatform::GetLogger()
 {
   return m_PlatformLogger;
 }
 
 Poco::Util::LayeredConfiguration& InternalPlatform::GetConfiguration() const
 {
   return this->config();
 }
 
 QStringList InternalPlatform::GetApplicationArgs() const
 {
   return m_FilteredArgs;
 }
 
 int& InternalPlatform::GetRawApplicationArgs(char**& argv)
 {
   argv = m_Argv;
   return *m_Argc;
 }
 
 void InternalPlatform::defineOptions(Poco::Util::OptionSet& options)
 {
   Poco::Util::Option helpOption("help", "h", "print this help text");
   helpOption.callback(Poco::Util::OptionCallback<InternalPlatform>(this, &InternalPlatform::PrintHelp));
   options.addOption(helpOption);
 
   Poco::Util::Option newInstanceOption(Platform::ARG_NEWINSTANCE.toStdString(), "", "forces a new instance of this application");
   newInstanceOption.binding(Platform::ARG_NEWINSTANCE.toStdString());
   options.addOption(newInstanceOption);
 
   Poco::Util::Option cleanOption(Platform::ARG_CLEAN.toStdString(), "", "cleans the plugin cache");
   cleanOption.binding(Platform::ARG_CLEAN.toStdString());
   options.addOption(cleanOption);
 
   Poco::Util::Option appOption(Platform::ARG_APPLICATION.toStdString(), "", "the id of the application extension to be executed");
   appOption.argument("<id>").binding(Platform::ARG_APPLICATION.toStdString());
   options.addOption(appOption);
 
   Poco::Util::Option storageDirOption(Platform::ARG_STORAGE_DIR.toStdString(), "", "the location for storing persistent application data");
   storageDirOption.argument("<dir>").binding(Platform::ARG_STORAGE_DIR.toStdString());
   options.addOption(storageDirOption);
 
   Poco::Util::Option consoleLogOption(Platform::ARG_CONSOLELOG.toStdString(), "", "log messages to the console");
   consoleLogOption.binding(Platform::ARG_CONSOLELOG.toStdString());
   options.addOption(consoleLogOption);
 
   Poco::Util::Option forcePluginOption(Platform::ARG_FORCE_PLUGIN_INSTALL.toStdString(), "", "force installing plug-ins with same symbolic name");
   forcePluginOption.binding(Platform::ARG_FORCE_PLUGIN_INSTALL.toStdString());
   options.addOption(forcePluginOption);
 
   Poco::Util::Option preloadLibsOption(Platform::ARG_PRELOAD_LIBRARY.toStdString(), "", "preload a library");
   preloadLibsOption.argument("<library>").repeatable(true).callback(Poco::Util::OptionCallback<InternalPlatform>(this, &InternalPlatform::handlePreloadLibraryOption));
   options.addOption(preloadLibsOption);
 
   Poco::Util::Option testPluginOption(Platform::ARG_TESTPLUGIN.toStdString(), "", "the plug-in to be tested");
   testPluginOption.argument("<id>").binding(Platform::ARG_TESTPLUGIN.toStdString());
   options.addOption(testPluginOption);
 
   Poco::Util::Option testAppOption(Platform::ARG_TESTAPPLICATION.toStdString(), "", "the application to be tested");
   testAppOption.argument("<id>").binding(Platform::ARG_TESTAPPLICATION.toStdString());
   options.addOption(testAppOption);
 
   Poco::Util::Option noRegistryCacheOption(Platform::ARG_NO_REGISTRY_CACHE.toStdString(), "", "do not use a cache for the registry");
   noRegistryCacheOption.binding(Platform::ARG_NO_REGISTRY_CACHE.toStdString());
   options.addOption(noRegistryCacheOption);
 
   Poco::Util::Option noLazyRegistryCacheLoadingOption(Platform::ARG_NO_LAZY_REGISTRY_CACHE_LOADING.toStdString(), "", "do not use lazy cache loading for the registry");
   noLazyRegistryCacheLoadingOption.binding(Platform::ARG_NO_LAZY_REGISTRY_CACHE_LOADING.toStdString());
   options.addOption(noLazyRegistryCacheLoadingOption);
 
   Poco::Util::Option registryMultiLanguageOption(Platform::ARG_REGISTRY_MULTI_LANGUAGE.toStdString(), "", "enable multi-language support for the registry");
   registryMultiLanguageOption.binding(Platform::ARG_REGISTRY_MULTI_LANGUAGE.toStdString());
   options.addOption(registryMultiLanguageOption);
 
   Poco::Util::Option xargsOption(Platform::ARG_XARGS.toStdString(), "", "Extended argument list");
   xargsOption.argument("<args>").binding(Platform::ARG_XARGS.toStdString());
   options.addOption(xargsOption);
 
   Poco::Util::Application::defineOptions(options);
 }
 
-void InternalPlatform::handlePreloadLibraryOption(const std::string& name, const std::string& value)
+void InternalPlatform::handlePreloadLibraryOption(const std::string& /*name*/, const std::string& value)
 {
   std::string oldVal;
   if (this->config().hasProperty(Platform::ARG_PRELOAD_LIBRARY.toStdString()))
   {
     oldVal = this->config().getString(Platform::ARG_PRELOAD_LIBRARY.toStdString());
   }
   this->config().setString(Platform::ARG_PRELOAD_LIBRARY.toStdString(), oldVal + "," + value);
 }
 
 int InternalPlatform::main(const std::vector<std::string>& args)
 {
   for(std::vector<std::string>::const_iterator i = args.begin(); i != args.end(); ++i)
   {
     m_FilteredArgs << QString::fromStdString(*i);
   }
   //m_FilteredArgs.insert(m_FilteredArgs.begin(), this->config().getString("application.argv[0]"));
 
   ctkPluginContext* context = GetCTKPluginFrameworkContext();
   QFileInfo storageDir = context->getDataFile("");
 
   m_ctkPluginFrameworkFactory->getFramework()->start();
   foreach(long pluginId, m_CTKPluginsToStart)
   {
     BERRY_INFO(m_ConsoleLog) << "Starting CTK plug-in: " << context->getPlugin(pluginId)->getSymbolicName().toStdString()
                              << " [" << pluginId << "]";
     // do not change the autostart setting of this plugin
     context->getPlugin(pluginId)->start(ctkPlugin::START_TRANSIENT | ctkPlugin::START_ACTIVATION_POLICY);
   }
 
   return EXIT_OK;
 }
 
 void InternalPlatform::PrintHelp(const std::string&, const std::string&)
 {
   Poco::Util::HelpFormatter help(this->options());
   help.setAutoIndent();
   help.setCommand(this->commandName());
   help.format(std::cout);
 
   exit(EXIT_OK);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryKeyedElement.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryKeyedElement.cpp
index 933d6a1ad8..7882c2cdca 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryKeyedElement.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryKeyedElement.cpp
@@ -1,43 +1,43 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryKeyedElement.h"
 
 #include <typeinfo>
 
 namespace berry {
 
 KeyedElement::~KeyedElement()
 {
 }
 
 bool KeyedElement::operator ==(const KeyedElement& other) const
 {
   return (typeid(*this) == typeid(other) && IsEqual(other));
 }
 
-bool KeyedElement::operator ==(const KeyedElement* other) const
+bool KeyedElement::operator ==(const Object* other) const
 {
   if (other == NULL) return false;
-  return (typeid(this) == typeid(other) && IsEqual(*other));
+  return (typeid(this) == typeid(other) && IsEqual(*static_cast<const KeyedElement*>(other)));
 }
 
 uint KeyedElement::HashCode() const
 {
   return qHash(this->GetKey());
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryKeyedElement.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryKeyedElement.h
index 10a8da3e18..645c542509 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryKeyedElement.h
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryKeyedElement.h
@@ -1,47 +1,47 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYKEYEDELEMENT_H
 #define BERRYKEYEDELEMENT_H
 
 #include <berryObject.h>
 
 namespace berry {
 
 class KeyedElement : public Object
 {
 public:
 
   berryObjectMacro(berry::KeyedElement)
 
   ~KeyedElement();
 
   bool operator==(const KeyedElement& other) const;
 
-  bool operator==(const KeyedElement* other) const;
+  bool operator==(const Object* other) const;
 
   virtual QString GetKey() const = 0;
 
   uint HashCode() const;
 
 private:
 
   virtual bool IsEqual(const KeyedElement& other) const = 0;
 };
 
 }
 
 #endif // BERRYKEYEDELEMENT_H
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryLogImpl.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryLogImpl.cpp
index afe170d812..ab9910856d 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryLogImpl.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryLogImpl.cpp
@@ -1,76 +1,76 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryLogImpl.h"
 
 #include "berryIStatus.h"
 
 #include <ctkPlugin.h>
 #include <mbilog.h>
 
 namespace berry {
 
 LogImpl::LogImpl(const QSharedPointer<ctkPlugin>& plugin)
   : plugin(plugin)
 {
 }
 
 LogImpl::~LogImpl()
 {
 }
 
-void LogImpl::AddLogListener(ILogListener* listener)
+void LogImpl::AddLogListener(ILogListener* /*listener*/)
 {
 }
 
 QSharedPointer<ctkPlugin> LogImpl::GetBundle() const
 {
   return plugin;
 }
 
 void LogImpl::Log(const SmartPointer<IStatus>& status)
 {
   switch (status->GetSeverity())
   {
   case IStatus::WARNING_TYPE:
     mbilog::PseudoStream(mbilog::Warn,
                          qPrintable(status->GetFileName()),
                          status->GetLineNumber(),
                          qPrintable(status->GetMethodName()))(qPrintable(plugin->getSymbolicName()))
         << status->ToString().toStdString();
     break;
   case IStatus::ERROR_TYPE:
     mbilog::PseudoStream(mbilog::Error,
                          qPrintable(status->GetFileName()),
                          status->GetLineNumber(),
                          qPrintable(status->GetMethodName()))(qPrintable(plugin->getSymbolicName()))
         << status->ToString().toStdString();
     break;
   default:
     mbilog::PseudoStream(mbilog::Info,
                          qPrintable(status->GetFileName()),
                          status->GetLineNumber(),
                          qPrintable(status->GetMethodName()))(qPrintable(plugin->getSymbolicName()))
         << status->ToString().toStdString();
     break;
   }
 }
 
-void LogImpl::RemoveLogListener(ILogListener* listener)
+void LogImpl::RemoveLogListener(ILogListener* /*listener*/)
 {
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryProvisioningInfo.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryProvisioningInfo.cpp
index 8a10e944b6..3e3bbacc01 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryProvisioningInfo.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryProvisioningInfo.cpp
@@ -1,228 +1,232 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #include "berryProvisioningInfo.h"
 
 #include <berryLog.h>
 
 #include <QFile>
 #include <QFileInfo>
 #include <QTextStream>
 #include <QCoreApplication>
 
 namespace berry {
 
 #ifdef CMAKE_INTDIR
 const QString ProvisioningInfo::intermediateOutDir = QString(CMAKE_INTDIR);
 #else
 const QString ProvisioningInfo::intermediateOutDir = QString();
 #endif
 
 ProvisioningInfo::ProvisioningInfo(const QString& file)
 {
   this->readProvisioningFile(file);
 }
 
 QStringList ProvisioningInfo::getPluginDirs() const
 {
   return pluginDirs.toList();
 }
 
 QList<QUrl> ProvisioningInfo::getPluginsToInstall() const
 {
   return pluginsToInstall;
 }
 
 QList<QUrl> ProvisioningInfo::getPluginsToStart() const
 {
   return pluginsToStart;
 }
 
 void ProvisioningInfo::readProvisioningFile(const QString& filePath)
 {
   QFile file(filePath);
   file.open(QFile::ReadOnly);
   QTextStream fileStream(&file);
   QRegExp sep("\\s+");
   QString line;
   int count = 1;
   do {
     line = fileStream.readLine().trimmed();
     if (!line.isEmpty() && !line.startsWith('#'))
     {
       QString keyword = line.section(sep, 0, 0);
       QString value = line.mid(keyword.size()).trimmed();
       value = substituteKeywords(value);
 
       if (keyword.isEmpty())
       {
         BERRY_WARN << "Keyword missing in line " << count
                    << " of provisioning file " << filePath.toStdString();
         continue;
       }
 
       Keyword key = UNKNOWN;
       if (keyword.compare("READ", Qt::CaseInsensitive) == 0)
       {
         key = READ;
       }
       else if (keyword.compare("INSTALL", Qt::CaseInsensitive) == 0)
       {
         key = INSTALL;
       }
       else if (keyword.compare("START", Qt::CaseInsensitive) == 0)
       {
         key = START;
       }
       else if (keyword.compare("STOP", Qt::CaseInsensitive) == 0)
       {
         key = STOP;
       }
 
       if (key == UNKNOWN)
       {
         BERRY_WARN << "Keyword " << keyword.toStdString() << " in line "
                       << count << " of provisioning file "
                       << filePath.toStdString() << " unknown";
         continue;
       }
 
       if (value.isEmpty())
       {
         BERRY_WARN << "Value after keyword " << keyword.toStdString()
                   << " missing in line " << count
                   << " of provisioning file " << filePath.toStdString();
         continue;
       }
 
       switch (key)
       {
       case READ:
       {
         QUrl readFileUrl(value);
         if (!readFileUrl.isValid())
         {
           BERRY_WARN << "The READ URL " << value.toStdString()
                      << "is invalid: " << readFileUrl.errorString().toStdString();
           break;
         }
         this->readProvisioningFile(readFileUrl.toLocalFile());
         break;
       }
       case INSTALL:
       {
         this->addPluginToInstall(value);
         break;
       }
       case START:
       {
         this->addPluginToStart(value);
         break;
       }
       case STOP:
       {
         break;
       }
+      case UNKNOWN:
+      {
+        break; // error handled above
+      }
       }
     }
     ++count;
   } while (!line.isNull());
 }
 
 QUrl ProvisioningInfo::addPluginToInstall(const QString& file)
 {
   QUrl pluginUrl(file);
   if (!pluginUrl.isValid())
   {
     BERRY_WARN << "The plugin URL " << file.toStdString() << " is invalid:"
                << pluginUrl.errorString().toStdString();
     return QUrl();
   }
 
   QFileInfo fileInfo(pluginUrl.toLocalFile());
   if (!fileInfo.exists())
   {
     QString fileName = fileInfo.fileName();
     QString filePath = fileInfo.absolutePath();
     if (!intermediateOutDir.isEmpty())
     {
       // search in the intermediate output dir
       QString filePath2 = filePath + "/" + intermediateOutDir;
       fileInfo = QFileInfo(filePath2 + "/" + fileName);
       if (!fileInfo.exists())
       {
         BERRY_WARN << "The plugin " << fileName.toStdString() << " was not found in "
                    << filePath.toStdString() << " or " << filePath2.toStdString();
         return QUrl();
       }
       pluginUrl = QUrl::fromLocalFile(fileInfo.canonicalFilePath());
       pluginDirs.insert(fileInfo.canonicalPath());
     }
     else
     {
       BERRY_WARN << "The plugin " << fileName.toStdString() << " was not found in "
                  << filePath.toStdString();
       return QUrl();
     }
   }
   else
   {
     pluginDirs.insert(fileInfo.canonicalPath());
   }
 
   pluginsToInstall.append(pluginUrl);
   return pluginUrl;
 }
 
 void ProvisioningInfo::addPluginToStart(const QString& file)
 {
   QUrl pluginUrl = this->addPluginToInstall(file);
   if (!pluginUrl.isEmpty())
   {
     pluginsToStart.append(pluginUrl);
   }
 }
 
 QString ProvisioningInfo::substituteKeywords(const QString& value) const
 {
   QString appPath = QCoreApplication::applicationDirPath();
   if (appPath.endsWith('/'))
   {
     appPath.chop(1);
   }
 
 #ifdef CMAKE_INTDIR
   // Strip the intermediate dir from the application path
   QString intDir(CMAKE_INTDIR);
   if (appPath.endsWith(intDir))
   {
     appPath.chop(intDir.size()+1);
   }
 #endif
 
 #ifdef _WIN32
   if (value.contains("@EXECUTABLE_DIR") && value.contains("blueberry_osgi"))
   {
     // special case for org_blueberry_osgi in install trees for Windows
     return QString(value).replace("@EXECUTABLE_DIR", appPath, Qt::CaseInsensitive).replace("plugins/", "");
   }
 #endif
 
   return QString(value).replace("@EXECUTABLE_DIR", appPath, Qt::CaseInsensitive);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryRegistryDelta.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryRegistryDelta.cpp
deleted file mode 100644
index 66bf8a2e87..0000000000
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryRegistryDelta.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*===================================================================
-
-BlueBerry Platform
-
-Copyright (c) German Cancer Research Center,
-Division of Medical and Biological Informatics.
-All rights reserved.
-
-This software is distributed WITHOUT ANY WARRANTY; without
-even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.
-
-See LICENSE.txt or http://www.mitk.org for details.
-
-===================================================================*/
-
-#include "berryExtensionDelta.h"
-#include "berryRegistryDelta.h"
-#include "berryIExtension.h"
-
-#include <QSet>
-
-namespace berry {
-
-class RegistryDeltaData : public QSharedData
-{
-public:
-
-  RegistryDeltaData()
-    : objectManager(NULL)
-  {
-  }
-
-  QSet<ExtensionDelta> extensionDeltas; //the extension deltas (each element indicate the type of the delta)
-  SmartPointer<IObjectManager> objectManager; //The object manager from which all the objects contained in the deltas will be found.
-
-};
-
-RegistryDelta::RegistryDelta()
-  : d(new RegistryDeltaData)
-{
-  //Nothing to do
-}
-
-RegistryDelta::~RegistryDelta()
-{
-}
-
-int RegistryDelta::GetExtensionDeltasCount() const
-{
-  return d->extensionDeltas.size();
-}
-
-QList<ExtensionDelta> RegistryDelta::GetExtensionDeltas() const
-{
-  return d->extensionDeltas.toList();
-}
-
-QList<ExtensionDelta> RegistryDelta::GetExtensionDeltas(const QString& extensionPoint) const
-{
-  QList<ExtensionDelta> selectedExtDeltas;
-  foreach (ExtensionDelta extensionDelta, d->extensionDeltas)
-  {
-    if (extensionDelta.GetExtension()->GetExtensionPointUniqueIdentifier() == extensionPoint)
-    {
-      selectedExtDeltas.push_back(extensionDelta);
-    }
-  }
-  return selectedExtDeltas;
-}
-
-ExtensionDelta RegistryDelta::GetExtensionDelta(const QString& extensionPointId, const QString& extensionId) const
-{
-  foreach (ExtensionDelta extensionDelta, d->extensionDeltas)
-  {
-    IExtension::Pointer extension = extensionDelta.GetExtension();
-    if (extension->GetExtensionPointUniqueIdentifier() == extensionPointId &&
-        extension->GetUniqueIdentifier() == extensionId)
-    {
-      return extensionDelta;
-    }
-  }
-  return ExtensionDelta();
-}
-
-void RegistryDelta::AddExtensionDelta(ExtensionDelta& extensionDelta)
-{
-  d->extensionDeltas.insert(extensionDelta);
-  extensionDelta.SetContainingDelta(this);
-}
-
-QString RegistryDelta::ToString() const
-{
-  QString str("\n\tHost ");
-  str += ": (";
-  int i = 0;
-  foreach (ExtensionDelta extensionDelta, d->extensionDeltas)
-  {
-    str += extensionDelta.ToString();
-    if (i < d->extensionDeltas.size() -1) str += ", ";
-  }
-  str += ")";
-  return str;
-}
-
-void RegistryDelta::SetObjectManager(const SmartPointer<IObjectManager>& objectManager)
-{
-  d->objectManager = objectManager;
-  //TODO May want to add into the existing one here... if it is possible to have batching
-}
-
-SmartPointer<IObjectManager> RegistryDelta::GetObjectManager() const
-{
-  return d->objectManager;
-}
-
-}
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryRegistryDelta.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryRegistryDelta.h
deleted file mode 100644
index e76d3e611c..0000000000
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryRegistryDelta.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*===================================================================
-
-BlueBerry Platform
-
-Copyright (c) German Cancer Research Center,
-Division of Medical and Biological Informatics.
-All rights reserved.
-
-This software is distributed WITHOUT ANY WARRANTY; without
-even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.
-
-See LICENSE.txt or http://www.mitk.org for details.
-
-===================================================================*/
-
-#ifndef BERRYREGISTRYDELTA_H
-#define BERRYREGISTRYDELTA_H
-
-#include <QList>
-#include <QExplicitlySharedDataPointer>
-
-namespace berry {
-
-struct IObjectManager;
-
-class ExtensionDelta;
-class RegistryDeltaData;
-
-/**
- * The extension deltas are grouped by namespace. There is one registry delta by namespace.
- */
-class RegistryDelta
-{
-
-public:
-
-  RegistryDelta();
-  ~RegistryDelta();
-
-  int GetExtensionDeltasCount() const;
-
-  QList<ExtensionDelta> GetExtensionDeltas() const;
-
-  QList<ExtensionDelta> GetExtensionDeltas(const QString& extensionPoint) const;
-
-  /**
-   * @param extensionPointId
-   * @param extensionId must not be null
-   */
-  ExtensionDelta GetExtensionDelta(const QString& extensionPointId, const QString& extensionId) const;
-
-  void AddExtensionDelta(ExtensionDelta &extensionDelta);
-
-  QString ToString() const;
-
-  void SetObjectManager(const SmartPointer<IObjectManager>& objectManager);
-
-  SmartPointer<IObjectManager> GetObjectManager() const;
-
-private:
-
-  QExplicitlySharedDataPointer<RegistryDeltaData> d;
-};
-
-}
-
-#endif // BERRYREGISTRYDELTA_H
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryRegistryObjectManager.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryRegistryObjectManager.cpp
index 91f779dfe4..27a82600ef 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryRegistryObjectManager.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryRegistryObjectManager.cpp
@@ -1,880 +1,888 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+
 #include "berryRegistryObjectManager.h"
 
 #include "berryConfigurationElementHandle.h"
 #include "berryExtension.h"
 #include "berryExtensionHandle.h"
 #include "berryExtensionPoint.h"
 #include "berryExtensionPointHandle.h"
 #include "berryInvalidRegistryObjectException.h"
 #include "berryRegistryObjectReferenceMap.h"
 #include "berryRegistryConstants.h"
 #include "berryRegistryContribution.h"
 #include "berryRegistryContributor.h"
 #include "berryRegistryIndexElement.h"
 #include "berryRegistryObject.h"
 #include "berryRegistryProperties.h"
 #include "berryTemporaryObjectManager.h"
 #include "berryThirdLevelConfigurationElementHandle.h"
 
 #include <limits>
 
 namespace berry {
 
 const int RegistryObjectManager::CACHE_INITIAL_SIZE = 512;
-uint RegistryObjectManager::UNKNOWN = std::numeric_limits<uint>::max();
+int RegistryObjectManager::UNKNOWN = std::numeric_limits<int>::max();
 
 RegistryObjectManager::RegistryObjectManager(ExtensionRegistry* registry)
   : cache(NULL), nextId(1), orphanExtensionsLoaded(false), formerContributionsLoaded(false),
     contributorsLoaded(false), namespacesIndexLoaded(false),
     isDirty(false), fromCache(false), registry(registry)
 {
   if (RegistryProperties::GetProperty(RegistryConstants::PROP_NO_REGISTRY_FLUSHING)
       .compare("true", Qt::CaseInsensitive) == 0)
   {
     cache = new RegistryObjectReferenceMap(RegistryObjectReferenceMap::HARD,
                                            CACHE_INITIAL_SIZE);
   }
   else
   {
     cache = new RegistryObjectReferenceMap(RegistryObjectReferenceMap::SOFT,
                                            CACHE_INITIAL_SIZE);
   }
 }
 
 RegistryObjectManager::~RegistryObjectManager()
 {
   delete cache;
 }
 
 void RegistryObjectManager::Add(const SmartPointer<RegistryObject>& registryObject, bool hold)
 {
   if (registryObject->GetObjectId() == UNKNOWN)
   {
     int id = nextId++;
     registryObject->SetObjectId(id);
   }
   cache->Put(registryObject->GetObjectId(), registryObject);
   if (hold)
     Hold(registryObject);
 }
 
 SmartPointer<RegistryObject> RegistryObjectManager::GetObject(int id, short type) const
 {
   return BasicGetObject(id, type);
 }
 
 bool RegistryObjectManager::ShouldPersist(int id) const
 {
   RegistryObject::Pointer result = cache->Get(id);
   if (result.IsNotNull())
     return result->ShouldPersist();
   return true;
 }
 
 QList<SmartPointer<RegistryObject> > RegistryObjectManager::GetObjects(const QList<int>& values, short type) const
 {
   QMutexLocker l(&mutex);
   return this->GetObjects_unlocked(values, type);
 }
 
 QList<SmartPointer<RegistryObject> > RegistryObjectManager::GetObjects_unlocked(const QList<int>& values, short type) const
 {
   if (values.empty())
   {
     return QList<RegistryObject::Pointer>();
   }
 
   QList<RegistryObject::Pointer> results;
   for (int i = 0; i < values.size(); ++i)
   {
     results.push_back(BasicGetObject(values[i], type));
   }
   return results;
 }
 
 SmartPointer<Handle> RegistryObjectManager::GetHandle(int id, short type) const
 {
   Handle::Pointer result;
   switch (type)
   {
   case EXTENSION_POINT :
     result = new ExtensionPointHandle(IObjectManager::ConstPointer(this), id);
     break;
   case EXTENSION :
     result = new ExtensionHandle(IObjectManager::ConstPointer(this), id);
     break;
   case CONFIGURATION_ELEMENT :
     result = new ConfigurationElementHandle(IObjectManager::ConstPointer(this), id);
     break;
   case THIRDLEVEL_CONFIGURATION_ELEMENT :
   default : //avoid compiler error, type should always be known
     result = new ThirdLevelConfigurationElementHandle(IObjectManager::ConstPointer(this), id);
   }
   return result;
 }
 
 QList<SmartPointer<Handle> > RegistryObjectManager::GetHandles(const QList<int>& ids, short type) const
 {
   QList<Handle::Pointer> results;
   if (ids.empty()) return results;
 
   switch (type)
   {
   case EXTENSION_POINT :
     for (int i = 0; i < ids.size(); i++)
     {
       Handle::Pointer handle(new ExtensionPointHandle(this, ids[i]));
       results.push_back(handle);
     }
     break;
   case EXTENSION :
     for (int i = 0; i < ids.size(); i++)
     {
       Handle::Pointer handle(new ExtensionHandle(this, ids[i]));
       results.push_back(handle);
     }
     break;
   case CONFIGURATION_ELEMENT :
     for (int i = 0; i < ids.size(); i++)
     {
       Handle::Pointer handle(new ConfigurationElementHandle(this, ids[i]));
       results.push_back(handle);
     }
     break;
   case THIRDLEVEL_CONFIGURATION_ELEMENT :
     for (int i = 0; i < ids.size(); i++)
     {
       Handle::Pointer handle(new ThirdLevelConfigurationElementHandle(this, ids[i]));
       results.push_back(handle);
     }
     break;
   }
   return results;
 }
 
 bool RegistryObjectManager::IsDirty() const
 {
   return isDirty;
 }
 
 void RegistryObjectManager::MarkDirty()
 {
   isDirty = true;
 }
 
 void RegistryObjectManager::Close()
 {
   //do nothing.
 }
 
 ExtensionRegistry* RegistryObjectManager::GetRegistry() const
 {
   return registry;
 }
 
 QList<SmartPointer<ExtensionHandle> >
 RegistryObjectManager::GetExtensionsFromContributor(const QString& contributorId) const
 {
   QList<int> ids = GetExtensionsFrom(contributorId);
   QList<ExtensionHandle::Pointer> result;
   foreach(Handle::Pointer handle, GetHandles(ids, EXTENSION))
   {
     result.push_back(handle.Cast<ExtensionHandle>());
   }
   return result;
 }
 
 QList<SmartPointer<ExtensionPointHandle> >
 RegistryObjectManager::GetExtensionPointsFromContributor(const QString& contributorId) const
 {
   QList<int> ids = GetExtensionPointsFrom(contributorId);
   QList<ExtensionPointHandle::Pointer> result;
   foreach(Handle::Pointer handle, GetHandles(ids, EXTENSION_POINT))
   {
     result.push_back(handle.Cast<ExtensionPointHandle>());
   }
   return result;
 }
 
 QList<SmartPointer<ExtensionPointHandle> >
 RegistryObjectManager::GetExtensionPointsFromNamespace(const QString& namespaceName) const
 {
   QMutexLocker l(&mutex);
   RegistryIndexElement::Pointer indexElement = GetNamespaceIndex(namespaceName);
   QList<int> namespaceExtensionPoints = indexElement->GetExtensionPoints();
   QList<ExtensionPointHandle::Pointer> result;
   foreach(Handle::Pointer handle, GetHandles(namespaceExtensionPoints, EXTENSION_POINT))
   {
     result.push_back(handle.Cast<ExtensionPointHandle>());
   }
   return result;
 }
 
 QList<SmartPointer<ExtensionHandle> >
 RegistryObjectManager::GetExtensionsFromNamespace(const QString& namespaceName) const
 {
   QMutexLocker l(&mutex);
   RegistryIndexElement::Pointer indexElement = GetNamespaceIndex(namespaceName);
   QList<int> namespaceExtensions = indexElement->GetExtensions();
 
   // filter extensions with no extension point (orphan extensions)
   QList<ExtensionHandle::Pointer> result;
-  QList<RegistryObject::Pointer> exts = GetObjects(namespaceExtensions, EXTENSION);
+  QList<RegistryObject::Pointer> exts = GetObjects_unlocked(namespaceExtensions, EXTENSION);
   for (int i = 0; i < exts.size(); i++)
   {
     Extension::Pointer ext = exts[i].Cast<Extension>();
-    if (GetExtensionPointObject(ext->GetExtensionPointIdentifier()).IsNotNull())
+    if (GetExtensionPointObject_unlocked(ext->GetExtensionPointIdentifier()).IsNotNull())
     {
       result.push_back(GetHandle(ext->GetObjectId(), EXTENSION).Cast<ExtensionHandle>());
     }
   }
   return result;
 }
 
-bool RegistryObjectManager::Init(long timeStamp)
+bool RegistryObjectManager::Init(long /*timeStamp*/)
 {
   return false;
 //  QMutexLocker l(&mutex);
 //  TableReader reader = registry.getTableReader();
 //  Object[] results = reader.loadTables(timeStamp);
 //  if (results == null) {
 //    return false;
 //  }
 //  fileOffsets = (OffsetTable) results[0];
 //  extensionPoints = (HashtableOfStringAndInt) results[1];
 //  nextId = ((Integer) results[2]).intValue();
 //  fromCache = true;
 
 //  if (!registry.useLazyCacheLoading()) {
 //    //TODO Here we could grow all the tables to the right size (ReferenceMap)
 //    reader.setHoldObjects(true);
 //    markOrphansHasDirty(getOrphans());
 //    fromCache = reader.readAllCache(this);
 //    formerContributions = getFormerContributions();
 //  }
 //  return fromCache;
 }
 
 void RegistryObjectManager::AddContribution(const SmartPointer<RegistryContribution>& contribution)
 {
   QMutexLocker l(&mutex);
   isDirty = true;
   QString Id = contribution->GetKey();
 
   KeyedElement::Pointer existingContribution = GetFormerContributions().GetByKey(Id);
   if (existingContribution.IsNotNull())
   { // move it from former to new contributions
     RemoveContribution(Id);
     newContributions.Add(existingContribution);
   }
   else
   {
     existingContribution = newContributions.GetByKey(Id);
   }
 
   if (existingContribution.IsNotNull()) // merge
     existingContribution.Cast<RegistryContribution>()->MergeContribution(contribution);
   else
     newContributions.Add(contribution);
 
   UpdateNamespaceIndex(contribution, true);
 }
 
 QList<int> RegistryObjectManager::GetExtensionPointsFrom(const QString& id) const
 {
   QMutexLocker l(&mutex);
   return this->GetExtensionPointsFrom_unlocked(id);
 }
 
 QList<int> RegistryObjectManager::GetExtensionPointsFrom_unlocked(const QString& id) const
 {
   KeyedElement::Pointer tmp = newContributions.GetByKey(id);
   if (tmp.IsNull())
     tmp = GetFormerContributions().GetByKey(id);
   if (tmp.IsNull())
     return QList<int>();
   return tmp.Cast<RegistryContribution>()->GetExtensionPoints();
 }
 
 bool RegistryObjectManager::HasContribution(const QString& id) const
 {
   KeyedElement::Pointer result = newContributions.GetByKey(id);
   if (result.IsNull())
     result = GetFormerContributions().GetByKey(id);
   return result.IsNotNull();
 }
 
 void RegistryObjectManager::Remove(int id, bool release)
 {
   QMutexLocker l(&mutex);
   this->Remove_unlocked(id, release);
 }
 
 void RegistryObjectManager::Remove_unlocked(int id, bool release)
 {
   RegistryObject::Pointer toRemove = cache->Get(id);
 //  if (fileOffsets != null)
 //    fileOffsets.removeKey(id);
   if (toRemove.IsNotNull())
     Remove(toRemove, release);
 }
 
 SmartPointer<ExtensionPoint> RegistryObjectManager::GetExtensionPointObject(const QString& xptUniqueId) const
 {
   QMutexLocker l(&mutex);
-  int id;
+  return this->GetExtensionPointObject_unlocked(xptUniqueId);
+}
+
+SmartPointer<ExtensionPoint> RegistryObjectManager::GetExtensionPointObject_unlocked(const QString& xptUniqueId) const
+{
   HashtableOfStringAndInt::const_iterator idIter = extensionPoints.find(xptUniqueId);
   if (idIter == extensionPoints.end())
     return ExtensionPoint::Pointer();
   return GetObject(idIter.value(), EXTENSION_POINT).Cast<ExtensionPoint>();
 }
 
 QList<SmartPointer<ExtensionPointHandle> > RegistryObjectManager::GetExtensionPointsHandles() const
 {
   QMutexLocker l(&mutex);
   QList<ExtensionPointHandle::Pointer> result;
   foreach(Handle::Pointer handle, GetHandles(extensionPoints.values(), EXTENSION_POINT))
   {
     result.push_back(handle.Cast<ExtensionPointHandle>());
   }
   return result;
 }
 
 SmartPointer<ExtensionPointHandle> RegistryObjectManager::GetExtensionPointHandle(const QString& xptUniqueId)
 {
   QMutexLocker l(&mutex);
   HashtableOfStringAndInt::const_iterator idIter = extensionPoints.find(xptUniqueId);
   if (idIter == extensionPoints.end())
     return ExtensionPointHandle::Pointer();
   return GetHandle(idIter.value(), EXTENSION_POINT).Cast<ExtensionPointHandle>();
 }
 
 QList<int> RegistryObjectManager::GetExtensionsFrom(const QString& contributorId) const
 {
   QMutexLocker l(&mutex);
   return this->GetExtensionsFrom_unlocked(contributorId);
 }
 
 QList<int> RegistryObjectManager::GetExtensionsFrom_unlocked(const QString& contributorId) const
 {
   KeyedElement::Pointer tmp = newContributions.GetByKey(contributorId);
   if (tmp.IsNull())
     tmp = GetFormerContributions().GetByKey(contributorId);
   if (tmp.IsNull())
     return QList<int>();
   return tmp.Cast<RegistryContribution>()->GetExtensions();
 }
 
 bool RegistryObjectManager::AddExtensionPoint(const SmartPointer<ExtensionPoint>& currentExtPoint, bool hold)
 {
   QMutexLocker l(&mutex);
   QString uniqueId = currentExtPoint->GetUniqueIdentifier();
   if (extensionPoints.contains(uniqueId))
     return false;
   Add(currentExtPoint, hold);
   extensionPoints.insert(uniqueId, currentExtPoint->GetObjectId());
   return true;
 }
 
 void RegistryObjectManager::RemoveExtensionPoint(const QString& extensionPointId)
 {
   QMutexLocker l(&mutex);
   HashtableOfStringAndInt::iterator pointIdIter = extensionPoints.find(extensionPointId);
   if (pointIdIter == extensionPoints.end())
     return;
 
   int pointId = pointIdIter.value();
   extensionPoints.erase(pointIdIter);
   Remove_unlocked(pointId, true);
 }
 
 void RegistryObjectManager::RemoveContribution(const QString& contributorId)
 {
   QMutexLocker l(&mutex);
   bool removed = newContributions.RemoveByKey(contributorId);
   if (removed == false)
   {
     removed = GetFormerContributions().RemoveByKey(contributorId);
     if (removed)
       formerContributions = GetFormerContributions(); //This forces the removed namespace to stay around, so we do not forget about removed namespaces
   }
 
   if (removed)
   {
     isDirty = true;
     return;
   }
 }
 
 void RegistryObjectManager::AddOrphans(const QString& extensionPoint, const QList<int>& extensions)
 {
   OrphansMapType& orphans = GetOrphans();
   orphans[extensionPoint].append(extensions);
 
 }
 
 void RegistryObjectManager::AddOrphan(const QString& extensionPoint, int extension)
 {
   OrphansMapType& orphans = GetOrphans();
   orphans[extensionPoint].push_back(extension);
 }
 
 QList<int> RegistryObjectManager::RemoveOrphans(const QString& extensionPoint)
 {
   OrphansMapType& orphans = GetOrphans();
   return orphans.take(extensionPoint);
 }
 
 void RegistryObjectManager::RemoveOrphan(const QString& extensionPoint, int extension)
 {
   OrphansMapType& orphans = GetOrphans();
   OrphansMapType::iterator existingOrphanExtensionsIter = orphans.find(extensionPoint);
 
   if (existingOrphanExtensionsIter == orphans.end())
     return;
 
   existingOrphanExtensionsIter.value().removeAll(extension);
   if (existingOrphanExtensionsIter.value().empty())
   {
     orphans.erase(existingOrphanExtensionsIter);
   }
 }
 
 QHash<QString, QList<int> > RegistryObjectManager::GetOrphanExtensions() const
 {
   return GetOrphans();
 }
 
 int RegistryObjectManager::GetNextId() const
 {
   return nextId;
 }
 
 HashtableOfStringAndInt RegistryObjectManager::GetExtensionPoints() const
   {
   return extensionPoints;
 }
 
 QList<KeyedHashSet> RegistryObjectManager::GetContributions() const
 {
   QList<KeyedHashSet> result;
   result.push_back(newContributions);
   result.push_back(GetFormerContributions());
   return result;
 }
 
 RegistryObjectManager::ContributorsMapType& RegistryObjectManager::GetContributors() const
 {
   if (!contributorsLoaded)
   {
     if (fromCache)
     {
       //contributors = registry->GetTableReader()->LoadContributors();
     }
     contributorsLoaded = true;
   }
   return contributors;
 }
 
 SmartPointer<RegistryContributor> RegistryObjectManager::GetContributor(const QString& id) const
 {
   QMutexLocker l(&mutex);
   RegistryContributor::Pointer contributor = GetContributors().value(id);
   if (contributor.IsNotNull())
     return contributor;
   // check if we have it among removed contributors - potentially
   // notification of removals might be processed after the contributor
   // marked as removed:
   if (!removedContributors.empty())
   {
     return removedContributors.value(id);
   }
   return RegistryContributor::Pointer();
 }
 
 void RegistryObjectManager::AddContributor(const SmartPointer<RegistryContributor>& newContributor)
 {
   QMutexLocker l(&mutex);
   QString key = newContributor->GetActualId();
   if (!GetContributors().contains(key))
   {
     isDirty = true;
     if (!removedContributors.empty())
     {
       removedContributors.remove(key);
     }
     GetContributors().insert(key, newContributor);
   }
 }
 
 void RegistryObjectManager::RemoveContributor(const QString& id)
 {
   QMutexLocker l(&mutex);
   isDirty = true;
   RegistryContributor::Pointer removed = GetContributors().take(id);
   if (removed.IsNotNull())
   {
     removedContributors.insert(id, removed);
   }
 }
 
 KeyedHashSet& RegistryObjectManager::GetNamespacesIndex() const
 {
   if (!namespacesIndexLoaded)
   {
     if (fromCache)
     {
       //namespacesIndex = registry->GetTableReader()->LoadNamespaces();
     }
     namespacesIndexLoaded = true;
   }
   return namespacesIndex;
 }
 
 QHash<int, SmartPointer<RegistryObject> > RegistryObjectManager::GetAssociatedObjects(const QString& contributionId) const
 {
   QMutexLocker l(&mutex);
   //Collect all the objects associated with this contribution
   QList<int> xpts = GetExtensionPointsFrom_unlocked(contributionId);
   QList<int> exts = GetExtensionsFrom_unlocked(contributionId);
   QHash<int, RegistryObject::Pointer> actualObjects;
   for (int i = 0; i < exts.size(); i++)
   {
     RegistryObject::Pointer tmp = BasicGetObject(exts[i], RegistryObjectManager::EXTENSION);
     actualObjects.insert(exts[i], tmp);
     CollectChildren(tmp, 0, actualObjects);
   }
   for (int i = 0; i < xpts.size(); i++)
   {
     RegistryObject::Pointer xpt = BasicGetObject(xpts[i], RegistryObjectManager::EXTENSION_POINT);
     actualObjects.insert(xpts[i], xpt);
   }
 
   return actualObjects;
 }
 
 void RegistryObjectManager::AddAssociatedObjects(QHash<int, SmartPointer<RegistryObject> >& map,
                             const SmartPointer<RegistryObject>& registryObject)
 {
   QMutexLocker l(&mutex);
   CollectChildren(registryObject, 0, map);
 }
 
 void RegistryObjectManager::AddNavigableObjects(QHash<int, SmartPointer<RegistryObject> >& associatedObjects)
 {
   QMutexLocker l(&mutex);
   typedef QHash<int, RegistryObject::Pointer> ObjectsMapType;
   ObjectsMapType result;
   for (ObjectsMapType::ConstIterator iter = associatedObjects.begin(); iter != associatedObjects.end(); ++iter)
   {
     const RegistryObject::Pointer& object = iter.value();
     if (Extension::Pointer extension = object.Cast<Extension>())
     {
       // add extension point
       ExtensionPoint::Pointer extPoint = GetExtensionPointObject(extension->GetExtensionPointIdentifier());
       if (extPoint.IsNull()) // already removed?
         continue;
 
       if (!associatedObjects.contains(extPoint->GetObjectId()))
         result.insert(extPoint->GetObjectId(), extPoint);
 
       // add all extensions for the extension point
       QList<int> extensions = extPoint->GetRawChildren();
       for (int j = 0; j < extensions.size(); j++)
       {
         RegistryObject::Pointer tmp = BasicGetObject(extensions[j], RegistryObjectManager::EXTENSION);
         if (tmp.IsNull()) // already removed
           continue;
         if (!associatedObjects.contains(extensions[j]))
         {
           result.insert(extensions[j], tmp);
           CollectChildren(tmp, 0, result);
         }
       }
     }
     else if (ExtensionPoint::Pointer extPoint = object.Cast<ExtensionPoint>())
     {
       // by now extensions of this extension point have been marked as orphans
       OrphansMapType& orphans = GetOrphans();
       QString name = extPoint->GetUniqueIdentifier();
       QList<int> extensions = orphans.value(name);
       for (int j = 0; j < extensions.size(); j++)
       {
         RegistryObject::Pointer tmp = BasicGetObject(extensions[j], RegistryObjectManager::EXTENSION);
         if (tmp.IsNull()) // already removed
           continue;
         if (!associatedObjects.contains(extensions[j]))
         {
           result.insert(extensions[j], tmp);
           CollectChildren(tmp, 0, result);
         }
       }
     }
   }
 
   for (ObjectsMapType::ConstIterator iter = result.begin(); iter != result.end(); ++iter)
   {
     associatedObjects.insert(iter.key(), iter.value());
   }
 }
 
 void RegistryObjectManager::RemoveObjects(const QHash<int, SmartPointer<RegistryObject> >& associatedObjects)
 {
   QMutexLocker l(&mutex);
   //Remove the objects from the main object manager so they can no longer be accessed.
   foreach (RegistryObject::Pointer toRemove, associatedObjects)
   {
     Remove(toRemove->GetObjectId(), true);
     if (ExtensionPoint::Pointer extPoint = toRemove.Cast<ExtensionPoint>())
     {
       RemoveExtensionPoint(extPoint->GetUniqueIdentifier());
     }
   }
 }
 
 SmartPointer<IObjectManager> RegistryObjectManager::CreateDelegatingObjectManager(const QHash<int, SmartPointer<RegistryObject> > &object)
 {
   IObjectManager::Pointer objMgr(new TemporaryObjectManager(object, this));
   return objMgr;
 }
 
 bool RegistryObjectManager::UnlinkChildFromContributions(int id)
 {
   QMutexLocker l(&mutex);
   if (UnlinkChildFromContributions(newContributions.Elements(), id))
     return true;
   return UnlinkChildFromContributions(GetFormerContributions().Elements(), id);
 }
 
 QString RegistryObjectManager::FindCommonNamespaceIdentifier(const QList<SmartPointer<RegistryObject> >& registryObjects) const
 {
   QString namespaceName;
   for (int i = 0; i < registryObjects.size(); i++)
   {
     RegistryObject::Pointer currentObject = registryObjects[i];
     QString tmp;
     if (ExtensionPoint::Pointer extPoint = currentObject.Cast<ExtensionPoint>())
     {
       tmp = extPoint->GetNamespace();
     }
     else if (Extension::Pointer extension = currentObject.Cast<Extension>())
     {
       tmp = extension->GetNamespaceIdentifier();
     }
 
     if (namespaceName.isNull())
     {
       namespaceName = tmp;
       continue;
     }
     if (namespaceName != tmp)
     {
       return QString();
     }
   }
   return namespaceName;
 }
 
 void RegistryObjectManager::RemoveExtensionPointFromNamespaceIndex(int extensionPoint, const QString& namespaceName)
 {
   QMutexLocker l(&mutex);
   RegistryIndexElement::Pointer indexElement = GetNamespaceIndex(namespaceName);
   indexElement->UpdateExtensionPoint(extensionPoint, false);
 }
 
 void RegistryObjectManager::RemoveExtensionFromNamespaceIndex(int extensions, const QString& namespaceName)
 {
   QMutexLocker l(&mutex);
   RegistryIndexElement::Pointer indexElement = GetNamespaceIndex(namespaceName);
   indexElement->UpdateExtension(extensions, false);
 }
 
 void RegistryObjectManager::UpdateNamespaceIndex(const SmartPointer<RegistryContribution>& contribution, bool added)
 {
   // if all extension points are from the same namespace combine them in one block and add them all together
   QList<int> contribExtensionPoints = contribution->GetExtensionPoints();
   QList<RegistryObject::Pointer> extensionPointObjects = GetObjects_unlocked(contribExtensionPoints, EXTENSION_POINT);
   QString commonExptsNamespace;
   if (contribExtensionPoints.size() > 1)
   {
     commonExptsNamespace = FindCommonNamespaceIdentifier(extensionPointObjects);
   }
   if (!commonExptsNamespace.isEmpty())
   {
     RegistryIndexElement::Pointer indexElement = GetNamespaceIndex(commonExptsNamespace);
     indexElement->UpdateExtensionPoints(contribExtensionPoints, added);
   }
   else
   {
     for (int i = 0; i < contribExtensionPoints.size(); i++)
     {
       QString namespaceName = extensionPointObjects[i].Cast<ExtensionPoint>()->GetNamespace();
       RegistryIndexElement::Pointer indexElement = GetNamespaceIndex(namespaceName);
       indexElement->UpdateExtensionPoint(contribExtensionPoints[i], added);
     }
   }
 
   // if all extensions are from the same namespace combine them in one block and add them all together
   QList<int> contrExtensions = contribution->GetExtensions();
   QList<RegistryObject::Pointer> extensionObjects = GetObjects_unlocked(contrExtensions, EXTENSION);
   QString commonExtNamespace;
   if (contrExtensions.size() > 1)
   {
     commonExtNamespace = FindCommonNamespaceIdentifier(extensionObjects);
   }
   if (!commonExtNamespace.isEmpty())
   {
     RegistryIndexElement::Pointer indexElement = GetNamespaceIndex(commonExtNamespace);
     indexElement->UpdateExtensions(contrExtensions, added);
   }
   else
   {
     for (int i = 0; i < contrExtensions.size(); i++)
     {
       QString namespaceName = extensionObjects[i].Cast<Extension>()->GetNamespaceIdentifier();
       RegistryIndexElement::Pointer indexElement = GetNamespaceIndex(namespaceName);
       indexElement->UpdateExtension(contrExtensions[i], added);
     }
   }
 }
 
 KeyedHashSet& RegistryObjectManager::GetFormerContributions() const
 {
   if (!formerContributionsLoaded)
   {
     if (fromCache)
     {
       //formerContributions = registry->GetTableReader()->LoadContributions();
     }
     formerContributionsLoaded = true;
   }
   return formerContributions;
 }
 
 void RegistryObjectManager::Remove(const SmartPointer<RegistryObject>& registryObject, bool release)
 {
   cache->Remove(registryObject->GetObjectId());
   if (release)
     Release(registryObject);
 }
 
 void RegistryObjectManager::Hold(const SmartPointer<RegistryObject>& toHold)
 {
   heldObjects.Add(toHold);
 }
 
 void RegistryObjectManager::Release(const SmartPointer<RegistryObject>& toRelease)
 {
   heldObjects.Remove(toRelease);
 }
 
 SmartPointer<RegistryObject> RegistryObjectManager::BasicGetObject(int id, short type) const
 {
   RegistryObject::Pointer result = cache->Get(id);
   if (result.IsNotNull())
     return result;
   if (fromCache)
     result = Load(id, type);
   if (result.IsNull())
     throw InvalidRegistryObjectException();
   cache->Put(id, result);
   return result;
 }
 
-SmartPointer<RegistryObject> RegistryObjectManager::Load(int id, short type) const
+SmartPointer<RegistryObject> RegistryObjectManager::Load(int /*id*/, short /*type*/) const
 {
 //  TableReader reader = registry.getTableReader();
 //  if (fileOffsets == null)
 //    return null;
 //  int offset = fileOffsets.get(id);
 //  if (offset == Integer.MIN_VALUE)
 //    return null;
 //  switch (type) {
 //    case CONFIGURATION_ELEMENT :
 //      return reader.loadConfigurationElement(offset);
 
 //    case THIRDLEVEL_CONFIGURATION_ELEMENT :
 //      return reader.loadThirdLevelConfigurationElements(offset, this);
 
 //    case EXTENSION :
 //      return reader.loadExtension(offset);
 
 //    case EXTENSION_POINT :
 //    default : //avoid compile errors. type must always be known
 //      return reader.loadExtensionPointTree(offset, this);
 //  }
   return RegistryObject::Pointer();
 }
 
 RegistryObjectManager::OrphansMapType& RegistryObjectManager::GetOrphans() const
 {
   if (!orphanExtensionsLoaded)
   {
     if(fromCache)
     {
       //orphanExtensions = registry->GetTableReader()->LoadOrphans();
     }
     orphanExtensionsLoaded = true;
   }
   return orphanExtensions;
 }
 
 SmartPointer<RegistryIndexElement> RegistryObjectManager::GetNamespaceIndex(const QString& namespaceName) const
 {
   RegistryIndexElement::Pointer indexElement = GetNamespacesIndex().GetByKey(namespaceName).Cast<RegistryIndexElement>();
   if (indexElement.IsNull())
   {
     indexElement = new RegistryIndexElement(namespaceName);
     namespacesIndex.Add(indexElement);
   }
   return indexElement;
 }
 
 void RegistryObjectManager::CollectChildren(const SmartPointer<RegistryObject>& ce, int level,
                                             QHash<int, SmartPointer<RegistryObject> >& collector) const
 {
   QList<RegistryObject::Pointer> children =
       GetObjects(ce->GetRawChildren(),
                  level == 0 || ce->NoExtraData() ? RegistryObjectManager::CONFIGURATION_ELEMENT : RegistryObjectManager::THIRDLEVEL_CONFIGURATION_ELEMENT);
   for (int j = 0; j < children.size(); j++)
   {
     collector.insert(children[j]->GetObjectId(), children[j]);
     CollectChildren(children[j], level + 1, collector);
   }
 }
 
 bool RegistryObjectManager::UnlinkChildFromContributions(const QList<SmartPointer<KeyedElement> >& contributions, int id)
 {
   for (int i = 0; i < contributions.size(); i++)
   {
     RegistryContribution::Pointer candidate = contributions[i].Cast<RegistryContribution>();
     if (candidate.IsNull())
       continue;
     if (candidate->HasChild(id))
     {
       candidate->UnlinkChild(id);
       if (candidate->IsEmpty())
         RemoveContribution(candidate->GetContributorId());
       return true;
     }
   }
   return false;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryRegistryObjectManager.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryRegistryObjectManager.h
index a1cae59657..91c9048660 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryRegistryObjectManager.h
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryRegistryObjectManager.h
@@ -1,284 +1,285 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYREGISTRYOBJECTMANAGER_H
 #define BERRYREGISTRYOBJECTMANAGER_H
 
 #include "berryIObjectManager.h"
 #include "berryHashtableOfStringAndInt.h"
 #include "berryKeyedHashSet.h"
 
 #include <QMutex>
 
 namespace berry {
 
 class ExtensionHandle;
 class ExtensionPoint;
 class ExtensionPointHandle;
 class ExtensionRegistry;
 class RegistryContribution;
 class RegistryContributor;
 class RegistryIndexElement;
 class RegistryObject;
 class RegistryObjectReferenceMap;
 
 /**
  * This class manage all the object from the registry but does not deal with their dependencies.
  * It serves the objects which are either directly obtained from memory or read from a cache.
  * It also returns handles for objects.
  */
 class RegistryObjectManager : public IObjectManager
 {
 
 public:
 
   berryObjectMacro(berry::RegistryObjectManager)
 
   //Constants used to get the objects and their handles
   enum Type {
     CONFIGURATION_ELEMENT = 1,
     EXTENSION,
     EXTENSION_POINT,
     THIRDLEVEL_CONFIGURATION_ELEMENT
   };
 
   RegistryObjectManager(ExtensionRegistry* registry);
   ~RegistryObjectManager();
 
   void Add(const SmartPointer<RegistryObject>& registryObject, bool hold);
 
   SmartPointer<RegistryObject> GetObject(int id, short type) const;
 
   // The current impementation of this method assumes that we don't cache dynamic
   // extension. In this case all extensions not yet loaded (i.e. not in the memory cache)
   // are "not dynamic" and we actually check memory objects to see if they are dynamic.
   //
   // If we decide to allow caching of dynamic objects, the implementation
   // of this method would have to retrieved the object from disk and check
   // its "dynamic" status. The problem is that id alone is not enough to get the object
   // from the disk; object type is needed as well.
   bool ShouldPersist(int id) const;
 
   QList<SmartPointer<RegistryObject> > GetObjects(const QList<int>& values, short type) const;
 
   SmartPointer<Handle> GetHandle(int id, short type) const;
 
   QList<SmartPointer<Handle> > GetHandles(const QList<int>& ids, short type) const;
 
   bool IsDirty() const;
 
   void MarkDirty();
 
   void Close();
 
   ExtensionRegistry* GetRegistry() const;
 
   QList<SmartPointer<ExtensionHandle> > GetExtensionsFromContributor(const QString& contributorId) const;
 
   QList<SmartPointer<ExtensionPointHandle> > GetExtensionPointsFromContributor(const QString& contributorId) const;
 
   QList<SmartPointer<ExtensionPointHandle> > GetExtensionPointsFromNamespace(const QString& namespaceName) const;
 
   // This method filters out extensions with no extension point
   QList<SmartPointer<ExtensionHandle> > GetExtensionsFromNamespace(const QString& namespaceName) const;
 
   SmartPointer<RegistryContributor> GetContributor(const QString& id) const;
 
 protected:
 
   friend class Extension;
   friend class ExtensionPoint;
   friend class ExtensionRegistry;
   friend class ExtensionsParser;
   friend class RegistryContribution;
   friend class RegistryObject;
 
   mutable QMutex mutex;
 
   static const int CACHE_INITIAL_SIZE; // = 512;
 
-  static uint UNKNOWN;
+  static int UNKNOWN;
 
   typedef QHash<QString, QList<int> > OrphansMapType;
   typedef QHash<QString, SmartPointer<RegistryContributor> > ContributorsMapType;
 
   /**
    * Initialize the object manager. Return true if the initialization succeeded, false otherwise
    */
   bool Init(long timeStamp);
 
   void AddContribution(const SmartPointer<RegistryContribution>& contribution);
 
   QList<int> GetExtensionPointsFrom(const QString& id) const;
   QList<int> GetExtensionPointsFrom_unlocked(const QString& id) const;
 
   bool HasContribution(const QString& id) const;
 
   void Remove(int id, bool release);
   void Remove_unlocked(int id, bool release);
 
   QList<SmartPointer<RegistryObject> > GetObjects_unlocked(const QList<int>& values, short type) const;
 
   SmartPointer<ExtensionPoint> GetExtensionPointObject(const QString& xptUniqueId) const;
+  SmartPointer<ExtensionPoint> GetExtensionPointObject_unlocked(const QString& xptUniqueId) const;
 
   QList<SmartPointer<ExtensionPointHandle> > GetExtensionPointsHandles() const;
 
   SmartPointer<ExtensionPointHandle> GetExtensionPointHandle(const QString& xptUniqueId);
 
   QList<int> GetExtensionsFrom(const QString& contributorId) const;
   QList<int> GetExtensionsFrom_unlocked(const QString& contributorId) const;
 
   bool AddExtensionPoint(const SmartPointer<ExtensionPoint>& currentExtPoint, bool hold);
 
   void RemoveExtensionPoint(const QString& extensionPointId);
 
   void RemoveContribution(const QString &contributorId);
 
   void AddOrphans(const QString& extensionPoint, const QList<int>& extensions);
 
   void AddOrphan(const QString& extensionPoint, int extension);
 
   QList<int> RemoveOrphans(const QString& extensionPoint);
 
   void RemoveOrphan(const QString& extensionPoint, int extension);
 
   //This method is only used by the writer to reach in
   QHash<QString, QList<int> > GetOrphanExtensions() const;
 
   //  This method is only used by the writer to reach in
   int GetNextId() const;
 
   //  This method is only used by the writer to reach in
   HashtableOfStringAndInt GetExtensionPoints() const;
 
   //  This method is only used by the writer to reach in
   QList<KeyedHashSet> GetContributions() const;
 
   // This method is used internally and by the writer to reach in. Notice that it doesn't
   // return contributors marked as removed.
   ContributorsMapType& GetContributors() const;
 
   // only adds a contributor if it is not already present in the table
   void AddContributor(const SmartPointer<RegistryContributor>& newContributor);
 
   void RemoveContributor(const QString& id);
 
   KeyedHashSet& GetNamespacesIndex() const;
 
   /**
    * Collect all the objects that are removed by this operation and store
    * them in a IObjectManager so that they can be accessed from the appropriate
    * deltas but not from the registry.
    */
   QHash<int, SmartPointer<RegistryObject> > GetAssociatedObjects(const QString& contributionId) const;
 
   /**
    * Adds elements to be removed along with the registry object.
    */
   void AddAssociatedObjects(QHash<int, SmartPointer<RegistryObject> >& map,
                             const SmartPointer<RegistryObject>& registryObject);
 
   /**
    * Add to the set of the objects all extensions and extension points that
    * could be navigated to from the objects in the set.
    */
   void AddNavigableObjects(QHash<int, SmartPointer<RegistryObject> >& associatedObjects);
 
   void RemoveObjects(const QHash<int, SmartPointer<RegistryObject> >& associatedObjects);
 
   SmartPointer<IObjectManager> CreateDelegatingObjectManager(const QHash<int, SmartPointer<RegistryObject> >& object);
 
   bool UnlinkChildFromContributions(int id);
 
 private:
 
   // key: extensionPointName, value: object id
   HashtableOfStringAndInt extensionPoints; //This is loaded on startup. Then entries can be added when loading a new plugin from the xml.
   // key: object id, value: an object
   RegistryObjectReferenceMap* cache; //Entries are added by getter. The structure is not thread safe.
   //key: int, value: int
   //OffsetTable fileOffsets = null; //This is read once on startup when loading from the cache. Entries are never added here. They are only removed to prevent "removed" objects to be reloaded.
 
   int nextId; //This is only used to get the next number available.
 
   mutable bool orphanExtensionsLoaded;
 
   //Those two data structures are only used when the addition or the removal of a plugin occurs.
   //They are used to keep track on a contributor basis of the extension being added or removed
   KeyedHashSet newContributions; //represents the contributers added during this session.
   mutable KeyedHashSet formerContributions; //represents the contributers encountered in previous sessions. This is loaded lazily.
   mutable bool formerContributionsLoaded;
 
   mutable QHash<QString, SmartPointer<RegistryContributor> > contributors; // key: contributor ID; value: contributor name
   mutable bool contributorsLoaded;
   QHash<QString, SmartPointer<RegistryContributor> > removedContributors; // key: contributor ID; value: contributor name
   mutable KeyedHashSet namespacesIndex; // registry elements (extension & extensionpoints) indexed by namespaces
   mutable bool namespacesIndexLoaded;
 
   // Map key: extensionPointFullyQualifiedName, value int[] of orphan extensions.
   // The orphan access does not need to be synchronized because the it is protected by the lock in extension registry.
   mutable QHash<QString, QList<int> > orphanExtensions;
 
   KeyedHashSet heldObjects; //strong reference to the objects that must be hold on to
 
   //Indicate if objects have been removed or added from the table. This only needs to be set in a couple of places (addNamespace and removeNamespace)
   bool isDirty;
 
   bool fromCache;
 
   ExtensionRegistry* registry;
 
 
   // TODO make ExtensionPoint, Extension provide namespace in a same way (move it to the RegistryObject?)
   // See if all the registryObjects have the same namespace. If not, return null.
   // Also can return null if empty array is passed in or objects are of an unexpected type
   QString FindCommonNamespaceIdentifier(const QList<SmartPointer<RegistryObject> >& registryObjects) const;
 
   void RemoveExtensionPointFromNamespaceIndex(int extensionPoint, const QString& namespaceName);
 
   void RemoveExtensionFromNamespaceIndex(int extensions, const QString& namespaceName);
 
   // Called from a synchronized method
   void UpdateNamespaceIndex(const SmartPointer<RegistryContribution>& contribution, bool added);
 
   KeyedHashSet& GetFormerContributions() const;
 
   void Remove(const SmartPointer<RegistryObject>& registryObject, bool release);
 
   void Hold(const SmartPointer<RegistryObject>& toHold);
 
   void Release(const SmartPointer<RegistryObject>& toRelease);
 
   SmartPointer<RegistryObject> BasicGetObject(int id, short type) const;
 
   SmartPointer<RegistryObject> Load(int id, short type) const;
 
   OrphansMapType& GetOrphans() const;
 
   // Find or create required index element
   SmartPointer<RegistryIndexElement> GetNamespaceIndex(const QString& namespaceName) const;
 
   void CollectChildren(const SmartPointer<RegistryObject>& ce, int level,
                        QHash<int, SmartPointer<RegistryObject> >& collector) const;
 
   // Called from a synchronized method only
   bool UnlinkChildFromContributions(const QList<SmartPointer<KeyedElement> >& contributions, int id);
 
 };
 
 }
 
 #endif // BERRYREGISTRYOBJECTMANAGER_H
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryRegistryObjectReferenceMap.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryRegistryObjectReferenceMap.cpp
index 813e5bee2d..147e7254e9 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryRegistryObjectReferenceMap.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryRegistryObjectReferenceMap.cpp
@@ -1,157 +1,158 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryRegistryObjectReferenceMap.h"
 
 #include "berryRegistryObject.h"
 
 namespace berry {
 
 
 struct RegistryObjectReferenceMap::IEntry
 {
   virtual ~IEntry() {}
 
   /**
    * Returns the value of this entry.
    * @return The entry value.
    */
   virtual SmartPointer<RegistryObject> GetValue() const = 0;
 };
 
 class RegistryObjectReferenceMap::SmartRef : public RegistryObjectReferenceMap::IEntry
 {
 
 private:
 
   /**
    * Reference value.  Note this can never be null.
    */
   RegistryObject::Pointer value;
 
 public:
 
   SmartRef(const RegistryObject::Pointer value)
     : value(value)
   {
   }
 
   RegistryObject::Pointer GetValue() const
   {
     return value;
   }
 
 };
 
 class RegistryObjectReferenceMap::WeakRef : public RegistryObjectReferenceMap::IEntry
 {
 
 private:
 
   /**
    * Reference value.  Note this can never be null.
    */
   RegistryObject::WeakPtr value;
 
 public:
 
   WeakRef(const RegistryObject::Pointer value)
     : value(value)
   {
   }
 
   RegistryObject::Pointer GetValue() const
   {
     return value.Lock();
   }
 
 };
 
 
 RegistryObjectReferenceMap::RegistryObjectReferenceMap(ReferenceType referenceType, int capacity)
   : valueType(referenceType)
 {
   references.reserve(capacity);
 }
 
 RegistryObjectReferenceMap::~RegistryObjectReferenceMap()
 {
   for(ReferenceMapType::Iterator i = references.begin(); i != references.end(); ++i)
   {
     delete i.value();
   }
 }
 
 SmartPointer<RegistryObject> RegistryObjectReferenceMap::Get(int key) const
 {
   Purge();
   ReferenceMapType::const_iterator entry = references.find(key);
   if (entry != references.end()) return entry.value()->GetValue();
   return RegistryObject::Pointer();
 }
 
 void RegistryObjectReferenceMap::Put(int key, const SmartPointer<RegistryObject>& value)
 {
   if (value.IsNull())
     throw ctkInvalidArgumentException("null values not allowed");
 
   Purge();
 
   ReferenceMapType::Iterator i = references.find(key);
   if (i != references.end())
   {
     delete *i;
   }
   references.insert(key, NewEntry(value));
 }
 
 SmartPointer<RegistryObject> RegistryObjectReferenceMap::Remove(int key)
 {
   Purge();
   IEntry* entry = references.take(key);
   RegistryObject::Pointer obj = entry->GetValue();
   delete entry;
   return obj;
 }
 
 RegistryObjectReferenceMap::IEntry*
 RegistryObjectReferenceMap::NewEntry(const SmartPointer<RegistryObject>& value) const
 {
   switch (valueType)
   {
   case HARD :
     return new SmartRef(value);
   case SOFT :
     return new WeakRef(value);
+  default: return NULL;
   }
 }
 
 void RegistryObjectReferenceMap::Purge() const
 {
   for (ReferenceMapType::Iterator i = references.begin(); i != references.end();)
   {
     if (i.value()->GetValue().IsNull())
     {
       i = references.erase(i);
     }
     else
     {
       ++i;
     }
   }
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryRegistryStrategy.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryRegistryStrategy.cpp
index 166b6ec938..b98281bf9a 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryRegistryStrategy.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryRegistryStrategy.cpp
@@ -1,272 +1,272 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryRegistryStrategy.h"
 
 #include "berryCoreException.h"
 #include "berryCTKPluginListener.h"
 #include "berryExtensionRegistry.h"
 #include "berryExtensionType.h"
 #include "berryRegistryConstants.h"
 #include "berryRegistryContributor.h"
 #include "berryRegistryMessages.h"
 #include "berryRegistrySupport.h"
 #include "berryStatus.h"
 #include "berryLog.h"
 #include "berryCTKPluginActivator.h"
 #include "berryCTKPluginUtils.h"
 
 #include <ctkPlugin.h>
 #include <ctkPluginContext.h>
 #include <ctkUtils.h>
 
 #include <QFileInfo>
 #include <QDateTime>
 #include <QXmlSimpleReader>
 
 namespace berry {
 
 RegistryStrategy::RegistryStrategy(const QList<QString>& storageDirs, const QList<bool>& cacheReadOnly,
                                    QObject* key)
   : storageDirs(storageDirs), cacheReadOnly(cacheReadOnly), token(key), trackTimestamp(false)
 {
   // Only do timestamp calculations if osgi.checkConfiguration is set to "true" (typically,
   // this implies -dev mode)
   ctkPluginContext* context = org_blueberry_core_runtime_Activator::getPluginContext();
   if (context)
   {
     trackTimestamp = context->getProperty(RegistryConstants::PROP_CHECK_CONFIG).toString().compare("true", Qt::CaseInsensitive) == 0;
   }
 }
 
 RegistryStrategy::~RegistryStrategy()
 {
 }
 
 int RegistryStrategy::GetLocationsLength() const
 {
   return storageDirs.size();
 }
 
 QString RegistryStrategy::GetStorage(int index) const
 {
   return storageDirs[index];
 }
 
 bool RegistryStrategy::IsCacheReadOnly(int index) const
 {
   if (!cacheReadOnly.empty())
     return cacheReadOnly[index];
   return true;
 }
 
 void RegistryStrategy::Log(const SmartPointer<IStatus>& status)
 {
   RegistrySupport::Log(status, QString());
 }
 
 QString RegistryStrategy::Translate(const QString& key, QTranslator* resources)
 {
   return RegistrySupport::Translate(key, resources);
 }
 
 void RegistryStrategy::OnStart(IExtensionRegistry* reg, bool loadedFromCache)
 {
   ExtensionRegistry* registry = dynamic_cast<ExtensionRegistry*>(reg);
   if (registry == NULL)
     return;
 
   // register a listener to catch new plugin installations/resolutions.
   pluginListener.reset(new CTKPluginListener(registry, token, this));
   org_blueberry_core_runtime_Activator::getPluginContext()->connectPluginListener(
         pluginListener.data(), SLOT(PluginChanged(ctkPluginEvent)), Qt::DirectConnection);
 
   // populate the registry with all the currently installed plugins.
   // There is a small window here while ProcessPlugins is being
   // called where the pluginListener may receive a ctkPluginEvent
   // to add/remove a plugin from the registry. This is ok since
   // the registry is a synchronized object and will not add the
   // same bundle twice.
   if (!loadedFromCache)
     pluginListener->ProcessPlugins(org_blueberry_core_runtime_Activator::getPluginContext()->getPlugins());
 }
 
-void RegistryStrategy::OnStop(IExtensionRegistry* registry)
+void RegistryStrategy::OnStop(IExtensionRegistry* /*registry*/)
 {
   if (!pluginListener.isNull())
   {
     org_blueberry_core_runtime_Activator::getPluginContext()->disconnectPluginListener(pluginListener.data());
   }
 }
 
 QObject* RegistryStrategy::CreateExecutableExtension(const SmartPointer<RegistryContributor>& contributor,
                                            const QString& className, const QString& /*overridenContributorName*/)
 {
   QObject* result = NULL;
 
   QSharedPointer<ctkPlugin> plugin = CTKPluginUtils::GetDefault()->GetPlugin(contributor->GetName());
   if (!plugin.isNull())
   {
     // immediately start the plugin but do not change the plugins autostart setting
     plugin->start(ctkPlugin::START_TRANSIENT);
   }
   else
   {
     QString message = QString("Unable to find plugin \"%1\" for contributor \"%2\".")
         .arg(contributor->GetName()).arg(contributor->GetActualName());
     IStatus::Pointer status(new Status(IStatus::ERROR_TYPE, RegistryMessages::OWNER_NAME,
                                        RegistryConstants::PLUGIN_ERROR, message, BERRY_STATUS_LOC));
     throw CoreException(status);
   }
 
   QString typeName = contributor->GetActualName() + "_" + className;
   int extensionTypeId = ExtensionType::type(typeName.toAscii().data());
   if (extensionTypeId == 0)
   {
     QString message = QString("Unable to find class \"%1\" from contributor \"%2\"."
                               " The class was either not registered via "
                               "BERRY_REGISTER_EXTENSION_CLASS(type, pluginContext) "
                               "or you forgot to run Qt's moc on the header file.")
         .arg(className).arg(contributor->GetActualName());
     IStatus::Pointer status(new Status(IStatus::ERROR_TYPE, RegistryMessages::OWNER_NAME,
                                        RegistryConstants::PLUGIN_ERROR, message, BERRY_STATUS_LOC));
     throw CoreException(status);
   }
   else
   {
     try
     {
       result = ExtensionType::construct(extensionTypeId);
     }
     catch (const ctkException& e)
     {
       QString message = QString("Contributor \"%1\" was unable to instantiate class \"%2\".")
           .arg(contributor->GetActualName()).arg(className);
       IStatus::Pointer status(new Status(IStatus::ERROR_TYPE, RegistryMessages::OWNER_NAME,
                                          RegistryConstants::PLUGIN_ERROR, message, e, BERRY_STATUS_LOC));
       throw CoreException(status);
     }
     catch (const std::exception& e)
     {
       QString message = QString("Contributor \"%1\" was unable to instantiate class \"%2\". Error: \"%3\"")
           .arg(contributor->GetActualName()).arg(className).arg(QString(e.what()));
       IStatus::Pointer status(new Status(IStatus::ERROR_TYPE, RegistryMessages::OWNER_NAME,
                                          RegistryConstants::PLUGIN_ERROR, message, BERRY_STATUS_LOC));
       throw CoreException(status);
     }
   }
 
   return result;
 }
 
 //void RegistryStrategy::ScheduleChangeEvent(const QList<IRegistryEventListener>& listeners,
 //                                           const QHash<QString, CombinedEventDelta>& deltas,
 //                                           IExtensionRegistry* registry)
 //{
 //  if (ExtensionRegistry* extRegistry = dynamic_cast<ExtensionRegistry*>(registry))
 //    extRegistry->ScheduleChangeEvent(listeners, deltas);
 //}
 
 //SmartPointer<IStatus> RegistryStrategy::ProcessChangeEvent(const QList<IRegistryEventListener>& listeners,
 //                                                const QHash<QString, CombinedEventDelta>& deltas,
 //                                                IExtensionRegistry* registry)
 //{
 //  if (ExtensionRegistry* extRegistry = dynamic_cast<ExtensionRegistry*>(registry))
 //    return extRegistry->ProcessChangeEvent(listeners, deltas);
 //  return IStatus::Pointer();
 //}
 
 bool RegistryStrategy::Debug() const
 {
   return false;
 }
 
 bool RegistryStrategy::DebugRegistryEvents() const
 {
   return false;
 }
 
 bool RegistryStrategy::CacheUse() const
 {
   return true;
 }
 
 bool RegistryStrategy::CacheLazyLoading() const
 {
   return true;
 }
 
 long RegistryStrategy::GetContainerTimestamp() const
 {
   return 0;
 }
 
 long RegistryStrategy::GetContributionsTimestamp() const
 {
   return 0;
 }
 
 bool RegistryStrategy::CheckContributionsTimestamp() const
 {
   return trackTimestamp;
 }
 
 long RegistryStrategy::GetExtendedTimestamp(const QSharedPointer<ctkPlugin>& plugin, const QString& pluginManifest) const
 {
   if (pluginManifest.isEmpty())
     return 0;
 
   // The plugin manifest does not have a timestamp as it is embedded into
   // the plugin itself. Try to get the timestamp of the plugin instead.
   QFileInfo pluginInfo(QUrl(plugin->getLocation()).toLocalFile());
   if (pluginInfo.exists())
   {
     return ctk::msecsTo(QDateTime::fromTime_t(0), pluginInfo.lastModified()) + plugin->getPluginId();
     //return pluginManifest.openConnection().getLastModified() + bundle.getBundleId();
   }
   else
   {
     if (Debug())
     {
       BERRY_DEBUG << "Unable to obtain timestamp for the plugin " <<
                      plugin->getSymbolicName();
     }
     return 0;
   }
 }
 
 QXmlReader* RegistryStrategy::GetXMLParser() const
 {
   if (theXMLParser.isNull())
   {
     theXMLParser.reset(new QXmlSimpleReader());
   }
   return theXMLParser.data();
 }
 
 QList<QString> RegistryStrategy::Translate(const QList<QString>& nonTranslated,
-                                 const SmartPointer<IContributor>& contributor,
-                                 const QLocale& locale)
+                                 const SmartPointer<IContributor>& /*contributor*/,
+                                 const QLocale& /*locale*/)
 {
   return nonTranslated;
 }
 
 QLocale RegistryStrategy::GetLocale() const
 {
   return QLocale();
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryTemporaryObjectManager.cpp b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryTemporaryObjectManager.cpp
index 3c40d250a1..07d9a91723 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryTemporaryObjectManager.cpp
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryTemporaryObjectManager.cpp
@@ -1,133 +1,133 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryTemporaryObjectManager.h"
 
 #include "berryRegistryObjectManager.h"
 #include "berryExtensionHandle.h"
 #include "berryExtensionPointHandle.h"
 #include "berryInvalidRegistryObjectException.h"
 #include "berryRegistryObject.h"
 #include "berryThirdLevelConfigurationElementHandle.h"
 
 namespace berry {
 
 TemporaryObjectManager::TemporaryObjectManager(const QHash<int, SmartPointer<RegistryObject> >& actualObjects,
                        RegistryObjectManager* parent)
   : actualObjects(actualObjects), parent(parent)
 {
 }
 
 SmartPointer<Handle> TemporaryObjectManager::GetHandle(int id, short type) const
 {
   Handle::Pointer handle;
   switch (type)
   {
   case RegistryObjectManager::EXTENSION_POINT :
     handle = new ExtensionPointHandle(IObjectManager::ConstPointer(this), id);
     return handle;
 
   case RegistryObjectManager::EXTENSION :
     handle = new ExtensionHandle(IObjectManager::ConstPointer(this), id);
     return handle;
 
   case RegistryObjectManager::CONFIGURATION_ELEMENT :
     handle = new ConfigurationElementHandle(IObjectManager::ConstPointer(this), id);
     return handle;
 
     case RegistryObjectManager::THIRDLEVEL_CONFIGURATION_ELEMENT :
     default : //avoid compiler error, type should always be known
       handle = new ThirdLevelConfigurationElementHandle(IObjectManager::ConstPointer(this), id);
       return handle;
   }
 }
 
 QList<SmartPointer<Handle> > TemporaryObjectManager::GetHandles(const QList<int>& ids, short type) const
 {
   QList<Handle::Pointer> results;
   switch (type)
   {
     case RegistryObjectManager::EXTENSION_POINT :
       for (int i = 0; i < ids.size(); i++)
       {
         Handle::Pointer handle(new ExtensionPointHandle(IObjectManager::ConstPointer(this), ids[i]));
         results.push_back(handle);
       }
       break;
 
     case RegistryObjectManager::EXTENSION :
       for (int i = 0; i < ids.size(); i++)
       {
         Handle::Pointer handle(new ExtensionHandle(IObjectManager::ConstPointer(this), ids[i]));
         results.push_back(handle);
       }
       break;
 
     case RegistryObjectManager::CONFIGURATION_ELEMENT :
       for (int i = 0; i < ids.size(); i++)
       {
         Handle::Pointer handle(new ConfigurationElementHandle(IObjectManager::ConstPointer(this), ids[i]));
         results.push_back(handle);
       }
       break;
 
     case RegistryObjectManager::THIRDLEVEL_CONFIGURATION_ELEMENT :
       for (int i = 0; i < ids.size(); i++)
       {
         Handle::Pointer handle(new ThirdLevelConfigurationElementHandle(IObjectManager::ConstPointer(this), ids[i]));
         results.push_back(handle);
       }
       break;
   }
   return results;
 }
 
 SmartPointer<RegistryObject> TemporaryObjectManager::GetObject(int id, short type) const
 {
   QMutexLocker l(&mutex);
   RegistryObject::Pointer result;
   try
   {
     result = parent->GetObject(id, type);
   }
-  catch (const InvalidRegistryObjectException& e)
+  catch (const InvalidRegistryObjectException& /*e*/)
   {
     result = actualObjects.value(id);
   }
   if (result.IsNull())
     throw InvalidRegistryObjectException();
   return result;
 }
 
 QList<SmartPointer<RegistryObject> > TemporaryObjectManager::GetObjects(const QList<int>& values, short type) const
 {
   QMutexLocker l(&mutex);
 
   QList<RegistryObject::Pointer> results;
   for (int i = 0; i < values.size(); i++)
   {
     results.push_back(GetObject(values[i], type));
   }
   return results;
 }
 
 void TemporaryObjectManager::Close()
 {
   QMutexLocker l(&mutex);
   actualObjects.clear();
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryThirdLevelConfigurationElementHandle.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryThirdLevelConfigurationElementHandle.h
index b6ada9469f..287fd47af0 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryThirdLevelConfigurationElementHandle.h
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/internal/berryThirdLevelConfigurationElementHandle.h
@@ -1,44 +1,45 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYTHIRDLEVELCONFIGURATIONELEMENTHANDLE_H
 #define BERRYTHIRDLEVELCONFIGURATIONELEMENTHANDLE_H
 
 #include "berryConfigurationElementHandle.h"
 
 namespace berry {
 
 class ThirdLevelConfigurationElementHandle : public ConfigurationElementHandle
 {
 
 public:
 
   berryObjectMacro(berry::ThirdLevelConfigurationElementHandle)
 
   ThirdLevelConfigurationElementHandle(const SmartPointer<const IObjectManager>& objectManager, int id);
   ThirdLevelConfigurationElementHandle(const IObjectManager* objectManager, int id);
 
+  using ConfigurationElementHandle::GetChildren;
   QList<SmartPointer<IConfigurationElement> > GetChildren() const;
 
 protected:
 
   SmartPointer<ConfigurationElement> GetConfigurationElement() const;
 
 };
 
 }
 
 #endif // BERRYTHIRDLEVELCONFIGURATIONELEMENTHANDLE_H
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/registry/berryIConfigurationElement.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/registry/berryIConfigurationElement.h
index 83d4706ea8..5562e42e85 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/registry/berryIConfigurationElement.h
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/registry/berryIConfigurationElement.h
@@ -1,302 +1,304 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIEXTENSIONELEMENT_H_
 #define BERRYIEXTENSIONELEMENT_H_
 
 #include <berryObject.h>
 
 #include <berryLog.h>
 
 namespace berry {
 
 struct IContributor;
 struct IExtension;
 
 class Handle;
 
 /**
  * A configuration element, with its attributes and children,
  * directly reflects the content and structure of the extension section
  * within the declaring plug-in's manifest (<code>plugin.xml</code>) file.
  * <p>
  * This interface also provides a way to create executable extension
  * objects.
  * </p>
  * <p>
  * These registry objects are intended for relatively short-term use. Clients that
  * deal with these objects must be aware that they may become invalid if the
  * declaring plug-in is updated or uninstalled. If this happens, all methods except
  * {@link #IsValid()} will throw {@link InvalidRegistryObjectException}.
  * For configuration element objects, the most common case is code in a plug-in dealing
  * with extensions contributed to one of the extension points it declares.
  * Code in a plug-in that has declared that it is not dynamic aware (or not
  * declared anything) can safely ignore this issue, since the registry
  * would not be modified while it is active. However, code in a plug-in that
  * declares that it is dynamic aware must be careful when accessing the extension
  * and configuration element objects because they become invalid if the contributing
  * plug-in is removed. Similarly, tools that analyze or display the extension registry
  * are vulnerable. Client code can pre-test for invalid objects by calling {@link #IsValid()},
  * which never throws this exception. However, pre-tests are usually not sufficient
  * because of the possibility of the extension or configuration element object becoming
  * invalid as a result of a concurrent activity. At-risk clients must treat
  * <code>InvalidRegistryObjectException</code> as if it were a checked exception.
  * Also, such clients should probably register a listener with the extension registry
  * so that they receive notification of any changes to the registry.
  * </p><p>
  * This interface is not intended to be implemented by clients.
  * </p>
  * @noimplement This interface is not intended to be implemented by clients.
  */
 struct org_blueberry_core_runtime_EXPORT IConfigurationElement : public virtual Object
 {
 
-  berryInterfaceMacro(IConfigurationElement, berry)
+  berryObjectMacro(berry::IConfigurationElement)
 
   virtual ~IConfigurationElement();
 
   /**
    * Creates and returns a new instance of the executable extension
    * identified by the named attribute of this configuration element.
    * The named attribute value must contain a fully qualified name
    * of a class. The class can either refer to a class implementing
    * the executable extension or to a factory capable of returning the
    * executable extension.
    * <p>
    * The specified class is instantiated using its 0-argument public constructor.
    * <p>
    * Then the following checks are done:<br>
    * If the specified class implements the {@link IExecutableExtension}
    * interface, the method {@link IExecutableExtension#SetInitializationData(IConfigurationElement, QString, Object*)}
    * is called, passing to the object the configuration information that was used to create it.
    * <p>
    * If the specified class implements {@link IExecutableExtensionFactory}
    * interface, the method {@link IExecutableExtensionFactory#Create()}
    * is invoked.
    * </p>
    * <p>
    * Unlike other methods on this object, invoking this method may activate
    * the plug-in.
    * </p>
    *
    * @param propertyName the name of the property
    * @return the executable instance
    * @exception CoreException if an instance of the executable extension
    *   could not be created for any reason
    * @see IExecutableExtension#SetInitializationData(IConfigurationElement, QString, Object*)
    * @see IExecutableExtensionFactory
    * @throws InvalidRegistryObjectException if this configuration element is no longer valid
    */
   virtual QObject* CreateExecutableExtension(const QString& propertyName) const = 0;
 
   template<class C>
   C* CreateExecutableExtension(const QString &propertyName) const
   {
     C* interface = qobject_cast<C*>(this->CreateExecutableExtension(propertyName));
     if (interface == 0)
     {
       BERRY_WARN << "The QObject subclass " << this->GetAttribute(propertyName).toStdString()
                  << " does not seem to implement the required interface \""
-                 << qobject_interface_iid<C>() << "\", or you forgot the Q_INTERFACES macro.";
+                 << qobject_interface_iid<C*>() << "\", or you forgot the Q_INTERFACES macro.";
     }
     return interface;
   }
 
   /**
    * Returns the named attribute of this configuration element, or
    * <code>null</code> if none.
    * <p>
    * The names of configuration element attributes
    * are the same as the attribute names of the corresponding XML element.
    * For example, the configuration markup
    * <pre>
    * &lt;bg pattern="stripes"/&gt;
    * </pre>
    * corresponds to a configuration element named <code>"bg"</code>
    * with an attribute named <code>"pattern"</code>
    * with attribute value <code>"stripes"</code>.
    * </p>
    * <p> Note that any translation specified in the plug-in manifest
    * file is automatically applied.
    * </p>
    *
    * @param name the name of the attribute
    * @return attribute value, or <code>null</code> if none
    * @throws InvalidRegistryObjectException if this configuration element is no longer valid
    */
   virtual QString GetAttribute(const QString& name) const = 0;
 
   /**
    * Returns the names of the attributes of this configuration element.
    * Returns an empty list if this configuration element has no attributes.
    * <p>
    * The names of configuration element attributes
    * are the same as the attribute names of the corresponding XML element.
    * For example, the configuration markup
    * <pre>
    * &lt;bg color="blue" pattern="stripes"/&gt;
    * </pre>
    * corresponds to a configuration element named <code>"bg"</code>
    * with attributes named <code>"color"</code>
    * and <code>"pattern"</code>.
    * </p>
    *
    * @return the names of the attributes
    * @throws InvalidRegistryObjectException if this configuration element is no longer valid
    */
   virtual QList<QString> GetAttributeNames() const = 0;
 
   /**
    * Returns all configuration elements that are children of this
    * configuration element.
    * Returns an empty list if this configuration element has no children.
    * <p>
    * Each child corresponds to a nested
    * XML element in the configuration markup.
    * For example, the configuration markup
    * <pre>
    * &lt;view&gt;
    * &nbsp&nbsp&nbsp&nbsp&lt;verticalHint&gt;top&lt;/verticalHint&gt;
    * &nbsp&nbsp&nbsp&nbsp&lt;horizontalHint&gt;left&lt;/horizontalHint&gt;
    * &lt;/view&gt;
    * </pre>
    * corresponds to a configuration element, named <code>"view"</code>,
    * with two children.
    * </p>
    *
    * @return the child configuration elements
    * @throws InvalidRegistryObjectException if this configuration element is no longer valid
    * @see #getChildren(String)
    */
   virtual QList<IConfigurationElement::Pointer> GetChildren() const = 0;
 
   /**
    * Returns all child configuration elements with the given name.
    * Returns an empty list if this configuration element has no children
    * with the given name.
    *
    * @param name the name of the child configuration element
    * @return the child configuration elements with that name
    * @throws InvalidRegistryObjectException if this configuration element is no longer valid
    * @see #getChildren()
    */
   virtual QList<IConfigurationElement::Pointer> GetChildren(const QString& name) const = 0;
 
   /**
    * Returns the extension that declares this configuration element.
    *
    * @return the extension
    * @throws InvalidRegistryObjectException if this configuration element is no longer valid
    */
   virtual SmartPointer<IExtension> GetDeclaringExtension() const = 0;
 
   /**
    * Returns the name of this configuration element.
    * The name of a configuration element is the same as
    * the XML tag of the corresponding XML element.
    * For example, the configuration markup
    * <pre>
    * &lt;wizard name="Create Project"/&gt;
    * </pre>
    * corresponds to a configuration element named <code>"wizard"</code>.
    *
    * @return the name of this configuration element
    * @throws InvalidRegistryObjectException if this configuration element is no longer valid
    */
   virtual QString GetName() const = 0;
 
   /**
    * Returns the element which contains this element. If this element
    * is an immediate child of an extension, the
    * returned value can be downcast to <code>IExtension</code>.
    * Otherwise the returned value can be downcast to
    * <code>IConfigurationElement</code>.
    *
    * @return the parent of this configuration element
    *  or <code>null</code>
    * @throws InvalidRegistryObjectException if this configuration element is no longer valid
    */
   virtual SmartPointer<Object> GetParent() const = 0;
 
   /**
    * Returns the text value of this configuration element.
    * For example, the configuration markup
    * <pre>
    * &lt;script lang="javascript"&gt;.\scripts\cp.js&lt;/script&gt;
    * </pre>
    * corresponds to a configuration element <code>"script"</code>
    * with value <code>".\scripts\cp.js"</code>.
    * <p> Values may span multiple lines (i.e., contain carriage returns
    * and/or line feeds).
    * <p> Note that any translation specified in the plug-in manifest
    * file is automatically applied.
    * </p>
    *
    * @return the text value of this configuration element or <code>null</code>
    * @throws InvalidRegistryObjectException if this configuration element is no longer valid
    */
   virtual QString GetValue() const = 0;
 
   /**
    * When multi-language support is enabled, this method returns the text value of this
    * configuration element in the specified locale, or <code>null</code> if none.
    * <p>
    * The locale matching tries to find the best match between available translations and
    * the requested locale, falling back to a more generic locale ("en") when the specific
    * locale ("en_US") is not available.
    * </p><p>
    * If multi-language support is not enabled, this method is equivalent to the method
    * {@link #getValue()}.
    * </p>
    * @param locale the requested locale
    * @return the text value of this configuration element in the specified locale,
    * or <code>null</code>
    * @throws InvalidRegistryObjectException if this configuration element is no longer valid
    * @see #GetValue(String)
    * @see IExtensionRegistry#IsMultiLanguage()
    */
   virtual QString GetValue(const QLocale& locale) const = 0;
 
   /**
    * Returns the namespace name for this configuration element.
    *
    * @return the namespace name for this configuration element
    * @throws InvalidRegistryObjectException if this configuration element is no longer valid
    */
   virtual QString GetNamespaceIdentifier() const = 0;
 
   /**
    * Returns the contributor of this configuration element.
    *
    * @return the contributor for this configuration element
    * @throws InvalidRegistryObjectException if this configuration element is no longer valid
    */
   virtual SmartPointer<IContributor> GetContributor() const = 0;
 
   /**
    * Returns whether this configuration element object is valid.
    *
    * @return <code>true</code> if the object is valid, and <code>false</code>
    * if it is no longer valid
    */
   virtual bool IsValid() const = 0;
 
 };
 
 }  // namespace berry
 
+Q_DECLARE_INTERFACE(berry::IConfigurationElement, "org.blueberry.core.IConfigurationElement")
+
 
 #endif /*BERRYIEXTENSIONELEMENT_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/registry/berryIContributor.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/registry/berryIContributor.h
index b0d29d48e7..13af6e12b6 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/registry/berryIContributor.h
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/registry/berryIContributor.h
@@ -1,60 +1,59 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYICONTRIBUTOR_H
 #define BERRYICONTRIBUTOR_H
 
 #include "berryObject.h"
-#include "berryMacros.h"
 
 #include <org_blueberry_core_runtime_Export.h>
 
 namespace berry {
 
 /**
  * This interface describes a registry contributor - an entity that supplies information
  * to the extension registry.
  * <p>
  * Registry contributor objects can be obtained by calling {@link IExtensionPoint#GetContributor()},
  * {@link IExtension#GetContributor()}, and {@link IConfigurationElement#GetContributor()}.
  * Alternatively, a contributor factory appropriate for the registry in use can be called to directly
  * obtain an IContributor object.
  * </p><p>
  * This interface is not intended to be implemented or extended by clients.
  * </p>
  * @see ContributorFactoryOSGi
  * @see ContributorFactorySimple
  *
  * @noimplement This interface is not intended to be implemented by clients.
  * @noextend This interface is not intended to be extended by clients.
  */
 struct org_blueberry_core_runtime_EXPORT IContributor : public Object
 {
-  berryInterfaceMacro(IContributor, berry)
+  berryObjectMacro(berry::IContributor)
 
   virtual ~IContributor();
 
   /**
    * Provides name of the contributor (e.g., "org.eclipse.core.runtime").
    *
    * @return name of the registry contributor
    */
   virtual QString GetName() const = 0;
 };
 
 }
 
 #endif // BERRYICONTRIBUTOR_H
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/registry/berryIExecutableExtension.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/registry/berryIExecutableExtension.h
index 9b487e8bcd..7f9a886031 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/registry/berryIExecutableExtension.h
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/registry/berryIExecutableExtension.h
@@ -1,144 +1,144 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 #ifndef BERRYIEXECUTABLEEXTENSION_H_
 #define BERRYIEXECUTABLEEXTENSION_H_
 
 #include "berryObject.h"
 #include "berrySmartPointer.h"
 
 #include <QObject>
 
 namespace berry {
 
 struct IConfigurationElement;
 
 /**
  * Interface for executable extension classes that require access to
  * their configuration element, or implement an extension adapter.
  * <p>
  * Extension adapters are typically required in cases where the extension
  * implementation does not follow the interface rules specified
  * by the provider of the extension point. In these
  * cases, the role of the adapter is to map between the extension point
  * interface, and the actual extension implementation. In general, adapters
  * are used when attempting to plug-in existing Java implementations, or
  * non-Java implementations (e.g., external executables).
  * </p>
  * <p>
  * Clients may implement this interface.
  * </p>
  *
  * @see IConfigurationElement#createExecutableExtension
  */
 struct org_blueberry_core_runtime_EXPORT IExecutableExtension
 {
   virtual ~IExecutableExtension();
 
   /**
    * This method is called by the implementation of the method
    * <code>IConfigurationElement.createExecutableExtension</code>
    * on a newly constructed extension, passing it its relevant configuration
    * information. Most executable extensions only make use of the first
    * two call arguments.
    * <p>
    * Regular executable extensions specify their Java implementation
    * class name as an attribute of the configuration element for the
    * extension. For example
    * <pre>
    *     &lt;action run="com.example.BaseAction"/&gt;
    * </pre>
    * In the above example, this method would be called with a reference
    * to the <code>&lt;action&gt;</code> element (first argument), and
    * <code>"run"</code> as the name of the attribute that defined
    * this executable extension (second argument).
    * </p>
    * <p>
    * The last parameter is for the specific use of extension adapters
    * and is typically not used by regular executable extensions.
    * </p>
    * <p>
    * There are two supported ways of associating additional
    * adapter-specific data with the configuration in a way that
    * is transparent to the extension point implementor:
    * </p>
    * <p>
    * (1) by specifying adapter data as part of the implementation
    * class attribute value. The Java class name can be followed
    * by a ":" separator, followed by any adapter data in string
    * form. For example, if the extension point specifies an attribute
    * <code>"run"</code> to contain the name of the extension implementation,
    * an adapter can be configured as
    * <pre>
    *     &lt;action run="com.example.ExternalAdapter:./cmds/util.exe -opt 3"/&gt;
    * </pre>
    * </p>
    * <p>
    * (2) by converting the attribute used to specify the executable
    * extension to a child element of the original configuration element,
    * and specifying the adapter data in the form of xml markup.
    * Using this form, the example above would become
    * <pre>
    *     &lt;action&gt;
    *         &lt;<it>run</it> class="com.xyz.ExternalAdapter"&gt;
    *             &lt;parameter name="exec" value="./cmds/util.exe"/&gt;
    *             &lt;parameter name="opt"  value="3"/&gt;
    *         &lt;/<it>run</it>&gt;
    *     &lt;/action&gt;
    * </pre>
    * </p>
    * <p>
    * Form (2) will typically only be
    * used for extension points that anticipate the majority of
    * extensions configured into it will in fact be in the form
    * of adapters.
    * </p>
    * <p>
    * In either case, the specified adapter class is instantiated using its
    * 0-argument public constructor. The adapter data is passed as the
    * last argument of this method. The data argument is defined as Object.
    * It can have the following values:
    * <ul>
    * <li><code>null</code>, if no adapter data was supplied</li>
    * <li>in case (1), the initialization data
    *    string is passed as a <code>String</code></li>
    * <li>in case (2), the initialization data is passed
    *    as a <code>Hashtable</code> containing the actual
    *    parameter names and values (both <code>String</code>s)</li>
    * </ul>
    * </p>
    *
    * @param config the configuration element used to trigger this execution.
    *    It can be queried by the executable extension for specific
    *    configuration properties
    * @param propertyName the name of an attribute of the configuration element
    *    used on the <code>createExecutableExtension(String)</code> call. This
    *    argument can be used in the cases where a single configuration element
    *    is used to define multiple executable extensions.
    * @param data adapter data in the form of a <code>String</code>,
    *    a <code>Hashtable</code>, or <code>null</code>.
    * @exception CoreException if error(s) detected during initialization processing
    * @see IConfigurationElement#createExecutableExtension
    */
   virtual void SetInitializationData(const SmartPointer<IConfigurationElement>& config,
                                      const QString& propertyName, const Object::Pointer& data) = 0;
 
 };
 
 }
 
-Q_DECLARE_INTERFACE(berry::IExecutableExtension, "org.blueberry.IExecutableExtension")
+Q_DECLARE_INTERFACE(berry::IExecutableExtension, "org.blueberry.ui.IExecutableExtension")
 
 #endif /*BERRYIEXECUTABLEEXTENSION_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/registry/berryIExtension.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/registry/berryIExtension.h
index a446952ce1..8880d59465 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/registry/berryIExtension.h
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/registry/berryIExtension.h
@@ -1,155 +1,155 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIEXTENSION_H_
 #define BERRYIEXTENSION_H_
 
 
 #include <berryObject.h>
 
 #include <QList>
 
 namespace berry {
 
 struct IConfigurationElement;
 struct IContributor;
 
 /**
  * An extension declared in a plug-in.
  * All information is obtained from the declaring plug-in's
  * manifest (<code>plugin.xml</code>) file.
  * <p>
  * These registry objects are intended for relatively short-term use. Clients that
  * deal with these objects must be aware that they may become invalid if the
  * declaring plug-in is updated or uninstalled. If this happens, all methods except
  * {@link #IsValid()} will throw {@link InvalidRegistryObjectException}.
  * For extension objects, the most common case is code in a plug-in dealing
  * with extensions contributed to one of the extension points it declares.
  * Code in a plug-in that has declared that it is not dynamic aware (or not
  * declared anything) can safely ignore this issue, since the registry
  * would not be modified while it is active. However, code in a plug-in that
  * declares that it is dynamic aware must be careful when accessing the extension
  * objects because they become invalid if the contributing plug-in is removed.
  * Similarly, tools that analyze or display the extension registry are vulnerable.
  * Client code can pre-test for invalid objects by calling {@link #IsValid()},
  * which never throws this exception. However, pre-tests are usually not sufficient
  * because of the possibility of the extension object becoming invalid as a
  * result of a concurrent activity. At-risk clients must treat
  * <code>InvalidRegistryObjectException</code> as if it were a checked exception.
  * Also, such clients should probably register a listener with the extension registry
  * so that they receive notification of any changes to the registry.
  * </p><p>
  * This interface is not intended to be implemented by clients.
  * </p>
  * @noimplement This interface is not intended to be implemented by clients.
  */
 struct org_blueberry_core_runtime_EXPORT IExtension : public virtual Object
 {
-  berryInterfaceMacro(IExtension, berry)
+  berryObjectMacro(berry::IExtension)
 
   virtual ~IExtension();
 
   /**
    * Returns all configuration elements declared by this extension.
    * These elements are a direct reflection of the configuration
    * markup supplied in the manifest (<code>plugin.xml</code>)
    * file for the plug-in that declares this extension.
    * Returns an empty array if this extension does not declare any
    * configuration elements.
    *
    * @return the configuration elements declared by this extension
    * @throws InvalidRegistryObjectException if this extension is no longer valid
    */
   virtual QList<SmartPointer<IConfigurationElement> > GetConfigurationElements() const = 0;
 
   /**
    * Returns the namespace name for this extension.
    *
    * @return the namespace name for this extension
    * @throws InvalidRegistryObjectException if this extension is no longer valid
    */
   virtual QString GetNamespaceIdentifier() const = 0;
 
   /**
    * Returns the contributor of this extension.
    *
    * @return the contributor for this extension
    * @throws InvalidRegistryObjectException if this extension is no longer valid
    */
   virtual SmartPointer<IContributor> GetContributor() const = 0;
 
   /**
    * Returns the unique identifier of the extension point
    * to which this extension should be contributed.
    *
    * @return the unique identifier of the relevant extension point
    * @throws InvalidRegistryObjectException if this extension is no longer valid
    */
   virtual QString GetExtensionPointUniqueIdentifier() const = 0;
 
   /**
    * Returns a displayable label for this extension.
    * Returns the empty string if no label for this extension
    * is specified in the extension manifest file.
    * <p> Note that any translation specified in the extension manifest
    * file is automatically applied.
    * <p>
    *
    * @return a displayable string label for this extension,
    *    possibly the empty string
    * @throws InvalidRegistryObjectException if this extension is no longer valid
    */
   virtual QString GetLabel() const = 0;
 
   /**
    * Returns the simple identifier of this extension, or <code>null</code>
    * if this extension does not have an identifier.
    * This identifier is specified in the extensions manifest
    * file as a non-empty string containing no period characters
    * (<code>'.'</code>) and must be unique within the defining host.
    *
    * @return the simple identifier of the extension (e.g. <code>"main"</code>)
    *  or <code>null</code>
    * @throws InvalidRegistryObjectException if this extension is no longer valid
    */
   virtual QString GetSimpleIdentifier() const = 0;
 
   /**
    * Returns the unique identifier of this extension, or <code>null</code>
    * if this extension does not have an identifier.
    * If available, this identifier is unique within the extension registry, and
    * is composed of the identifier of the host that declared
    * this extension and this extension's simple identifier.
    *
    * @return the unique identifier of the extension
    *    (e.g. <code>"com.example.acme.main"</code>), or <code>null</code>
    * @throws InvalidRegistryObjectException if this extension is no longer valid
    */
   virtual QString GetUniqueIdentifier() const = 0;
 
   /**
    * Returns whether this extension object is valid.
    *
    * @return <code>true</code> if the object is valid, and <code>false</code>
    * if it is no longer valid
    */
   virtual bool IsValid() const = 0;
 
 };
 
 }
 
 #endif /*BERRYIEXTENSION_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/registry/berryIExtensionPoint.h b/BlueBerry/Bundles/org.blueberry.core.runtime/src/registry/berryIExtensionPoint.h
index d17dac6b04..348f527b36 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/registry/berryIExtensionPoint.h
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/src/registry/berryIExtensionPoint.h
@@ -1,167 +1,167 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIEXTENSIONPOINT_H_
 #define BERRYIEXTENSIONPOINT_H_
 
 #include <berryObject.h>
 
 namespace berry {
 
 struct IConfigurationElement;
 struct IContributor;
 struct IExtension;
 
 /**
  * An extension point declared in a plug-in.
  * Except for the list of extensions plugged in to it, the information
  * available for an extension point is obtained from the declaring plug-in's
  * manifest (<code>plugin.xml</code>) file.
  * <p>
  * These registry objects are intended for relatively short-term use. Clients that
  * deal with these objects must be aware that they may become invalid if the
  * declaring plug-in is updated or uninstalled. If this happens, all methods except
  * {@link #isValid()} will throw {@link InvalidRegistryObjectException}.
  * For extension point objects, the most common case is code in a plug-in dealing
  * with one of the extension points it declares. These extension point objects are
  * guaranteed to be valid while the plug-in is active. Code in a plug-in that has
  * declared that it is not dynamic aware (or not declared anything) can also safely
  * ignore this issue, since the registry would not be modified while it is
  * active. However, code in a plug-in that declares that it is dynamic aware
  * must be careful if it access the extension point object of a different plug-in,
  * because it's at risk if that other plug-in is removed. Similarly,
  * tools that analyze or display the extension registry are vulnerable.
  * Client code can pre-test for invalid objects by calling {@link #isValid()},
  * which never throws this exception. However, pre-tests are usually not sufficient
  * because of the possibility of the extension point object becoming invalid as a
  * result of a concurrent activity. At-risk clients must treat
  * <code>InvalidRegistryObjectException</code> as if it were a checked exception.
  * Also, such clients should probably register a listener with the extension registry
  * so that they receive notification of any changes to the registry.
  * </p>
  * <p>
  * This interface is not intended to be implemented by clients.
  * </p>
  * @noimplement This interface is not intended to be implemented by clients.
  */
 struct IExtensionPoint : public virtual Object
 {
 
-  berryInterfaceMacro(IExtensionPoint, berry)
+  berryObjectMacro(berry::IExtensionPoint)
 
   virtual ~IExtensionPoint();
 
   /**
    * Returns all configuration elements from all extensions configured
    * into this extension point. Returns an empty array if this extension
    * point has no extensions configured, or none of the extensions
    * contain configuration elements.
    *
    * @return the configuration elements for all extension configured
    *   into this extension point
    * @throws InvalidRegistryObjectException if this extension point is no longer valid
    */
   virtual QList<SmartPointer<IConfigurationElement> > GetConfigurationElements() const = 0;
 
   /**
    * Returns the namespace name for this extension point.
    *
    * @return the namespace name for this extension point
    * @throws InvalidRegistryObjectException if this extension point is no longer valid
    */
   virtual QString GetNamespaceIdentifier() const = 0;
 
   /**
    * Returns the contributor of this extension point.
    *
    * @return the contributor for this extension point
    * @throws InvalidRegistryObjectException if this extension point is no longer valid
    */
   virtual SmartPointer<IContributor> GetContributor() const = 0;
 
   /**
    * Returns the extension with the given unique identifier configured into
    * this extension point, or <code>null</code> if there is no such extension.
    * Since an extension might not have an identifier, some extensions
    * can only be found via the <code>getExtensions</code> method.
    *
    * @param extensionId the unique identifier of an extension
    *    (e.g. <code>"com.example.acme.main"</code>).
    * @return an extension, or <code>null</code>
    * @throws InvalidRegistryObjectException if this extension point is no longer valid
    */
   virtual SmartPointer<IExtension> GetExtension(const QString& extensionId) const = 0;
 
   /**
    * Returns all extensions configured into this extension point.
    * Returns an empty array if this extension point has no extensions.
    *
    * @return the extensions configured into this extension point
    * @throws InvalidRegistryObjectException if this extension point is no longer valid
    */
   virtual QList<SmartPointer<IExtension> > GetExtensions() const = 0;
 
   /**
    * Returns a displayable label for this extension point.
    * Returns the empty string if no label for this extension point
    * is specified in the plug-in manifest file.
    * <p> Note that any translation specified in the plug-in manifest
    * file is automatically applied.
    * </p>
    *
    * @return a displayable string label for this extension point,
    *    possibly the empty string
    * @throws InvalidRegistryObjectException if this extension point is no longer valid
    */
   virtual QString GetLabel() const = 0;
 
   /**
    * Returns the simple identifier of this extension point.
    * This identifier is a non-empty string containing no
    * period characters (<code>'.'</code>) and is guaranteed
    * to be unique within the defining plug-in.
    *
    * @return the simple identifier of the extension point (e.g. <code>"builders"</code>)
    * @throws InvalidRegistryObjectException if this extension point is no longer valid
    */
   virtual QString GetSimpleIdentifier() const = 0;
 
   /**
    * Returns the unique identifier of this extension point.
    * This identifier is unique within the plug-in registry, and
    * is composed of the namespace for this extension point
    * and this extension point's simple identifier.
    *
    *
    * @return the unique identifier of the extension point
    *    (e.g. <code>"org.blueberry.core.resources.builders"</code>)
    * @throws InvalidRegistryObjectException if this extension point is no longer valid
    */
   virtual QString GetUniqueIdentifier() const = 0;
 
   /**
    * Returns whether this extension point object is valid.
    *
    * @return <code>true</code> if the object is valid, and <code>false</code>
    * if it is no longer valid
    */
   virtual bool IsValid() const = 0;
 
 };
 
 }
 
 #endif /*BERRYIEXTENSIONPOINT_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.test/src/berryITestDescriptor.h b/BlueBerry/Bundles/org.blueberry.test/src/berryITestDescriptor.h
index ed2d5348a1..67540cc46e 100644
--- a/BlueBerry/Bundles/org.blueberry.test/src/berryITestDescriptor.h
+++ b/BlueBerry/Bundles/org.blueberry.test/src/berryITestDescriptor.h
@@ -1,42 +1,42 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYITESTDESCRIPTOR_H_
 #define BERRYITESTDESCRIPTOR_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
 
 #include <cppunit/Test.h>
 
 namespace berry {
 
 struct ITestDescriptor : public Object
 {
-  berryInterfaceMacro(ITestDescriptor, berry);
+  berryObjectMacro(berry::ITestDescriptor)
 
   virtual CppUnit::Test* CreateTest() = 0;
   virtual std::string GetId() const = 0;
   virtual std::string GetContributor() const = 0;
   virtual std::string GetDescription() const = 0;
 
   virtual bool IsUITest() const = 0;
 };
 
 }
 
 #endif /* BERRYITESTDESCRIPTOR_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.help/src/internal/berryHelpEditor.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt.help/src/internal/berryHelpEditor.cpp
index b29b5a0a74..e591a489bf 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt.help/src/internal/berryHelpEditor.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt.help/src/internal/berryHelpEditor.cpp
@@ -1,342 +1,339 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryHelpEditor.h"
 
 #include "berryHelpEditorInput.h"
 #include "berryHelpPluginActivator.h"
 #include "berryHelpPerspective.h"
 #include "berryHelpWebView.h"
 #include "berryQHelpEngineWrapper.h"
 #include "berryHelpEditorFindWidget.h"
 #include "berryHelpPluginActivator.h"
 #include "berryQHelpEngineWrapper.h"
 
 #include <berryUIException.h>
 #include <berryPlatformUI.h>
 #include <berryIWorkbenchPage.h>
 #include <berryIWorkbenchPartConstants.h>
 
 #include <QToolBar>
 #include <QHelpEngine>
 #include <QVBoxLayout>
 
 namespace berry {
 
 const QString HelpEditor::EDITOR_ID = "org.blueberry.editors.help";
 
 HelpEditor::HelpEditor()
   : m_ToolBar(0)
   , m_WebView(0)
 {
 
 }
 
 HelpEditor::~HelpEditor()
 {
-  // we need to wrap the RemovePartListener call inside a
-  // register/unregister block to prevent infinite recursion
-  // due to the destruction of temporary smartpointer to this
-  this->Register();
-  this->GetSite()->GetPage()->RemovePartListener(IPartListener::Pointer(this));
-  this->GetSite()->GetPage()->GetWorkbenchWindow()->RemovePerspectiveListener(IPerspectiveListener::Pointer(this));
-  this->UnRegister(false);
+  this->GetSite()->GetPage()->RemovePartListener(this);
+  this->GetSite()->GetPage()->GetWorkbenchWindow()->RemovePerspectiveListener(this);
 }
 
 void HelpEditor::Init(berry::IEditorSite::Pointer site, berry::IEditorInput::Pointer input)
 {
   if (input.Cast<HelpEditorInput>().IsNull())
      throw PartInitException("Invalid Input: Must be berry::HelpEditorInput");
 
   this->SetSite(site);
-  site->GetPage()->AddPartListener(IPartListener::Pointer(this));
-  site->GetPage()->GetWorkbenchWindow()->AddPerspectiveListener(IPerspectiveListener::Pointer(this));
+  site->GetPage()->AddPartListener(this);
+  site->GetPage()->GetWorkbenchWindow()->AddPerspectiveListener(this);
 
   m_WebView = new HelpWebView(site, 0);
 
   connect(m_WebView, SIGNAL(loadFinished(bool)), this, SLOT(InitializeTitle()));
 
   this->DoSetInput(input);
 }
 
 void HelpEditor::CreateQtPartControl(QWidget* parent)
 {
   QVBoxLayout* verticalLayout = new QVBoxLayout(parent);
   verticalLayout->setSpacing(0);
   verticalLayout->setContentsMargins(0, 0, 0, 0);
 
   m_ToolBar = new QToolBar(parent);
   m_ToolBar->setMaximumHeight(32);
   verticalLayout->addWidget(m_ToolBar);
 
   m_WebView->setParent(parent);
   m_WebView->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
   verticalLayout->addWidget(m_WebView);
 
   m_FindWidget = new HelpEditorFindWidget(parent);
   m_FindWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Maximum);
   verticalLayout->addWidget(m_FindWidget);
   m_FindWidget->hide();
 
   connect(m_FindWidget, SIGNAL(findNext()), this, SLOT(findNext()));
   connect(m_FindWidget, SIGNAL(findPrevious()), this, SLOT(findPrevious()));
   connect(m_FindWidget, SIGNAL(find(QString, bool)), this,
           SLOT(find(QString, bool)));
   connect(m_FindWidget, SIGNAL(escapePressed()), m_WebView, SLOT(setFocus()));
 
   // Fill the editor toolbar
   m_BackAction = m_ToolBar->addAction(QIcon(":/org.blueberry.ui.qt.help/go-previous.png"), "Go back",
                                              m_WebView, SLOT(backward()));
   m_ForwardAction = m_ToolBar->addAction(QIcon(":/org.blueberry.ui.qt.help/go-next.png"), "Go forward",
                                                 m_WebView, SLOT(forward()));
   m_HomeAction = m_ToolBar->addAction(QIcon(":/org.blueberry.ui.qt.help/go-home.png"), "Go home",
                                       m_WebView, SLOT(home()));
   m_PrintAction = m_ToolBar->addAction(QIcon(":/org.blueberry.ui.qt.help/print.png"), "Print",
     m_WebView, SLOT(print()));
 
   m_ToolBar->addSeparator();
 
   m_FindAction = m_ToolBar->addAction(QIcon(":/org.blueberry.ui.qt.help/find.png"), "Find in text",
                                              this, SLOT(ShowTextSearch()));
 
   m_ToolBar->addSeparator();
 
   m_ZoomIn = m_ToolBar->addAction(QIcon(":/org.blueberry.ui.qt.help/zoom-in.png"), "Zoom in", m_WebView, SLOT(scaleUp()));
   m_ZoomOut = m_ToolBar->addAction(QIcon(":/org.blueberry.ui.qt.help/zoom-out.png"), "Zoom out", m_WebView, SLOT(scaleDown()));
 
   m_ToolBar->addSeparator();
 
   m_OpenHelpMode = m_ToolBar->addAction("Open Help Perspective", this, SLOT(OpenHelpPerspective()));
   m_CloseHelpMode = m_ToolBar->addAction("Close Help Perspective", this, SLOT(CloseHelpPerspective()));
   IPerspectiveDescriptor::Pointer currPersp = this->GetSite()->GetPage()->GetPerspective();
   m_OpenHelpMode->setVisible(!(currPersp.IsNotNull() && currPersp->GetId() == HelpPerspective::ID));
   m_CloseHelpMode->setVisible((currPersp.IsNotNull() && currPersp->GetId() == HelpPerspective::ID));
 
   connect(m_WebView, SIGNAL(backwardAvailable(bool)), m_BackAction, SLOT(setEnabled(bool)));
   connect(m_WebView, SIGNAL(forwardAvailable(bool)), m_ForwardAction, SLOT(setEnabled(bool)));
 
   m_BackAction->setEnabled(false);
   m_ForwardAction->setEnabled(false);
   m_HomeAction->setEnabled(!HelpPluginActivator::getInstance()->getQHelpEngine().homePage().isEmpty());
 
   connect(&HelpPluginActivator::getInstance()->getQHelpEngine(), SIGNAL(homePageChanged(QString)),
           this, SLOT(HomePageChanged(QString)));
 }
 
 void HelpEditor::DoSetInput(IEditorInput::Pointer input)
 {
   if (input.IsNull())
   {
     // close editor
     class CloseEditorRunnable : public Poco::Runnable
     {
     private:
       IEditorPart::Pointer editor;
 
     public:
       CloseEditorRunnable(IEditorPart::Pointer editor)
         : editor(editor)
       {}
 
       void run()
       {
         editor->GetSite()->GetPage()->CloseEditor(editor, false);
         delete this;
       }
     };
 
     Display::GetDefault()->AsyncExec(new CloseEditorRunnable(IEditorPart::Pointer(this)));
   }
   else
   {
     // an empty url represents the home page
     HelpEditorInput::Pointer helpInput = input.Cast<HelpEditorInput>();
     QString currHomePage = HelpPluginActivator::getInstance()->getQHelpEngine().homePage();
     if (helpInput->GetUrl().isEmpty() && !currHomePage.isEmpty())
     {
       helpInput = HelpEditorInput::Pointer(new HelpEditorInput(currHomePage));
     }
     QtEditorPart::SetInput(helpInput);
     m_WebView->setSource(helpInput->GetUrl());
   }
 }
 
 void HelpEditor::SetInputWithNotify(IEditorInput::Pointer input)
 {
   DoSetInput(input);
   FirePropertyChange(IWorkbenchPartConstants::PROP_INPUT);
 }
 
 void HelpEditor::SetInput(IEditorInput::Pointer input)
 {
   SetInputWithNotify(input);
 }
 
 void HelpEditor::HomePageChanged(const QString &page)
 {
   if (page.isEmpty())
   {
     m_HomeAction->setEnabled(false);
   }
 
   m_HomeAction->setEnabled(true);
   if (this->GetEditorInput().Cast<HelpEditorInput>()->GetUrl().isEmpty())
   {
     IEditorInput::Pointer newInput(new HelpEditorInput(page));
     DoSetInput(newInput);
   }
 }
 
 void HelpEditor::OpenHelpPerspective()
 {
   PlatformUI::GetWorkbench()->ShowPerspective(HelpPerspective::ID, this->GetSite()->GetPage()->GetWorkbenchWindow());
 }
 
 void HelpEditor::CloseHelpPerspective()
 {
   berry::IWorkbenchPage::Pointer
     page =
     berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage();
   page->ClosePerspective(page->GetPerspective(), true, true);
 }
 
 void HelpEditor::InitializeTitle()
 {
   QString title = m_WebView->title();
   this->SetPartName(title);
 }
 
 void HelpEditor::ShowTextSearch()
 {
   m_FindWidget->show();
 }
 
 void HelpEditor::SetFocus()
 {
   m_WebView->setFocus();
 
   enableShortcuts();
 }
 
 QWebPage *HelpEditor::GetQWebPage() const
 {
   return m_WebView->page();
 }
 
 IPartListener::Events::Types HelpEditor::GetPartEventTypes() const
 {
   return IPartListener::Events::DEACTIVATED;
 }
 
-void HelpEditor::PartDeactivated(IWorkbenchPartReference::Pointer partRef)
+void HelpEditor::PartDeactivated(const IWorkbenchPartReference::Pointer& partRef)
 {
   if (partRef == GetSite()->GetPage()->GetReference(IWorkbenchPart::Pointer(this)))
     disableShortcuts();
 }
 
 IPerspectiveListener::Events::Types HelpEditor::GetPerspectiveEventTypes() const
 {
   return IPerspectiveListener::Events::ACTIVATED | IPerspectiveListener::Events::DEACTIVATED;
 }
 
-void HelpEditor::PerspectiveActivated(SmartPointer<IWorkbenchPage> page, IPerspectiveDescriptor::Pointer perspective)
+void HelpEditor::PerspectiveActivated(const SmartPointer<IWorkbenchPage>& /*page*/,
+                                      const IPerspectiveDescriptor::Pointer& perspective)
 {
   if (perspective->GetId() == HelpPerspective::ID)
   {
     m_OpenHelpMode->setVisible(false);
     m_CloseHelpMode->setVisible(true);
   }
 }
 
-void HelpEditor::PerspectiveDeactivated(SmartPointer<IWorkbenchPage> page, IPerspectiveDescriptor::Pointer perspective)
+void HelpEditor::PerspectiveDeactivated(const SmartPointer<IWorkbenchPage>& /*page*/,
+                                        const IPerspectiveDescriptor::Pointer& perspective)
 {
   if (perspective->GetId() == HelpPerspective::ID)
   {
     m_OpenHelpMode->setVisible(true);
     m_CloseHelpMode->setVisible(false);
   }
 }
 
 void HelpEditor::findNext()
 {
   find(m_FindWidget->text(), true);
 }
 
 void HelpEditor::findPrevious()
 {
   find(m_FindWidget->text(), false);
 }
 
 void HelpEditor::find(const QString &ttf, bool forward)
 {
   bool found = findInWebPage(ttf, forward);
 
   if (!found && ttf.isEmpty())
     found = true;   // the line edit is empty, no need to mark it red...
 
   if (!m_FindWidget->isVisible())
     m_FindWidget->show();
   m_FindWidget->setPalette(found);
 }
 
 bool HelpEditor::findInWebPage(const QString &ttf, bool forward)
 {
   bool found = false;
   QWebPage::FindFlags options;
   if (!ttf.isEmpty())
   {
     if (!forward)
       options |= QWebPage::FindBackward;
 
     if (m_FindWidget->caseSensitive())
       options |= QWebPage::FindCaseSensitively;
 
     found = m_WebView->findText(ttf, options);
 
     if (!found)
     {
       options |= QWebPage::FindWrapsAroundDocument;
       found = m_WebView->findText(ttf, options);
     }
   }
   // force highlighting of all other matches, also when empty (clear)
   options = QWebPage::HighlightAllOccurrences;
   if (m_FindWidget->caseSensitive())
     options |= QWebPage::FindCaseSensitively;
   m_WebView->findText(QLatin1String(""), options);
   m_WebView->findText(ttf, options);
   return found;
 }
 
 void HelpEditor::enableShortcuts()
 {
   m_BackAction->setShortcut(QKeySequence::Back);
   m_ForwardAction->setShortcut(QKeySequence::Forward);
   m_FindAction->setShortcut(QKeySequence::Find);
   m_ZoomIn->setShortcut(QKeySequence::ZoomIn);
   m_ZoomOut->setShortcut(QKeySequence::ZoomOut);
 }
 
 void HelpEditor::disableShortcuts()
 {
   m_BackAction->setShortcut(QKeySequence());
   m_ForwardAction->setShortcut(QKeySequence());
   m_FindAction->setShortcut(QKeySequence());
   m_ZoomIn->setShortcut(QKeySequence());
   m_ZoomOut->setShortcut(QKeySequence());
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.help/src/internal/berryHelpEditor.h b/BlueBerry/Bundles/org.blueberry.ui.qt.help/src/internal/berryHelpEditor.h
index ba9bea81a0..946401b733 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt.help/src/internal/berryHelpEditor.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt.help/src/internal/berryHelpEditor.h
@@ -1,112 +1,114 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYHELPEDITOR_H_
 #define BERRYHELPEDITOR_H_
 
 #include <berryIReusableEditor.h>
 #include <berryIPartListener.h>
 #include <berryIPerspectiveListener.h>
 #include <berryQtEditorPart.h>
 
 class QToolBar;
 class QWebPage;
 
 namespace berry {
 
 class HelpWebView;
 class HelpEditorFindWidget;
 
 class HelpEditor : public QtEditorPart, public IReusableEditor, public IPartListener, public IPerspectiveListener
 {
   Q_OBJECT
 
 public:
   berryObjectMacro(HelpEditor);
 
   static const QString EDITOR_ID;
 
   HelpEditor();
   ~HelpEditor();
 
   void Init(berry::IEditorSite::Pointer site, berry::IEditorInput::Pointer input);
 
   void SetFocus();
 
   void DoSave() {}
   void DoSaveAs() {}
   bool IsDirty() const { return false; }
   bool IsSaveAsAllowed() const { return false; }
 
   QWebPage* GetQWebPage() const;
 
   IPartListener::Events::Types GetPartEventTypes() const;
-  void PartDeactivated(IWorkbenchPartReference::Pointer /*partRef*/);
+  void PartDeactivated(const IWorkbenchPartReference::Pointer& /*partRef*/);
 
   IPerspectiveListener::Events::Types GetPerspectiveEventTypes() const;
-  void PerspectiveActivated(SmartPointer<IWorkbenchPage> page, IPerspectiveDescriptor::Pointer perspective);
-  void PerspectiveDeactivated(SmartPointer<IWorkbenchPage> page, IPerspectiveDescriptor::Pointer perspective);
+  void PerspectiveActivated(const SmartPointer<IWorkbenchPage>& page,
+                            const IPerspectiveDescriptor::Pointer& perspective);
+  void PerspectiveDeactivated(const SmartPointer<IWorkbenchPage>& page,
+                              const IPerspectiveDescriptor::Pointer& perspective);
 
 protected:
 
   void CreateQtPartControl(QWidget* parent);
 
   void DoSetInput(IEditorInput::Pointer input);
   void SetInputWithNotify(IEditorInput::Pointer input);
   void SetInput(IEditorInput::Pointer input);
 
 private Q_SLOTS:
 
   void HomePageChanged(const QString& page);
   void OpenHelpPerspective();
   void CloseHelpPerspective();
 
   void InitializeTitle();
   void ShowTextSearch();
 
   void findNext();
   void findPrevious();
   void find(const QString& ttf, bool forward);
 
 private:
 
   bool findInWebPage(const QString& ttf, bool forward);
 
   void enableShortcuts();
   void disableShortcuts();
 
 private:
 
   Q_DISABLE_COPY(HelpEditor)
 
   QToolBar* m_ToolBar;
   HelpWebView* m_WebView;
   HelpEditorFindWidget* m_FindWidget;
 
   QAction* m_BackAction;
   QAction* m_ForwardAction;
   QAction* m_FindAction;
   QAction* m_ZoomIn;
   QAction* m_ZoomOut;
   QAction* m_OpenHelpMode;
   QAction* m_CloseHelpMode;
   QAction* m_HomeAction;
   QAction* m_PrintAction;
 };
 
 } // end namespace berry
 
 #endif /*BERRYHELPEDITOR_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.help/src/internal/berryHelpPluginActivator.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt.help/src/internal/berryHelpPluginActivator.cpp
index e5671e6c1c..f616f1797d 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt.help/src/internal/berryHelpPluginActivator.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt.help/src/internal/berryHelpPluginActivator.cpp
@@ -1,472 +1,476 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryHelpPluginActivator.h"
 
 #include "berryHelpContentView.h"
 #include "berryHelpIndexView.h"
 #include "berryHelpSearchView.h"
 #include "berryHelpEditor.h"
 #include "berryHelpEditorInput.h"
 #include "berryHelpPerspective.h"
 
 #include "berryQHelpEngineConfiguration.h"
 #include "berryQHelpEngineWrapper.h"
 
 #include <berryPlatformUI.h>
 
 #include <service/event/ctkEventConstants.h>
 
 #include <QtPlugin>
 #include <QDir>
 #include <QDateTime>
 
 namespace berry {
 
 class HelpPerspectiveListener : public IPerspectiveListener
 {
 public:
 
   Events::Types GetPerspectiveEventTypes() const;
 
-  void PerspectiveOpened(SmartPointer<IWorkbenchPage> page, IPerspectiveDescriptor::Pointer perspective);
-  void PerspectiveChanged(SmartPointer<IWorkbenchPage> page, IPerspectiveDescriptor::Pointer perspective, const QString &changeId);
+  using IPerspectiveListener::PerspectiveChanged;
+
+  void PerspectiveOpened(const SmartPointer<IWorkbenchPage>& page, const IPerspectiveDescriptor::Pointer& perspective);
+  void PerspectiveChanged(const SmartPointer<IWorkbenchPage>& page, const IPerspectiveDescriptor::Pointer& perspective, const QString &changeId);
 };
 
 class HelpWindowListener : public IWindowListener
 {
 public:
 
   HelpWindowListener();
   ~HelpWindowListener();
 
-  void WindowClosed(IWorkbenchWindow::Pointer window);
-  void WindowOpened(IWorkbenchWindow::Pointer window);
+  void WindowClosed(const IWorkbenchWindow::Pointer& window);
+  void WindowOpened(const IWorkbenchWindow::Pointer& window);
 
 private:
 
   // We use the same perspective listener for every window
-  IPerspectiveListener::Pointer perspListener;
+  QScopedPointer<IPerspectiveListener> perspListener;
 };
 
 
 HelpPluginActivator* HelpPluginActivator::instance = 0;
 
 HelpPluginActivator::HelpPluginActivator()
   : pluginListener(0)
 {
   this->instance = this;
 }
 
 HelpPluginActivator::~HelpPluginActivator()
 {
   instance = 0;
 }
 
 void
 HelpPluginActivator::start(ctkPluginContext* context)
 {
   BERRY_REGISTER_EXTENSION_CLASS(berry::HelpContentView, context)
   BERRY_REGISTER_EXTENSION_CLASS(berry::HelpIndexView, context)
   BERRY_REGISTER_EXTENSION_CLASS(berry::HelpSearchView, context)
   BERRY_REGISTER_EXTENSION_CLASS(berry::HelpEditor, context)
   BERRY_REGISTER_EXTENSION_CLASS(berry::HelpPerspective, context)
 
   QFileInfo qhcInfo = context->getDataFile("qthelpcollection.qhc");
   helpEngine.reset(new QHelpEngineWrapper(qhcInfo.absoluteFilePath()));
   if (!helpEngine->setupData())
   {
     BERRY_ERROR << "QHelpEngine set-up failed: " << helpEngine->error().toStdString();
     return;
   }
 
   helpEngineConfiguration.reset(new QHelpEngineConfiguration(context, *helpEngine.data()));
 
   delete pluginListener;
   pluginListener = new QCHPluginListener(context, helpEngine.data());
   context->connectPluginListener(pluginListener, SLOT(pluginChanged(ctkPluginEvent)));
 
   // register all QCH files from all the currently installed plugins
   pluginListener->processPlugins();
 
   helpEngine->initialDocSetupDone();
 
   // Register a wnd listener which registers a perspective listener for each
   // new window. The perspective listener opens the help home page in the window
   // if no other help page is opened yet.
-  wndListener = IWindowListener::Pointer(new HelpWindowListener());
-  PlatformUI::GetWorkbench()->AddWindowListener(wndListener);
+  wndListener.reset(new HelpWindowListener());
+  PlatformUI::GetWorkbench()->AddWindowListener(wndListener.data());
 
   // Register an event handler for CONTEXTHELP_REQUESTED events
   helpContextHandler.reset(new HelpContextHandler);
   ctkDictionary helpHandlerProps;
   helpHandlerProps.insert(ctkEventConstants::EVENT_TOPIC, "org/blueberry/ui/help/CONTEXTHELP_REQUESTED");
   context->registerService<ctkEventHandler>(helpContextHandler.data(), helpHandlerProps);
 }
 
 void
 HelpPluginActivator::stop(ctkPluginContext* /*context*/)
 {
   delete pluginListener;
   pluginListener = 0;
 
   if (PlatformUI::IsWorkbenchRunning())
   {
-    PlatformUI::GetWorkbench()->RemoveWindowListener(wndListener);
+    PlatformUI::GetWorkbench()->RemoveWindowListener(wndListener.data());
   }
-  wndListener = 0;
+  wndListener.reset();
 }
 
 HelpPluginActivator *HelpPluginActivator::getInstance()
 {
   return instance;
 }
 
 QHelpEngineWrapper& HelpPluginActivator::getQHelpEngine()
 {
   return *helpEngine;
 }
 
 void HelpPluginActivator::linkActivated(IWorkbenchPage::Pointer page, const QUrl &link)
 {
   IEditorInput::Pointer input(new HelpEditorInput(link));
 
   // see if an editor with the same input is already open
   IEditorPart::Pointer reuseEditor = page->FindEditor(input);
   if (reuseEditor)
   {
     // just activate it
     page->Activate(reuseEditor);
   }
   else
   {
     // reuse the currently active editor, if it is a HelpEditor
     reuseEditor = page->GetActiveEditor();
     if (reuseEditor.IsNotNull() && page->GetReference(reuseEditor)->GetId() == HelpEditor::EDITOR_ID)
     {
       page->ReuseEditor(reuseEditor.Cast<IReusableEditor>(), input);
       page->Activate(reuseEditor);
     }
     else
     {
       // get the last used HelpEditor instance
       QList<IEditorReference::Pointer> editors =
           page->FindEditors(IEditorInput::Pointer(0), HelpEditor::EDITOR_ID, IWorkbenchPage::MATCH_ID);
       if (editors.empty())
       {
         // no HelpEditor is currently open, create a new one
         page->OpenEditor(input, HelpEditor::EDITOR_ID);
       }
       else
       {
         // reuse an existing editor
         reuseEditor = editors.front()->GetEditor(false);
         page->ReuseEditor(reuseEditor.Cast<IReusableEditor>(), input);
         page->Activate(reuseEditor);
       }
     }
   }
 }
 
 QCHPluginListener::QCHPluginListener(ctkPluginContext* context, QHelpEngine* helpEngine)
   : delayRegistration(true), context(context), helpEngine(helpEngine)
 {}
 
 void QCHPluginListener::processPlugins()
 {
   QMutexLocker lock(&mutex);
   processPlugins_unlocked();
 }
 
 void QCHPluginListener::pluginChanged(const ctkPluginEvent& event)
 {
   QMutexLocker lock(&mutex);
   if (delayRegistration)
   {
     this->processPlugins_unlocked();
     return;
   }
 
   /* Only should listen for RESOLVED and UNRESOLVED events.
    *
    * When a plugin is updated the Framework will publish an UNRESOLVED and
    * then a RESOLVED event which should cause the plugin to be removed
    * and then added back into the registry.
    *
    * When a plugin is uninstalled the Framework should publish an UNRESOLVED
    * event and then an UNINSTALLED event so the plugin will have been removed
    * by the UNRESOLVED event before the UNINSTALLED event is published.
    */
   QSharedPointer<ctkPlugin> plugin = event.getPlugin();
   switch (event.getType())
   {
-    case ctkPluginEvent::RESOLVED :
-      addPlugin(plugin);
-      break;
-    case ctkPluginEvent::UNRESOLVED :
-      removePlugin(plugin);
-      break;
+  case ctkPluginEvent::RESOLVED :
+    addPlugin(plugin);
+    break;
+  case ctkPluginEvent::UNRESOLVED :
+    removePlugin(plugin);
+    break;
+  default:
+    break;
   }
 }
 
 void QCHPluginListener::processPlugins_unlocked()
 {
   if (!delayRegistration) return;
 
   foreach (QSharedPointer<ctkPlugin> plugin, context->getPlugins())
   {
     if (isPluginResolved(plugin))
       addPlugin(plugin);
     else
       removePlugin(plugin);
   }
 
   delayRegistration = false;
 }
 
 bool QCHPluginListener::isPluginResolved(QSharedPointer<ctkPlugin> plugin)
 {
   return (plugin->getState() & (ctkPlugin::RESOLVED | ctkPlugin::ACTIVE | ctkPlugin::STARTING | ctkPlugin::STOPPING)) != 0;
 }
 
 void QCHPluginListener::removePlugin(QSharedPointer<ctkPlugin> plugin)
 {
   // bail out if system plugin
   if (plugin->getPluginId() == 0) return;
 
   QFileInfo qchDirInfo = context->getDataFile("qch_files/" + QString::number(plugin->getPluginId()));
   if (qchDirInfo.exists())
   {
     QDir qchDir(qchDirInfo.absoluteFilePath());
     QStringList qchEntries = qchDir.entryList(QStringList("*.qch"));
     QStringList qchFiles;
     foreach(QString qchEntry, qchEntries)
     {
       qchFiles << qchDir.absoluteFilePath(qchEntry);
     }
     // unregister the cached qch files
     foreach(QString qchFile, qchFiles)
     {
       QString namespaceName = QHelpEngineCore::namespaceName(qchFile);
       if (namespaceName.isEmpty())
       {
         BERRY_ERROR << "Could not get the namespace for qch file " << qchFile.toStdString();
         continue;
       }
       else
       {
         if (!helpEngine->unregisterDocumentation(namespaceName))
         {
           BERRY_ERROR << "Unregistering qch namespace " << namespaceName.toStdString() << " failed: " << helpEngine->error().toStdString();
         }
       }
     }
     // clean the directory
     foreach(QString qchEntry, qchEntries)
     {
       qchDir.remove(qchEntry);
     }
   }
 }
 
 void QCHPluginListener::addPlugin(QSharedPointer<ctkPlugin> plugin)
 {
   // bail out if system plugin
   if (plugin->getPluginId() == 0) return;
 
   QFileInfo qchDirInfo = context->getDataFile("qch_files/" + QString::number(plugin->getPluginId()));
   QUrl location(plugin->getLocation());
   QFileInfo pluginFileInfo(location.toLocalFile());
 
   if (!qchDirInfo.exists() || qchDirInfo.lastModified() < pluginFileInfo.lastModified())
   {
     removePlugin(plugin);
 
     if (!qchDirInfo.exists())
     {
       QDir().mkpath(qchDirInfo.absoluteFilePath());
     }
 
     QStringList localQCHFiles;
     QStringList resourceList = plugin->findResources("/", "*.qch", true);
     foreach(QString resource, resourceList)
     {
       QByteArray content = plugin->getResource(resource);
       QFile localFile(qchDirInfo.absoluteFilePath() + "/" + resource.section('/', -1));
       localFile.open(QIODevice::WriteOnly);
       localFile.write(content);
       localFile.close();
       if (localFile.error() != QFile::NoError)
       {
         BERRY_WARN << "Error writing " << localFile.fileName().toStdString()
                    << ": " << localFile.errorString().toStdString();
       }
       else
       {
         localQCHFiles << localFile.fileName();
       }
     }
 
     foreach(QString qchFile, localQCHFiles)
     {
       if (!helpEngine->registerDocumentation(qchFile))
       {
         BERRY_ERROR << "Registering qch file " << qchFile.toStdString() << " failed: " << helpEngine->error().toStdString();
       }
     }
   }
 
 }
 
 IPerspectiveListener::Events::Types HelpPerspectiveListener::GetPerspectiveEventTypes() const
 {
   return Events::OPENED | Events::CHANGED;
 }
 
-void HelpPerspectiveListener::PerspectiveOpened(SmartPointer<IWorkbenchPage> page, IPerspectiveDescriptor::Pointer perspective)
+void HelpPerspectiveListener::PerspectiveOpened(const SmartPointer<IWorkbenchPage>& page, const IPerspectiveDescriptor::Pointer& perspective)
 {
   // if no help editor is opened, open one showing the home page
   if (perspective->GetId() == HelpPerspective::ID &&
       page->FindEditors(IEditorInput::Pointer(0), HelpEditor::EDITOR_ID, IWorkbenchPage::MATCH_ID).empty())
   {
     IEditorInput::Pointer input(new HelpEditorInput());
     page->OpenEditor(input, HelpEditor::EDITOR_ID);
   }
 }
 
-void HelpPerspectiveListener::PerspectiveChanged(SmartPointer<IWorkbenchPage> page, IPerspectiveDescriptor::Pointer perspective, const QString &changeId)
+void HelpPerspectiveListener::PerspectiveChanged(const SmartPointer<IWorkbenchPage>& page, const IPerspectiveDescriptor::Pointer& perspective, const QString &changeId)
 {
   if (perspective->GetId() == HelpPerspective::ID && changeId == IWorkbenchPage::CHANGE_RESET)
   {
     PerspectiveOpened(page, perspective);
   }
 }
 
 HelpWindowListener::HelpWindowListener()
   : perspListener(new HelpPerspectiveListener())
 {
   // Register perspective listener for already opened windows
   typedef QList<IWorkbenchWindow::Pointer> WndVec;
   WndVec windows = PlatformUI::GetWorkbench()->GetWorkbenchWindows();
   for (WndVec::iterator i = windows.begin(); i != windows.end(); ++i)
   {
-    (*i)->AddPerspectiveListener(perspListener);
+    (*i)->AddPerspectiveListener(perspListener.data());
   }
 }
 
 HelpWindowListener::~HelpWindowListener()
 {
   typedef QList<IWorkbenchWindow::Pointer> WndVec;
   WndVec windows = PlatformUI::GetWorkbench()->GetWorkbenchWindows();
   for (WndVec::iterator i = windows.begin(); i != windows.end(); ++i)
   {
-    (*i)->RemovePerspectiveListener(perspListener);
+    (*i)->RemovePerspectiveListener(perspListener.data());
   }
 }
 
-void HelpWindowListener::WindowClosed(IWorkbenchWindow::Pointer window)
+void HelpWindowListener::WindowClosed(const IWorkbenchWindow::Pointer& window)
 {
-  window->RemovePerspectiveListener(perspListener);
+  window->RemovePerspectiveListener(perspListener.data());
 }
 
-void HelpWindowListener::WindowOpened(IWorkbenchWindow::Pointer window)
+void HelpWindowListener::WindowOpened(const IWorkbenchWindow::Pointer& window)
 {
-  window->AddPerspectiveListener(perspListener);
+  window->AddPerspectiveListener(perspListener.data());
 }
 
 void HelpContextHandler::handleEvent(const ctkEvent &event)
 {
   struct _runner : public Poco::Runnable
   {
     _runner(const ctkEvent& ev) : ev(ev) {}
 
     void run()
     {
       QUrl helpUrl;
       if (ev.containsProperty("url"))
       {
         helpUrl = QUrl(ev.getProperty("url").toString());
       }
       else
       {
         helpUrl = contextUrl();
       }
 
       HelpPluginActivator::linkActivated(PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage(),
                                          helpUrl);
       delete this;
     }
 
     QUrl contextUrl() const
     {
       berry::IWorkbench* currentWorkbench = berry::PlatformUI::GetWorkbench();
       if (currentWorkbench)
       {
         berry::IWorkbenchWindow::Pointer currentWorkbenchWindow = currentWorkbench->GetActiveWorkbenchWindow();
         if (currentWorkbenchWindow)
         {
           berry::IWorkbenchPage::Pointer currentPage = currentWorkbenchWindow->GetActivePage();
           if (currentPage)
           {
             berry::IWorkbenchPart::Pointer currentPart = currentPage->GetActivePart();
             if (currentPart)
             {
               QString pluginID = currentPart->GetSite()->GetPluginId();
               QString viewID = currentPart->GetSite()->GetId();
               QString loc = "qthelp://" + pluginID + "/bundle/%1.html";
 
               QHelpEngineWrapper& helpEngine = HelpPluginActivator::getInstance()->getQHelpEngine();
               // Get view help page if available
               QUrl contextUrl(loc.arg(viewID.replace(".", "_")));
               QUrl url = helpEngine.findFile(contextUrl);
               if (url.isValid()) return url;
               else
               {
                 BERRY_INFO << "Context help url invalid: " << contextUrl.toString().toStdString();
               }
               // If no view help exists get plugin help if available
               QUrl pluginContextUrl(loc.arg(pluginID.replace(".", "_")));
               url = helpEngine.findFile(pluginContextUrl);
               if (url.isValid()) return url;
               // Try to get the index.html file of the plug-in contributing the
               // currently active part.
               QUrl pluginIndexUrl(loc.arg("index"));
               url = helpEngine.findFile(pluginIndexUrl);
               if (url != pluginIndexUrl)
               {
                 // Use the default page instead of another index.html
                 // (merged via the virtual folder property).
                 url = QUrl();
               }
               return url;
             }
           }
         }
       }
       return QUrl();
     }
 
     ctkEvent ev;
   };
   // sync with GUI thread
   Display::GetDefault()->AsyncExec(new _runner(event));
 }
 
 }
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
   Q_EXPORT_PLUGIN2(org_blueberry_ui_qt_help, berry::HelpPluginActivator)
 #endif
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.help/src/internal/berryHelpPluginActivator.h b/BlueBerry/Bundles/org.blueberry.ui.qt.help/src/internal/berryHelpPluginActivator.h
index 157018f622..0ba31602fe 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt.help/src/internal/berryHelpPluginActivator.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt.help/src/internal/berryHelpPluginActivator.h
@@ -1,120 +1,120 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYLOGPLUGIN_H_
 #define BERRYLOGPLUGIN_H_
 
 #include <ctkPluginActivator.h>
 
 #include <service/event/ctkEvent.h>
 #include <service/event/ctkEventHandler.h>
 
 #include <QScopedPointer>
 #include <QMutex>
 
 #include <berryIWorkbenchPage.h>
 #include <berryIWindowListener.h>
 
 class QHelpEngine;
 
 namespace berry {
 
 class QHelpEngineConfiguration;
 class QHelpEngineWrapper;
 class QCHPluginListener;
 
 class HelpContextHandler : public QObject, public ctkEventHandler
 {
   Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
   Q_PLUGIN_METADATA(IID "org_blueberry_ui_qt_help")
 #endif
   Q_INTERFACES(ctkEventHandler)
 
 public:
 
   void handleEvent(const ctkEvent& event);
 };
 
 class HelpPluginActivator : public QObject, public ctkPluginActivator
 {
   Q_OBJECT
   Q_INTERFACES(ctkPluginActivator)
 
 public:
 
   HelpPluginActivator();
   ~HelpPluginActivator();
 
   void start(ctkPluginContext* context);
   void stop(ctkPluginContext* context);
 
   static HelpPluginActivator* getInstance();
 
   static void linkActivated(IWorkbenchPage::Pointer page, const QUrl &link);
 
   QHelpEngineWrapper& getQHelpEngine();
 
 private:
 
   Q_DISABLE_COPY(HelpPluginActivator)
 
   static HelpPluginActivator* instance;
 
   QScopedPointer<QHelpEngineWrapper> helpEngine;
   QScopedPointer<QHelpEngineConfiguration> helpEngineConfiguration;
   QScopedPointer<HelpContextHandler> helpContextHandler;
 
   QCHPluginListener* pluginListener;
-  IWindowListener::Pointer wndListener;
+  QScopedPointer<IWindowListener> wndListener;
 };
 
 /**
  * A listener for CTK plugin events. When plugins come and go we look to see
  * if there are any qch files and update the QHelpEngine accordingly.
  */
 class QCHPluginListener : public QObject {
 
   Q_OBJECT
 
 public:
 
   QCHPluginListener(ctkPluginContext* context, QHelpEngine* helpEngine);
 
   void processPlugins();
 
 public Q_SLOTS:
 
   void pluginChanged(const ctkPluginEvent& event);
 
 private:
 
   void processPlugins_unlocked();
 
   bool isPluginResolved(QSharedPointer<ctkPlugin> plugin);
 
   void removePlugin(QSharedPointer<ctkPlugin> plugin);
   void addPlugin(QSharedPointer<ctkPlugin> plugin);
 
   QMutex mutex;
   bool delayRegistration;
   ctkPluginContext* context;
   QHelpEngine* helpEngine;
 };
 
 }
 
 #endif /*BERRYLOGPLUGIN_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.help/src/internal/berryHelpWebView.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt.help/src/internal/berryHelpWebView.cpp
index 7fd80252bf..b98ee9873c 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt.help/src/internal/berryHelpWebView.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt.help/src/internal/berryHelpWebView.cpp
@@ -1,546 +1,546 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #include "berryHelpWebView.h"
 
 #include "berryHelpPluginActivator.h"
 #include "berryHelpEditor.h"
 #include "berryHelpEditorInput.h"
 #include "berryQHelpEngineWrapper.h"
 
 #include <berryIWorkbenchPage.h>
 
 #include <QCoreApplication>
 #include <QTimer>
 #include <QStringBuilder>
 #include <QTemporaryFile>
 #include <QDesktopServices>
 #include <QWheelEvent>
 #include <QPrinter>
 #include <QPrintDialog>
 
 #include <QWebPage>
 
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 
 namespace berry {
 
 struct ExtensionMap {
   const char *extension;
   const char *mimeType;
 } extensionMap[] = {
     { ".bmp", "image/bmp" },
     { ".css", "text/css" },
     { ".gif", "image/gif" },
     { ".html", "text/html" },
     { ".htm", "text/html" },
     { ".ico", "image/x-icon" },
     { ".jpeg", "image/jpeg" },
     { ".jpg", "image/jpeg" },
     { ".js", "application/x-javascript" },
     { ".mng", "video/x-mng" },
     { ".pbm", "image/x-portable-bitmap" },
     { ".pgm", "image/x-portable-graymap" },
     { ".pdf", "application/pdf" },
     { ".png", "image/png" },
     { ".ppm", "image/x-portable-pixmap" },
     { ".rss", "application/rss+xml" },
     { ".svg", "image/svg+xml" },
     { ".svgz", "image/svg+xml" },
     { ".text", "text/plain" },
     { ".tif", "image/tiff" },
     { ".tiff", "image/tiff" },
     { ".txt", "text/plain" },
     { ".xbm", "image/x-xbitmap" },
     { ".xml", "text/xml" },
     { ".xpm", "image/x-xpm" },
     { ".xsl", "text/xsl" },
     { ".xhtml", "application/xhtml+xml" },
     { ".wml", "text/vnd.wap.wml" },
     { ".wmlc", "application/vnd.wap.wmlc" },
     { "about:blank", 0 },
     { 0, 0 }
 };
 
 
 const QString HelpWebView::m_PageNotFoundMessage =
     QCoreApplication::translate("org.blueberry.ui.qt.help", "<title>Error 404...</title><div "
                                 "align=\"center\"><br><br><h1>The page could not be found</h1><br><h3>'%1'"
                                 "</h3></div>");
 
 class HelpNetworkReply : public QNetworkReply
 {
 public:
   HelpNetworkReply(const QNetworkRequest &request, const QByteArray &fileData,
                    const QString &mimeType);
 
   virtual void abort();
 
   virtual qint64 bytesAvailable() const
   { return data.length() + QNetworkReply::bytesAvailable(); }
 
 protected:
   virtual qint64 readData(char *data, qint64 maxlen);
 
 private:
   QByteArray data;
   qint64 origLen;
 };
 
 HelpNetworkReply::HelpNetworkReply(const QNetworkRequest &request,
                                    const QByteArray &fileData, const QString& mimeType)
   : data(fileData), origLen(fileData.length())
 {
   setRequest(request);
   setOpenMode(QIODevice::ReadOnly);
 
   setHeader(QNetworkRequest::ContentTypeHeader, mimeType);
   setHeader(QNetworkRequest::ContentLengthHeader, QByteArray::number(origLen));
   QTimer::singleShot(0, this, SIGNAL(metaDataChanged()));
   QTimer::singleShot(0, this, SIGNAL(readyRead()));
 }
 
 void HelpNetworkReply::abort()
 {
 }
 
 qint64 HelpNetworkReply::readData(char *buffer, qint64 maxlen)
 {
   qint64 len = qMin(qint64(data.length()), maxlen);
   if (len) {
     memcpy(buffer, data.constData(), len);
     data.remove(0, len);
   }
   if (!data.length())
     QTimer::singleShot(0, this, SIGNAL(finished()));
   return len;
 }
 
 class HelpNetworkAccessManager : public QNetworkAccessManager
 {
 public:
   HelpNetworkAccessManager(QObject *parent);
 
 protected:
     virtual QNetworkReply *createRequest(Operation op,
                                          const QNetworkRequest &request,
                                          QIODevice *outgoingData = 0);
 };
 
 HelpNetworkAccessManager::HelpNetworkAccessManager(QObject *parent)
   : QNetworkAccessManager(parent)
 {
 }
 
 QNetworkReply *HelpNetworkAccessManager::createRequest(Operation /*op*/,
                                                        const QNetworkRequest &request,
                                                        QIODevice* /*outgoingData*/)
 {
   QString url = request.url().toString();
   QHelpEngine& helpEngine = HelpPluginActivator::getInstance()->getQHelpEngine();
 
   // TODO: For some reason the url to load is already wrong (passed from webkit)
   // though the css file and the references inside should work that way. One
   // possible problem might be that the css is loaded at the same level as the
   // html, thus a path inside the css like (../images/foo.png) might cd out of
   // the virtual folder
   // if (!helpEngine.findFile(url).isValid()) {
   //   if (url.startsWith(AbstractHelpWebView::DocPath)) {
   //     QUrl newUrl = request.url();
   //     if (!newUrl.path().startsWith(QLatin1String("/qdoc/"))) {
   //       newUrl.setPath(QLatin1String("qdoc") + newUrl.path());
   //       url = newUrl.toString();
   //     }
   //   }
   // }
 
   const QString &mimeType = HelpWebView::mimeFromUrl(url);
   const QByteArray &data = helpEngine.findFile(url).isValid()
                            ? helpEngine.fileData(url)
                            : HelpWebView::m_PageNotFoundMessage.arg(url).toUtf8();
   return new HelpNetworkReply(request, data, mimeType.isEmpty()
                               ? QLatin1String("application/octet-stream") : mimeType);
 }
 
 class HelpPage : public QWebPage
 {
 
 public:
 
   HelpPage(IEditorSite::Pointer editorSite, QObject *parent);
 
 protected:
 
   virtual QWebPage *createWindow(QWebPage::WebWindowType);
   virtual void triggerAction(WebAction action, bool checked = false);
 
   virtual bool acceptNavigationRequest(QWebFrame *frame,
                                        const QNetworkRequest &request,
                                        NavigationType type);
 
 private:
 
   IEditorSite::Pointer m_EditorSite;
   bool m_CloseNewTabIfNeeded;
 
   friend class HelpWebView;
   QUrl m_loadingUrl;
   Qt::MouseButtons m_pressedButtons;
   Qt::KeyboardModifiers m_keyboardModifiers;
 
 };
 
 HelpPage::HelpPage(IEditorSite::Pointer editorSite, QObject *parent)
   : QWebPage(parent)
   , m_EditorSite(editorSite)
   , m_CloseNewTabIfNeeded(false)
   , m_pressedButtons(Qt::NoButton)
   , m_keyboardModifiers(Qt::NoModifier)
 {
 
 }
 
-QWebPage *HelpPage::createWindow(QWebPage::WebWindowType type)
+QWebPage *HelpPage::createWindow(QWebPage::WebWindowType /*type*/)
 {
   IEditorInput::Pointer input(new HelpEditorInput(QUrl()));
   IEditorPart::Pointer editorPart = m_EditorSite->GetPage()->OpenEditor(input, HelpEditor::EDITOR_ID);
   HelpEditor::Pointer helpEditor = editorPart.Cast<HelpEditor>();
   HelpPage* newPage = static_cast<HelpPage*>(helpEditor->GetQWebPage());
   if (newPage)
     newPage->m_CloseNewTabIfNeeded = m_CloseNewTabIfNeeded;
   m_CloseNewTabIfNeeded = false;
   return newPage;
 }
 
 void HelpPage::triggerAction(WebAction action, bool checked)
 {
   switch (action)
   {
   case OpenLinkInNewWindow:
     m_CloseNewTabIfNeeded = true;
   default:        // fall through
     QWebPage::triggerAction(action, checked);
     break;
   }
 }
 
 bool HelpPage::acceptNavigationRequest(QWebFrame *,
                                        const QNetworkRequest &request,
-                                       QWebPage::NavigationType type)
+                                       QWebPage::NavigationType /*type*/)
 {
-  const bool closeNewTab = m_CloseNewTabIfNeeded;
+  //const bool closeNewTab = m_CloseNewTabIfNeeded;
   m_CloseNewTabIfNeeded = false;
 
   // open in an external browser if a http link
   const QUrl &url = request.url();
   if (url.scheme() == QLatin1String("http"))
   {
     QDesktopServices::openUrl(url);
     return false;
   }
 
 //  const QUrl &url = request.url();
 //  if (AbstractHelpWebView::launchWithExternalApp(url))
 //  {
 //    if (closeNewTab)
 //      QMetaObject::invokeMethod(centralWidget, "closeTab");
 //    return false;
 //  }
 
 //  if (type == QWebPage::NavigationTypeLinkClicked
 //      && (m_keyboardModifiers & Qt::ControlModifier
 //          || m_pressedButtons == Qt::MidButton))
 //  {
 //    if (centralWidget->newEmptyTab())
 //      centralWidget->setSource(url);
 //    m_pressedButtons = Qt::NoButton;
 //    m_keyboardModifiers = Qt::NoModifier;
 //    return false;
 //  }
 
 //  m_loadingUrl = url; // because of async page loading, we will hit some kind
   // of race condition while using a remote command, like a combination of
   // SetSource; SyncContent. SetSource would be called and SyncContents shortly
   // afterwards, but the page might not have finished loading and the old url
   // would be returned.
   return true;
 }
 
 // -- HelpWebView
 
 HelpWebView::HelpWebView(IEditorSite::Pointer editorSite, QWidget *parent, qreal zoom)
   : QWebView(parent)
   //, parentWidget(parent)
   , m_LoadFinished(false)
   , m_HelpEngine(HelpPluginActivator::getInstance()->getQHelpEngine())
 {
   setAcceptDrops(false);
 
   setPage(new HelpPage(editorSite, parent));
 
   page()->setNetworkAccessManager(new HelpNetworkAccessManager(this));
 
   QAction* action = pageAction(QWebPage::OpenLinkInNewWindow);
   action->setText(tr("Open Link in New Tab"));
   if (!parent)
     action->setVisible(false);
 
   pageAction(QWebPage::DownloadLinkToDisk)->setVisible(false);
   pageAction(QWebPage::DownloadImageToDisk)->setVisible(false);
   pageAction(QWebPage::OpenImageInNewWindow)->setVisible(false);
 
   connect(pageAction(QWebPage::Copy), SIGNAL(changed()), this,
           SLOT(actionChanged()));
   connect(pageAction(QWebPage::Back), SIGNAL(changed()), this,
           SLOT(actionChanged()));
   connect(pageAction(QWebPage::Forward), SIGNAL(changed()), this,
           SLOT(actionChanged()));
   connect(page(), SIGNAL(linkHovered(QString,QString,QString)), this,
           SIGNAL(highlighted(QString)));
   connect(this, SIGNAL(urlChanged(QUrl)), this, SIGNAL(sourceChanged(QUrl)));
   connect(this, SIGNAL(loadStarted()), this, SLOT(setLoadStarted()));
   connect(this, SIGNAL(loadFinished(bool)), this, SLOT(setLoadFinished(bool)));
   connect(page(), SIGNAL(printRequested(QWebFrame*)), this, SIGNAL(printRequested()));
 
   setFont(viewerFont());
   setTextSizeMultiplier(zoom == 0.0 ? 1.0 : zoom);
 }
 
 HelpWebView::~HelpWebView()
 {
 }
 
 QFont HelpWebView::viewerFont() const
 {
   //if (m_HelpEngine.usesBrowserFont())
   //  return m_HelpEngine.browserFont();
 
   QWebSettings *webSettings = QWebSettings::globalSettings();
   return QFont(webSettings->fontFamily(QWebSettings::StandardFont),
                webSettings->fontSize(QWebSettings::DefaultFontSize));
 }
 
 void HelpWebView::setViewerFont(const QFont &font)
 {
   QWebSettings *webSettings = settings();
   webSettings->setFontFamily(QWebSettings::StandardFont, font.family());
   webSettings->setFontSize(QWebSettings::DefaultFontSize, font.pointSize());
 }
 
 void HelpWebView::scaleUp()
 {
   setTextSizeMultiplier(textSizeMultiplier() + 0.1);
 }
 
 void HelpWebView::scaleDown()
 {
   setTextSizeMultiplier(qMax(0.0, textSizeMultiplier() - 0.1));
 }
 
 void HelpWebView::resetScale()
 {
   setTextSizeMultiplier(1.0);
 }
 
 bool HelpWebView::handleForwardBackwardMouseButtons(QMouseEvent *e)
 {
   if (e->button() == Qt::XButton1)
   {
     triggerPageAction(QWebPage::Back);
     return true;
   }
 
   if (e->button() == Qt::XButton2)
   {
     triggerPageAction(QWebPage::Forward);
     return true;
   }
 
   return false;
 }
 
 QUrl HelpWebView::source() const
 {
   HelpPage *currentPage = static_cast<HelpPage*> (page());
   if (currentPage && !hasLoadFinished())
   {
     // see HelpPage::acceptNavigationRequest(...)
     return currentPage->m_loadingUrl;
   }
   return url();
 }
 
 void HelpWebView::setSource(const QUrl &url)
 {
   if (m_HelpEngine.findFile(url).isValid())
     load(url);
   else
     setHtml(m_PageNotFoundMessage.arg(url.toString()));
 }
 
 void HelpWebView::wheelEvent(QWheelEvent *e)
 {
   if (e->modifiers()& Qt::ControlModifier)
   {
     e->accept();
     e->delta() > 0 ? scaleUp() : scaleDown();
   }
   else
   {
     QWebView::wheelEvent(e);
   }
 }
 
 void HelpWebView::mouseReleaseEvent(QMouseEvent *e)
 {
 #ifndef Q_OS_LINUX
   if (handleForwardBackwardMouseButtons(e))
     return;
 #endif
 
   QWebView::mouseReleaseEvent(e);
 }
 
 void HelpWebView::actionChanged()
 {
   QAction *a = qobject_cast<QAction *>(sender());
   if (a == pageAction(QWebPage::Copy))
     emit copyAvailable(a->isEnabled());
   else if (a == pageAction(QWebPage::Back))
     emit backwardAvailable(a->isEnabled());
   else if (a == pageAction(QWebPage::Forward))
     emit forwardAvailable(a->isEnabled());
 }
 
 void HelpWebView::mousePressEvent(QMouseEvent *event)
 {
 #ifdef Q_OS_LINUX
   if (handleForwardBackwardMouseButtons(event))
     return;
 #endif
 
   HelpPage *currentPage = static_cast<HelpPage*>(page());
   if (currentPage)
   {
     currentPage->m_pressedButtons = event->buttons();
     currentPage->m_keyboardModifiers = event->modifiers();
   }
   QWebView::mousePressEvent(event);
 }
 
 void HelpWebView::setLoadStarted()
 {
   m_LoadFinished = false;
 }
 
 void HelpWebView::setLoadFinished(bool ok)
 {
   m_LoadFinished = ok;
   emit sourceChanged(url());
 }
 
 QString HelpWebView::mimeFromUrl(const QUrl &url)
 {
   const QString &path = url.path();
   const int index = path.lastIndexOf(QLatin1Char('.'));
   const QByteArray &ext = path.mid(index).toUtf8().toLower();
 
   const ExtensionMap *e = extensionMap;
   while (e->extension)
   {
     if (ext == e->extension)
       return QLatin1String(e->mimeType);
     ++e;
   }
   return QLatin1String("");
 }
 
 bool HelpWebView::canOpenPage(const QString &url)
 {
   return !mimeFromUrl(url).isEmpty();
 }
 
 bool HelpWebView::isLocalUrl(const QUrl &url)
 {
   const QString &scheme = url.scheme();
   return scheme.isEmpty()
       || scheme == QLatin1String("file")
       || scheme == QLatin1String("qrc")
       || scheme == QLatin1String("data")
       || scheme == QLatin1String("qthelp")
       || scheme == QLatin1String("about");
 }
 
 bool HelpWebView::launchWithExternalApp(const QUrl &url)
 {
   if (isLocalUrl(url))
   {
     const QHelpEngine& helpEngine = HelpPluginActivator::getInstance()->getQHelpEngine();
     const QUrl &resolvedUrl = helpEngine.findFile(url);
     if (!resolvedUrl.isValid())
       return false;
 
     const QString& path = resolvedUrl.path();
     if (!canOpenPage(path))
     {
       QTemporaryFile tmpTmpFile;
       if (!tmpTmpFile.open())
         return false;
 
       const QString &extension = QFileInfo(path).completeSuffix();
       QFile actualTmpFile(tmpTmpFile.fileName() % QLatin1String(".")
                           % extension);
       if (!actualTmpFile.open(QIODevice::ReadWrite | QIODevice::Truncate))
         return false;
 
       actualTmpFile.write(helpEngine.fileData(resolvedUrl));
       actualTmpFile.close();
       return QDesktopServices::openUrl(QUrl(actualTmpFile.fileName()));
     }
   }
   else if (url.scheme() == QLatin1String("http"))
   {
     return QDesktopServices::openUrl(url);
   }
   return false;
 }
 
 void HelpWebView::home()
 {
   setSource(m_HelpEngine.homePage());
 }
 
 void HelpWebView::print()
 {
   QPrinter printer;
 
   QPrintDialog *dialog = new QPrintDialog(&printer, this);
   dialog->setWindowTitle(tr("Print Document"));
   if(hasSelection())
   {
     dialog->addEnabledOption(QAbstractPrintDialog::PrintSelection);
   }
   if(dialog->exec() == QDialog::Accepted)
   {
     QWebView::print(&printer);
   }
 }
 
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryLogView.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryLogView.cpp
index dee4c45928..ce32004946 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryLogView.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryLogView.cpp
@@ -1,56 +1,50 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifdef __MINGW32__
 // We need to inlclude winbase.h here in order to declare
 // atomic intrinsics like InterlockedIncrement correctly.
 // Otherwhise, they would be declared wrong within qatomic_windows.h .
 #include <windows.h>
 #endif
 
 #include "berryLogView.h"
 
 #include "berryQtLogView.h"
 
 #include <QHBoxLayout>
 
 namespace berry {
 
 LogView::LogView()
 {
 
 }
 
-LogView::LogView(const LogView& other)
-{
-  Q_UNUSED(other)
-  throw std::runtime_error("Copy constructor not implemented");
-}
-
 void LogView::CreateQtPartControl(QWidget* parent)
 {
   QHBoxLayout* layout = new QHBoxLayout(parent);
   layout->setContentsMargins(0,0,0,0);
   QtLogView* logView = new QtLogView(parent);
   layout->addWidget(logView);
 }
 
 void LogView::SetFocus()
 {
 
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryLogView.h b/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryLogView.h
index 4d08e09390..3cb8ad7486 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryLogView.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryLogView.h
@@ -1,45 +1,44 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYLOGVIEW_H_
 #define BERRYLOGVIEW_H_
 
 #include <QWidget>
 
 #include "berryQtViewPart.h"
 
 namespace berry {
 
 class LogView : public QtViewPart
 {
   Q_OBJECT
 
 public:
 
   LogView();
-  LogView(const LogView& other);
 
   void SetFocus();
 
 protected:
 
   void CreateQtPartControl(QWidget* parent);
 
 };
 
 } // namespace berry
 
 #endif /*BERRYLOGVIEW_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryQtLogView.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryQtLogView.cpp
index adcfddcd85..d5bad2f170 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryQtLogView.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryQtLogView.cpp
@@ -1,168 +1,168 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifdef __MINGW32__
 // We need to inlclude winbase.h here in order to declare
 // atomic intrinsics like InterlockedIncrement correctly.
 // Otherwhise, they would be declared wrong within qatomic_windows.h .
 #include <windows.h>
 #endif
 
 #include "berryQtLogView.h"
 
 #include "berryQtLogPlugin.h"
 
 #include <berryIPreferencesService.h>
 #include <berryIBerryPreferences.h>
 #include <berryPlatform.h>
 #include <berryPlatformUI.h>
 
 #include <QHeaderView>
 
 #include <QTimer>
 #include <QClipboard>
 
 namespace berry {
 
 QtLogView::QtLogView(QWidget *parent)
     : QWidget(parent)
 {
   berry::IPreferencesService* prefService = berry::Platform::GetPreferencesService();
   berry::IBerryPreferences::Pointer prefs
       = (prefService->GetSystemPreferences()->Node("org_blueberry_ui_qt_log"))
         .Cast<berry::IBerryPreferences>();
 
 
   prefs->PutBool("ShowAdvancedFields", false);
   prefs->PutBool("ShowCategory", true);
   bool showAdvancedFields = false;
 
   ui.setupUi(this);
 
   model = QtLogPlugin::GetInstance()->GetLogModel();
   model->SetShowAdvancedFiels( showAdvancedFields );
 
   filterModel = new QSortFilterProxyModel(this);
   filterModel->setSourceModel(model);
   filterModel->setFilterKeyColumn(-1);
 
 #ifdef __APPLE__
   QFont fnt = ui.tableView->font();
   fnt.setPointSize(11);
   ui.tableView->setFont(fnt);
 #endif
   ui.tableView->setModel(filterModel);
   ui.tableView->verticalHeader()->setVisible(false);
   ui.tableView->horizontalHeader()->setStretchLastSection(true);
 
   connect( ui.filterContent, SIGNAL( textChanged( const QString& ) ), this, SLOT( slotFilterChange( const QString& ) ) );
   connect( filterModel, SIGNAL( rowsInserted ( const QModelIndex &, int, int ) ), this, SLOT( slotRowAdded( const QModelIndex &, int , int  ) ) );
   connect( ui.SaveToClipboard, SIGNAL( clicked()),this, SLOT(on_SaveToClipboard_clicked()));
 
   ui.ShowAdvancedFields->setChecked( showAdvancedFields );
 
 }
 
 QtLogView::~QtLogView()
 {
 }
 
 void QtLogView::slotScrollDown( )
 {
   ui.tableView->scrollToBottom();
 }
 
 void QtLogView::slotFilterChange( const QString& q )
 {
   filterModel->setFilterRegExp(QRegExp(q, Qt::CaseInsensitive, QRegExp::FixedString));
 }
 
 
-void QtLogView::slotRowAdded ( const QModelIndex &  /*parent*/, int start, int end )
+void QtLogView::slotRowAdded ( const QModelIndex &  /*parent*/, int /*start*/, int /*end*/ )
 {
   ui.tableView->setVisible(false);
   ui.tableView->resizeRowsToContents();
 
   //only resize columns when first entry is added
   static bool first = true;
   if(first)
     {
     ui.tableView->resizeColumnsToContents();
     first = false;
     }
   ui.tableView->setVisible(true);
 
   QTimer::singleShot(0,this,SLOT( slotScrollDown() ) );
 }
 
-void QtLogView::showEvent( QShowEvent * event )
+void QtLogView::showEvent( QShowEvent * /*event*/ )
 {
     ui.tableView->setVisible(false);
   ui.tableView->resizeColumnsToContents();
   ui.tableView->resizeRowsToContents();
   ui.tableView->setVisible(true);
 }
 
 void QtLogView::on_ShowAdvancedFields_clicked( bool checked )
 {
   ui.tableView->setVisible(false);
   QtLogPlugin::GetInstance()->GetLogModel()->SetShowAdvancedFiels( checked );
   ui.tableView->resizeColumnsToContents();
   ui.tableView->setVisible(true);
 
   berry::IPreferencesService* prefService = berry::Platform::GetPreferencesService();
   berry::IBerryPreferences::Pointer prefs
       = (prefService->GetSystemPreferences()->Node("org_blueberry_ui_qt_log"))
         .Cast<berry::IBerryPreferences>();
 
   prefs->PutBool("ShowAdvancedFields", checked);
   prefs->Flush();
 }
 
 void QtLogView::on_ShowCategory_clicked( bool checked )
 {
   ui.tableView->setVisible(false);
   QtLogPlugin::GetInstance()->GetLogModel()->SetShowCategory( checked );
   ui.tableView->resizeColumnsToContents();
   ui.tableView->setVisible(true);
 
   berry::IPreferencesService* prefService = berry::Platform::GetPreferencesService();
   berry::IBerryPreferences::Pointer prefs
       = (prefService->GetSystemPreferences()->Node("org_blueberry_ui_qt_log"))
         .Cast<berry::IBerryPreferences>();
 
   prefs->PutBool("ShowCategory", checked);
   prefs->Flush();
 }
 
 void QtLogView::on_SaveToClipboard_clicked()
 {
   QClipboard *clipboard = QApplication::clipboard();
   QString loggingMessagesAsText = QString("");
   for (int i=0; i<ui.tableView->model()->rowCount(); i++)
     {
     for (int j=0; j<ui.tableView->model()->columnCount(); j++)
       {
       QModelIndex index = ui.tableView->model()->index(i, j);
       loggingMessagesAsText += ui.tableView->model()->data(index, Qt::DisplayRole).toString() + " ";
       }
     loggingMessagesAsText += "\n";
     }
 
   clipboard->setText(loggingMessagesAsText);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryQtPlatformLogModel.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryQtPlatformLogModel.cpp
index 4d6427635f..5e2f93f7e8 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryQtPlatformLogModel.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryQtPlatformLogModel.cpp
@@ -1,345 +1,346 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifdef __MINGW32__
 // We need to inlclude winbase.h here in order to declare
 // atomic intrinsics like InterlockedIncrement correctly.
 // Otherwhise, they would be declared wrong within qatomic_windows.h .
 #include <windows.h>
 #endif
 
 #include "berryQtPlatformLogModel.h"
 #include "berryQtLogPlugin.h"
 
 #include "berryPlatform.h"
 
 #include "mbilogLoggingTypes.h"
 
 #include <sstream>
 #include <string>
 #include <iostream>
 #include <iomanip>
 
 #include <QTimer>
 #include <QIcon>
 #include <QModelIndex>
+#include <QDebug>
 
 namespace berry {
 
 const QString QtPlatformLogModel::Error = QString("Error");
 const QString QtPlatformLogModel::Warn = QString("Warning");
 const QString QtPlatformLogModel::Fatal = QString("Fatal");
 const QString QtPlatformLogModel::Info = QString("Info");
 const QString QtPlatformLogModel::Debug = QString("Debug");
 
 void QtPlatformLogModel::slotFlushLogEntries()
 {
   m_Mutex.lock();
   QList<ExtendedLogMessage> *tmp=m_Active;
   m_Active=m_Pending; m_Pending=tmp;
   m_Mutex.unlock();
 
   int num = static_cast<int>(m_Pending->size());
 
   if (num > 0)
   {
     int row = static_cast<int>(m_Entries.size());
     this->beginInsertRows(QModelIndex(), row, row+num-1);
     do {
       m_Entries.push_back(m_Pending->front());
       m_Pending->pop_front();
 
 
 
     } while(--num);
     this->endInsertRows();
   }
 }
 
 void QtPlatformLogModel::addLogEntry(const mbilog::LogMessage &msg)
 {
   m_Mutex.lock();
   //mbilog::BackendCout::FormatSmart(msg); FormatSmart is not static any more. So commented out this statement. Todo: fix
   m_Active->push_back(ExtendedLogMessage(msg));
   m_Mutex.unlock();
 
   emit signalFlushLogEntries();
 
 }
 
 void
 QtPlatformLogModel::SetShowAdvancedFiels( bool showAdvancedFiels )
 {
   if( m_ShowAdvancedFiels != showAdvancedFiels )
   {
     m_ShowAdvancedFiels = showAdvancedFiels;
     this->beginResetModel();
     this->endResetModel();
   }
 }
 
 void QtPlatformLogModel::SetShowCategory( bool showCategory )
 {
   if( m_ShowCategory != showCategory )
   {
     m_ShowCategory = showCategory;
     this->beginResetModel();
     this->endResetModel();
   }
 }
 
 void
 QtPlatformLogModel::addLogEntry(const ctkPluginFrameworkEvent& event)
 {
   int level = mbilog::Info;
   if (event.getType() == ctkPluginFrameworkEvent::PLUGIN_ERROR)
   {
     level = mbilog::Error;
   }
   else if (event.getType() == ctkPluginFrameworkEvent::FRAMEWORK_WAIT_TIMEDOUT ||
            event.getType() == ctkPluginFrameworkEvent::PLUGIN_WARNING)
   {
     level = mbilog::Warn;
   }
 
   mbilog::LogMessage msg(level,"n/a",-1,"n/a");
 
   QString str;
   QDebug dbg(&str);
   dbg << event;
   msg.message = str.toStdString();
   //msg.moduleName = event.getPlugin()->getSymbolicName().toStdString();
 
   addLogEntry(msg);
 }
 
 QtPlatformLogModel::QtPlatformLogModel(QObject* parent) : QAbstractTableModel(parent),
 m_ShowAdvancedFiels(false),
 m_ShowCategory(true)
 {
   m_Active=new QList<ExtendedLogMessage>;
   m_Pending=new QList<ExtendedLogMessage>;
   connect(this, SIGNAL(signalFlushLogEntries()), this, SLOT( slotFlushLogEntries() ), Qt::QueuedConnection );
   QtLogPlugin::GetInstance()->GetContext()->connectFrameworkListener(this, SLOT(addLogEntry(ctkPluginFrameworkEvent)));
   myBackend = new QtLogBackend(this);
 }
 
 QtPlatformLogModel::~QtPlatformLogModel()
 {
   disconnect(this, SIGNAL(signalFlushLogEntries()), this, SLOT( slotFlushLogEntries() ));
   QtLogPlugin::GetInstance()->GetContext()->disconnectFrameworkListener(this);
 
   // dont delete and unregister backend, only deactivate it to avoid thread syncronization issues cause mbilog::UnregisterBackend is not threadsafe
   // will be fixed.
   //  delete myBackend;
   //  delete m_Active;
   //  delete m_Pending;
   m_Mutex.lock();
   myBackend->Deactivate();
   m_Mutex.unlock();
 }
 
 // QT Binding
 
 int
 QtPlatformLogModel::rowCount(const QModelIndex&) const
 {
   return static_cast<int>(m_Entries.size());
 }
 
 int
 QtPlatformLogModel::columnCount(const QModelIndex&) const
 {
   int returnValue = 2;
   if( m_ShowAdvancedFiels ) returnValue += 7;
   if( m_ShowCategory ) returnValue += 1;
   return returnValue;
 }
           /*
   struct LogEntry {
     LogEntry(const std::string& msg, const std::string& src, std::time_t t)
     : message(msg.c_str()), moduleName(src.c_str()),time(std::clock())
     {
     }
 
     QString message;
     clock_t time;
 
     QString level;
     QString filePath;
     QString lineNumber;
     QString moduleName;
     QString category;
     QString function;
 
     LogEntry(const mbilog::LogMessage &msg)
     {
       message = msg.message.c_str();
 
 
       filePath = msg.filePath;
 
       std::stringstream out;
       out << msg.lineNumber;
       lineNumber = out.str().c_str();
 
       moduleName = msg.moduleName;
       category = msg.category.c_str();
       function = msg.functionName;
 
       time=std::clock();
     }
   };        */
 
 
 QVariant QtPlatformLogModel::data(const QModelIndex& index, int role) const
 {
   const ExtendedLogMessage *msg = &m_Entries[index.row()];
 
   if (role == Qt::DisplayRole)
     {
     switch (index.column())
       {
       case 0:
         if (m_ShowAdvancedFiels) return msg->getTime();
         else return msg->getLevel();
       case 1:
         if (m_ShowAdvancedFiels) return msg->getLevel();
         else return msg->getMessage();
       case 2:
         if (m_ShowAdvancedFiels) return msg->getMessage();
         else return msg->getCategory();
       case 3:
         if (m_ShowAdvancedFiels && m_ShowCategory) return msg->getCategory();
         else if (m_ShowAdvancedFiels && !m_ShowCategory) return msg->getModuleName();
         else break;
       case 4:
         if (m_ShowAdvancedFiels && m_ShowCategory) return msg->getModuleName();
         else if (m_ShowAdvancedFiels && !m_ShowCategory) return msg->getFunctionName();
         else break;
       case 5:
         if (m_ShowAdvancedFiels && m_ShowCategory) return msg->getFunctionName();
         else if (m_ShowAdvancedFiels && !m_ShowCategory) return msg->getPath();
         else break;
       case 6:
         if (m_ShowAdvancedFiels && m_ShowCategory) return msg->getPath();
         else if (m_ShowAdvancedFiels && !m_ShowCategory) return msg->getLine();
         else break;
       case 7:
         if (m_ShowAdvancedFiels && m_ShowCategory) return msg->getLine();
         else break;
       }
     }
 
   else if(  role == Qt::DecorationRole )
   {
     if ( (m_ShowAdvancedFiels && index.column()==1)
       || (!m_ShowAdvancedFiels && index.column()==0) )
     {
       QString file ( ":/org_blueberry_ui_qt_log/information.png" );
 
       if( msg->message.level == mbilog::Error )
         file = ":/org_blueberry_ui_qt_log/error.png";
       else if( msg->message.level == mbilog::Warn )
         file = ":/org_blueberry_ui_qt_log/warning.png";
       else if( msg->message.level == mbilog::Debug )
         file = ":/org_blueberry_ui_qt_log/debug.png";
       else if( msg->message.level == mbilog::Fatal )
         file = ":/org_blueberry_ui_qt_log/fatal.png";
 
       QIcon icon(file);
       return QVariant(icon);
 
     }
   }
 
 
   return QVariant();
 }
 
 QVariant
 QtPlatformLogModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
   if (role == Qt::DisplayRole && orientation == Qt::Horizontal)
   {
     if( m_ShowAdvancedFiels && m_ShowCategory )
     {
       switch (section)
       {
         case 0: return QVariant(" Time ");
         case 1: return QVariant(" Level ");
         case 2: return QVariant(" Message ");
         case 3: return QVariant(" Category ");
         case 4: return QVariant(" Module ");
         case 5: return QVariant(" Function ");
         case 6: return QVariant(" File ");
         case 7: return QVariant(" Line ");
       }
     }
     else if (m_ShowAdvancedFiels && !m_ShowCategory)
     {
       switch (section)
       {
         case 0: return QVariant(" Time ");
         case 1: return QVariant(" Level ");
         case 2: return QVariant(" Message ");
         case 3: return QVariant(" Module ");
         case 4: return QVariant(" Function ");
         case 5: return QVariant(" File ");
         case 6: return QVariant(" Line ");
       }
     }
     else //!m_ShowAdvancedFiels, m_ShowCategory is not handled seperately because it only activates case 2
     {
       switch (section)
       {
         case 0: return QVariant(" Level ");
         case 1: return QVariant(" Message ");
         case 2: return QVariant(" Category ");
       }
     }
   }
 
   return QVariant();
 }
 
 QVariant QtPlatformLogModel::ExtendedLogMessage::getTime() const
     {
     std::stringstream ss;
     std::locale C("C");
     ss.imbue(C);
     ss << std::setw(7) << std::setprecision(3) << std::fixed << ((double)this->time)/CLOCKS_PER_SEC;
     return QVariant(QString(ss.str().c_str()));
     }
 
 QString QtPlatformLogModel::GetDataAsString()
     {
     QString returnValue("");
 
     for (int message=0; message<this->rowCount(QModelIndex()); message++)
       {
       for (int column=0; column<this->columnCount(QModelIndex()); column++)
         {
         returnValue += " " + this->data(this->index(message,column),Qt::DisplayRole).toString();
         }
       returnValue += "\n";
       }
 
     return returnValue;
     }
 
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/src/internal/berryObjectBrowserView.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/src/internal/berryObjectBrowserView.cpp
index 9bf1671b71..dd0720ce9a 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/src/internal/berryObjectBrowserView.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/src/internal/berryObjectBrowserView.cpp
@@ -1,279 +1,271 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifdef __MINGW32__
 // We need to inlclude winbase.h here in order to declare
 // atomic intrinsics like InterlockedIncrement correctly.
 // Otherwhise, they would be declared wrong within qatomic_windows.h .
 #include <windows.h>
 #endif
 
 #include <QToolBar>
 #include <QSortFilterProxyModel>
 #include <QVBoxLayout>
 #include <QLabel>
 
 #include "berryObjectBrowserView.h"
 #include "berryDebugUtil.h"
 #include "berryDebugBreakpointManager.h"
 
 namespace berry
 {
 
 const std::string ObjectBrowserView::VIEW_ID = "objectbrowser";
 
 ObjectBrowserView::ObjectBrowserView() :
   m_ActionToggleBreakpoint(this), m_ActionEnableBreakpoint(this),
   m_ActionDisableBreakpoint(this)
 {
 #ifdef BLUEBERRY_DEBUG_SMARTPOINTER
   m_Useful = true;
 #else
   m_Useful = false;
 #endif
 }
 
-ObjectBrowserView::ObjectBrowserView(const ObjectBrowserView& other)
-  : m_ActionToggleBreakpoint(this), m_ActionEnableBreakpoint(this),
-    m_ActionDisableBreakpoint(this)
-{
-  Q_UNUSED(other)
-  throw std::runtime_error("Copy constructor not implemented");
-}
-
 void ObjectBrowserView::Init(IViewSite::Pointer site, IMemento::Pointer memento)
 {
   QtViewPart::Init(site, memento);
 
   m_StateMemento = memento;
 }
 
 void ObjectBrowserView::CreateQtPartControl(QWidget* parent)
 {
   if (m_Useful)
   {
     m_Controls.setupUi(parent);
 
     m_ProxyModel = new QSortFilterProxyModel(m_Controls.m_TreeView);
     m_ObjectModel = new QtObjectTableModel(m_ProxyModel);
 
     m_ProxyModel->setSourceModel(m_ObjectModel);
     m_Controls.m_TreeView->setModel(m_ProxyModel);
     m_Controls.m_TreeView->setSortingEnabled(true);
     m_Controls.m_TreeView->setContextMenuPolicy(Qt::CustomContextMenu);
 
     m_ActionToggleBreakpoint.setText(QString("Toggle Breakpoint"));
     m_ActionToggleBreakpoint.setCheckable(true);
     m_ContextMenu.addAction(&m_ActionToggleBreakpoint);
 
     QToolBar* toolbar = new QToolBar(parent);
     QAction* resetAction = toolbar->addAction("Reset");
     toolbar->addAction("Show Breakpoints Only");
 
     connect(resetAction, SIGNAL(triggered(bool)), this, SLOT(ResetAction(bool)));
     connect(m_Controls.m_TreeView->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
         this, SLOT(SelectionChanged(const QItemSelection&, const QItemSelection&)));
     connect(m_Controls.m_TreeView, SIGNAL(customContextMenuRequested(const QPoint&)),
         this, SLOT(ContextMenuRequested(const QPoint&)));
 
     // context menu actions
     connect(&m_ActionToggleBreakpoint, SIGNAL(triggered(bool)), this, SLOT(ToggleBreakpoint(bool)));
 
     parent->layout()->setMenuBar(toolbar);
 
     RestoreGuiState(m_StateMemento);
     m_StateMemento = 0;
   }
   else
   {
     QVBoxLayout* layout = new QVBoxLayout(parent);
     QLabel* label = new QLabel(parent);
     label->setText(
         "Set the CMake variable BLUEBERRY_DEBUG_SMARTPOINTER to ON for a useful object browser.");
     label->setWordWrap(true);
     label->setAlignment(Qt::AlignTop);
     layout->addWidget(label);
   }
 }
 
 void ObjectBrowserView::RestoreGuiState(IMemento::Pointer memento)
 {
   if (memento)
   {
     IMemento::Pointer columnWidths = memento->GetChild("columnWidths");
     if (columnWidths)
     {
       int colWidth = 0;
       if (columnWidths->GetInteger("column0", colWidth))
       {
         m_Controls.m_TreeView->setColumnWidth(0, colWidth);
       }
       if (columnWidths->GetInteger("column1", colWidth))
       {
         m_Controls.m_TreeView->setColumnWidth(1, colWidth);
       }
     }
 
     IMemento::Pointer splitter = memento->GetChild("splitter");
     if (splitter)
     {
       QList<int> sizes;
       int size = 200;
       splitter->GetInteger("first", size);
       sizes.push_back(size);
       splitter->GetInteger("second", size);
       sizes.push_back(size);
       m_Controls.m_Splitter->setSizes(sizes);
     }
   }
 }
 
 void ObjectBrowserView::ResetAction(bool  /*checked*/)
 {
   m_ObjectModel->ResetData();
 }
 
 void ObjectBrowserView::SelectionChanged(const QItemSelection& selected,
     const QItemSelection&  /*deselected*/)
 {
   QList<QModelIndex> indexes = selected.indexes();
   if (indexes.empty())
   {
     m_Controls.m_DetailsView->clear();
     return;
   }
 
   QModelIndex index = indexes.front();
   if (!index.parent().isValid())
   {
     m_Controls.m_DetailsView->clear();
   }
 
   QVariant data = m_ProxyModel->data(index, Qt::UserRole);
   if (data.isValid())
   {
     const ObjectItem* item =
         static_cast<const ObjectItem*> (data.value<void*> ());
     if (item)
     {
       const Object* obj = 0;
       if (item->type == ObjectItem::INSTANCE)
         obj = item->obj;
       else if (item->type == ObjectItem::SMARTPOINTER)
       {
         const ObjectItem* item =
             static_cast<const ObjectItem*> (m_ProxyModel->data(index.parent(),
                 Qt::UserRole).value<void*> ());
         if (item)
           obj = item->obj;
       }
 
       if (obj)
       {
         QString str;
         QDebug ss(&str);
         obj->Print(ss);
         m_Controls.m_DetailsView->setPlainText(str);
       }
       else
       {
         m_Controls.m_DetailsView->setPlainText(QString("0"));
       }
     }
     else
     {
       m_Controls.m_DetailsView->setPlainText(QString("0"));
     }
   }
 }
 
 void ObjectBrowserView::ContextMenuRequested(const QPoint& p)
 {
   QModelIndex index = m_Controls.m_TreeView->selectionModel()->currentIndex();
   if (index.isValid())
   {
     QVariant data = m_ProxyModel->data(index, Qt::UserRole);
     if (!data.isValid())
       return;
 
     const ObjectItem* item = static_cast<ObjectItem*> (data.value<void*> ());
     if (item->type == ObjectItem::CLASS)
       return;
 
     m_ContextMenu.exec(m_Controls.m_TreeView->mapToGlobal(p));
   }
 }
 
 void ObjectBrowserView::ToggleBreakpoint(bool checked)
 {
   QModelIndex index = m_Controls.m_TreeView->selectionModel()->currentIndex();
   if (index.isValid())
   {
     QVariant data = m_ProxyModel->data(index, Qt::UserRole);
     if (!data.isValid())
       return;
 
     const ObjectItem* item = static_cast<ObjectItem*> (data.value<void*> ());
     if (item->type == ObjectItem::INSTANCE)
     {
 #ifdef BLUEBERRY_DEBUG_SMARTPOINTER
       if (checked)
       DebugUtil::GetBreakpointManager()->AddObjectBreakpoint(item->obj->GetTraceId());
       else
       DebugUtil::GetBreakpointManager()->RemoveObjectBreakpoint(item->obj->GetTraceId());
 #endif
     }
     else if (item->type == ObjectItem::SMARTPOINTER)
     {
       if (checked)
         DebugUtil::GetBreakpointManager()->AddSmartpointerBreakpoint(item->spId);
       else
         DebugUtil::GetBreakpointManager()->RemoveSmartpointerBreakpoint(
             item->spId);
     }
   }
 }
 
 void ObjectBrowserView::SetFocus()
 {
   if (m_Useful)
   {
     m_Controls.m_TreeView->setFocus();
   }
 }
 
 void ObjectBrowserView::SaveState(IMemento::Pointer memento)
 {
   if (!m_Useful)
     return;
 
   IMemento::Pointer cols = memento->CreateChild("columnWidths");
   cols->PutInteger("column0", m_Controls.m_TreeView->columnWidth(0));
   cols->PutInteger("column1", m_Controls.m_TreeView->columnWidth(1));
 
   QList<int> sizes(m_Controls.m_Splitter->sizes());
   IMemento::Pointer splitter = memento->CreateChild("splitter");
   splitter->PutInteger("first", sizes[0]);
   splitter->PutInteger("second", sizes[1]);
 
   // delete the tree view here in order to delete the underlying model
   // which in turn unregisters the object listener. Otherwise, we get
   // notifications of deleted objects during workbench shutdown which
   // leads to segmentation faults
   m_Controls.m_TreeView->deleteLater();
 }
 
 } //namespace berry
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/src/internal/berryObjectBrowserView.h b/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/src/internal/berryObjectBrowserView.h
index 98330a34fc..6cfc57d68b 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/src/internal/berryObjectBrowserView.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/src/internal/berryObjectBrowserView.h
@@ -1,101 +1,100 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRY_OBJECTINSPECTORVIEW_H_INCLUDED
 #define BERRY_OBJECTINSPECTORVIEW_H_INCLUDED
 
 #include <berryQtViewPart.h>
 #include <string>
 
 #include <ui_berryQtObjectBrowserView.h>
 #include "berryQtObjectTableModel.h"
 
 #include <QAction>
 #include <QMenu>
 
 class QAbstractProxyModel;
 
 namespace berry {
 
 /*!
  * \ingroup org_blueberry_ui_qt_objectinspector_internal
  *
  * \brief Object Inspector
  *
  * You need to reimplement the methods SetFocus() and CreateQtPartControl(QWidget*)
  * from berry::QtViewPart
  *
  * \sa berry::QtViewPart
  */
 class ObjectBrowserView : public berry::QtViewPart
 {
   Q_OBJECT
 
 public:
 
   static const std::string VIEW_ID;
 
   ObjectBrowserView();
-  ObjectBrowserView(const ObjectBrowserView& other);
 
   void Init(IViewSite::Pointer site, IMemento::Pointer memento);
 
   /*!
    * \brief Gives focus to a specific control in the view
    * This method is called from the framework when the view is activated.
    */
   void SetFocus();
 
   void SaveState(IMemento::Pointer memento);
 
 protected slots:
 
   void ResetAction(bool checked);
   void SelectionChanged(const QItemSelection& selected, const QItemSelection& deselected);
   void ContextMenuRequested(const QPoint&);
   void ToggleBreakpoint(bool checked);
 
 protected:
 
   /*!
    * \brief Builds the user interface of the view
    * This method is called from the framework. The parent widget has no layout, so
    * you should set one adapted to your needs.
    */
   void CreateQtPartControl(QWidget* parent);
 
   void RestoreGuiState(IMemento::Pointer memento);
 
 private:
 
   Ui::QtObjectBrowserView m_Controls;
   QtObjectTableModel* m_ObjectModel;
   QAbstractProxyModel* m_ProxyModel;
 
   QAction m_ActionToggleBreakpoint;
   QAction m_ActionEnableBreakpoint;
   QAction m_ActionDisableBreakpoint;
 
   QMenu m_ContextMenu;
 
   IMemento::Pointer m_StateMemento;
 
   bool m_Useful;
 };
 
 } //namespace berry
 
 #endif /*BERRY_OBJECTINSPECTORVIEW_H_INCLUDED*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/src/internal/berryObjectItem.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/src/internal/berryObjectItem.cpp
index f7e9fe39e0..07c450e7b0 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/src/internal/berryObjectItem.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/src/internal/berryObjectItem.cpp
@@ -1,107 +1,105 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryObjectItem.h"
 
 namespace berry
 {
 
 ObjectItem::ObjectItem()
 {
   type = CLASS;
-  className = 0;
   parent = 0;
 }
 
-ObjectItem::ObjectItem(const char* className) :
+ObjectItem::ObjectItem(const QString& className) :
   className(className), type(CLASS), parent(0)
 {
 }
 
 ObjectItem::ObjectItem(const Object* obj, ObjectItem* parent) :
   obj(obj), type(INSTANCE), parent(parent)
 {
 }
 
 ObjectItem::ObjectItem(unsigned int spId, ObjectItem* parent) :
   spId(spId), type(SMARTPOINTER), parent(parent)
 {
 }
 
 ObjectItem::ObjectItem(const ObjectItem& item) :
   type(item.type), children(item.children), parent(item.parent)
 {
   switch (type)
   {
   case CLASS:
     className = item.className;
     break;
   case INSTANCE:
     obj = item.obj;
     break;
   case SMARTPOINTER:
     spId = item.spId;
     break;
   }
 }
 
 ObjectItem::~ObjectItem()
 {
   qDeleteAll(children);
 }
 
 ObjectItem& ObjectItem::operator=(const ObjectItem& item)
 {
   type = item.type;
   children = item.children;
   parent = item.parent;
 
   switch (type)
   {
   case CLASS:
     className = item.className;
     break;
   case INSTANCE:
     obj = item.obj;
     break;
   case SMARTPOINTER:
     spId = item.spId;
     break;
   }
 
   return *this;
 }
 
 bool ObjectItem::operator==(const ObjectItem& item) const
 {
   if (type != item.type)
     return false;
   switch (type)
   {
   case CLASS:
   {
-    std::string str(className);
-    return str == item.className;
+    return className == item.className;
   }
   case INSTANCE:
     return obj == item.obj;
   case SMARTPOINTER:
     return spId == item.spId;
   };
   return false;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/src/internal/berryObjectItem.h b/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/src/internal/berryObjectItem.h
index d18823291c..a07f2ef5e7 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/src/internal/berryObjectItem.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/src/internal/berryObjectItem.h
@@ -1,67 +1,68 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYOBJECTITEM_H_
 #define BERRYOBJECTITEM_H_
 
 #include <QList>
 
 #include <berryObject.h>
 
 namespace berry
 {
 
 struct ObjectItem
 {
 
   enum Type
   {
     CLASS = 0, INSTANCE = 1, SMARTPOINTER = 2
   };
 
   union
   {
     const Object* obj;
-    const char* className;
     unsigned int spId;
   };
 
+  QString className;
+
   Type type;
 
   QList<ObjectItem*> children;
   ObjectItem* parent;
 
   ObjectItem();
 
-  ObjectItem(const char* className);
+  ObjectItem(const QString& className);
 
   ObjectItem(const Object* obj, ObjectItem* parent);
 
   ObjectItem(unsigned int spId, ObjectItem* parent);
 
   ObjectItem(const ObjectItem& item);
 
   ~ObjectItem();
 
   ObjectItem& operator=(const ObjectItem& item);
 
   bool operator==(const ObjectItem& item) const;
 
 };
 
 }
 
 #endif /* BERRYOBJECTITEM_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/src/internal/berryQtObjectTableModel.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/src/internal/berryQtObjectTableModel.cpp
index c6a7cee470..8f7e384296 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/src/internal/berryQtObjectTableModel.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/src/internal/berryQtObjectTableModel.cpp
@@ -1,590 +1,590 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryQtObjectTableModel.h"
 
 #include <berryLog.h>
 #include <berryDebugUtil.h>
 #include <berryDebugBreakpointManager.h>
 
 #include <QTimer>
 #include <QIcon>
 
 #include <cstring>
 
 namespace berry
 {
 
 class DebugObjectListener: public IDebugObjectListener
 {
 public:
 
   DebugObjectListener(QtObjectTableModel* model) :
     model(model)
   {
 
   }
 
   Events::Types GetEventTypes() const
   {
     return Events::ALL;
   }
 
   void ObjectCreated(const Object* obj)
   {
     model->ObjectCreated(obj);
   }
 
   void ObjectDestroyed(const Object* obj)
   {
     model->ObjectDestroyed(obj);
   }
 
   void ObjectTracingChanged(unsigned int /*traceId*/, bool /*enabled = true*/,
       const Object*  /*obj*/ = 0)
   {
   }
 
   void SmartPointerCreated(unsigned int id, const Object* obj)
   {
     model->SmartPointerCreated(id, obj);
   }
 
   void SmartPointerDestroyed(unsigned int id, const Object* obj)
   {
     model->SmartPointerDestroyed(id, obj);
   }
 
 private:
 
   QtObjectTableModel* model;
 };
 
 QtObjectTableModel::QtObjectTableModel(QObject* parent) :
   QAbstractItemModel(parent), objectListener(new DebugObjectListener(this))
 {
   QList<const Object*> objects = DebugUtil::GetRegisteredObjects();
   for (QList<const Object*>::const_iterator i = objects.begin(); i
       != objects.end(); ++i)
   {
-    const char* name = (*i)->GetClassName();
+    QString name = (*i)->GetClassName();
     ObjectItem* classItem = 0;
     QListIterator<ObjectItem*> iter(indexData);
     bool classFound = false;
     while (iter.hasNext())
     {
       classItem = iter.next();
-      if (std::strcmp(classItem->className, name) == 0)
+      if (name == classItem->className)
       {
         classFound = true;
         break;
       }
     }
 
     ObjectItem* instanceItem = new ObjectItem(*i, 0);
     // get smartpointer ids
     QList<unsigned int> spIds(DebugUtil::GetSmartPointerIDs(*i));
     for (QList<unsigned int>::const_iterator spIdIter = spIds.begin(); spIdIter
         != spIds.end(); ++spIdIter)
     {
       ObjectItem* spItem = new ObjectItem((unsigned int) (*spIdIter), instanceItem);
       instanceItem->children.push_back(spItem);
     }
 
     if (classFound)
     {
       instanceItem->parent = classItem;
       classItem->children.push_back(instanceItem);
     }
     else
     {
       classItem = new ObjectItem(name);
       indexData.push_back(classItem);
 
       instanceItem->parent = classItem;
       classItem->children.push_back(instanceItem);
     }
 
   }
 
   QTimer* timer = new QTimer(this);
   connect(timer, SIGNAL(timeout()), this, SLOT(UpdatePendingData()));
   timer->start(500);
 
-  DebugUtil::AddObjectListener(objectListener.GetPointer());
+  DebugUtil::AddObjectListener(objectListener.data());
 }
 
 QtObjectTableModel::~QtObjectTableModel()
 {
-  DebugUtil::RemoveObjectListener(objectListener.GetPointer());
+  DebugUtil::RemoveObjectListener(objectListener.data());
 
   qDeleteAll(pendingData);
   qDeleteAll(indexData);
 }
 
 QModelIndex QtObjectTableModel::index(int row, int column,
     const QModelIndex& parent) const
 {
   if (parent.isValid())
   {
     if (parent.parent().isValid())
     {
       ObjectItem* data = static_cast<ObjectItem*> (parent.internalPointer());
       poco_assert(data->type == ObjectItem::INSTANCE)
 ;      return createIndex(row, column, data->children[row]);
     }
     else
     {
       ObjectItem* data = static_cast<ObjectItem*>(parent.internalPointer());
       poco_assert(data->type == ObjectItem::CLASS);
       return createIndex(row, column, data->children[row]);
     }
   }
   else
   return createIndex(row, column, indexData[row]);
 }
 
 QModelIndex QtObjectTableModel::parent(const QModelIndex& index) const
 {
   ObjectItem* data = static_cast<ObjectItem*>(index.internalPointer());
   if (data->parent)
   {
     return createIndex(data->parent->children.indexOf(data), 0, data->parent);
   }
   else
   {
     return QModelIndex();
   }
 }
 
 int QtObjectTableModel::rowCount(const QModelIndex& parent) const
 {
   if (parent.isValid())
   {
     if (parent.parent().isValid())
     {
       if (parent.parent().parent().isValid()) // smart pointer parent
       return 0;
 
       // instance parent
       ObjectItem* data = static_cast<ObjectItem*>(parent.internalPointer());
       poco_assert(data->type == ObjectItem::INSTANCE);
       return data->children.size();
     }
     else
     {
       // class parent
       ObjectItem* data = static_cast<ObjectItem*>(parent.internalPointer());
       poco_assert(data->type == ObjectItem::CLASS);
       return data->children.size();
     }
   }
   else
   {
     // root
     return indexData.size();
   }
 }
 
 int QtObjectTableModel::columnCount(const QModelIndex&) const
 {
   return 2;
 }
 
 QVariant QtObjectTableModel::data(const QModelIndex& index, int role) const
 {
   if (role == Qt::DisplayRole)
   {
     if (index.column() == 0)
     {
       if (index.parent().isValid())
       {
         QModelIndex parentIndex = index.parent();
         if (parentIndex.parent().isValid())
         {
           ObjectItem* data = static_cast<ObjectItem*>(index.internalPointer());
           poco_assert(data->type == ObjectItem::SMARTPOINTER);
           return QVariant(QString("SmartPointer (id: ") + QString::number(data->spId) + QString(")"));
         }
         else
         {
           ObjectItem* data = static_cast<ObjectItem*>(index.internalPointer());
           poco_assert(data->type == ObjectItem::INSTANCE);
 #ifdef BLUEBERRY_DEBUG_SMARTPOINTER
           QString text = QString::number(data->obj->GetTraceId());
 #else
           QString text;
 #endif
           text += QString(" (References: ") + QString::number(data->obj->GetReferenceCount()) + QString(")");
           return QVariant(text);
         }
       }
       else
       {
         ObjectItem* data = static_cast<ObjectItem*>(index.internalPointer());
         poco_assert(data->type == ObjectItem::CLASS);
         return QVariant(QString(data->className) + " (" + QString::number(data->children.size()) + ")");
       }
     }
   }
   else if (role == Qt::CheckStateRole && index.column() == 1)
   {
     ObjectItem* data = static_cast<ObjectItem*>(index.internalPointer());
     if (data->type == ObjectItem::INSTANCE)
     {
       QVariant var = (DebugUtil::IsTraced(data->obj) ? Qt::Checked : Qt::Unchecked);
       return var;
     }
     else if (data->type == ObjectItem::CLASS)
     {
       QVariant var = (DebugUtil::IsTraced(data->className) ? Qt::Checked : Qt::Unchecked);
       return var;
     }
   }
   else if (role == Qt::DecorationRole && index.column() == 0)
   {
     ObjectItem* data = static_cast<ObjectItem*>(index.internalPointer());
     if (data->type == ObjectItem::INSTANCE)
     {
       QVariant var;
 #ifdef BLUEBERRY_DEBUG_SMARTPOINTER
       if (DebugUtil::GetBreakpointManager()->BreakAtObject(data->obj->GetTraceId()))
 #else
       if(false)
 #endif
       {
         var = QIcon(":/objectinspector/break-enabled.png");
       }
       return var;
     }
     else if (data->type == ObjectItem::SMARTPOINTER)
     {
       QVariant var;
       if (DebugUtil::GetBreakpointManager()->BreakAtSmartpointer(data->spId))
       {
         var = QIcon(":/objectinspector/break-enabled.png");
       }
       return var;
     }
   }
   else if (role == Qt::UserRole)
   {
 
     return QVariant::fromValue(index.internalPointer());
   }
 
   return QVariant();
 }
 
 QVariant QtObjectTableModel::headerData(int section,
     Qt::Orientation orientation, int role) const
 {
   if (role == Qt::DisplayRole && orientation == Qt::Horizontal)
   {
     switch (section)
     {
       case 0:
       {
         int count = 0;
         QListIterator<ObjectItem*> iter(indexData);
         while (iter.hasNext())
         {
           count += iter.next()->children.size();
         }
 
         return QVariant(QString("Instances (") + QString::number(count) + ")");
       }
       case 1:
       {
         return QVariant(QString("Trace"));
       }
     }
   }
 
   return QVariant();
 }
 
 Qt::ItemFlags QtObjectTableModel::flags(const QModelIndex& index) const
 {
   Qt::ItemFlags flags = QAbstractItemModel::flags(index);
 
   ObjectItem* item = static_cast<ObjectItem*> (index.internalPointer());
   if ((item->type == ObjectItem::INSTANCE || item->type == ObjectItem::CLASS)
       && index.column() == 1)
   flags |= Qt::ItemIsUserCheckable;
 
   return flags;
 }
 
 bool QtObjectTableModel::setData(const QModelIndex &index,
     const QVariant &value, int role)
 {
   if (index.isValid() && index.column() == 1 && role == Qt::CheckStateRole)
   {
     ObjectItem* item = static_cast<ObjectItem*> (index.internalPointer());
 
     if (value.toInt() == Qt::Checked)
     {
       if (item->type == ObjectItem::INSTANCE)
         DebugUtil::TraceObject(item->obj);
       else if (item->type == ObjectItem::CLASS)
         DebugUtil::TraceClass(item->className);
     }
     else
     {
       if (item->type == ObjectItem::INSTANCE)
         DebugUtil::StopTracing(item->obj);
       else if (item->type == ObjectItem::CLASS)
         DebugUtil::StopTracing(item->className);
     }
 
     emit dataChanged(index, index);
     return true;
   }
 
   return false;
 }
 
 void QtObjectTableModel::ResetData()
 {
   indexData.clear();
   DebugUtil::ResetObjectSummary();
   QAbstractItemModel::beginResetModel();
   QAbstractItemModel::endResetModel();
 }
 
 void QtObjectTableModel::ObjectCreated(const Object* obj)
 {
   // This method is called inside the berry::Object
   // constructor, hence we cannot reliably call the virtual
   // method berry::Object::GetClassName() to put the new
   // object under the right "class" parent. So add it to
   // a list of pending objects.
 
   ObjectItem* item = new ObjectItem(obj, 0);
   pendingData.push_back(item);
 }
 
 void QtObjectTableModel::UpdatePendingData()
 {
   if (pendingData.empty())
   return;
 
   QListIterator<ObjectItem*> instanceIter(pendingData);
   while (instanceIter.hasNext())
   {
     ObjectItem* instanceItem = instanceIter.next();
     ObjectItem* classItem = 0;
     ObjectItem classSearchItem(instanceItem->obj->GetClassName());
     int classIndex = 0;
     classItem = FindObjectItem(classSearchItem, classIndex);
     if (!classItem)
     {
       classItem = new ObjectItem(instanceItem->obj->GetClassName());
       classItem->children.push_back(instanceItem);
       instanceItem->parent = classItem;
 
       classIndex = rowCount(QModelIndex());
       beginInsertRows(QModelIndex(), classIndex, classIndex);
       indexData.push_back(classItem);
       endInsertRows();
     }
     else
     {
       instanceItem->parent = classItem;
 
       QModelIndex classModelIndex = createIndex(classIndex, 0, classItem);
       int rowIndex = rowCount(classModelIndex);
       beginInsertRows(classModelIndex, rowIndex, rowIndex);
       classItem->children.push_back(instanceItem);
       endInsertRows();
     }
   }
 
   pendingData.clear();
 }
 
 void QtObjectTableModel::ObjectDestroyed(const Object* obj)
 {
   ObjectItem searchItem(obj, 0);
   int index = 0;
   ObjectItem* item = FindObjectItem(searchItem, index);
   if (!item)
   {
     QMutableListIterator<ObjectItem*> pendingIter(pendingData);
     while (pendingIter.hasNext())
     {
       ObjectItem* pendingItem = pendingIter.next();
       if (pendingItem->obj == obj)
       {
         pendingIter.remove();
         delete pendingItem;
         break;
       }
     }
     return;
   }
 
   int parentIndex = indexData.indexOf(item->parent);
   beginRemoveRows(createIndex(parentIndex, 0, item->parent), index, index);
   item->parent->children.removeAt(index);
   endRemoveRows();
 
   if (item->parent->children.empty())
   {
     beginRemoveRows(QModelIndex(), parentIndex, parentIndex);
     indexData.removeAt(parentIndex);
     endRemoveRows();
 
     delete item->parent;
   }
   else
   {
     delete item;
   }
 }
 
 void QtObjectTableModel::SmartPointerCreated(unsigned int id, const Object* obj)
 {
   ObjectItem searchInstance(obj, 0);
   int instanceIndex = 0;
   ObjectItem* instanceItem = FindObjectItem(searchInstance, instanceIndex);
   if (!instanceItem)
   {
     QListIterator<ObjectItem*> pendingIter(pendingData);
     while (pendingIter.hasNext())
     {
       ObjectItem* pendingItem = pendingIter.next();
       if (pendingItem->obj == obj)
       {
         pendingItem->children.push_back(new ObjectItem(id, pendingItem));
         break;
       }
     }
     return;
   }
 
   int itemIndex = instanceItem->children.size();
   beginInsertRows(createIndex(instanceIndex, 0, instanceItem), itemIndex,
       itemIndex);
   instanceItem->children.push_back(new ObjectItem(id, instanceItem));
   endInsertRows();
 }
 
 void QtObjectTableModel::SmartPointerDestroyed(unsigned int id, const Object* obj)
 {
   ObjectItem searchSP(id, 0);
   int spIndex = 0;
   ObjectItem* spItem = FindObjectItem(searchSP, spIndex);
   if (!spItem)
   {
     QListIterator<ObjectItem*> pendingIter(pendingData);
     while (pendingIter.hasNext())
     {
       ObjectItem* pendingItem = pendingIter.next();
       if (pendingItem->obj == obj)
       {
         QMutableListIterator<ObjectItem*> spIter(pendingItem->children);
         while (spIter.hasNext())
         {
           spItem = spIter.next();
           if (spItem->spId == id)
           {
             spIter.remove();
             delete spItem;
             return;
           }
         }
         break;
       }
     }
     return;
   }
 
   int parentIndex = 0;
   ObjectItem searchInstance(obj, 0);
   ObjectItem* instanceItem = FindObjectItem(searchInstance, parentIndex);
   beginRemoveRows(createIndex(parentIndex, 0, instanceItem), spIndex, spIndex);
   instanceItem->children.removeAt(spIndex);
   delete spItem;
   endRemoveRows();
 }
 
 ObjectItem* QtObjectTableModel::FindObjectItem(
     const ObjectItem& item, int& index)
 {
   switch (item.type)
   {
     case ObjectItem::CLASS:
     {
       QListIterator<ObjectItem*> i(indexData);
       index = 0;
       while (i.hasNext())
       {
         ObjectItem* next = i.next();
-        if (std::strcmp(next->className, item.className) == 0)
-        return next;
+        if (next->className == item.className)
+          return next;
         ++index;
       }
       return 0;
     }
     case ObjectItem::INSTANCE:
     {
       QListIterator<ObjectItem*> i(indexData);
       while (i.hasNext())
       {
         ObjectItem* next = i.next();
         index = 0;
         QListIterator<ObjectItem*> childIter(next->children);
         while (childIter.hasNext())
         {
           ObjectItem* child = childIter.next();
           if (child->obj == item.obj)
           return child;
           ++index;
         }
       }
       return 0;
     }
     case ObjectItem::SMARTPOINTER:
     {
       QListIterator<ObjectItem*> classIter(indexData);
       while (classIter.hasNext())
       {
         ObjectItem* nextClass = classIter.next();
         QListIterator<ObjectItem*> instanceIter(nextClass->children);
         while (instanceIter.hasNext())
         {
           ObjectItem* nextInstance = instanceIter.next();
           index = 0;
           QListIterator<ObjectItem*> spIter(nextInstance->children);
           while (spIter.hasNext())
           {
             ObjectItem* nextSp = spIter.next();
             if (nextSp->spId == item.spId)
             return nextSp;
             ++index;
           }
         }
 
       }
       return 0;
     }
   }
   return 0;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/src/internal/berryQtObjectTableModel.h b/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/src/internal/berryQtObjectTableModel.h
index 8a4d9ee6d6..b299dfc07b 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/src/internal/berryQtObjectTableModel.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/src/internal/berryQtObjectTableModel.h
@@ -1,81 +1,81 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYQTOBJECTTABLEMODEL_H_
 #define BERRYQTOBJECTTABLEMODEL_H_
 
 #include <QAbstractItemModel>
 #include <QSortFilterProxyModel>
 #include <QList>
 
 #include <berryIDebugObjectListener.h>
 
 #include "berryObjectItem.h"
 
 namespace berry
 {
 
 class QtObjectTableModel: public QAbstractItemModel
 {
   Q_OBJECT
 
 public:
 
   QtObjectTableModel(QObject* parent = 0);
   ~QtObjectTableModel();
 
   QModelIndex index(int row, int column, const QModelIndex& parent =
       QModelIndex()) const;
   QModelIndex parent(const QModelIndex& index) const;
 
   int rowCount(const QModelIndex&) const;
   int columnCount(const QModelIndex&) const;
   QVariant data(const QModelIndex& index, int) const;
 
   QVariant headerData(int section, Qt::Orientation orientation, int) const;
 
   Qt::ItemFlags flags(const QModelIndex& index) const;
   bool setData(const QModelIndex &index, const QVariant &value, int role);
 
   void ResetData();
 
 protected:
 
   void ObjectCreated(const Object* obj);
   void ObjectDestroyed(const Object* obj);
 
   void SmartPointerCreated(unsigned int id, const Object* obj);
   void SmartPointerDestroyed(unsigned int id, const Object* obj);
 
 private slots:
 
   void UpdatePendingData();
 
 private:
 
   ObjectItem* FindObjectItem(const ObjectItem& item, int& index);
 
   QList<ObjectItem*> indexData;
   QList<ObjectItem*> pendingData;
 
-  IDebugObjectListener::Pointer objectListener;
+  QScopedPointer<IDebugObjectListener> objectListener;
   friend class DebugObjectListener;
 
 };
 
 }
 
 #endif /* BERRYQTOBJECTTABLEMODEL_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/files.cmake b/BlueBerry/Bundles/org.blueberry.ui.qt/files.cmake
index ac5d297365..fde8abe0d2 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/files.cmake
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/files.cmake
@@ -1,425 +1,468 @@
 set(SRC_CPP_FILES
   berryAbstractSourceProvider.cpp
   berryAbstractUICTKPlugin.cpp
   berryConstants.cpp
   berryDisplay.cpp
   berryEditorPart.cpp
   berryFileEditorInput.cpp
   berryGeometry.cpp
 
   berryIActionBars.h
+  berryIContextService.cpp
   berryIContributionRoot.h
   berryIDropTargetListener.cpp
   berryIEditorDescriptor.cpp
   berryIEditorInput.cpp
   berryIEditorMatchingStrategy.cpp
   berryIEditorPart.cpp
   berryIEditorReference.cpp
   berryIEditorRegistry.cpp
   berryIEditorSite.cpp
   berryIFileEditorMapping.cpp
   berryIFolderLayout.cpp
   berryImageDescriptor.cpp
   berryIMemento.cpp
   berryINullSelectionListener.cpp
   berryIPageLayout.cpp
   berryIPartListener.cpp
   berryIPageService.cpp
   berryIPartService.cpp
   berryIPathEditorInput.cpp
   berryIPerspectiveDescriptor.cpp
   berryIPerspectiveFactory.cpp
   berryIPerspectiveListener.cpp
   berryIPerspectiveRegistry.cpp
   berryIPlaceholderFolderLayout.cpp
   berryIPluginContribution.h
   berryIPostSelectionProvider.cpp
   berryIPreferencePage.cpp
   berryIPropertyChangeListener.cpp
   berryIQtPreferencePage.cpp
   berryIQtStyleManager.cpp
   berryIReusableEditor.cpp
   berryISaveablePart.cpp
   berryISaveablesLifecycleListener.cpp
   berryISaveablesSource.cpp
   berryISelection.cpp
   berryISelectionChangedListener.cpp
   berryISelectionListener.cpp
   berryISelectionProvider.cpp
   berryISelectionService.cpp
   berryIShellListener.cpp
   berryIShellProvider.cpp
+  berryIShowInSource.h
+  berryIShowInTarget.h
   berryISizeProvider.cpp
   berryISourceProvider.cpp
   berryISourceProviderListener.cpp
   berryISources.cpp
   berryIStickyViewDescriptor.cpp
   berryIStructuredSelection.cpp
   berryIViewCategory.cpp
   berryIViewDescriptor.cpp
   berryIViewLayout.cpp
   berryIViewPart.cpp
   berryIViewReference.cpp
   berryIViewRegistry.cpp
   berryIViewSite.cpp
   berryIWorkbenchCommandConstants.cpp
   berryIWindowListener.cpp
   berryIWorkbench.cpp
   berryIWorkbenchListener.cpp
   berryIWorkbenchPage.cpp
   berryIWorkbenchPart.cpp
   berryIWorkbenchPartConstants.cpp
   berryIWorkbenchPartDescriptor.cpp
   berryIWorkbenchPartReference.cpp
   berryIWorkbenchPartSite.cpp
   berryIWorkbenchSite.cpp
   berryIWorkbenchWindow.cpp
   berryMenuUtil.cpp
   berryPlatformUI.cpp
   berryPoint.cpp
   berryPropertyChangeEvent.cpp
   berryQModelIndexObject.cpp
   berryQtEditorPart.cpp
   berryQtItemSelection.cpp
   berryQtIntroPart.cpp
   berryQtPreferences.cpp
   berryQtSelectionProvider.cpp
   berryQtViewPart.cpp
   berryRectangle.cpp
   berrySameShellProvider.cpp
   berrySaveable.cpp
   berrySaveablesLifecycleEvent.cpp
   berrySelectionChangedEvent.cpp
   berryShell.cpp
   berryShellEvent.cpp
+  berryShowInContext.cpp
   berryUIException.cpp
   berryViewPart.cpp
   berryWindow.cpp
   berryWorkbenchActionConstants.cpp
   berryWorkbenchPart.cpp
   berryWorkbenchPreferenceConstants.cpp
   berryXMLMemento.cpp
 
   #actions
   actions/berryAbstractContributionFactory.cpp
   actions/berryAbstractGroupMarker.cpp
   #actions/berryAction.cpp
   #actions/berryActionContributionItem.cpp
   actions/berryCommandContributionItem.h
   actions/berryCommandContributionItem.cpp
   actions/berryContributionItem.cpp
   actions/berryContributionItemFactory.cpp
   actions/berryContributionManager.cpp
   actions/berryIContributionItem.h
   actions/berryIContributionManager.h
   actions/berryIContributionManagerOverrides.cpp
   actions/berryIMenuManager.h
   #actions/berryManuBarManager.cpp
   actions/berryMenuManager.cpp
   actions/berrySeparator.cpp
   actions/berrySubContributionItem.cpp
 
 
   #application
   application/berryActionBarAdvisor.cpp
   application/berryIActionBarConfigurer.cpp
   application/berryIWorkbenchConfigurer.cpp
   application/berryIWorkbenchWindowConfigurer.cpp
   application/berryWorkbenchAdvisor.cpp
   application/berryWorkbenchWindowAdvisor.cpp
 
   #commands
   commands/berryICommandImageService.cpp
   commands/berryICommandService.cpp
   commands/berryIElementReference.h
   commands/berryIElementUpdater.h
   commands/berryIMenuService.h
   commands/berryUIElement.cpp
 
   #dialogs
   dialogs/berryIDialog.cpp
   dialogs/berryIShowViewDialog.cpp
   dialogs/berryMessageDialog.cpp
 
   #guitk
   guitk/berryGuiTkControlEvent.cpp
   guitk/berryGuiTkEvent.cpp
   guitk/berryGuiTkIControlListener.cpp
   guitk/berryGuiTkIMenuListener.cpp
   guitk/berryGuiTkISelectionListener.cpp
   guitk/berryGuiTkSelectionEvent.cpp
 
   #handlers
   handlers/berryHandlerUtil.cpp
   handlers/berryIHandlerActivation.cpp
   handlers/berryIHandlerService.cpp
+  handlers/berryRadioState.cpp
+  handlers/berryRegistryToggleState.cpp
   handlers/berryShowViewHandler.cpp
+  handlers/berryToggleState.cpp
 
   #intro
   intro/berryIIntroManager.cpp
   intro/berryIIntroPart.cpp
   intro/berryIIntroSite.cpp
   intro/berryIntroPart.cpp
 
   #tweaklets
   tweaklets/berryDnDTweaklet.cpp
   tweaklets/berryGuiWidgetsTweaklet.cpp
   tweaklets/berryImageTweaklet.cpp
   tweaklets/berryMessageDialogTweaklet.cpp
   tweaklets/berryITracker.cpp
   tweaklets/berryWorkbenchPageTweaklet.cpp
   tweaklets/berryWorkbenchTweaklet.cpp
 
   #presentations
   presentations/berryIPresentablePart.cpp
   presentations/berryIPresentationFactory.cpp
   presentations/berryIPresentationSerializer.cpp
   presentations/berryIStackPresentationSite.cpp
   presentations/berryStackDropResult.cpp
   presentations/berryStackPresentation.cpp
 
   #services
   services/berryIDisposable.cpp
   services/berryIEvaluationReference.h
   services/berryIEvaluationService.cpp
   services/berryINestable.cpp
   services/berryIServiceFactory.cpp
   services/berryIServiceLocator.cpp
+  services/berryIServiceScopes.cpp
   services/berryIServiceWithSources.cpp
+  services/berryISourceProviderService.cpp
 
   #testing
   testing/berryTestableObject.cpp
 
   #util
   util/berryISafeRunnableRunner.cpp
   util/berrySafeRunnable.cpp
 
   # application
   application/berryQtWorkbenchAdvisor.cpp
 )
 
 set(INTERNAL_CPP_FILES
 
   defaultpresentation/berryEmptyTabFolder.cpp
   defaultpresentation/berryEmptyTabItem.cpp
   defaultpresentation/berryNativeTabFolder.cpp
   defaultpresentation/berryNativeTabItem.cpp
   defaultpresentation/berryQCTabBar.cpp
   defaultpresentation/berryQtWorkbenchPresentationFactory.cpp
 
   util/berryAbstractTabFolder.cpp
   util/berryAbstractTabItem.cpp
   util/berryIPresentablePartList.cpp
   util/berryLeftToRightTabOrder.cpp
   util/berryPartInfo.cpp
   util/berryPresentablePartFolder.cpp
   util/berryReplaceDragHandler.cpp
   util/berryTabbedStackPresentation.cpp
   util/berryTabDragHandler.cpp
   util/berryTabFolderEvent.cpp
   util/berryTabOrder.cpp
 
   #intro
   intro/berryEditorIntroAdapterPart.cpp
   intro/berryIIntroDescriptor.cpp
   intro/berryIIntroRegistry.cpp
   intro/berryIntroConstants.cpp
   intro/berryIntroDescriptor.cpp
   intro/berryIntroPartAdapterSite.cpp
   intro/berryIntroRegistry.cpp
   intro/berryViewIntroAdapterPart.cpp
   intro/berryWorkbenchIntroManager.cpp
 
   berryAbstractMenuAdditionCacheEntry.cpp
   berryAbstractPartSelectionTracker.cpp
   berryAbstractSelectionService.cpp
+  berryActivePartExpression.cpp
   berryAlwaysEnabledExpression.cpp
+  berryAndExpression.cpp
   berryBundleUtility.cpp
   berryCommandContributionItemParameter.cpp
+  berryCommandParameter.cpp
+  berryCommandPersistence.cpp
   berryCommandService.cpp
+  berryCommandServiceFactory.cpp
+  berryCommandStateProxy.cpp
+  berryCompositeExpression.cpp
   berryContainerPlaceholder.cpp
   berryContributionRoot.cpp
   berryDetachedPlaceHolder.cpp
   berryDefaultSaveable.cpp
   berryDefaultStackPresentationSite.cpp
   berryDetachedWindow.cpp
   berryDragUtil.cpp
   berryEditorAreaHelper.cpp
   berryEditorDescriptor.cpp
   berryEditorManager.cpp
   berryEditorReference.cpp
   berryEditorRegistry.cpp
   berryEditorRegistryReader.cpp
   berryEditorSashContainer.cpp
   berryEditorSite.cpp
   berryElementReference.cpp
   berryErrorViewPart.cpp
   berryEvaluationAuthority.cpp
   berryEvaluationReference.cpp
   berryEvaluationResultCache.cpp
   berryEvaluationService.cpp
   berryExpressionAuthority.cpp
   berryFileEditorMapping.cpp
   berryFolderLayout.cpp
+  berryHandlerActivation.cpp
+  berryHandlerAuthority.cpp
+  berryHandlerPersistence.cpp
+  berryHandlerProxy.cpp
+  berryHandlerService.cpp
+  berryHandlerServiceFactory.cpp
   berryIDragOverListener.cpp
   berryIDropTarget.cpp
   berryIEvaluationResultCache.cpp
   berryILayoutContainer.cpp
+  berryInternalMenuService.h
   berryIServiceLocatorCreator.cpp
   berryIStickyViewManager.cpp
   berryIWorkbenchLocationService.cpp
   berryLayoutHelper.cpp
   berryLayoutPart.cpp
   berryLayoutPartSash.cpp
   berryLayoutTree.cpp
   berryLayoutTreeNode.cpp
+  berryMenuServiceFactory.cpp
   berryMMMenuListener.cpp
+  berryNestableHandlerService.cpp
   berryNullEditorInput.cpp
   berryPageLayout.cpp
   berryPagePartSelectionTracker.cpp
   berryPageSelectionService.cpp
+  berryParameterValueConverterProxy.cpp
   berryPartList.cpp
   berryPartPane.cpp
   berryPartPlaceholder.cpp
   berryPartSashContainer.cpp
   berryPartService.cpp
   berryPartSite.cpp
   berryPartStack.cpp
   berryPartTester.cpp
+  berryPersistentState.cpp
   berryPerspective.cpp
   berryPerspectiveDescriptor.cpp
   berryPerspectiveExtensionReader.cpp
   berryPerspectiveHelper.cpp
   berryPerspectiveRegistry.cpp
   berryPerspectiveRegistryReader.cpp
   berryPlaceholderFolderLayout.cpp
   berryPreferenceConstants.cpp
   berryPresentablePart.cpp
   berryPresentationFactoryUtil.cpp
   berryPresentationSerializer.cpp
   berryQtControlWidget.cpp
   berryQtDnDControlWidget.cpp
   berryQtDisplay.cpp
   berryQtDnDTweaklet.cpp
   berryQtFileImageDescriptor.cpp
   berryQtGlobalEventFilter.cpp
   berryQtIconImageDescriptor.cpp
   berryQtImageTweaklet.cpp
   berryQtMainWindowControl.cpp
   berryQtMessageDialogTweaklet.cpp
   berryQtMissingImageDescriptor.cpp
   berryQtOpenPerspectiveAction.cpp
   berryQtPerspectiveSwitcher.cpp
   berryQtSafeApplication.cpp
   berryQtSash.cpp
   berryQtShell.cpp
   berryQtShowViewAction.cpp
   berryQtShowViewDialog.cpp
   berryQtStyleManager.cpp
   berryQtStylePreferencePage.cpp
   berryQtTracker.cpp
   berryQtWidgetController.cpp
   berryQtWidgetsTweaklet.cpp
   berryQtWidgetsTweakletImpl.cpp
   berryQtWorkbenchPageTweaklet.cpp
   berryQtWorkbenchTweaklet.cpp
+  berryRegistryPersistence.cpp
   berryRegistryReader.cpp
   berrySaveablesList.cpp
   berryShowViewMenu.cpp
   berryServiceLocator.cpp
   berryServiceLocatorCreator.cpp
   berryShellPool.cpp
+  berrySlaveCommandService.cpp
+  berrySlaveHandlerService.cpp
+  berrySlaveMenuService.cpp
+  berrySourceProviderService.cpp
   berrySourcePriorityNameMapping.cpp
   berryStatusUtil.cpp
   berryStickyViewDescriptor.cpp
   berryStickyViewManager.cpp
   berryTweaklets.cpp
+  berryUtil.cpp
   berryViewDescriptor.cpp
   berryViewFactory.cpp
   berryViewLayout.cpp
   berryViewReference.cpp
   berryViewRegistry.cpp
   berryViewRegistryReader.cpp
   berryViewSashContainer.cpp
   berryViewSite.cpp
   berryWorkbenchPage.cpp
   berryWindowManager.cpp
   berryWindowPartSelectionTracker.cpp
   berryWindowSelectionService.cpp
   berryWorkbench.cpp
   berryWorkbenchConfigurer.cpp
   berryWorkbenchConstants.cpp
+  berryWorkbenchLocationService.cpp
   berryWorkbenchMenuService.cpp
   berryWorkbenchPagePartList.cpp
   berryWorkbenchPartReference.cpp
   berryWorkbenchPlugin.cpp
   berryWorkbenchRegistryConstants.cpp
   berryWorkbenchServiceRegistry.cpp
+  berryWorkbenchSourceProvider.cpp
   berryWorkbenchTestable.cpp
   berryWorkbenchWindow.cpp
   berryWorkbenchWindowConfigurer.cpp
+  berryWorkbenchWindowExpression.cpp
   berryWWinActionBars.cpp
   berryWWinPartService.cpp
 
 )
 
 set(MOC_H_FILES
 
   src/berryEditorPart.h
+  src/berryQtSelectionProvider.h
   src/berryViewPart.h
   src/berryWorkbenchPart.h
-  src/intro/berryIntroPart.h
 
-  src/berryQtSelectionProvider.h
+  src/actions/berryCommandContributionItem.h
 
-  src/internal/berryMMMenuListener.h
+  src/intro/berryIntroPart.h
 
-  src/internal/defaultpresentation/berryNativeTabFolder.h
-  src/internal/defaultpresentation/berryNativeTabItem.h
-  src/internal/defaultpresentation/berryQCTabBar.h
-  src/internal/defaultpresentation/berryQtWorkbenchPresentationFactory.h
-
-  src/internal/intro/berryEditorIntroAdapterPart.h
+  src/handlers/berryShowViewHandler.h
 
+  src/internal/berryCommandServiceFactory.h
+  src/internal/berryHandlerServiceFactory.h
+  src/internal/berryMenuServiceFactory.h
+  src/internal/berryMMMenuListener.h
+  src/internal/berryWorkbenchSourceProvider.h
   src/internal/berryQtDisplay.h
   src/internal/berryQtDnDTweaklet.h
   src/internal/berryQtGlobalEventFilter.h
   src/internal/berryQtImageTweaklet.h
   src/internal/berryQtMainWindowControl.h
   src/internal/berryQtMessageDialogTweaklet.h
   src/internal/berryQtOpenPerspectiveAction.h
   src/internal/berryQtPerspectiveSwitcher.h
   src/internal/berryQtSash.h
   src/internal/berryQtShowViewAction.h
   src/internal/berryQtStyleManager.h
   src/internal/berryQtStylePreferencePage.h
   src/internal/berryQtTracker.h
   src/internal/berryQtWidgetsTweaklet.h
   src/internal/berryQtWidgetsTweakletImpl.h
   src/internal/berryQtWorkbenchTweaklet.h
   src/internal/berryQtWorkbenchPageTweaklet.h
+
+  src/internal/defaultpresentation/berryNativeTabFolder.h
+  src/internal/defaultpresentation/berryNativeTabItem.h
+  src/internal/defaultpresentation/berryQCTabBar.h
+  src/internal/defaultpresentation/berryQtWorkbenchPresentationFactory.h
+
+  src/internal/intro/berryEditorIntroAdapterPart.h
 )
 
 set(UI_FILES
   src/internal/berryQtShowViewDialog.ui
   src/internal/berryQtStylePreferencePage.ui
   src/internal/berryQtStatusPart.ui
 )
 
 set(QRC_FILES
   resources/org_blueberry_ui_qt.qrc
 )
 
 set(CACHED_RESOURCE_FILES
   plugin.xml
 )
 
 set(CPP_FILES )
 
 foreach(file ${SRC_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/${file})
 endforeach(file ${SRC_CPP_FILES})
 
 foreach(file ${INTERNAL_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/internal/${file})
 endforeach(file ${INTERNAL_CPP_FILES})
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/plugin.xml b/BlueBerry/Bundles/org.blueberry.ui.qt/plugin.xml
index 8754aa85be..82a058d000 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/plugin.xml
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/plugin.xml
@@ -1,144 +1,167 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?BlueBerry version="0.1"?>
 <plugin>
 
    <extension-point id="org.blueberry.ui.commands" name="Commands" schema="schema/commands.exsd"/>
    <extension-point id="org.blueberry.ui.editors" name="Editors" schema="schema/editors.exsd"/>
    <extension-point id="org.blueberry.ui.handlers" name="Handlers" schema="schema/handlers.exsd"/>
    <extension-point id="org.blueberry.ui.intro" name="Introduction Extensions" schema="schema/intro.exsd"/>
    <extension-point id="org.blueberry.ui.preferencePages" name="Preference Pages" schema="schema/preferencePages.exsd"/>
    <extension-point id="org.blueberry.ui.views" name="Views" schema="schema/views.exsd"/>
    <extension-point id="org.blueberry.ui.keywords" name="keywords" schema="schema/keywords.exsd"/>
    <extension-point id="org.blueberry.ui.tweaklets" name="Tweaklets" schema="schema/tweaklets.exsd"/>
    <extension-point id="org.blueberry.ui.perspectives" name="Perspectives" schema="schema/perspectives.exsd"/>
    <extension-point id="org.blueberry.ui.presentationFactories" name="Presentation Factories" schema="schema/presentationFactories.exsd"/>
    <extension-point id="org.blueberry.ui.services" name="Services" schema="schema/services.exsd"/>
 
-   <extension
-         point="org.eclipse.ui.services">
-      <serviceFactory
-            factoryClass="org.eclipse.ui.internal.WorkbenchSupportFactory">
-         <service
-               serviceClass="org.eclipse.ui.progress.IProgressService">
-         </service>
-         <service
-               serviceClass="org.eclipse.ui.progress.IWorkbenchSiteProgressService">
-         </service>
-         <service
-               serviceClass="org.eclipse.ui.IPartService">
-         </service>
-         <service
-               serviceClass="org.eclipse.ui.IPageService">
-         </service>
-         <service
-               serviceClass="org.eclipse.ui.ISelectionService">
-         </service>
+   <extension point="org.blueberry.ui.services">
+
+      <serviceFactory factoryClass="berry::WorkbenchSupportFactory">
+         <service serviceClass="org.blueberry.ui.IProgressService"/>
+         <service serviceClass="org.blueberry.ui.IWorkbenchSiteProgressService"/>
+         <service serviceClass="org.blueberry.ui.IPartService"/>
+         <service serviceClass="org.blueberry.ui.IPageService"/>
+         <service serviceClass="org.blueberry.ui.ISelectionService"/>
+      </serviceFactory>
+
+      <serviceFactory factoryClass="berry::HandlerServiceFactory">
+         <service serviceClass="org.blueberry.ui.IHandlerService"/>
+      </serviceFactory>
+
+      <serviceFactory factoryClass="berry::EvaluationServiceFactory">
+         <service serviceClass="org.blueberry.ui.IEvaluationService"/>
+      </serviceFactory>
+<!--
+      <serviceFactory factoryClass="berry::ContextServiceFactory">
+         <service serviceClass="org.blueberry.ui.IContextService"/>
       </serviceFactory>
+-->
+      <serviceFactory factoryClass="berry::CommandServiceFactory">
+         <service serviceClass="org.blueberry.ui.ICommandService"/>
+      </serviceFactory>
+
+      <serviceFactory factoryClass="berry::MenuServiceFactory">
+         <service serviceClass="org.blueberry.ui.IMenuService"/>
+      </serviceFactory>
+
+      <sourceProvider provider="berry::WorkbenchSourceProvider">
+         <variable name="selection" priorityLevel="workbench"/>
+         <variable name="activeShell" priorityLevel="workbench"/>
+         <variable name="activeWorkbenchWindow" priorityLevel="workbench"/>
+         <variable name="activeWorkbenchWindowShell" priorityLevel="workbench"/>
+         <variable name="activeWorkbenchWindow.isToolbarVisible" priorityLevel="workbench"/>
+         <variable name="activeWorkbenchWindow.isPerspectiveBarVisible" priorityLevel="workbench"/>
+         <variable name="activeWorkbenchWindow.isSatusLineVisible" priorityLevel="workbench"/>
+         <variable name="activeWorkbenchWindow.activePerspective" priorityLevel="workbench"/>
+         <variable name="activeEditor" priorityLevel="workbench"/>
+         <variable name="activeEditorId" priorityLevel="workbench"/>
+         <variable name="activePart" priorityLevel="workbench"/>
+         <variable name="activePartId" priorityLevel="workbench"/>
+         <variable name="activeSite" priorityLevel="workbench"/>
+         <variable name="activeEditorInput" priorityLevel="workbench"/>
+      </sourceProvider>
+
    </extension>
 
-   <extension
-     point="org.blueberry.ui.commands">
+   <extension point="org.blueberry.ui.commands">
      <command
-      name="Show View"
+        name="Show View"
         description="Shows a particular view"
         id="org.blueberry.ui.views.showView"
         defaultHandler="berry::ShowViewHandler">
         <commandParameter
           id="org.blueberry.ui.views.showView.viewId"
           name="View"
           values="berry::ViewParameterValues" />
         <commandParameter
           id="org.blueberry.ui.views.showView.secondaryId"
           name="Secondary Id"
           optional="true"/>
     </command>
    </extension>
 
-   <extension
-         point="org.blueberry.ui.views">
+   <extension point="org.blueberry.ui.views">
       <category
             name="General"
             id="org.blueberry.ui"/>
       <view
             class="berry::ViewIntroAdapterPart"
             category="org.blueberry.ui"
             name="Welcome"
             id="org.blueberry.ui.internal.introview"/>
       <stickyView
             location="RIGHT"
             id="org.blueberry.ui.internal.introview"/>
    </extension>
 
-   <extension
-         point="org.blueberry.ui.editors">
+   <extension point="org.blueberry.ui.editors">
       <editor
             class="berry::EditorIntroAdapterPart"
             name="Welcome"
             id="org.blueberry.ui.internal.introeditor">
       </editor>
    </extension>
 
    <extension point="org.blueberry.ui.tweaklets">
       <tweaklet
          id="org.blueberry.ui.qt.tweaklets.WorkbenchTweaklet"
          name="Qt Workbench Tweaklet"
          description="Qt specific Workbench tweaks"
          definition="org.blueberry.WorkbenchTweaklet"
          implementation="berry::QtWorkbenchTweaklet" />
 
       <tweaklet
          id="org.blueberry.ui.qt.tweaklets.WorkbenchPageTweaklet"
          name="Qt WorkbenchPage Tweaklet"
          description="Qt specific WorkbenchPage tweaks"
          definition="org.blueberry.WorkbenchPageTweaklet"
          implementation="berry::QtWorkbenchPageTweaklet" />
 
       <tweaklet
          id="org.blueberry.ui.qt.tweaklets.GuiWidgetsTweaklet"
          name="Qt Widgets Tweaklet"
          description="Qt specific widget tweaks"
          definition="org.blueberry.GuiWidgetsTweaklet"
          implementation="berry::QtWidgetsTweaklet" />
 
        <tweaklet
          id="org.blueberry.ui.qt.tweaklets.DnDTweaklet"
          name="Qt DnD Tweaklet"
          description="Qt specific DnD tweaks"
          definition="org.blueberry.DnDTweaklet"
          implementation="berry::QtDnDTweaklet" />
 
        <tweaklet
          id="org.blueberry.ui.qt.tweaklets.ImageTweaklet"
          name="Qt Image Tweaklet"
          description="Qt specific image tweaks"
          definition="org.blueberry.ImageTweaklet"
          implementation="berry::QtImageTweaklet" />
 
        <tweaklet
          id="org.blueberry.ui.qt.tweaklets.MessageDialogTweaklet"
          name="Qt Message Dialog Tweaklet"
          description="Qt specific message dialogs"
          definition="org.blueberry.MessageDialogTweaklet"
          implementation="berry::QtMessageDialogTweaklet" />
    </extension>
 
-   <extension
-         point="org.blueberry.ui.presentationFactories">
+   <extension point="org.blueberry.ui.presentationFactories">
       <factory
             name="Default"
             class="berry::QtWorkbenchPresentationFactory"
             id="org.blueberry.ui.presentations.default">
       </factory>
    </extension>
 
    <extension point="org.blueberry.ui.preferencePages">
      <page id="org.blueberry.ui.qt.stylepreferencepage" name="Themes" class="berry::QtStylePreferencePage">
        <keywordreference id="org.blueberry.ui.qt.styleprefpagekeywords"/>
      </page>
    </extension>
 
    <extension point="org.blueberry.ui.keywords">
      <keyword id="org.blueberry.ui.qt.styleprefpagekeywords" label="theme skin style"></keyword>
    </extension>
 
 </plugin>
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryCommandContributionItem.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryCommandContributionItem.cpp
index 19bbbbe79a..8b956a2a1e 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryCommandContributionItem.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryCommandContributionItem.cpp
@@ -1,714 +1,733 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryCommandContributionItem.h"
 
 #include "berryIMenuService.h"
 #include "berryICommandService.h"
 #include "berryICommandImageService.h"
 #include "berryIContributionManager.h"
 #include "berryIElementReference.h"
 #include "berryIElementUpdater.h"
 #include "berryUIElement.h"
 
 #include <berryICommandListener.h>
 #include <berryIEvaluationContext.h>
 #include <berryIHandler.h>
 #include <berryCommand.h>
 #include <berryCommandEvent.h>
 #include <berryParameterizedCommand.h>
 #include <berryCommandExceptions.h>
 
 #include "../berryImageDescriptor.h"
 #include "../berryDisplay.h"
 #include "../berryAsyncRunnable.h"
 
 #include "../handlers/berryIHandlerService.h"
 #include "../services/berryIServiceLocator.h"
 
 #include "../internal/berryCommandContributionItemParameter.h"
 #include "../internal/berryWorkbenchPlugin.h"
 
 #include <QMenu>
 #include <QMenuBar>
 #include <QToolBar>
+#include <QApplication>
 
 namespace berry
 {
 
 ContributionItem::Modes CommandContributionItem::modes = ContributionItem::MODE_FORCE_TEXT;
 
 
 //class CommandUIElementListener : public IUIElementListener
 //{
 //private:
 //  CommandContributionItem* item;
 
 //  public:
 
 //    CommandUIElementListener(CommandContributionItem* item);
 
 //    void UIElementDisposed(UIElement* item);
 
 //void UIElementSelected(SmartPointer<UIElement> item);
 //};
 
 
 CommandContributionItem::CommandContributionItem(
     const SmartPointer<CommandContributionItemParameter>& contributionParameters)
   : ContributionItem(contributionParameters->id)
   , action(0)
   , checkedState(false)
 {
   this->icon = contributionParameters->icon;
   this->label = contributionParameters->label;
   this->mnemonic = contributionParameters->mnemonic;
   this->tooltip = contributionParameters->tooltip;
   this->style = contributionParameters->style;
   this->helpContextId = contributionParameters->helpContextId;
   this->visibleEnabled = contributionParameters->visibleEnabled;
   this->mode = contributionParameters->mode;
 
   menuService = contributionParameters->serviceLocator->GetService<IMenuService>();
   commandService = contributionParameters->serviceLocator->GetService<ICommandService>();
   handlerService = contributionParameters->serviceLocator->GetService<IHandlerService>();
   //    bindingService = (IBindingService) contributionParameters.serviceLocator
   //        .getService(IBindingService.class);
 
   this->CreateCommand(contributionParameters->commandId,
                       contributionParameters->parameters);
 
   if (command)
   {
     try
     {
       class CommandUIElement : public UIElement
       {
 
       private:
         CommandContributionItem* item;
 
       public:
 
         CommandUIElement(CommandContributionItem* item, IServiceLocator* serviceLocator)
           : UIElement(serviceLocator), item(item) {}
 
         void SetText(const QString& text)
         {
           item->SetText(text);
         }
 
         void SetToolTip(const QString& text)
         {
           item->SetToolTip(text);
         }
 
         void SetIcon(const QIcon& icon)
         {
           item->SetIcon(icon);
         }
 
         void SetChecked(bool checked)
         {
           item->SetChecked(checked);
         }
 
         void SetDropDownId(const QString& id)
         {
           item->dropDownMenuOverride = id;
         }
 
       };
 
       UIElement::Pointer callback(new CommandUIElement(this,
                                                        contributionParameters->serviceLocator));
 
       elementRef = commandService->RegisterElementForCommand(command, callback);
       command->GetCommand()->AddCommandListener(this->GetCommandListener());
       this->SetImages(contributionParameters->serviceLocator,
                       contributionParameters->iconStyle);
 
       if (contributionParameters->helpContextId.isEmpty())
       {
         try
         {
           this->helpContextId = commandService->GetHelpContextId(
                 contributionParameters->commandId);
         }
-        catch (const NotDefinedException& e)
+        catch (const NotDefinedException& /*e*/)
         {
           // it's OK to not have a helpContextId
         }
       }
       //        IWorkbenchLocationService::Pointer wls = contributionParameters.serviceLocator
       //            ->GetService(IWorkbenchLocationService::GetManifestName()).Cast<IWorkbenchLocationService>();
       //        const IWorkbench* workbench = wls->GetWorkbench();;
       //        if (workbench != 0 && !helpContextId.empty()) {
       //          this->workbenchHelpSystem = workbench->GetHelpSystem();
       //        }
     }
-    catch (const NotDefinedException& e)
+    catch (const NotDefinedException& /*e*/)
     {
       WorkbenchPlugin::Log(QString("Unable to register menu item \"") + this->GetId()
                            + "\", command \"" + contributionParameters->commandId
                            + "\" not defined");
     }
   }
 }
 
 QAction* CommandContributionItem::Fill(QMenu* parent, QAction* before)
 {
   if (!command)
   {
     return 0;
   }
   if (action || parent == 0)
   {
     return 0;
   }
 
   // Menus don't support the pulldown style
   Style tmpStyle = style;
   if (tmpStyle == STYLE_PULLDOWN)
     tmpStyle = STYLE_PUSH;
 
   QAction* item = 0;
   if (before)
   {
     item = new QAction(icon, label, parent);
     parent->insertAction(before, item);
   }
   else
   {
     item = parent->addAction(icon, label);
   }
   item->setData(QVariant::fromValue(Object::Pointer(this)));
+  item->setProperty("contributionItem", QVariant::fromValue(Object::Pointer(this)));
   //  if (workbenchHelpSystem != null)
   //  {
   //    workbenchHelpSystem.setHelp(item, helpContextId);
   //  }
-  //item->AddListener(this->GetItemListener());
+
+  connect(item, SIGNAL(triggered()), this, SLOT(HandleWidgetSelection()));
   action = item;
 
   this->Update();
   this->UpdateIcons();
 
   //bindingService.addBindingManagerListener(bindingManagerListener);
 
   return item;
 }
 
 QAction *CommandContributionItem::Fill(QToolBar *parent, QAction *before)
 {
   if (!command)
   {
     return 0;
   }
   if (action || parent == 0)
   {
     return 0;
   }
 
   QAction* item = 0;
   if (before)
   {
     item = parent->addAction(icon, label);
   }
   else
   {
     item = new QAction(icon, label, parent);
     parent->insertAction(before, item);
   }
   item->setData(QVariant::fromValue(Object::Pointer(this)));
+  item->setProperty("contributionItem", QVariant::fromValue(Object::Pointer(this)));
 
   //item->AddListener(this->GetItemListener());
   action = item;
 
   this->Update();
   this->UpdateIcons();
 
   //bindingService.addBindingManagerListener(bindingManagerListener);
 
   return item;
 }
 
-void CommandContributionItem::Update(const QString& id)
+void CommandContributionItem::Update()
+{
+  this->Update(QString());
+}
+
+void CommandContributionItem::Update(const QString& /*id*/)
 {
   if (action)
   {
     QWidget* parent = action->parentWidget();
     if(qobject_cast<QMenu*>(parent))
     {
       this->UpdateMenuItem();
     }
     else if (qobject_cast<QMenuBar*>(parent))
     {
       this->UpdateMenuItem();
     }
     else if (qobject_cast<QToolBar*>(parent))
     {
       this->UpdateToolItem();
     }
   }
 
 }
 
 void CommandContributionItem::UpdateMenuItem()
 {
   QString text = label;
   if (text.isEmpty())
   {
     if (command.IsNotNull())
     {
       try
       {
         text = command->GetCommand()->GetName();
       }
       catch (const NotDefinedException& e)
       {
 //        StatusManager.getManager().handle(
 //              StatusUtil.newStatus(IStatus.ERROR,
 //                                   "Update item failed "
 //                                   + getId(), e));
         BERRY_ERROR << "Update item failed " << GetId() << e.what();
       }
     }
   }
   text = UpdateMnemonic(text);
 
 //  String keyBindingText = null;
 //  if (command != null)
 //  {
 //    TriggerSequence binding = bindingService
 //        .getBestActiveBindingFor(command);
 //    if (binding != null)
 //    {
 //      keyBindingText = binding.format();
 //    }
 //  }
 //  if (text != null)
 //  {
 //    if (keyBindingText == null)
 //    {
 //      item.setText(text);
 //    }
 //    else
 //    {
 //      item.setText(text + '\t' + keyBindingText);
 //    }
 //  }
 
   if (action->isChecked() != checkedState)
   {
     action->setChecked(checkedState);
   }
 
   // allow the handler update its enablement
   bool shouldBeEnabled = IsEnabled();
   if (action->isEnabled() != shouldBeEnabled)
   {
     action->setEnabled(shouldBeEnabled);
   }
 }
 
 void CommandContributionItem::UpdateToolItem()
 {
   QString text = label;
   QString tooltip = label;
   if (text.isNull())
   {
     if (command.IsNotNull())
     {
       try
       {
         text = command->GetCommand()->GetName();
         tooltip = command->GetCommand()->GetDescription();
         if (tooltip.trimmed().isEmpty())
         {
           tooltip = text;
         }
       }
       catch (const NotDefinedException& e)
       {
 //        StatusManager.getManager().handle(
 //              StatusUtil.newStatus(IStatus.ERROR,
 //                                   "Update item failed "
 //                                   + getId(), e));
         BERRY_ERROR << "Update item failed " << GetId() << e.what();
       }
     }
   }
 
   if ((icon.isNull() || (mode & MODE_FORCE_TEXT) == MODE_FORCE_TEXT)
       && !text.isNull())
   {
     action->setText(text);
   }
 
   QString toolTipText = GetToolTipText(tooltip);
   action->setToolTip(toolTipText);
 
   if (action->isChecked() != checkedState)
   {
     action->setChecked(checkedState);
   }
 
   // allow the handler update its enablement
   bool shouldBeEnabled = IsEnabled();
   if (action->isEnabled() != shouldBeEnabled)
   {
     action->setEnabled(shouldBeEnabled);
   }
 }
 
 CommandContributionItem::~CommandContributionItem()
 {
   if (elementRef)
   {
     commandService->UnregisterElement(elementRef);
   }
   if (commandListener)
   {
-    command->GetCommand()->RemoveCommandListener(commandListener.GetPointer());
+    command->GetCommand()->RemoveCommandListener(commandListener.data());
   }
 }
 
 bool CommandContributionItem::IsEnabled() const
 {
   if (command)
   {
     command->GetCommand()->SetEnabled(menuService->GetCurrentState());
     return command->GetCommand()->IsEnabled();
   }
   return false;
 }
 
 bool CommandContributionItem::IsVisible() const
 {
   if (visibleEnabled)
   {
     return ContributionItem::IsVisible() && this->IsEnabled();
   }
   return ContributionItem::IsVisible();
 }
 
 void CommandContributionItem::SetImages(IServiceLocator* locator,
                                         const QString& iconStyle)
 {
   if (icon.isNull())
   {
     ICommandImageService* service = locator->GetService<ICommandImageService>();
     icon = service->GetImage(command->GetId(), iconStyle);
   }
 }
 
 ICommandListener* CommandContributionItem::GetCommandListener()
 {
   if (!commandListener)
   {
     class MyCommandListener : public ICommandListener
     {
 
     private:
       CommandContributionItem* item;
 
     public:
 
       MyCommandListener(CommandContributionItem* item)
         : item(item)
       {}
 
-      void CommandChanged(SmartPointer<const CommandEvent> commandEvent)
+      void CommandChanged(const SmartPointer<const CommandEvent>& commandEvent)
       {
         if (commandEvent->IsHandledChanged() || commandEvent->IsEnabledChanged()
             || commandEvent->IsDefinedChanged())
         {
           item->UpdateCommandProperties(commandEvent);
         }
       }
 
     };
 
-    commandListener = ICommandListener::Pointer(new MyCommandListener(this));
+    commandListener.reset(new MyCommandListener(this));
   }
-  return commandListener.GetPointer();
+  return commandListener.data();
 }
 
 void CommandContributionItem::UpdateCommandProperties(const SmartPointer<
     const CommandEvent> commandEvent)
 {
   if (commandEvent->IsHandledChanged())
   {
     dropDownMenuOverride = "";
   }
   if (!action)
   {
     return;
   }
   Display* display = Display::GetDefault();
   typedef AsyncRunnable<SmartPointer<const CommandEvent>, CommandContributionItem > UpdateRunnable;
   Poco::Runnable* update = new UpdateRunnable(this, &CommandContributionItem::UpdateCommandPropertiesInUI, commandEvent);
   if (display->InDisplayThread())
   {
     update->run();
   }
   else
   {
     display->AsyncExec(update);
   }
 }
 
 void CommandContributionItem::UpdateCommandPropertiesInUI(const SmartPointer<
     const CommandEvent>& commandEvent)
 {
    if (commandEvent->GetCommand()->IsDefined())
       {
         this->Update();
       }
       if (commandEvent->IsEnabledChanged()
           || commandEvent->IsHandledChanged())
       {
         if (visibleEnabled)
         {
           IContributionManager* parent = this->GetParent();
           if (parent)
           {
             parent->Update(true);
           }
         }
       }
 }
 
 bool CommandContributionItem::ShouldRestoreAppearance(const SmartPointer<IHandler>& handler)
 {
   // if no handler or handler doesn't implement IElementUpdater,
   // restore the contributed elements
   if (handler.IsNull())
     return true;
 
   if (!(handler.Cast<IElementUpdater>()))
     return true;
 
   // special case, if its HandlerProxy, then check the actual handler
 //  if (handler instanceof HandlerProxy) {
 //    HandlerProxy handlerProxy = (HandlerProxy) handler;
 //    IHandler actualHandler = handlerProxy.getHandler();
 //    return shouldRestoreAppearance(actualHandler);
 //  }
   return false;
 }
 
 SmartPointer<ParameterizedCommand> CommandContributionItem::GetCommand() const
 {
   return command;
 }
 
 void CommandContributionItem::CreateCommand(const QString &commandId,
     const QHash<QString,Object::Pointer> &parameters)
 {
   if (commandId.isEmpty())
   {
 //    StatusManager.getManager().handle(StatusUtil.newStatus(IStatus.ERROR,
 //                                                           "Unable to create menu item \"" + getId()
 //                                                           + "\", no command id", null));
     BERRY_ERROR << "Unable to create menu item \"" << this->GetId().toStdString()
                 << "\", no command id";
     return;
   }
   Command::Pointer cmd = commandService->GetCommand(commandId);
   if (!cmd->IsDefined())
   {
 //    StatusManager.getManager().handle(StatusUtil.newStatus(
 //                                        IStatus.ERROR, "Unable to create menu item \"" + getId()
 //                                        + "\", command \"" + commandId + "\" not defined", null));
     BERRY_ERROR << "Unable to create menu item \"" << this->GetId().toStdString()
                 << "\", command \"" << commandId.toStdString() << "\" not defined";
     return;
   }
 
   command = ParameterizedCommand::GenerateCommand(cmd, parameters);
 }
 
 QString CommandContributionItem::GetToolTipText(const QString& text) const
 {
   QString tooltipText = tooltip;
   if (tooltip.isNull())
   {
     if (!text.isNull())
     {
       tooltipText = text;
     }
     else
     {
       tooltipText = "";
     }
   }
 
 //  TriggerSequence activeBinding = bindingService
 //      .getBestActiveBindingFor(command);
 //  if (activeBinding != null && !activeBinding.isEmpty())
 //  {
 //    String acceleratorText = activeBinding.format();
 //    if (acceleratorText != null
 //        && acceleratorText.length() != 0)
 //    {
 //      tooltipText = NLS.bind(CommandMessages.Tooltip_Accelerator,
 //                             tooltipText, acceleratorText);
 //    }
 //  }
 
   return tooltipText;
 }
 
 QString CommandContributionItem::UpdateMnemonic(const QString &s)
 {
   if (mnemonic.isNull() || s.isEmpty())
   {
     return s;
   }
 
   int idx = s.indexOf(mnemonic);
   if (idx == -1)
   {
     return s;
   }
 
   return s.left(idx) + '&' + s.mid(idx);
 }
 
 //SmartPointer<IUIElementListener> CommandContributionItem::GetItemListener()
 //{
 //  if (!itemListener)
 //  {
 //    itemListener = new CommandUIElementListener(this);
 //  }
 //  return itemListener;
 //}
 
-void CommandContributionItem::HandleWidgetSelection(const UIElement::Pointer& element)
+void CommandContributionItem::HandleWidgetSelection()
 {
 //  // Special check for ToolBar dropdowns...
 //  if (this->OpenDropDownMenu(event))
 //  //return;
 
-//  if ((style & (UIElement::STYLE_TOGGLE | UIElement::STYLE_CHECK)) != 0)
-//  {
-//    checkedState = element->GetChecked();
-//  }
+  if ((style & STYLE_CHECK) != 0)
+  {
+    checkedState = action->isChecked();
+  }
 
-//  try
-//  {
-//    handlerService->ExecuteCommand(command, element);
-//  } catch (const ExecutionException& e)
-//  {
-//    WorkbenchPlugin::Log("Failed to execute item " //$NON-NLS-1$
-//        + GetId(), e);
-//  } catch (const NotDefinedException& e)
-//  {
-//    WorkbenchPlugin::Log("Failed to execute item " //$NON-NLS-1$
-//        + GetId(), e);
-//  } catch (const NotEnabledException& e)
-//  {
-//    WorkbenchPlugin::Log("Failed to execute item " //$NON-NLS-1$
-//        + GetId(), e);
-//  } catch (const NotHandledException& e)
-//  {
-//    WorkbenchPlugin::Log("Failed to execute item " //$NON-NLS-1$
-//        + GetId(), e);
-//  }
+  try
+  {
+    handlerService->ExecuteCommand(command, UIElement::Pointer(0));
+  }
+  catch (const ExecutionException& e)
+  {
+    WorkbenchPlugin::Log("Failed to execute item " + GetId(), e);
+  }
+  catch (const NotDefinedException& e)
+  {
+    WorkbenchPlugin::Log("Failed to execute item " + GetId(), e);
+  }
+  catch (const NotEnabledException& e)
+  {
+    WorkbenchPlugin::Log("Failed to execute item " + GetId(), e);
+  }
+  catch (const NotHandledException& e)
+  {
+    WorkbenchPlugin::Log("Failed to execute item " + GetId(), e);
+  }
+}
+
+void CommandContributionItem::connectNotify(const char *signal)
+{
+  qDebug() << "Connected to:" << signal;
+}
+
+void CommandContributionItem::disconnectNotify(const char *signal)
+{
+  qDebug() << "Disconnected from:" << signal;
 }
 
 //TODO Tool item drop down menu contributions
 //bool CommandContributionItem::OpenDropDownMenu(SmartPointer<GuiTk::Event> event)
 //{
 //Widget item = event.widget;
 //if (item != null)
 //{
 //  int style = item.getStyle();
 //  if ((style & SWT.DROP_DOWN) != 0)
 //  {
 //    if (event.detail == 4)
 //    { // on drop-down button
 //      ToolItem ti = (ToolItem) item;
 //
 //      final MenuManager menuManager = new MenuManager();
 //      Menu menu = menuManager.createContextMenu(ti.getParent());
 //      if (workbenchHelpSystem != null)
 //      {
 //        workbenchHelpSystem.setHelp(menu, helpContextId);
 //      }
 //      menuManager.addMenuListener(new IMenuListener()
 //          {
 //          public void menuAboutToShow(IMenuManager manager)
 //            {
 //              String id = getId();
 //              if (dropDownMenuOverride != null)
 //              {
 //                id = dropDownMenuOverride;
 //              }
 //              menuService.populateContributionManager(
 //                  menuManager, "menu:" + id); //$NON-NLS-1$
 //            }
 //          });
 //
 //      // position the menu below the drop down item
 //      Point point = ti.getParent().toDisplay(
 //          new Point(event.x, event.y));
 //      menu.setLocation(point.x, point.y); // waiting for SWT
 //      // 0.42
 //      menu.setVisible(true);
 //      return true; // we don't fire the action
 //    }
 //  }
 //}
 //
 //return false;
 //}
 
 void CommandContributionItem::SetIcon(const QIcon &icon)
 {
   this->icon = icon;
   this->UpdateIcons();
 }
 
 void CommandContributionItem::UpdateIcons()
 {
   action->setIcon(icon);
 }
 
 void CommandContributionItem::SetText(const QString &text)
 {
   label = text;
   this->Update();
 }
 
 void CommandContributionItem::SetChecked(bool checked)
 {
   if (checkedState == checked)
   {
     return;
   }
   checkedState = checked;
   action->setChecked(checkedState);
 }
 
 void CommandContributionItem::SetToolTip(const QString &text)
 {
   tooltip = text;
   action->setToolTip(text);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryCommandContributionItem.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryCommandContributionItem.h
index e91c1645e5..4b8d52ee38 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryCommandContributionItem.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryCommandContributionItem.h
@@ -1,205 +1,215 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYCOMMANDCONTRIBUTIONITEM_H_
 #define BERRYCOMMANDCONTRIBUTIONITEM_H_
 
 #include "berryContributionItem.h"
 
 #include <QIcon>
 
 namespace berry {
 
 struct IMenuService;
 struct ICommandService;
 struct ICommandListener;
 struct IHandlerService;
 struct IHandler;
 struct IElementReference;
 struct IServiceLocator;
 
 class CommandEvent;
 class ParameterizedCommand;
 class CommandContributionItemParameter;
 class UIElement;
 
 /**
  * A contribution item which delegates to a command. It can be used in {@link
  * AbstractContributionFactory#CreateContributionItems(IServiceLocator,
  * IContributionRoot)}.
  * <p>
  * It currently supports placement in menus and toolbars.
  * </p>
  * <p>
  * This class may be instantiated; it is not intended to be subclassed.
  * </p>
  */
-class BERRY_UI_QT CommandContributionItem : public ContributionItem
+class BERRY_UI_QT CommandContributionItem : public QObject, public ContributionItem
 {
+  Q_OBJECT
 
 public:
 
   /**
    * Mode bit: Show text on tool items or buttons, even if an image is
    * present. If this mode bit is not set, text is only shown on tool items if
    * there is no image present.
    */
   static Modes modes;
 
 private:
 
   //LocalResourceManager localResourceManager;
 
   //Listener menuItemListener;
 
   QAction* action;
 
   IMenuService* menuService;
 
   ICommandService* commandService;
 
   IHandlerService* handlerService;
 
   //IBindingService bindingService;
 
   SmartPointer<ParameterizedCommand> command;
 
   QIcon icon;
 
   QString label;
 
   QString tooltip;
 
   QChar mnemonic;
 
   SmartPointer<IElementReference> elementRef;
 
   bool checkedState;
 
   Style style;
 
-  SmartPointer<ICommandListener> commandListener;
+  QScopedPointer<ICommandListener> commandListener;
 
   QString dropDownMenuOverride;
 
   //IWorkbenchHelpSystem workbenchHelpSystem;
 
   QString helpContextId;
 
   Modes mode;
 
   /**
    * This is <code>true</code> when the menu contribution's visibleWhen
    * checkEnabled attribute is <code>true</code>.
    */
   bool visibleEnabled;
 
   // items contributed
   QString contributedLabel;
 
   QIcon contributedIcon;
 
   SmartPointer<IServiceLocator> serviceLocator;
 
 public:
 
   /**
    * Create a CommandContributionItem to place in a ContributionManager.
    *
    * @param contributionParameters
    *    parameters necessary to render this contribution item.
    */
   CommandContributionItem(
       const SmartPointer<CommandContributionItemParameter>& contributionParameters);
 
   ~CommandContributionItem();
 
+  using ContributionItem::Fill;
+
   QAction* Fill(QMenu* parent, QAction* before);
 
   QAction* Fill(QToolBar* parent, QAction* before);
 
-  void Update(const QString& id = QString());
+  void Update();
+
+  void Update(const QString& id);
 
   bool IsEnabled() const;
 
   bool IsVisible() const;
 
   void UpdateCommandPropertiesInUI(const SmartPointer<
     const CommandEvent>& commandEvent);
 
 
 private:
 
   void SetImages(IServiceLocator* locator, const QString &iconStyle);
 
   ICommandListener *GetCommandListener();
 
   void UpdateMenuItem();
 
   void UpdateToolItem();
 
   void UpdateCommandProperties(const SmartPointer<const CommandEvent> commandEvent);
 
   bool ShouldRestoreAppearance(const SmartPointer<IHandler>& handler);
 
   SmartPointer<ParameterizedCommand> GetCommand() const;
 
   void CreateCommand(const QString& commandId, const QHash<QString, Object::Pointer>& parameters);
 
   QString GetToolTipText(const QString& text) const;
 
   QString UpdateMnemonic(const QString& s);
 
 //  void disposeOldImages() {
 //    if (localResourceManager != null) {
 //      localResourceManager.dispose();
 //      localResourceManager = null;
 //    }
 //  }
 
   //SmartPointer<IUIElementListener> GetItemListener();
 
-  void HandleWidgetSelection(const SmartPointer<UIElement>& element);
+  void connectNotify(const char *signal);
+  void disconnectNotify(const char *signal);
 
   /**
    * Determines if the selection was on the dropdown affordance and, if so,
    * opens the drop down menu (populated using the same id as this item...
    *
    * @param event
    *    The <code>SWT.Selection</code> event to be tested
    *
    * @return <code>true</code> iff a drop down menu was opened
    */
   //TODO Tool item drop down menu contributions
   //bool OpenDropDownMenu(SmartPointer<GuiTk::Event> event);
 
   void SetIcon(const QIcon& icon);
 
   void UpdateIcons();
 
   void SetText(const QString& text);
 
   void SetChecked(bool checked);
 
   void SetToolTip(const QString& text);
 
+private slots:
+
+  void HandleWidgetSelection();
+
 };
 
 }
 
 
 #endif /* BERRYCOMMANDCONTRIBUTIONITEM_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryIContributionItem.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryIContributionItem.h
index baa329b4a1..64b29f748a 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryIContributionItem.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryIContributionItem.h
@@ -1,202 +1,202 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYICONTRIBUTIONITEM_H
 #define BERRYICONTRIBUTIONITEM_H
 
 #include <berryMacros.h>
 #include <berryObject.h>
 
 class QStatusBar;
 class QMenu;
 class QMenuBar;
 class QToolBar;
 class QAction;
 
 namespace berry {
 
 struct IContributionManager;
 
 /**
  * A contribution item represents a contribution to a shared UI resource such as a
  * menu or tool bar. More generally, contribution items are managed by a contribution
  * manager.
  * For instance, in a tool bar a contribution item is a tool bar button or a separator.
  * In a menu bar a contribution item is a menu, and in a menu a contribution item
  * is a menu item or separator.
  * <p>
  * A contribution item can realize itself in different Qt widgets, using the different
  * <code>fill</code> methods.  The same type of contribution item can be used with a
  * <code>MenuBarManager</code>, <code>ToolBarManager</code>,
  * </code>or a <code>StatusLineManager</code>.
  * </p>
  * <p>
  * This interface is internal to the framework; it should not be implemented outside
  * the framework.
  * </p>
  *
  * @see IContributionManager
  * @noimplement This interface is not intended to be implemented by clients.
  */
 struct IContributionItem : public virtual Object
 {
 
-  berryInterfaceMacro(IContributionItem, berry)
+  berryObjectMacro(berry::IContributionItem)
 
 
   /**
    * Fills the given status bar control with controls representing this
    * contribution item.  Used by <code>StatusLineManager</code>.
    *
    * @param parent the parent control
    */
   virtual void Fill(QStatusBar* parent) = 0;
 
   /**
    * Fills the given menu bar with controls representing this contribution item.
    * Used by <code>MenuBarManager</code>.
    *
    * @param parent the parent menu
    * @param index the index where the controls are inserted,
    *   or <code>-1</code> to insert at the end
    */
   virtual QAction* Fill(QMenuBar* parent, QAction* before) = 0;
 
   /**
    * Fills the given menu with controls representing this contribution item.
    * Used by <code>MenuManager</code>.
    *
    * @param parent the parent menu
    * @param index the index where the controls are inserted,
    *   or <code>-1</code> to insert at the end
    */
   virtual QAction* Fill(QMenu* parent, QAction* before) = 0;
 
   /**
    * Fills the given tool bar with controls representing this contribution item.
    * Used by <code>ToolBarManager</code>.
    *
    * @param parent the parent tool bar
    * @param index the index where the controls are inserted,
    *   or <code>-1</code> to insert at the end
    */
   virtual QAction* Fill(QToolBar* parent, QAction* before) = 0;
 
   /**
    * Returns the identifier of this contribution item.
    * The id is used for retrieving an item from its manager.
    *
    * @return the contribution item identifier, or <code>null</code>
    *   if none
    */
   virtual QString GetId() const = 0;
 
   /**
    * Returns whether this contribution item is enabled.
    *
    * @return <code>true</code> if this item is enabled
    */
   virtual bool IsEnabled() const = 0;
 
   /**
    * Returns whether this contribution item is dirty. A dirty item will be
    * recreated when the action bar is updated.
    *
    * @return <code>true</code> if this item is dirty
    */
   virtual bool IsDirty() const = 0;
 
   /**
    * Returns whether this contribution item is dynamic. A dynamic contribution
    * item contributes items conditionally, dependent on some internal state.
    *
    * @return <code>true</code> if this item is dynamic, and
    *  <code>false</code> for normal items
    */
   virtual bool IsDynamic() const = 0;
 
   /**
    * Returns whether this contribution item is a group marker.
    * This information is used when adding items to a group.
    *
    * @return <code>true</code> if this item is a group marker, and
    *  <code>false</code> for normal items
    *
    * @see GroupMarker
    * @see IContributionManager#appendToGroup(String, IContributionItem)
    * @see IContributionManager#prependToGroup(String, IContributionItem)
    */
   virtual bool IsGroupMarker() const = 0;
 
   /**
    * Returns whether this contribution item is a separator.
    * This information is used to enable hiding of unnecessary separators.
    *
    * @return <code>true</code> if this item is a separator, and
    *  <code>false</code> for normal items
    * @see Separator
    */
   virtual bool IsSeparator() const = 0;
 
   /**
    * Returns whether this contribution item is visibile within its manager.
    *
    * @return <code>true</code> if this item is visible, and
    *  <code>false</code> otherwise
    */
   virtual bool IsVisible() const = 0;
 
   /**
    * Saves any state information of the control(s) owned by this contribution item.
    * The contribution manager calls this method before disposing of the controls.
    */
   virtual void SaveWidgetState() = 0;
 
   /**
    * Sets the parent manager of this item
    *
    * @param parent the parent contribution manager
    */
   virtual void SetParent(IContributionManager* parent) = 0;
 
   /**
    * Sets whether this contribution item is visibile within its manager.
    *
    * @param visible <code>true</code> if this item should be visible, and
    *  <code>false</code> otherwise
    */
   virtual void SetVisible(bool visible) = 0;
 
   /**
    * Updates any controls cached by this contribution item with any
    * changes which have been made to this contribution item since the last update.
    * Called by contribution manager update methods.
    */
   virtual void Update() = 0;
 
   /**
    * Updates any controls cached by this contribution item with changes
    * for the the given property.
    *
    * @param id the id of the changed property
    */
   virtual void Update(const QString& id) = 0;
 };
 
 }
 
 #endif // BERRYICONTRIBUTIONITEM_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryIContributionManager.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryIContributionManager.h
index 6eaf10e31b..8e8ff07e47 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryIContributionManager.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryIContributionManager.h
@@ -1,252 +1,252 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYICONTRIBUTIONMANAGER_H
 #define BERRYICONTRIBUTIONMANAGER_H
 
 #include <berryMacros.h>
 #include <berryObject.h>
 
 namespace berry {
 
 //struct Action;
 struct IContributionItem;
 struct IContributionManagerOverrides;
 
 /**
  * A contribution manager organizes contributions to such UI components
  * as menus, toolbars and status lines.
  * <p>
  * A contribution manager keeps track of a list of contribution
  * items. Each contribution item may has an optional identifier, which can be used
  * to retrieve items from a manager, and for positioning items relative to
  * each other. The list of contribution items can be subdivided into named groups
  * using special contribution items that serve as group markers.
  * </p>
  * <p>
  * The <code>IContributionManager</code> interface provides general
  * protocol for adding, removing, and retrieving contribution items.
  * It also provides convenience methods that make it convenient
  * to contribute actions. This interface should be implemented
  * by all objects that wish to manage contributions.
  * </p>
  * <p>
  * There are several implementions of this interface in this package,
  * including ones for menus ({@link MenuManager <code>MenuManager</code>}),
  * tool bars ({@link ToolBarManager <code>ToolBarManager</code>}),
  * and status lines ({@link StatusLineManager <code>StatusLineManager</code>}).
  * </p>
  */
 struct IContributionManager : public virtual Object
 {
 
-  berryInterfaceMacro(IContributionManager, berry)
+  berryObjectMacro(berry::IContributionManager)
 
   /*
      * Adds an action as a contribution item to this manager.
      * Equivalent to <code>add(new ActionContributionItem(action))</code>.
      *
      * @param action the action, this cannot be <code>null</code>
      */
   //virtual void Add(Action* action) = 0;
 
   /**
    * Adds a contribution item to this manager.
    *
    * @param item the contribution item, this cannot be <code>null</code>
    */
   virtual void Add(const SmartPointer<IContributionItem>& item) = 0;
 
   /*
    * Adds a contribution item for the given action at the end of the group
    * with the given name.
    * Equivalent to
    * <code>appendToGroup(groupName,new ActionContributionItem(action))</code>.
    *
    * @param groupName the name of the group
    * @param action the action
    * @exception std::invalid_argument if there is no group with
    *   the given name
    */
   //virtual void AppendToGroup(const QString& groupName, Action* action) = 0;
 
   /**
    * Adds a contribution item to this manager at the end of the group
    * with the given name.
    *
    * @param groupName the name of the group
    * @param item the contribution item
    * @exception std::invalid_argument if there is no group with
    *   the given name
    */
   virtual void AppendToGroup(const QString& groupName, const SmartPointer<IContributionItem>& item) = 0;
 
   /**
    * Finds the contribution item with the given id.
    *
    * @param id the contribution item id
    * @return the contribution item, or <code>null</code> if
    *   no item with the given id can be found
    */
   virtual SmartPointer<IContributionItem> Find(const QString& id) const = 0;
 
   /**
      * Returns all contribution items known to this manager.
      *
      * @return a list of contribution items
      */
   virtual QList<SmartPointer<IContributionItem> > GetItems() const = 0;
 
   /**
    * Returns the overrides for the items of this manager.
    *
    * @return the overrides for the items of this manager
    */
   virtual SmartPointer<IContributionManagerOverrides> GetOverrides() = 0;
 
   /*
    * Inserts a contribution item for the given action after the item
    * with the given id.
    * Equivalent to
    * <code>insertAfter(id,new ActionContributionItem(action))</code>.
    *
    * @param id the contribution item id
    * @param action the action to insert
    * @exception IllegalArgumentException if there is no item with
    *   the given id
    */
   //virtual void InsertAfter(const QString& id, Action* action) = 0;
 
   /**
    * Inserts a contribution item after the item with the given id.
    *
    * @param id the contribution item id
    * @param item the contribution item to insert
    * @exception IllegalArgumentException if there is no item with
    *   the given id
    */
   virtual void InsertAfter(const QString& id, const SmartPointer<IContributionItem>& item) = 0;
 
   /*
    * Inserts a contribution item for the given action before the item
    * with the given id.
    * Equivalent to
    * <code>InsertBefore(id,new ActionContributionItem(action))</code>.
    *
    * @param id the contribution item id
    * @param action the action to insert
    * @exception IllegalArgumentException if there is no item with
    *   the given id
    */
   //virtual void InsertBefore(const QString& id, Action* action) = 0;
 
   /**
    * Inserts a contribution item before the item with the given id.
    *
    * @param id the contribution item id
    * @param item the contribution item to insert
    * @exception IllegalArgumentException if there is no item with
    *   the given id
    */
   virtual void InsertBefore(const QString& id, const SmartPointer<IContributionItem>& item) = 0;
 
   /**
    * Returns whether the list of contributions has recently changed and
    * has yet to be reflected in the corresponding widgets.
    *
    * @return <code>true</code> if this manager is dirty, and <code>false</code>
    *   if it is up-to-date
    */
   virtual bool IsDirty() const = 0;
 
   /**
    * Returns whether this manager has any contribution items.
    *
    * @return <code>true</code> if there are no items, and
    *   <code>false</code> otherwise
    */
   virtual bool IsEmpty() const = 0;
 
   /**
    * Marks this contribution manager as dirty.
    */
   virtual void MarkDirty() = 0;
 
   /*
    * Adds a contribution item for the given action at the beginning of the
    * group with the given name.
    * Equivalent to
    * <code>prependToGroup(groupName,new ActionContributionItem(action))</code>.
    *
    * @param groupName the name of the group
    * @param action the action
    * @exception IllegalArgumentException if there is no group with
    *   the given name
    */
   //virtual void PrependToGroup(const QString& groupName, Action* action) = 0;
 
   /**
    * Adds a contribution item to this manager at the beginning of the
    * group with the given name.
    *
    * @param groupName the name of the group
    * @param item the contribution item
    * @exception IllegalArgumentException if there is no group with
    *   the given name
    */
   virtual void PrependToGroup(const QString& groupName, const SmartPointer<IContributionItem>& item) = 0;
 
   /**
    * Removes and returns the contribution item with the given id from this manager.
    * Returns <code>null</code> if this manager has no contribution items
    * with the given id.
    *
    * @param id the contribution item id
    * @return the item that was found and removed, or <code>null</code> if none
    */
   virtual SmartPointer<IContributionItem> Remove(const QString& id) = 0;
 
   /**
    * Removes the given contribution item from the contribution items
    * known to this manager.
    *
    * @param item the contribution item
    * @return the <code>item</code> parameter if the item was removed,
    *   and <code>null</code> if it was not found
    */
   virtual SmartPointer<IContributionItem> Remove(const SmartPointer<IContributionItem>& item) = 0;
 
   /**
    * Removes all contribution items from this manager.
    */
   virtual void RemoveAll() = 0;
 
   /**
    * Updates this manager's underlying widget(s) with any changes which
    * have been made to it or its items.  Normally changes to a contribution
    * manager merely mark it as dirty, without updating the underlying widgets.
    * This brings the underlying widgets up to date with any changes.
    *
    * @param force <code>true</code> means update even if not dirty,
    *   and <code>false</code> for normal incremental updating
    */
   virtual void Update(bool force) = 0;
 };
 
 }
 
 #endif // BERRYICONTRIBUTIONMANAGER_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryIContributionManagerOverrides.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryIContributionManagerOverrides.h
index b35afdf9c8..22d20c8354 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryIContributionManagerOverrides.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryIContributionManagerOverrides.h
@@ -1,79 +1,79 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYICONTRIBUTIONMANAGEROVERRIDES_H
 #define BERRYICONTRIBUTIONMANAGEROVERRIDES_H
 
 #include <berryMacros.h>
 #include <berryObject.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 
 namespace berry {
 
 struct IContributionItem;
 
 /**
  * This interface is used by instances of <code>IContributionItem</code>
  * to determine if the values for certain properties have been overriden
  * by their manager.
  * <p>
  * This interface is internal to the framework; it should not be implemented outside
  * the framework.
  * </p>
  *
  * @noimplement This interface is not intended to be implemented by clients.
  */
 struct BERRY_UI_QT IContributionManagerOverrides : virtual Object
 {
 
-  berryInterfaceMacro(IContributionManagerOverrides, berry)
+  berryObjectMacro(berry::IContributionManagerOverrides)
 
   /**
    * Id for the enabled property. Value is <code>"enabled"</code>.
    */
   static const QString P_ENABLED;
 
   /**
    * Find out the enablement of the item
    * @param item the contribution item for which the enable override value is
    * determined
    * @param defaultValue the default value
    * @return <ul>
    *           <li><code>1</code> if the given contribution item should be enabled</li>
    *           <li><code>0</code> if the item should not be enabled</li>
    *           <li><code>-1</code> if the item may determine its own enablement</li>
    *         </ul>
    */
   virtual int GetEnabled(IContributionItem* item) const = 0;
 
   /**
    * Visiblity override.
    *
    * @param item the contribution item in question
    * @return <ul>
    *           <li><code>1</code> if the given contribution item should be visible</li>
    *           <li><code>0</code> if the item should not be visible</li>
    *           <li><code>-1</code> if the item may determine its own visibility</li>
    *         </ul>
    */
   virtual int GetVisible(IContributionItem* item) const = 0;
 };
 
 }
 
 #endif // BERRYICONTRIBUTIONMANAGEROVERRIDES_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryIMenuManager.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryIMenuManager.h
index 2a63afc077..2223488de7 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryIMenuManager.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryIMenuManager.h
@@ -1,130 +1,130 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIMENUMANAGER_H
 #define BERRYIMENUMANAGER_H
 
 #include <berryIContributionManager.h>
 #include <berryIContributionItem.h>
 
 namespace berry {
 
 /**
  * The <code>IMenuManager</code> interface provides protocol for managing
  * contributions to a menu bar and its sub menus.
  * An <code>IMenuManager</code> is also an <code>IContributionItem</code>,
  * allowing sub-menus to be nested in parent menus.
  * <p>
- * This interface is internal to the framework = 0; it should not be implemented outside
+ * This interface is internal to the framework; it should not be implemented outside
  * the framework.
  * </p>
  * <p>
  * This package provides a concrete menu manager implementation,
  * {@link MenuManager <code>MenuManager</code>}.
  * </p>
  * @noimplement This interface is not intended to be implemented by clients.
  */
 struct IMenuManager : public virtual IContributionManager, public IContributionItem
 {
 
-  berryInterfaceMacro(IMenuManager, berry)
+  berryObjectMacro(berry::IMenuManager)
 
   /**
    * Adds a menu listener to this menu.
    * Has no effect if an identical listener is already registered.
    *
    * @param listener a menu listener
    */
   //virtual void AddMenuListener(QObject* listener, const char* slot) = 0;
 
   /**
    * Finds the manager for the menu at the given path. A path
    * consists of contribution item ids separated by the separator
    * character.  The path separator character is <code>'/'</code>.
    * <p>
    * Convenience for <code>findUsingPath(path)</code> which
    * extracts an <code>IMenuManager</code> if possible.
    * </p>
    *
    * @param path the path string
    * @return the menu contribution item, or <code>null</code>
    *   if there is no such contribution item or if the item does
    *   not have an associated menu manager
    */
   virtual IMenuManager::Pointer FindMenuUsingPath(const QString& path) const = 0;
 
   /**
    * Finds the contribution item at the given path. A path
    * consists of contribution item ids separated by the separator
    * character. The path separator character is <code>'/'</code>.
    *
    * @param path the path string
    * @return the contribution item, or <code>null</code> if there is no
    *   such contribution item
    */
   virtual IContributionItem::Pointer FindUsingPath(const QString& path) const = 0;
 
   /**
    * Returns whether all items should be removed when the menu is about to
    * show, but before notifying menu listeners. The default is
    * <code>false</code>.
    *
    * @return <code>true</code> if all items should be removed when shown,
    *         <code>false</code> if not
    */
   virtual bool GetRemoveAllWhenShown() const = 0;
 
   /**
    * Returns whether this menu should be enabled or not.
    *
    * @return <code>true</code> if enabled, and
    *   <code>false</code> if disabled
    */
   virtual bool IsEnabled() const = 0;
 
   /**
    * Removes the given menu listener from this menu.
    * Has no effect if an identical listener is not registered.
    *
    * @param listener the menu listener
    */
   //virtual void RemoveMenuListener(QObject* listener) = 0;
 
   /**
    * Sets whether all items should be removed when the menu is about to show,
    * but before notifying menu listeners.
    *
    * @param removeAll
    *            <code>true</code> if all items should be removed when shown,
    *            <code>false</code> if not
    */
   virtual void SetRemoveAllWhenShown(bool removeAll) = 0;
 
   /**
      * Incrementally builds the menu from the contribution items, and
      * does so recursively for all submenus.
      *
      * @param force <code>true</code> means update even if not dirty,
      *   and <code>false</code> for normal incremental updating
      */
   virtual void UpdateAll(bool force) = 0;
 
 };
 
 }
 
 #endif // BERRYIMENUMANAGER_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryMenuManager.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryMenuManager.cpp
index 2bfd845380..4ea4d19af3 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryMenuManager.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryMenuManager.cpp
@@ -1,699 +1,726 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryMenuManager.h"
 
 #include "berryIContributionManagerOverrides.h"
 #include "berrySubContributionItem.h"
 
 #include "internal/berryMMMenuListener.h"
 
 #include <QMenu>
 #include <QMenuBar>
 
 
 class QMenuProxy
 {
 
 public:
 
   QMenu* menu;
   QMenuBar* menuBar;
 
   enum Type {
     MenuBar,
     Menu
   };
 
   QMenuProxy(Type type, QWidget* parent = 0)
     : menu(0), menuBar(0)
   {
     switch (type)
     {
     case MenuBar: menuBar = new QMenuBar(parent);
     case Menu: menu = new QMenu(parent);
     }
   }
 
   bool isMenuBar() const
   {
     return menuBar != 0;
   }
 
   void setTitle(const QString& title)
   {
     if (menu)
       menu->setTitle(title);
   }
 
   void setIcon(const QIcon& icon)
   {
     if (menu)
       menu->setIcon(icon);
   }
 
   QList<QAction*> actions() const
   {
     return menu ? menu->actions() : menuBar->actions();
   }
 
   void removeAction(QAction* action)
   {
     menu ? menu->removeAction(action) : menuBar->removeAction(action);
   }
 
   bool isEnabled() const
   {
     return menu ? menu->isEnabled() : menuBar->isEnabled();
   }
 
   void setEnabled(bool enabled)
   {
     menu ? menu->setEnabled(enabled) : menuBar->setEnabled(enabled);
   }
 
 };
 
 namespace berry
 {
 
 struct NullOverrides: public IContributionManagerOverrides
 {
 public:
 
   int GetEnabled(IContributionItem* /*item*/) const
   {
     return -1;
   }
 
   int GetVisible(IContributionItem* /*item*/) const
   {
     return -1;
   }
 };
 
 //struct GuiTkMenuListener : public GuiTk::IMenuListener
 //{
 //public:
 
 //  GuiTkMenuListener(MenuManager::Pointer manager) :
 //    manager(manager)
 //  {
 
 //  }
 
 //  void MenuAboutToHide()
 //  {
 //    //      ApplicationWindow.resetDescription(e.widget);
 //    MenuManager::Pointer(manager)->HandleAboutToHide();
 //  }
 
 //  void MenuAboutToShow()
 //  {
 //    MenuManager::Pointer(manager)->HandleAboutToShow();
 //  }
 
 //private:
 
 //  MenuManager::WeakPtr manager;
 //};
 
 MenuManager::MenuManager(const QString& text, const QString& id)
   : id(id), menu(0), menuItem(0), menuListener(new MMMenuListener(this))
   , menuText(text), parent(0)
   , removeAllWhenShown(false), visible(true)
 {
 
 }
 
 MenuManager::MenuManager(const QString& text, const QIcon& image, const QString& id)
   : id(id), menu(0), menuItem(0), menuListener(new MMMenuListener(this))
   , menuText(text), image(image)
   , parent(0), removeAllWhenShown(false), visible(true)
 {
 
 }
 
 bool MenuManager::IsDirty() const
 {
   return ContributionManager::IsDirty();
 }
 
 MenuManager::~MenuManager()
 {
   delete menu;
 }
 
 //void MenuManager::AddMenuListener(SmartPointer<IMenuListener> listener)
 //{
 //  menuEvents.AddListener(listener);
 //}
 
 QMenu* MenuManager::CreateContextMenu(QWidget* parent)
 {
   if (!menu)
   {
     menu = new QMenuProxy(QMenuProxy::Menu, parent);
     this->InitializeMenu();
   }
-  menu->menu;
+  return menu->menu;
 }
 
 QMenuBar* MenuManager::CreateMenuBar(QWidget* parent)
 {
   if (!menu)
   {
     menu = new QMenuProxy(QMenuProxy::MenuBar, parent);
     this->Update(false);
   }
   return menu->menuBar;
 }
 
 void MenuManager::Fill(QStatusBar* /*parent*/)
 {
 }
 
 QAction* MenuManager::Fill(QToolBar* /*parent*/, QAction* /*before*/)
 {
   return 0;
 }
 
 QAction* MenuManager::Fill(QMenu* parent, QAction* before)
 {
    return this->FillMenu(parent, before);
 }
 
 QAction* MenuManager::Fill(QMenuBar* parent, QAction* before)
 {
   return this->FillMenu(parent, before);
 }
 
 QAction* MenuManager::FillMenu(QWidget* parent, QAction* before)
 {
   if (!menuItem)
   {
     menuItem = new QAction(parent);
     if (parent)
     {
       parent->insertAction(before, menuItem);
     }
 
     menuItem->setText(GetMenuText());
     menuItem->setIcon(image);
 
     if(!menu)
     {
       menu = new QMenuProxy(QMenuProxy::Menu, parent);
     }
 
     if (!menu->isMenuBar())
       menuItem->setMenu(menu->menu);
 
     this->InitializeMenu();
 
     this->SetDirty(true);
   }
   return menuItem;
 }
 
 IMenuManager::Pointer MenuManager::FindMenuUsingPath(const QString& path) const
 {
   IContributionItem::Pointer item(this->FindUsingPath(path));
   if (IMenuManager::Pointer manager = item.Cast<IMenuManager>())
   {
     return manager;
   }
   return IMenuManager::Pointer(0);
 }
 
 IContributionItem::Pointer MenuManager::FindUsingPath(const QString& path) const
 {
   QString id(path);
   QString rest;
   int separator = path.indexOf('/');
   if (separator != -1)
   {
     id = path.left(separator);
     rest = path.mid(separator + 1);
   }
   else
   {
     return ContributionManager::Find(path);
   }
 
   IContributionItem::Pointer item(ContributionManager::Find(id));
   if (IMenuManager::Pointer manager = item.Cast<IMenuManager>())
   {
     return manager->FindUsingPath(rest);
   }
   return IContributionItem::Pointer(0);
 }
 
 QString MenuManager::GetId() const
 {
   return id;
 }
 
 QMenu* MenuManager::GetMenu() const
 {
   return menu->menu;
 }
 
 QString MenuManager::GetMenuText() const
 {
   if (definitionId == "")
   {
     return menuText;
   }
 //  ExternalActionManager::ICallback callback = ExternalActionManager
 //  .getInstance().getCallback();
 //  if (callback != null)
 //  {
 //    String shortCut = callback.getAcceleratorText(definitionId);
 //    if (shortCut == null)
 //    {
 //      return menuText;
 //    }
 //    return menuText + "\t" + shortCut; //$NON-NLS-1$
 //  }
   return menuText;
 }
 
 QIcon MenuManager::GetImage() const
 {
   return image;
 }
 
 SmartPointer<IContributionManagerOverrides> MenuManager::GetOverrides()
 {
   if (!overrides)
   {
     if (!parent)
     {
       overrides = new NullOverrides();
     }
     else
     {
       overrides = parent->GetOverrides();
     }
     ContributionManager::SetOverrides(overrides);
   }
   return overrides;
 }
 
 IContributionManager* MenuManager::GetParent() const
 {
   return parent;
 }
 
 bool MenuManager::GetRemoveAllWhenShown() const
 {
   return removeAllWhenShown;
 }
 
 bool MenuManager::IsDynamic() const
 {
   return false;
 }
 
 bool MenuManager::IsEnabled() const
 {
   return true;
 }
 
 bool MenuManager::IsGroupMarker() const
 {
   return false;
 }
 
 bool MenuManager::IsSeparator() const
 {
   return false;
 }
 
 bool MenuManager::IsVisible() const
 {
   if (!visible)
   {
     return false; // short circuit calculations in this case
   }
 
   if (removeAllWhenShown)
   {
     // we have no way of knowing if the menu has children
     return true;
   }
 
   // menus aren't visible if all of its children are invisible (or only contains visible separators).
   bool visibleChildren = false;
   foreach(IContributionItem::Pointer item, this->GetItems())
   {
     if (item->IsVisible() && !item->IsSeparator())
     {
       visibleChildren = true;
       break;
     }
   }
 
   return visibleChildren;
 }
 
 void MenuManager::MarkDirty()
 {
   ContributionManager::MarkDirty();
   // Can't optimize by short-circuiting when the first dirty manager is encountered,
   // since non-visible children are not even processed.
   // That is, it's possible to have a dirty sub-menu under a non-dirty parent menu
   // even after the parent menu has been updated.
   // If items are added/removed in the sub-menu, we still need to propagate the dirty flag up,
   // even if the sub-menu is already dirty, since the result of isVisible() may change
   // due to the added/removed items.
   IContributionManager* p = this->GetParent();
   if (p)
   {
     p->MarkDirty();
   }
 }
 
 //void MenuManager::RemoveMenuListener(SmartPointer<IMenuListener> listener)
 //{
 //  menuEvents.RemoveListener(listener);
 //}
 
 void MenuManager::SaveWidgetState()
 {
 }
 
 void MenuManager::SetOverrides(SmartPointer<IContributionManagerOverrides> newOverrides)
 {
   overrides = newOverrides;
   ContributionManager::SetOverrides(overrides);
 }
 
 void MenuManager::SetParent(IContributionManager* manager)
 {
   parent = manager;
 }
 
 void MenuManager::SetRemoveAllWhenShown(bool removeAll)
 {
   this->removeAllWhenShown = removeAll;
 }
 
 void MenuManager::SetVisible(bool visible)
 {
   this->visible = visible;
 }
 
 void MenuManager::SetActionDefinitionId(const QString& definitionId)
 {
   this->definitionId = definitionId;
 }
 
 void MenuManager::Update()
 {
   this->UpdateMenuItem();
 }
 
 void MenuManager::Update(const QString& /*property*/)
 {
 
 }
 
 void MenuManager::Update(bool force)
 {
   this->Update(force, false);
 }
 
 void MenuManager::UpdateAll(bool force)
 {
   this->Update(force, true);
 }
 
 //void MenuManager::FireAboutToShow(IMenuManager::Pointer manager)
 //{
 //  menuEvents.menuAboutToShow(manager);
 //}
 
 //void MenuManager::FireAboutToHide(IMenuManager::Pointer manager)
 //{
 //  menuEvents.menuAboutToHide(manager);
 //}
 
 //void MenuManager::HandleAboutToShow()
 //{
 //  if (removeAllWhenShown)
 //  {
 //    this->RemoveAll();
 //  }
 //  this->FireAboutToShow(IMenuManager::Pointer(this));
 //  this->Update(false, false);
 //}
 
 //void MenuManager::HandleAboutToHide()
 //{
 //  this->FireAboutToHide(IMenuManager::Pointer(this));
 //}
 
 void MenuManager::InitializeMenu()
 {
   menu->setTitle(GetMenuText());
   menu->setIcon(GetImage());
 
   //menuListener = new GuiTkMenuListener(MenuManager::Pointer(this));
   if (!menu->isMenuBar())
   {
     QObject::connect(menu->menu, SIGNAL(aboutToShow()), menuListener.data(), SLOT(HandleAboutToShow()));
   }
   //menu->AddMenuListener(menuListener);
 
   // Don't do an update(true) here, in case menu is never opened.
   // Always do it lazily in handleAboutToShow().
 }
 
 //void MenuManager::DisposeOldImages()
 //{
 //  if (imageManager)
 //  {
 //    imageManager.dispose();
 //    imageManager = null;
 //  }
 //}
 
 void MenuManager::UpdateMenuItem()
 {
   if (menuItem && menu)
   {
     bool enabled = removeAllWhenShown || menu->actions().size() > 0;
     if (menu->isEnabled() != enabled)
     {
       menuItem->setEnabled(enabled);
     }
   }
 }
 
 //QList<SmartPointer<IMenuItem> > MenuManager::GetMenuItems()
 //{
 //  if (menu)
 //  {
 //    return menu->GetItems();
 //  }
 //  return QList<IMenuItem::Pointer>();
 //}
 
 //SmartPointer<IMenuItem> MenuManager::GetMenuItem(unsigned int index)
 //{
 //  if (menu)
 //  {
 //    return menu->GetItem(index);
 //  }
 //  return IMenuItem::Pointer(0);
 //}
 
 //unsigned int MenuManager::GetMenuItemCount()
 //{
 //  if (menu)
 //  {
 //    return menu->GetItemCount();
 //  }
 //  return 0;
 //}
 
 void MenuManager::DoItemFill(IContributionItem::Pointer ci, QAction* before)
 {
   if (menu->isMenuBar())
   {
     ci->Fill(menu->menuBar, before);
   }
   else
   {
     ci->Fill(menu->menu, before);
   }
 }
 
 void MenuManager::Update(bool force, bool recursive)
 {
   if (ContributionManager::IsDirty() || force)
   {
     if (menu)
     {
       // clean contains all active items without double separators
       QList<IContributionItem::Pointer> items = this->GetItems();
       QList<IContributionItem::Pointer> clean;
       IContributionItem::Pointer separator;
       foreach (IContributionItem::Pointer ci, items)
       {
         if (!ci->IsVisible())
         {
           continue;
         }
         if (ci->IsSeparator())
         {
           // delay creation until necessary
           // (handles both adjacent separators, and separator at end)
           separator = ci;
         }
         else
         {
           if (separator)
           {
             if (clean.size() > 0)
             {
               clean.push_back(separator);
             }
             separator = 0;
           }
           clean.push_back(ci);
         }
       }
 
       // remove obsolete (removed or non active)
       QList<QAction*> mi = menu->actions();
 
-      for (unsigned int i = 0; i < mi.size(); i++)
+      for (int i = 0; i < mi.size(); i++)
       {
         Object::Pointer data = mi[i]->data().value<Object::Pointer>();
 
         if (!data || !clean.contains(data.Cast<IContributionItem>()))
         {
           menu->removeAction(mi[i]);
         }
         else if (IContributionItem::Pointer ci = data.Cast<IContributionItem>())
         {
           if(ci->IsDynamic() && ci->IsDirty())
           {
             menu->removeAction(mi[i]);
             delete mi[i];
           }
         }
       }
 
       // add new
       mi = menu->actions();
       int srcIx = 0;
       int destIx = 0;
 
       for (QList<IContributionItem::Pointer>::Iterator e = clean.begin();
            e != clean.end(); ++e)
       {
         IContributionItem::Pointer src(*e);
         IContributionItem::Pointer dest;
 
         // get corresponding item in widget
         if (srcIx < mi.size())
         {
           dest = mi[srcIx]->data().value<Object::Pointer>().Cast<IContributionItem>();
         }
         else
         {
           dest = 0;
         }
 
         if (dest && src == dest)
         {
           srcIx++;
           destIx++;
         }
-        else if (dest && dest->IsSeparator()
-            && src->IsSeparator())
+        else if (dest && dest->IsSeparator() && src->IsSeparator())
         {
           mi[srcIx]->setData(QVariant::fromValue<Object::Pointer>(src));
           srcIx++;
           destIx++;
         }
         else
         {
           int start = menu->actions().size();
           this->DoItemFill(src, destIx < 1 ? 0 : menu->actions().at(destIx-1));
           int newItems = menu->actions().size() - start;
           for (int i = 0; i < newItems; ++i)
           {
             menu->actions().at(destIx++)->setData(QVariant::fromValue<Object::Pointer>(src));
           }
         }
 
         // May be we can optimize this call. If the menu has just
         // been created via the call src.fill(fMenuBar, destIx) then
         // the menu has already been updated with update(true)
         // (see MenuManager). So if force is true we do it again. But
         // we can't set force to false since then information for the
         // sub sub menus is lost.
         if (recursive)
         {
           IContributionItem::Pointer item(src);
           if (SubContributionItem::Pointer subItem = item.Cast<SubContributionItem>())
           {
             item = subItem->GetInnerItem();
           }
           if (IMenuManager::Pointer mm = item.Cast<IMenuManager>())
           {
             mm->UpdateAll(force);
           }
         }
 
       }
 
       // remove any old menu items not accounted for
       for (; srcIx < mi.size(); srcIx++)
       {
         menu->removeAction(mi[srcIx]);
         delete mi[srcIx];
       }
 
       this->SetDirty(false);
     }
   }
   else
   {
     // I am not dirty. Check if I must recursivly walk down the hierarchy.
     if (recursive)
     {
       foreach (IContributionItem::Pointer ci, this->GetItems())
       {
         if (IMenuManager::Pointer mm = ci.Cast<IMenuManager>())
         {
           if (mm->IsVisible())
           {
             mm->UpdateAll(force);
           }
         }
       }
     }
   }
   this->UpdateMenuItem();
 }
 
+void MenuManager::DumpActionInfo(QMenuProxy* menu)
+{
+  if (menu->isMenuBar())
+  {
+    qDebug() << "QMenuBar [" << menu->menuBar << "]";
+    DumpActionInfo(menu->menuBar, 1);
+  }
+  else
+  {
+    qDebug() << "QMenu [" << menu->menu << "]" << menu->menu;
+    DumpActionInfo(menu->menu, 1);
+  }
+}
+
+void MenuManager::DumpActionInfo(QWidget* widget, int level)
+{
+  QString indent = " |";
+  for (int i = 0; i < level; ++i) indent += "--";
+  foreach(QAction* action, widget->actions())
+  {
+    qDebug() << qPrintable(indent) << action->text() << "[" << action << "]";
+    if (action->menu())
+    {
+      DumpActionInfo(action->menu(), level+1);
+    }
+  }
+}
+
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryMenuManager.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryMenuManager.h
index 049eb866e6..2a8f0e5e59 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryMenuManager.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berryMenuManager.h
@@ -1,466 +1,469 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYMENUMANAGER_H_
 #define BERRYMENUMANAGER_H_
 
 #include "berryIMenuManager.h"
 #include "berryContributionManager.h"
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include <QIcon>
 
 class QMenu;
 class QMenuProxy;
 class QAction;
 
 namespace berry
 {
 
 class MMMenuListener;
 
 /**
  * A menu manager is a contribution manager which realizes itself and its items
  * in a menu control; either as a menu bar, a sub-menu, or a context menu.
  * <p>
  * This class may be instantiated; it may also be subclassed.
  * </p>
  */
 class BERRY_UI_QT MenuManager: public ContributionManager, public IMenuManager
 {
 
 public:
 
   berryObjectMacro(MenuManager)
 
 private:
 
   friend class MMMenuListener;
 
   /**
    * The menu id.
    */
   QString id;
 
   /**
    * List of registered menu listeners (element type: <code>IMenuListener</code>).
    */
   //IMenuListener::Events menuEvents;
   //GuiTk::IMenuListener::Pointer menuListener;
 
   /**
    * The menu control; <code>null</code> before
    * creation and after disposal.
    */
   QMenuProxy* menu;
   QAction* menuItem;
 
   QScopedPointer<MMMenuListener> menuListener;
 
   /**
    * The menu item widget; <code>null</code> before
    * creation and after disposal. This field is used
    * when this menu manager is a sub-menu.
    */
   //SmartPointer<IMenuItem> menuItem;
 
   /**
    * The text for a sub-menu.
    */
   QString menuText;
 
   /**
    * The image for a sub-menu.
    */
   QIcon image;
 
   /**
    * A resource manager to remember all of the images that have been used by this menu.
    */
   //LocalResourceManager imageManager;
 
   /**
    * The overrides for items of this manager
    */
   SmartPointer<IContributionManagerOverrides> overrides;
 
   /**
    * The parent contribution manager.
    */
   IContributionManager* parent;
 
   /**
    * Indicates whether <code>removeAll</code> should be
    * called just before the menu is displayed.
    */
   bool removeAllWhenShown;
 
   /**
    * allows a submenu to display a shortcut key. This is often used with the
    * QuickMenu command or action which can pop up a menu using the shortcut.
    */
   QString definitionId;
 
 protected:
 
   /**
    * Indicates this item is visible in its manager; <code>true</code>
    * by default.
    */
   bool visible;
 
 public:
 
   /**
    * Creates a menu manager with the given text and id.
    * Typically no text is given when creating a context menu.
    * Supply a text and id for creating a sub-menu, where it needs to be referred to by the id.
    *
    * @param text the text for the menu, or <code>""</code> if none
    * @param id the menu id, or <code>""</code> if it is to have no id
    */
   MenuManager(const QString& text = QString(), const QString& id = QString());
 
   ~MenuManager();
 
   /**
    * Creates a menu manager with the given text, image, and id.
    * Typically used for creating a sub-menu, where it needs to be referred to by id.
    *
    * @param text the text for the menu, or <code>""</code> if none
    * @param image the image for the menu, or <code>ImageDescriptor::Pointer(0)</code> if none
    * @param id the menu id, or <code>""</code> if it is to have no id
    */
   MenuManager(const QString& text, const QIcon& image,
               const QString& id);
 
   /*
    * @see IMenuManager#AddMenuListener(SmartPointer<IMenuListener>)
    */
   //void AddMenuListener(SmartPointer<IMenuListener> listener);
 
   bool IsDirty() const;
 
   /**
    * Creates and returns a Qt menu control for this menu,
    * and installs all registered contributions.
    * Does not create a new control if one already exists.
    * <p>
    * Note that the menu is not expected to be dynamic.
    * </p>
    *
    * @param parent the parent control
    * @return the menu control
    */
   QMenu* CreateContextMenu(QWidget* parent);
 
   /**
    * Creates and returns a Qt menu bar control for this menu,
    * for use in the given <code>QWidget</code>, and installs all registered
    * contributions. Does not create a new control if one already exists.
    *
    * @param parent the parent decorations
    * @return the menu control
    * @since 2.1
    */
   QMenuBar* CreateMenuBar(QWidget* parent);
 
   /*
    * @see IContributionItem#Fill(QStatusBar*)
    */
   void Fill(QStatusBar* parent);
 
   /*
    * @see IContributionItem#Fill(QToolBar*, int)
    */
   QAction* Fill(QToolBar* parent, QAction *index);
 
   /*
    * @see IContributionItem#Fill(QMenu*, int)
    */
   QAction* Fill(QMenu* parent, QAction *before);
 
   /*
    * @see IContributionItem#Fill(QMenuBar*, int)
    */
   QAction* Fill(QMenuBar* parent, QAction *before);
 
   /*
    * @see IMenuManager#FindMenuUsingPath(const QString&)
    */
   IMenuManager::Pointer FindMenuUsingPath(const QString& path) const;
 
   /*
    * @see IMenuManager#FindUsingPath(const QString&)
    */
   IContributionItem::Pointer FindUsingPath(const QString& path) const;
 
   /**
    * Returns the menu id. The menu id is used when creating a contribution
    * item for adding this menu as a sub menu of another.
    *
    * @return the menu id
    */
   QString GetId() const;
 
   /**
    * Returns the SWT menu control for this menu manager.
    *
    * @return the menu control
    */
   QMenu* GetMenu() const;
 
   /**
    * Returns the text shown in the menu, potentially with a shortcut
    * appended.
    *
    * @return the menu text
    */
   QString GetMenuText() const;
 
   /**
    * Returns the image for this menu as an image descriptor.
    *
    * @return the image, or <code>null</code> if this menu has no image
    */
   QIcon GetImage() const;
 
   /*
    * @see IContributionManager#GetOverrides()
    */
   SmartPointer<IContributionManagerOverrides> GetOverrides();
 
   /**
    * Returns the parent contribution manager of this manger.
    *
    * @return the parent contribution manager
    */
   IContributionManager* GetParent() const;
 
   /*
    * @see IMenuManager#GetRemoveAllWhenShown()
    */
   bool GetRemoveAllWhenShown() const;
 
   /*
    * @see IContributionItem#IsDynamic()
    */
   bool IsDynamic() const;
 
   /**
    * Returns whether this menu should be enabled or not.
    * Used to enable the menu item containing this menu when it is realized as a sub-menu.
    * <p>
    * The default implementation of this framework method
    * returns <code>true</code>. Subclasses may reimplement.
    * </p>
    *
    * @return <code>true</code> if enabled, and
    *   <code>false</code> if disabled
    */
   bool IsEnabled() const;
 
   /*
    * @see IContributionItem#IsGroupMarker()
    */
   bool IsGroupMarker() const;
 
   /*
    * @see IContributionItem#IsSeparator()
    */
   bool IsSeparator() const;
 
   /*
    * @see IContributionItem#IsVisible()
    */
   bool IsVisible() const;
 
   /**
    * The <code>MenuManager</code> implementation of this <code>ContributionManager</code> method
    * also propagates the dirty flag up the parent chain.
    */
   void MarkDirty();
 
   /*
    * @see IMenuManager#removeMenuListener(IMenuListener)
    */
   //void RemoveMenuListener(SmartPointer<IMenuListener> listener);
 
   /*
    * @IContributionItem#SaveWidgetState()
    */
   void SaveWidgetState();
 
   /**
    * Sets the overrides for this contribution manager
    *
    * @param newOverrides the overrides for the items of this manager
    */
   void SetOverrides(SmartPointer<IContributionManagerOverrides> newOverrides);
 
   /*
    * @see IContributionItem#SetParent(IContributionManager)
    */
   void SetParent(IContributionManager* manager);
 
   /*
    * @see IMenuManager#SetRemoveAllWhenShown(boolean)
    */
   void SetRemoveAllWhenShown(bool removeAll);
 
   /*
    * @see IContributionItem#SetVisible(bool)
    */
   void SetVisible(bool visible);
 
   /**
    * Sets the action definition id of this action. This simply allows the menu
    * item text to include a short cut if available.  It can be used to
    * notify a user of a key combination that will open a quick menu.
    *
    * @param definitionId
    *            the command definition id
    */
   void SetActionDefinitionId(const QString& definitionId);
 
   /*
    * @see IContributionItem#Update()
    */
   void Update();
 
   void Update(const QString& property);
 
   /**
    * The <code>MenuManager</code> implementation of this <code>IContributionManager</code>
    * updates this menu, but not any of its submenus.
    *
    * @see #updateAll
    */
   void Update(bool force);
 
   /*
    * @see IMenuManager#UpdateAll(bool)
    */
   void UpdateAll(bool force);
 
 private:
 
   /**
    * Notifies any menu listeners that a menu is about to show.
    * Only listeners registered at the time this method is called are notified.
    *
    * @param manager the menu manager
    *
    * @see IMenuListener#menuAboutToShow
    */
   //void FireAboutToShow(IMenuManager::Pointer manager);
 
   /**
    * Notifies any menu listeners that a menu is about to hide.
    * Only listeners registered at the time this method is called are notified.
    *
    * @param manager the menu manager
    *
    */
   //void FireAboutToHide(IMenuManager::Pointer manager);
 
   /**
    * Notifies all listeners that this menu is about to appear.
    */
   //void HandleAboutToShow();
 
   /**
    * Notifies all listeners that this menu is about to disappear.
    */
   //void HandleAboutToHide();
 
   /**
    * Initializes the menu control.
    */
   void InitializeMenu();
 
   /**
    * Dispose any images allocated for this menu
    */
  // void DisposeOldImages();
 
   /**
    * Updates the menu item for this sub menu.
    * The menu item is disabled if this sub menu is empty.
    * Does nothing if this menu is not a submenu.
    */
   void UpdateMenuItem();
 
   QAction* FillMenu(QWidget* parent, QAction* before);
 
+  void DumpActionInfo(QMenuProxy* menu);
+  void DumpActionInfo(QWidget* widget, int level);
+
 protected:
 
   /**
    * Get all the items from the implementation's widget.
    *
    * @return the menu items
    */
   //QList<SmartPointer<IMenuItem> > GetMenuItems();
 
   /**
    * Get an item from the implementation's widget.
    *
    * @param index
    *            of the item
    * @return the menu item
    */
   //SmartPointer<IMenuItem> GetMenuItem(unsigned int index);
 
   /**
    * Get the menu item count for the implementation's widget.
    *
    * @return the number of items
    */
   //unsigned int GetMenuItemCount();
 
   /**
    * Call an <code>IContributionItem</code>'s fill method with the
    * implementation's widget. The default is to use the <code>Menu</code>
    * widget.<br>
    * <code>fill(Menu menu, int index)</code>
    *
    * @param ci
    *            An <code>IContributionItem</code> whose <code>fill()</code>
    *            method should be called.
    * @param index
    *            The position the <code>fill()</code> method should start
    *            inserting at.
    */
   void DoItemFill(IContributionItem::Pointer ci, QAction *before);
 
   /**
    * Incrementally builds the menu from the contribution items.
    * This method leaves out double separators and separators in the first
    * or last position.
    *
    * @param force <code>true</code> means update even if not dirty,
    *   and <code>false</code> for normal incremental updating
    * @param recursive <code>true</code> means recursively update
    *   all submenus, and <code>false</code> means just this menu
    */
   void Update(bool force, bool recursive);
 
 };
 
 }
 
 #endif /* BERRYMENUMANAGER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berrySeparator.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berrySeparator.h
index f58ba5ac10..0f21bcbef0 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berrySeparator.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berrySeparator.h
@@ -1,68 +1,70 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYSEPARATOR_H
 #define BERRYSEPARATOR_H
 
 #include "berryAbstractGroupMarker.h"
 
 namespace berry {
 
 /**
  * A separator is a special kind of contribution item which acts
  * as a visual separator and, optionally, acts as a group marker.
  * Unlike group markers, separators do have a visual representation for
  * menus and toolbars.
  * <p>
  * This class may be instantiated; it is not intended to be
  * subclassed outside the framework.
  * </p>
  * @noextend This class is not intended to be subclassed by clients.
  */
 class Separator : public AbstractGroupMarker
 {
 
 public:
 
   /**
    * Creates a separator which does not start a new group.
      */
   Separator();
 
   /**
    * Creates a new separator which also defines a new group having the given group name.
    * The group name must not be <code>null</code> or the empty string.
    * The group name is also used as the item id.
    *
    * @param groupName the group name of the separator
    */
   Separator(const QString& groupName);
 
+  using AbstractGroupMarker::Fill;
+
   QAction* Fill(QMenu* menu, QAction* before);
 
   QAction* Fill(QToolBar* toolbar, QAction* before);
 
   /**
    * The <code>Separator</code> implementation of this <code>IContributionItem</code>
    * method returns <code>true</code>
    */
   bool IsSeparator() const;
 };
 
 }
 
 #endif // BERRYSEPARATOR_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berrySubContributionItem.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berrySubContributionItem.cpp
index 3cea2554a8..4ef6d00ed0 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berrySubContributionItem.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berrySubContributionItem.cpp
@@ -1,119 +1,119 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berrySubContributionItem.h"
 
 namespace berry
 {
 
 SubContributionItem::SubContributionItem(IContributionItem::Pointer item)
 : visible(true), innerItem(item)
 {
 
 }
 
 void SubContributionItem::Fill(QStatusBar* parent)
 {
   if (visible)
   {
     innerItem->Fill(parent);
   }
 }
 
 QAction *SubContributionItem::Fill(QMenu *parent, QAction *before)
 {
   if (visible)
   {
     return innerItem->Fill(parent, before);
   }
   return 0;
 }
 
 QAction *SubContributionItem::Fill(QToolBar *parent, QAction *before)
 {
   if (visible)
   {
     return innerItem->Fill(parent, before);
   }
   return 0;
 }
 
 QString SubContributionItem::GetId() const
 {
   return innerItem->GetId();
 }
 
 IContributionItem::Pointer SubContributionItem::GetInnerItem() const
 {
   return innerItem;
 }
 
 bool SubContributionItem::IsEnabled() const
 {
   return innerItem->IsEnabled();
 }
 
 bool SubContributionItem::IsDirty() const
 {
   return innerItem->IsDirty();
 }
 
 bool SubContributionItem::IsDynamic() const
 {
   return innerItem->IsDynamic();
 }
 
 bool SubContributionItem::IsGroupMarker() const
 {
   return innerItem->IsGroupMarker();
 }
 
 bool SubContributionItem::IsSeparator() const
 {
   return innerItem->IsSeparator();
 }
 
 bool SubContributionItem::IsVisible() const
 {
   return visible && innerItem->IsVisible();
 }
 
-void SubContributionItem::SetParent(IContributionManager */*parent*/)
+void SubContributionItem::SetParent(IContributionManager* /*parent*/)
 {
   // do nothing, the parent of our inner item
   // is its SubContributionManager
 }
 
 void SubContributionItem::SetVisible(bool visible)
 {
   this->visible = visible;
 }
 
 void SubContributionItem::Update()
 {
   innerItem->Update();
 }
 
 void SubContributionItem::Update(const QString& id)
 {
   innerItem->Update(id);
 }
 
 void SubContributionItem::SaveWidgetState()
 {
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berrySubContributionItem.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berrySubContributionItem.h
index 2f426b4be9..31ed6f1ac2 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berrySubContributionItem.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/actions/berrySubContributionItem.h
@@ -1,149 +1,151 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYSUBCONTRIBUTIONITEM_H_
 #define BERRYSUBCONTRIBUTIONITEM_H_
 
 #include "berryIContributionItem.h"
 
 #include <org_blueberry_ui_qt_Export.h>
 
 namespace berry {
 
 /**
  * A <code>SubContributionItem</code> is a wrapper for an <code>IContributionItem</code>.
  * It is used within a <code>SubContributionManager</code> to control the visibility
  * of items.
  * <p>
  * This class is not intended to be subclassed.
  * </p>
  * @noextend This class is not intended to be subclassed by clients.
  */
 class BERRY_UI_QT SubContributionItem : public IContributionItem
 {
 
 public:
 
   berryObjectMacro(SubContributionItem)
 
 private:
 
     /**
      * The visibility of the item.
      */
     bool visible;
 
     /**
      * The inner item for this contribution.
      */
     IContributionItem::Pointer innerItem;
 
 public:
 
     /**
      * Creates a new <code>SubContributionItem</code>.
      * @param item the contribution item to be wrapped
      */
     SubContributionItem(IContributionItem::Pointer item);
 
+    using IContributionItem::Fill;
+
     /*
      * Method declared on IContributionItem.
      */
     void Fill(QStatusBar* parent);
 
     /*
      * Method declared on IContributionItem.
      */
     QAction* Fill(QMenu* parent, QAction* before);
 
     /*
      * Method declared on IContributionItem.
      */
     QAction* Fill(QToolBar* parent, QAction* before);
 
     /*
      * Method declared on IContributionItem.
      */
     QString GetId() const;
 
     /**
      * Returns the inner contribution item.
      *
      * @return the inner contribution item
      */
     IContributionItem::Pointer GetInnerItem() const;
 
     /*
      * Method declared on IContributionItem.
      */
     bool IsEnabled() const;
 
     /*
      * Method declared on IContributionItem.
      */
     bool IsDirty() const;
 
     /*
      * Method declared on IContributionItem.
      */
     bool IsDynamic() const;
 
     /*
      * Method declared on IContributionItem.
      */
     bool IsGroupMarker() const;
 
     /*
      * Method declared on IContributionItem.
      */
     bool IsSeparator() const;
 
     /*
      * Method declared on IContributionItem.
      */
     bool IsVisible() const;
 
     /*
      * Method declared on IContributionItem.
      */
     void SetParent(IContributionManager* parent);
 
     /*
      * Method declared on IContributionItem.
      */
     void SetVisible(bool visible);
 
     /*
      * Method declared on IContributionItem.
      */
     void Update();
 
     /*
      * Method declared on IContributionItem.
      */
     void Update(const QString& id);
 
     /*
      * @see IContributionItem#SaveWidgetState()
      */
     void SaveWidgetState();
 
 };
 
 }
 
 #endif /* BERRYSUBCONTRIBUTIONITEM_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/application/berryActionBarAdvisor.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/application/berryActionBarAdvisor.cpp
index ee3307686e..5d57857588 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/application/berryActionBarAdvisor.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/application/berryActionBarAdvisor.cpp
@@ -1,87 +1,88 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryActionBarAdvisor.h"
 
 #include <berryIActionBarConfigurer.h>
 #include <berryIWorkbenchWindowConfigurer.h>
 #include <berryIWorkbenchWindow.h>
+#include <berryIMemento.h>
 
 namespace berry
 {
 
 ActionBarAdvisor::ActionBarAdvisor(const SmartPointer<IActionBarConfigurer>& configurer)
   : actionBarConfigurer(configurer)
 {
   Q_ASSERT(configurer.IsNotNull());
 }
 
 IActionBarConfigurer::Pointer ActionBarAdvisor::GetActionBarConfigurer() const
 {
   return actionBarConfigurer;
 }
 
 void ActionBarAdvisor::FillActionBars(FillFlags flags)
 {
   if (flags.testFlag(FILL_PROXY))
   {
     this->MakeActions(actionBarConfigurer->GetWindowConfigurer()->GetWindow().GetPointer());
   }
   if (flags.testFlag(FILL_MENU_BAR))
   {
     this->FillMenuBar(actionBarConfigurer->GetMenuManager());
   }
   if (flags.testFlag(FILL_TOOL_BAR))
   {
     this->FillToolBar(actionBarConfigurer->GetToolBarManager());
   }
   if (flags.testFlag(FILL_STATUS_LINE))
   {
     //this->FillStatusLine(actionBarConfigurer->GetStatusLineManager());
   }
 }
 
 void ActionBarAdvisor::MakeActions(IWorkbenchWindow*  /*window*/)
 {
   // do nothing
 }
 
 void ActionBarAdvisor::FillMenuBar(IMenuManager*  /*menuBar*/)
 {
   // do nothing
 }
 
 void ActionBarAdvisor::FillToolBar(IToolBarManager* /*toolBar*/)
 {
   // do nothing
 }
 
 void ActionBarAdvisor::FillStatusLine(IStatusLineManager* /*statusLine*/)
 {
   // do nothing
 }
 
 bool ActionBarAdvisor::SaveState(SmartPointer<IMemento>  /*memento*/)
 {
   return true;
 }
 
 bool ActionBarAdvisor::RestoreState(SmartPointer<IMemento>  /*memento*/)
 {
   return true;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/application/berryIActionBarConfigurer.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/application/berryIActionBarConfigurer.h
index b8c6da8d21..f274b09649 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/application/berryIActionBarConfigurer.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/application/berryIActionBarConfigurer.h
@@ -1,106 +1,106 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIACTIONBARCONFIGURER_H_
 #define BERRYIACTIONBARCONFIGURER_H_
 
 #include <berryObject.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 
 
 namespace berry
 {
 
 struct IWorkbenchWindowConfigurer;
 struct IMenuManager;
 struct IToolBarManager;
 
 /**
  * Interface providing special access for configuring the action bars
  * of a workbench window.
  * <p>
  * Note that these objects are only available to the main application
  * (the plug-in that creates and owns the workbench).
  * </p>
  * <p>
  * This interface is not intended to be implemented by clients.
  * </p>
  *
  * @see org.blueberry.ui.application.WorkbenchAdvisor#fillActionBars
  * @noimplement This interface is not intended to be implemented by clients.
  */
 struct BERRY_UI_QT IActionBarConfigurer : public Object
 {
 
-  berryInterfaceMacro(IActionBarConfigurer, berry)
+  berryObjectMacro(berry::IActionBarConfigurer)
 
   ~IActionBarConfigurer();
 
   /**
    * Returns the workbench window configurer for the window
    * containing this configurer's action bars.
    *
    * @return the workbench window configurer
    */
   virtual SmartPointer<IWorkbenchWindowConfigurer> GetWindowConfigurer() = 0;
 
   /**
    * Creates a menu manager for the main menu bar of a workbench window. The
    * action bar advisor should use this factory method rather than creating a
    * <code>MenuManager</code> directly.
    *
    * @return the menu manager
    */
   virtual IMenuManager* GetMenuManager() = 0;
 
   /**
    * Creates a tool bar manager for the workbench window's tool bar. The
    * action bar advisor should use this factory method rather than creating a
    * <code>ToolBarManager</code> directly.
    *
    * @return the tool bar manager
    */
   virtual IToolBarManager* GetToolBarManager() = 0;
 
   /*
    * Returns the status line manager of a workbench window.
    *
    * @return the status line manager
    */
   //virtual IStatusLineManager GetStatusLineManager() = 0;
 
   /*
    * Register the action as a global action with a workbench
    * window.
    * <p>
    * For a workbench retarget action
    * ({@link org.blueberry.ui.actions.RetargetAction RetargetAction})
    * to work, it must be registered.
    * You should also register actions that will participate
    * in custom key bindings.
    * </p>
    *
    * @param action the global action
    * @see org.blueberry.ui.actions.RetargetAction
    */
   //virtual void RegisterGlobalAction(IAction action) = 0;
 
 };
 
 }
 
 #endif /*BERRYIACTIONBARCONFIGURER_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/application/berryIWorkbenchConfigurer.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/application/berryIWorkbenchConfigurer.h
index 2899478766..cbbbdacd22 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/application/berryIWorkbenchConfigurer.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/application/berryIWorkbenchConfigurer.h
@@ -1,260 +1,261 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIWORKBENCHCONFIGURER_H_
 #define BERRYIWORKBENCHCONFIGURER_H_
 
 #include <berryMacros.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 #include "berryIWorkbench.h"
 
 #include "berryIWorkbenchWindowConfigurer.h"
 
 namespace berry {
 
 /**
  * Interface providing special access for configuring the workbench.
  * <p>
  * Note that these objects are only available to the main application
  * (the plug-in that creates and owns the workbench).
  * </p>
  * <p>
  * This interface is not intended to be implemented by clients.
  * </p>
  *
  * @see WorkbenchAdvisor#Initialize()
  * @note This interface is not intended to be implemented by clients.
  */
-struct BERRY_UI_QT IWorkbenchConfigurer : public Object {
+struct BERRY_UI_QT IWorkbenchConfigurer : public Object
+{
 
-  berryInterfaceMacro(IWorkbenchConfigurer, berry);
+  berryObjectMacro(berry::IWorkbenchConfigurer)
 
   ~IWorkbenchConfigurer();
 
     /**
      * Restore status code indicating that the saved state
      * could not be restored, but that startup should continue
      * with a reset state.
      *
      * @see #RestoreState()
      */
     static const int RESTORE_CODE_RESET = 1;
 
     /**
      * Restore status code indicating that the saved state
      * could not be restored, and that the application
      * must exit immediately without modifying any previously
      * saved workbench state.
      */
     static const int RESTORE_CODE_EXIT = 2;
 
     /**
      * Returns the underlying workbench.
      *
      * @return the workbench
      */
     virtual IWorkbench* GetWorkbench() = 0;
 
     /**
      * Returns whether the workbench state should be saved on close and
      * restored on subsequent open.
      * <p>
      * The initial value is <code>false</code>.
      * </p>
      *
      * @return <code>true</code> to save and restore workbench state, or
      *  <code>false</code> to forget current workbench state on close.
      */
     virtual bool GetSaveAndRestore() = 0;
 
     /**
      * Sets whether the workbench state should be saved on close and
      * restored on subsequent open.
      *
      * @param enabled <code>true</code> to save and restore workbench state, or
      *  <code>false</code> to forget current workbench state on close.
      */
     virtual void SetSaveAndRestore(bool enabled) = 0;
 
   /**
    * Restores a workbench window from the given memento.
    *
    * @param memento the memento from which to restore the window's state
    * @return the configurer for the restored window
    * @throws WorkbenchException if an error occurred during the restore
    * @see IWorkbenchWindowConfigurer#SaveState(IMemento::Pointer)
    */
   virtual IWorkbenchWindowConfigurer::Pointer RestoreWorkbenchWindow(IMemento::Pointer memento) = 0;
 
     /*
      * Declares a workbench image.
      * <p>
      * The workbench remembers the given image descriptor under the given name,
      * and makes the image available to plug-ins via
      * {@link IWorkbench#GetSharedImages() IWorkbench.getSharedImages()}.
      * For "shared" images, the workbench remembers the image descriptor and
      * will manages the image object create from it; clients retrieve "shared"
      * images via
      * {@link org.blueberry.ui.ISharedImages#getImage ISharedImages.getImage()}.
      * For the other, "non-shared" images, the workbench remembers only the
      * image descriptor; clients retrieve the image descriptor via
      * {@link org.blueberry.ui.ISharedImages#getImageDescriptor
      * ISharedImages.getImageDescriptor()} and are entirely
      * responsible for managing the image objects they create from it.
      * (This is made confusing by the historical fact that the API interface
      *  is called "ISharedImages".)
      * </p>
      *
      * @param symbolicName the symbolic name of the image
      * @param descriptor the image descriptor
      * @param shared <code>true</code> if this is a shared image, and
      * <code>false</code> if this is not a shared image
      * @see org.blueberry.ui.ISharedImages#getImage
      * @see org.blueberry.ui.ISharedImages#getImageDescriptor
      */
 //    virtual void declareImage(String symbolicName, ImageDescriptor descriptor,
 //            boolean shared);
 
     /**
      * Forces the workbench to close due to an emergency. This method should
      * only be called when the workbench is in dire straights and cannot
      * continue, and cannot even risk a normal workbench close (think "out of
      * memory" or "unable to create shell"). When this method is called, an
      * abbreviated workbench shutdown sequence is performed (less critical
      * steps may be skipped). The workbench advisor is still called; however,
      * it must not attempt to communicate with the user. While an emergency
      * close is in progress, <code>EmergencyClosing()</code> returns
      * <code>true</code>. %Workbench advisor methods should always check this
      * flag before communicating with the user.
      *
      * @see #EmergencyClosing()
      */
     virtual void EmergencyClose() = 0;
 
     /**
      * Returns whether the workbench is being closed due to an emergency.
      * When this method returns <code>true</code>, the workbench is in dire
      * straights and cannot continue. Indeed, things are so bad that we cannot
      * even risk a normal workbench close. %Workbench advisor methods should
      * always check this flag before attempting to communicate with the user.
      *
      * @return <code>true</code> if the workbench is in the process of being
      * closed under emergency conditions, and <code>false</code> otherwise
      */
     virtual bool EmergencyClosing() = 0;
 
     /**
      * Returns an object that can be used to configure the given window.
      *
      * @param window a workbench window
      * @return a workbench window configurer
      */
     virtual IWorkbenchWindowConfigurer::Pointer GetWindowConfigurer(
             IWorkbenchWindow::Pointer window) = 0;
 
     /**
      * Returns the data associated with the workbench at the given key.
      *
      * @param key the key
      * @return the data, or <code>null</code> if there is no data at the given
      * key
      */
     virtual Object::Pointer GetData(const QString& key) const = 0;
 
     /**
      * Sets the data associated with the workbench at the given key.
      *
      * @param key the key
      * @param data the data, or <code>null</code> to delete existing data
      */
     virtual void SetData(const QString& key, Object::Pointer data) = 0;
 
     /**
      * Restores the workbench state saved from the previous session, if any.
      * This includes any open windows and their open perspectives, open views
      * and editors, layout information, and any customizations to the open
      * perspectives.
      * <p>
      * This is typically called from the advisor's <code>WorkbenchAdvisor#OpenWindows()</code>
      * method.
      * </p>
      *
      * @return a status object indicating whether the restore was successful
      * @see #RESTORE_CODE_RESET
      * @see #RESTORE_CODE_EXIT
      * @see WorkbenchAdvisor#OpenWindows()
      */
     virtual bool RestoreState() = 0;
 
     /**
      * Opens the first time window, using the default perspective and
      * default page input.
      * <p>
      * This is typically called from the advisor's <code>WorkbenchAdvisor#OpenWindows()</code>
      * method.
      * </p>
      *
      * @see WorkbenchAdvisor#OpenWindows()
      */
     virtual void OpenFirstTimeWindow() = 0;
 
     /**
    * Returns <code>true</code> if the workbench should exit when the last
    * window is closed, <code>false</code> if the window should just be
    * closed, leaving the workbench (and its event loop) running.
    * <p>
    * If <code>true</code>, the last window's state is saved before closing,
    * so that it will be restored in the next session. This applies only if
    * <code>#GetSaveAndRestore()</code> returns <code>true</code>).
    * </p>
    * <p>
    * If <code>false</code>, the window is simply closed, losing its state.
    * </p>
    * <p>
    * If the workbench is left running, it can be closed using
    * <code>IWorkbench#Close()</code>, or a new window can be opened using
    * <code>IWorkbench#OpenWorkbenchWindow(const QString&, IAdaptable*)</code>.
    * </p>
    * <p>
    * The initial value is <code>true</code>.
    * </p>
    *
    * @return <code>true</code> if the workbench will exit when the last
    *         window is closed, <code>false</code> if the window should just
    *         be closed
    */
     virtual bool GetExitOnLastWindowClose() = 0;
 
     /**
    * Sets whether the workbench should exit when the last window is closed, or
    * whether the window should just be closed, leaving the workbench (and its
    * event loop) running.
    * <p>
    * For more details, see <code>#GetExitOnLastWindowClose()</code>.
    * </p>
    *
    * @param enabled
    *            <code>true</code> if the workbench should exit when the last
    *            window is closed, <code>false</code> if the window should
    *            just be closed
    */
     virtual void SetExitOnLastWindowClose(bool enabled) = 0;
 };
 
 }
 
 #endif /*BERRYIWORKBENCHCONFIGURER_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/application/berryIWorkbenchWindowConfigurer.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/application/berryIWorkbenchWindowConfigurer.h
index 81ddafc2d1..933e1c1753 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/application/berryIWorkbenchWindowConfigurer.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/application/berryIWorkbenchWindowConfigurer.h
@@ -1,378 +1,378 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIWORKBENCHWINDOWCONFIGURER_H_
 #define BERRYIWORKBENCHWINDOWCONFIGURER_H_
 
 #include <berryObject.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include "berryPoint.h"
 
 class QMenuBar;
 
 namespace berry
 {
 
 struct IActionBarConfigurer;
 struct IDropTargetListener;
 struct IMemento;
 struct IWorkbenchConfigurer;
 struct IWorkbenchWindow;
 
 /**
  * Interface providing special access for configuring workbench windows.
  * <p>
  * %Window configurer objects are in 1-1 correspondence with the workbench
  * windows they configure. Clients may use <code>Get/SetData</code> to
  * associate arbitrary state with the window configurer object.
  * </p>
  * <p>
  * Note that these objects are only available to the main application
  * (the plug-in that creates and owns the workbench).
  * </p>
  * <p>
  * This interface is not intended to be implemented by clients.
  * </p>
  *
  * @see IWorkbenchConfigurer#GetWindowConfigurer()
  * @see WorkbenchAdvisor#PreWindowOpen()
  * @note This interface is not intended to be implemented by clients.
  */
 struct BERRY_UI_QT IWorkbenchWindowConfigurer : public Object
 {
 
-  berryInterfaceMacro(IWorkbenchWindowConfigurer, berry)
+  berryObjectMacro(berry::IWorkbenchWindowConfigurer)
 
   ~IWorkbenchWindowConfigurer();
 
   /**
    * Returns the underlying workbench window.
    *
    * @return the workbench window
    */
   virtual SmartPointer<IWorkbenchWindow> GetWindow() = 0;
 
   /**
    * Returns the workbench configurer.
    *
    * @return the workbench configurer
    */
   virtual SmartPointer<IWorkbenchConfigurer> GetWorkbenchConfigurer() = 0;
 
   /**
    * Returns the action bar configurer for this workbench
    * window.
    *
    * @return the action bar configurer
     */
   virtual SmartPointer<IActionBarConfigurer> GetActionBarConfigurer() = 0;
 
   /**
    * Returns the title of the underlying workbench window.
    *
    * @return the window title
    */
   virtual QString GetTitle() = 0;
 
   /**
    * Sets the title of the underlying workbench window.
    *
    * @param title the window title
    */
   virtual void SetTitle(const QString& title) = 0;
 
   /**
    * Returns whether the underlying workbench window has a menu bar.
    * <p>
    * The initial value is <code>true</code>.
    * </p>
    *
    * @return <code>true</code> for a menu bar, and <code>false</code>
    * for no menu bar
    */
   virtual bool GetShowMenuBar() const = 0;
 
   /**
    * Sets whether the underlying workbench window has a menu bar.
    *
    * @param show <code>true</code> for a menu bar, and <code>false</code>
    * for no menu bar
    */
   virtual void SetShowMenuBar(bool show) = 0;
 
   /**
    * Returns whether the underlying workbench window has a tool bar.
    * <p>
    * The initial value is <code>true</code>.
    * </p>
    *
    * @return <code>true</code> for a tool bar, and <code>false</code>
    * for no tool bar
    */
   virtual bool GetShowToolBar() const = 0;
 
   /**
    * Sets whether the underlying workbench window has a tool bar.
    *
    * @param show <code>true</code> for a tool bar, and <code>false</code>
    * for no tool bar
    */
   virtual void SetShowToolBar(bool show) = 0;
 
   /**
    * Returns whether the underlying workbench window has a status line.
    * <p>
    * The initial value is <code>true</code>.
    * </p>
    *
    * @return <code>true</code> for a status line, and <code>false</code>
    * for no status line
    */
   virtual bool GetShowStatusLine() const = 0;
 
   /**
    * Sets whether the underlying workbench window has a status line.
    *
    * @param show <code>true</code> for a status line, and <code>false</code>
    * for no status line
    */
   virtual void SetShowStatusLine(bool show) = 0;
 
   /**
    * Returns whether the underlying workbench window has a perspective bar (the
    * perspective bar provides buttons to quickly switch between perspectives).
    * <p>
    * The initial value is <code>false</code>.
    * </p>
    *
    * @return <code>true</code> for a perspective bar, and <code>false</code>
    * for no perspective bar
    */
   virtual bool GetShowPerspectiveBar() const = 0;
 
   /**
    * Sets whether the underlying workbench window has a perspective bar (the
    * perspective bar provides buttons to quickly switch between perspectives).
    *
    * @param show <code>true</code> for a perspective bar, and
    * <code>false</code> for no perspective bar
    */
   virtual void SetShowPerspectiveBar(bool show) = 0;
 
   /**
    * Returns whether the underlying workbench window has a progress indicator.
    * <p>
    * The initial value is <code>false</code>.
    * </p>
    *
    * @return <code>true</code> for a progress indicator, and <code>false</code>
    * for no progress indicator
    */
   virtual bool GetShowProgressIndicator() const = 0;
 
   /**
    * Sets whether the underlying workbench window has a progress indicator.
    *
    * @param show <code>true</code> for a progress indicator, and <code>false</code>
    * for no progress indicator
    */
   virtual void SetShowProgressIndicator(bool show) = 0;
 
   /**
    * Returns the style bits to use for the window's main widget when it is created.
    * The default is <code>0</code>.
    *
    * @return the style bits
    */
   virtual Qt::WindowFlags GetWindowFlags() const = 0;
 
   /**
    * Sets the style bits to use for the window's main widget when it is created.
    * This method has no effect after the widget is created.
    * That is, it must be called within the <code>WorkbenchAdvisor#PreWindowOpen()</code>
    * callback.
    * <p>
    * For more details on the applicable style bits, see the
    * documentation for Qt::WindowFlags.
    * </p>
    *
    * @param windowFlags the style bits
    */
   virtual void SetWindowFlags(Qt::WindowFlags windowFlags) = 0;
 
   /**
    * Returns the size to use for the window's shell when it is created.
    *
    * @return the initial size to use for the shell
    */
   virtual Point GetInitialSize() const = 0;
 
   /**
    * Sets the size to use for the window's shell when it is created.
    * This method has no effect after the shell is created.
    * That is, it must be called within the <code>WorkbenchAdvisor#PreWindowOpen()</code>
    * callback.
    *
    * @param initialSize the initial size to use for the shell
    */
   virtual void SetInitialSize(Point initialSize) = 0;
 
   /*
    * Returns the data associated with this workbench window at the given key.
    *
    * @param key the key
    * @return the data, or <code>null</code> if there is no data at the given
    * key
    */
   //virtual Object getData(String key);
 
   /*
    * Sets the data associated with this workbench window at the given key.
    *
    * @param key the key
    * @param data the data, or <code>null</code> to delete existing data
    */
   //virtual void setData(String key, Object data);
 
   /**
    * Adds the given drag and drop Mime types to the ones
    * supported for drag and drop on the editor area of this workbench window.
    * <p>
    * The workbench advisor would ordinarily call this method from the
    * <code>PreWindowOpen</code> callback.
    * A newly-created workbench window supports no drag and drop transfer
    * types.
    * </p>
    * <p>
    * Note that drag and drop to the editor area requires adding one or more
    * transfer types (using <code>AddEditorAreaTransfer</code>) and
    * configuring a drop target listener
    * (with <code>ConfigureEditorAreaDropListener</code>)
    * capable of handling any of those transfer types.
    * </p>
    *
    * @param transfer a drag and drop transfer object
    * @see #configureEditorAreaDropListener
    * @see org.blueberry.ui.part.EditorInputTransfer
    */
   virtual void AddEditorAreaTransfer(const QStringList& transferTypes) = 0;
 
   /**
    * Configures the drop target listener for the editor area of this workbench window.
    * <p>
    * The workbench advisor ordinarily calls this method from the
    * <code>PreWindowOpen</code> callback.
    * A newly-created workbench window has no configured drop target listener for its
    * editor area.
    * </p>
    * <p>
    * Note that drag and drop to the editor area requires adding one or more
    * transfer types (using <code>AddEditorAreaTransfer</code>) and
    * configuring a drop target listener
    * (with <code>ConfigureEditorAreaDropListener</code>)
    * capable of handling any of those transfer types.
    * </p>
    *
    * @param dropTargetListener the drop target listener that will handle
    * requests to drop an object on to the editor area of this window
    *
    * @see #AddEditorAreaTransfer
    */
-  virtual void ConfigureEditorAreaDropListener(const SmartPointer<IDropTargetListener>& dropTargetListener) = 0;
+  virtual void ConfigureEditorAreaDropListener(IDropTargetListener* dropTargetListener) = 0;
 
   /**
    * Creates the menu bar for the window's shell.
    * <p>
    * This should only be called if the advisor is defining custom window contents
    * in <code>CreateWindowContents</code>, and may only be called once.
    * The caller must set it in the shell using <code>Shell.setMenuBar(Menu)</code>
    * but must not make add, remove or change items in the result.
    * The menu bar is populated by the window's menu manager.
    * The application can add to the menu manager in the advisor's
    * <code>FillActionBars</code> method instead.
    * </p>
    *
    * @return the menu bar, suitable for setting in the shell
    */
   virtual QMenuBar* CreateMenuBar() = 0;
 
   /**
    * Creates the tool bar control.
    * <p>
    * This should only be called if the advisor is defining custom window contents
    * in <code>CreateWindowContents</code>, and may only be called once.
    * The caller must lay out the tool bar appropriately within the parent,
    * but must not add, remove or change items in the result (hence the
    * return type of <code>QWidget</code>).
    * The tool bar is populated by the window's tool bar manager.
    * The application can add to the tool bar manager in the advisor's
    * <code>FillActionBars</code> method instead.
    * </p>
    *
    * @param parent the parent widget
    * @return the tool bar control, suitable for laying out in the parent
    */
   virtual QWidget* CreateToolBar(QWidget* parent) = 0;
 
   /*
    * Creates the status line control.
    * <p>
    * This should only be called if the advisor is defining custom window contents
    * in <code>createWindowContents</code>, and may only be called once.
    * The caller must lay out the status line appropriately within the parent,
    * but must not add, remove or change items in the result (hence the
    * return type of <code>Control</code>).
    * The status line is populated by the window's status line manager.
    * The application can add to the status line manager in the advisor's
    * <code>fillActionBars</code> method instead.
    * </p>
    *
    * @param parent the parent composite
    * @return the status line control, suitable for laying out in the parent
    */
   //virtual Control createStatusLineControl(Composite parent);
 
   /**
    * Creates the page composite, in which the window's pages, and their
    * views and editors, appear.
    * <p>
    * This should only be called if the advisor is defining custom window contents
    * in <code>WorkbenchWindowAdvisor#CreateWindowContents()</code>, and may only be called once.
    * The caller must lay out the page composite appropriately within the parent,
    * but must not add, remove or change items in the result.
    * The page composite is populated by the workbench.
    * </p>
    *
    * @param parent the parent composite
    * @return the page composite, suitable for laying out in the parent
    */
   virtual QWidget* CreatePageComposite(QWidget* parent) = 0;
 
   /**
    * Saves the current state of the window using the specified memento.
    *
    * @param memento the memento in which to save the window's state
    * @return a status object indicating whether the save was successful
    * @see IWorkbenchConfigurer#RestoreWorkbenchWindow(IMemento::Pointer)
    */
   virtual bool SaveState(SmartPointer<IMemento> memento) = 0;
 };
 
 }
 
 #endif /*BERRYIWORKBENCHWINDOWCONFIGURER_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/application/berryWorkbenchWindowAdvisor.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/application/berryWorkbenchWindowAdvisor.cpp
index 780f3568e8..a64c6484a7 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/application/berryWorkbenchWindowAdvisor.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/application/berryWorkbenchWindowAdvisor.cpp
@@ -1,143 +1,144 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryWorkbenchWindowAdvisor.h"
 
 #include <Poco/Bugcheck.h>
 
+#include <berryShell.h>
 #include <berryActionBarAdvisor.h>
 #include <berryWorkbenchPreferenceConstants.h>
 #include <berryObjects.h>
 #include <berryIPreferences.h>
 #include <berryIPreferencesService.h>
 
 #include "internal/berryWorkbenchWindowConfigurer.h"
 #include "internal/berryWorkbenchPlugin.h"
 
 namespace berry
 {
 
 IWorkbenchWindowConfigurer::Pointer WorkbenchWindowAdvisor::GetWindowConfigurer()
 {
   return windowConfigurer;
 }
 
 WorkbenchWindowAdvisor::WorkbenchWindowAdvisor(
     const IWorkbenchWindowConfigurer::Pointer& configurer)
 {
   poco_assert(configurer.IsNotNull());
   this->windowConfigurer = configurer;
 }
 
 WorkbenchWindowAdvisor::~WorkbenchWindowAdvisor()
 {
 }
 
 void WorkbenchWindowAdvisor::PreWindowOpen()
 {
   // do nothing
 }
 
 ActionBarAdvisor::Pointer WorkbenchWindowAdvisor::CreateActionBarAdvisor(
     IActionBarConfigurer::Pointer configurer)
 {
   ActionBarAdvisor::Pointer actionBarAdvisor(new ActionBarAdvisor(configurer));
   return actionBarAdvisor;
 }
 
 void WorkbenchWindowAdvisor::PostWindowRestore()
 {
   // do nothing
 }
 
 void WorkbenchWindowAdvisor::OpenIntro()
 {
   // TODO: Refactor this into an IIntroManager.openIntro(IWorkbenchWindow) call
 
   // introOpened flag needs to be global
   IWorkbenchConfigurer::Pointer wbConfig = GetWindowConfigurer()->GetWorkbenchConfigurer();
   QString key = "introOpened"; //$NON-NLS-1$
   ObjectBool::Pointer introOpened = wbConfig->GetData(key).Cast<ObjectBool>();
   if (introOpened && introOpened->GetValue())
   {
     return;
   }
 
   wbConfig->SetData(key, ObjectBool::Pointer(new ObjectBool(true)));
 
   IPreferences::Pointer workbenchPrefs = WorkbenchPlugin::GetDefault()->GetPreferencesService()->GetSystemPreferences();
 
   bool showIntro = workbenchPrefs->GetBool(WorkbenchPreferenceConstants::SHOW_INTRO, true);
 
   IIntroManager* introManager = wbConfig->GetWorkbench()->GetIntroManager();
 
   bool hasIntro = introManager->HasIntro();
   bool isNewIntroContentAvailable = introManager->IsNewContentAvailable();
 
   if (hasIntro && (showIntro || isNewIntroContentAvailable))
   {
     introManager
     ->ShowIntro(GetWindowConfigurer()->GetWindow(), false);
 
     workbenchPrefs->PutBool(WorkbenchPreferenceConstants::SHOW_INTRO, false);
     workbenchPrefs->Flush();
   }
 }
 
 void WorkbenchWindowAdvisor::PostWindowCreate()
 {
   // do nothing
 }
 
 void WorkbenchWindowAdvisor::PostWindowOpen()
 {
   // do nothing
 }
 
 bool WorkbenchWindowAdvisor::PreWindowShellClose()
 {
   // do nothing, but allow the close() to proceed
   return true;
 }
 
 void WorkbenchWindowAdvisor::PostWindowClose()
 {
   // do nothing
 }
 
 void WorkbenchWindowAdvisor::CreateWindowContents(Shell::Pointer shell)
 {
   this->GetWindowConfigurer().Cast<WorkbenchWindowConfigurer>()->CreateDefaultContents(shell);
 }
 
 void* WorkbenchWindowAdvisor::CreateEmptyWindowContents(void*  /*parent*/)
 {
   return 0;
 }
 
 bool WorkbenchWindowAdvisor::SaveState(IMemento::Pointer  /*memento*/)
 {
   // do nothing
   return true;
 }
 
 bool WorkbenchWindowAdvisor::RestoreState(IMemento::Pointer  /*memento*/)
 {
   // do nothing
   return true;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryAbstractSourceProvider.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryAbstractSourceProvider.cpp
index a9a81b089c..be749e9771 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryAbstractSourceProvider.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryAbstractSourceProvider.cpp
@@ -1,75 +1,75 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include <berryLog.h>
 
 #include "berryAbstractSourceProvider.h"
 #include "services/berryIServiceLocator.h"
 
 #include <Poco/Exception.h>
 
 namespace berry
 {
 
-bool AbstractSourceProvider::DEBUG = true; //Policy.DEBUG_SOURCES;
+bool AbstractSourceProvider::DEBUG = false; //Policy.DEBUG_SOURCES;
 
 void AbstractSourceProvider::FireSourceChanged(int sourcePriority,
-    const QString &sourceName, Object::Pointer sourceValue)
+    const QString &sourceName, Object::ConstPointer sourceValue)
 {
   sourceEvents.singleSourceChanged(sourcePriority, sourceName, sourceValue);
 }
 
 void AbstractSourceProvider::FireSourceChanged(int sourcePriority,
-    const QHash<QString, Object::Pointer> &sourceValuesByName)
+    const QHash<QString, Object::ConstPointer> &sourceValuesByName)
 {
   sourceEvents.multipleSourcesChanged(sourcePriority, sourceValuesByName);
 }
 
 void AbstractSourceProvider::LogDebuggingInfo(const QString& message)
 {
   if (DEBUG && (message != ""))
   {
     BERRY_INFO << "SOURCES" << " >>> " << message;
   }
 }
 
 void AbstractSourceProvider::AddSourceProviderListener(
     ISourceProviderListener* listener)
 {
   if (listener == 0)
   {
-    throw Poco::NullPointerException("The listener cannot be null"); //$NON-NLS-1$
+    throw Poco::NullPointerException("The listener cannot be null");
   }
 
   sourceEvents.AddListener(listener);
 }
 
 void AbstractSourceProvider::RemoveSourceProviderListener(
     ISourceProviderListener* listener)
 {
   if (listener == 0)
   {
-    throw Poco::NullPointerException("The listener cannot be null"); //$NON-NLS-1$
+    throw Poco::NullPointerException("The listener cannot be null");
   }
 
   sourceEvents.RemoveListener(listener);
 }
 
-void AbstractSourceProvider::Initialize(IServiceLocator::ConstPointer  /*locator*/)
+void AbstractSourceProvider::Initialize(IServiceLocator* /*locator*/)
 {
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryAbstractSourceProvider.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryAbstractSourceProvider.h
index 174af1cf92..a9830f28e2 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryAbstractSourceProvider.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryAbstractSourceProvider.h
@@ -1,118 +1,114 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYABSTRACTSOURCEPROVIDER_H_
 #define BERRYABSTRACTSOURCEPROVIDER_H_
 
 #include "berryISourceProvider.h"
 
 #include <berryISourceProviderListener.h>
 
 namespace berry {
 
 struct IServiceLocator;
 
 /**
  * <p>
  * An implementation of <code>ISourceProvider</code> that provides listener
  * support. Subclasses need only call <code>fireSourceChanged</code> whenever
  * appropriate.
  * </p>
- *
- * @since 3.1
  */
 class AbstractSourceProvider : public ISourceProvider {
 
 protected:
 
   /**
    * Whether source providers should print out debugging information to the
    * console when events arrive.
-   *
-   * @since 3.2
    */
   static bool DEBUG; // = Policy.DEBUG_SOURCES;
 
   /**
    * Notifies all listeners that a single source has changed.
    *
    * @param sourcePriority
    *            The source priority that has changed.
    * @param sourceName
    *            The name of the source that has changed; must not be
    *            <code>null</code>.
    * @param sourceValue
    *            The new value for the source; may be <code>null</code>.
    */
   void FireSourceChanged(int sourcePriority,
-                         const QString& sourceName, Object::Pointer sourceValue);
+                         const QString& sourceName, Object::ConstPointer sourceValue);
 
   /**
    * Notifies all listeners that multiple sources have changed.
    *
    * @param sourcePriority
    *            The source priority that has changed.
    * @param sourceValuesByName
    *            The map of source names (<code>String</code>) to source
    *            values (<code>Object</code>) that have changed; must not
    *            be <code>null</code>. The names must not be
    *            <code>null</code>, but the values may be <code>null</code>.
    */
   void FireSourceChanged(int sourcePriority,
-                         const QHash<QString, Object::Pointer>& sourceValuesByName);
+                         const QHash<QString, Object::ConstPointer>& sourceValuesByName);
 
   /**
    * Logs a debugging message in an appropriate manner. If the message is
    * <code>null</code> or the <code>DEBUG</code> is <code>false</code>,
    * then this method does nothing.
    *
    * @param message
    *            The debugging message to log; if <code>null</code>, then
    *            nothing is logged.
-   * @since 3.2
    */
   void LogDebuggingInfo(const QString& message);
 
 
 private:
 
 
   ISourceProviderListener::Events sourceEvents;
 
 
 public:
 
+  berryObjectMacro(berry::AbstractSourceProvider)
+
   void AddSourceProviderListener(ISourceProviderListener* listener);
 
   void RemoveSourceProviderListener(ISourceProviderListener *listener);
 
   /**
    * This method is called when the source provider is instantiated by
    * <code>org.blueberry.ui.services</code>. Clients may override this method
    * to perform initialization.
    *
    * @param locator
    *            The global service locator. It can be used to retrieve
    *            services like the IContextService
-   * @since 3.4
    */
-  void Initialize(SmartPointer<const IServiceLocator> locator);
+  virtual void Initialize(IServiceLocator* locator);
 };
 
 }
 
 #endif /* BERRYABSTRACTSOURCEPROVIDER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryAbstractUICTKPlugin.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryAbstractUICTKPlugin.cpp
index 518a8c4e40..f856d850e6 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryAbstractUICTKPlugin.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryAbstractUICTKPlugin.cpp
@@ -1,282 +1,281 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryAbstractUICTKPlugin.h"
 
 #include "internal/berryBundleUtility.h"
 #include "internal/berryWorkbenchPlugin.h"
 
 #include "berryImageDescriptor.h"
 #include "berryPlatformUI.h"
 #include "berryIPreferencesService.h"
 #include "berryIPreferences.h"
 
 #include <QIcon>
 #include <QImage>
 
 namespace berry
 {
 
 const QString AbstractUICTKPlugin::FN_DIALOG_SETTINGS = "dialog_settings.xml";
 
 AbstractUICTKPlugin::AbstractUICTKPlugin()
   : preferencesService(0)
-  , context(0)
 {
-
 }
 
 //    IDialogSettings getDialogSettings() {
 //        if (dialogSettings == null) {
 //      loadDialogSettings();
 //    }
 //        return dialogSettings;
 //    }
 
 
 //    ImageRegistry getImageRegistry() {
 //        if (imageRegistry == null) {
 //            imageRegistry = createImageRegistry();
 //            initializeImageRegistry(imageRegistry);
 //        }
 //        return imageRegistry;
 //    }
 
 
 IPreferencesService* AbstractUICTKPlugin::GetPreferencesService() const
 {
   // Create the preference store lazily.
   if (preferencesService == 0)
   {
-    ctkServiceReference serviceRef = context->getServiceReference<IPreferencesService>();
+    ctkServiceReference serviceRef = m_Context->getServiceReference<IPreferencesService>();
     if (!serviceRef)
     {
       BERRY_ERROR << "Preferences service not available";
     }
-    preferencesService = context->getService<IPreferencesService>(serviceRef);
+    preferencesService = m_Context->getService<IPreferencesService>(serviceRef);
   }
   return preferencesService;
 }
 
 SmartPointer<IPreferences> AbstractUICTKPlugin::GetPreferences() const
 {
   IPreferencesService* prefService = this->GetPreferencesService();
   if (prefService == NULL) return IPreferences::Pointer(0);
 
   return prefService->GetSystemPreferences();
 }
 
 IWorkbench* AbstractUICTKPlugin::GetWorkbench()
 {
   return PlatformUI::GetWorkbench();
 }
 
 //    ImageRegistry createImageRegistry()
 //    {
 //
 //      //If we are in the UI Thread use that
 //      if (Display.getCurrent() != null)
 //      {
 //        return new ImageRegistry(Display.getCurrent());
 //      }
 //
 //      if (PlatformUI.isWorkbenchRunning())
 //      {
 //        return new ImageRegistry(PlatformUI.getWorkbench().getDisplay());
 //      }
 //
 //      //Invalid thread access if it is not the UI Thread
 //      //and the workbench is not created.
 //      throw new SWTError(SWT.ERROR_THREAD_INVALID_ACCESS);
 //    }
 
 
 //    void initializeImageRegistry(ImageRegistry reg) {
 //        // spec'ed to do nothing
 //    }
 
 
 //    void loadDialogSettings() {
 //        dialogSettings = new DialogSettings("Workbench"); //$NON-NLS-1$
 //
 //        // bug 69387: The instance area should not be created (in the call to
 //        // #getStateLocation) if -data @none or -data @noDefault was used
 //        IPath dataLocation = getStateLocationOrNull();
 //        if (dataLocation != null) {
 //          // try r/w state area in the local file system
 //          String readWritePath = dataLocation.append(FN_DIALOG_SETTINGS)
 //                  .toOSString();
 //          File settingsFile = new File(readWritePath);
 //          if (settingsFile.exists()) {
 //              try {
 //                  dialogSettings.load(readWritePath);
 //              } catch (IOException e) {
 //                  // load failed so ensure we have an empty settings
 //                  dialogSettings = new DialogSettings("Workbench"); //$NON-NLS-1$
 //              }
 //
 //              return;
 //          }
 //        }
 //
 //        // otherwise look for bundle specific dialog settings
 //        URL dsURL = BundleUtility.find(getBundle(), FN_DIALOG_SETTINGS);
 //        if (dsURL == null) {
 //      return;
 //    }
 //
 //        InputStream is = null;
 //        try {
 //            is = dsURL.openStream();
 //            BufferedReader reader = new BufferedReader(
 //                    new InputStreamReader(is, "utf-8")); //$NON-NLS-1$
 //            dialogSettings.load(reader);
 //        } catch (IOException e) {
 //            // load failed so ensure we have an empty settings
 //            dialogSettings = new DialogSettings("Workbench"); //$NON-NLS-1$
 //        } finally {
 //            try {
 //                if (is != null) {
 //          is.close();
 //        }
 //            } catch (IOException e) {
 //                // do nothing
 //            }
 //        }
 //    }
 
 
 //    void refreshPluginActions() {
 //        // If the workbench is not started yet, or is no longer running, do nothing.
 //        if (!PlatformUI.isWorkbenchRunning()) {
 //      return;
 //    }
 //
 //        // startup() is not guaranteed to be called in the UI thread,
 //        // but refreshPluginActions must run in the UI thread,
 //        // so use asyncExec.  See bug 6623 for more details.
 //        Display.getDefault().asyncExec(new Runnable() {
 //            public void run() {
 //                WWinPluginAction.refreshActionList();
 //            }
 //        });
 //    }
 
 
 //    void saveDialogSettings() {
 //        if (dialogSettings == null) {
 //            return;
 //        }
 //
 //        try {
 //          IPath path = getStateLocationOrNull();
 //          if(path == null) {
 //        return;
 //      }
 //            String readWritePath = path
 //                    .append(FN_DIALOG_SETTINGS).toOSString();
 //            dialogSettings.save(readWritePath);
 //        } catch (IOException e) {
 //            // spec'ed to ignore problems
 //        } catch (IllegalStateException e) {
 //            // spec'ed to ignore problems
 //        }
 //    }
 
 
 void AbstractUICTKPlugin::start(ctkPluginContext* context)
 {
-  this->context = context;
+  Plugin::start(context);
 
   // Should only attempt refreshPluginActions() once the bundle
   // has been fully started.  Otherwise, action delegates
   // can be created while in the process of creating
   // a triggering action delegate (if UI events are processed during startup).
   // Also, if the start throws an exception, the bundle will be shut down.
   // We don't want to have created any delegates if this happens.
   // See bug 63324 for more details.
 
   //  bundleListener = new BundleListener()
   //  {
   //  public void bundleChanged(BundleEvent event)
   //    {
   //      if (event.getBundle() == getBundle())
   //      {
   //        if (event.getType() == BundleEvent.STARTED)
   //        {
   //          // We're getting notified that the bundle has been started.
   //          // Make sure it's still active.  It may have been shut down between
   //          // the time this event was queued and now.
   //          if (getBundle().getState() == Bundle.ACTIVE)
   //          {
   //            refreshPluginActions();
   //          }
   //          fc.removeBundleListener(this);
   //        }
   //      }
   //    }
   //  };
   //  context.addBundleListener(bundleListener);
 
   // bundleListener is removed in stop(BundleContext)
 }
 
 void AbstractUICTKPlugin::stop(ctkPluginContext* context)
 {
   Q_UNUSED(context)
 
-  this->context = 0;
   //  try
   //  {
   //    if (bundleListener != null)
   //    {
   //      context.removeBundleListener(bundleListener);
   //    }
   //    saveDialogSettings();
   //    savePreferenceStore();
   //    preferenceStore = null;
   //    if (imageRegistry != null)
   //    imageRegistry.dispose();
   //    imageRegistry = null;
   //}
+
+  Plugin::stop(context);
 }
 
 SmartPointer<ImageDescriptor> AbstractUICTKPlugin::ImageDescriptorFromPlugin(
     const QString& pluginId, const QString& imageFilePath)
 {
   if (pluginId.isEmpty() || imageFilePath.isEmpty())
   {
     throw ctkInvalidArgumentException("argument cannot be empty");
   }
 
   // if the plug-in is not ready then there is no image
   QSharedPointer<ctkPlugin> plugin = BundleUtility::FindPlugin(pluginId);
   if (!BundleUtility::IsReady(plugin.data()))
   {
     return ImageDescriptor::Pointer(0);
   }
 
   QByteArray imgContent = plugin->getResource(imageFilePath);
   QImage image = QImage::fromData(imgContent);
   QPixmap pixmap = QPixmap::fromImage(image);
   QIcon* icon = new QIcon(pixmap);
   if (icon->isNull())
     return ImageDescriptor::Pointer(0);
 
   return ImageDescriptor::CreateFromImage(icon);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryAbstractUICTKPlugin.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryAbstractUICTKPlugin.h
index ac05691486..ab4218e075 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryAbstractUICTKPlugin.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryAbstractUICTKPlugin.h
@@ -1,334 +1,331 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYABSTRACTUICTKPLUGIN_H_
 #define BERRYABSTRACTUICTKPLUGIN_H_
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include <berryPlugin.h>
 
 namespace berry {
 
 template<class T> class SmartPointer;
 
 struct IPreferences;
 struct IPreferencesService;
 struct IWorkbench;
 
-class ImageDescriptor;
+struct ImageDescriptor;
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * Abstract base class for plug-ins that integrate with the BlueBerry platform UI.
  * <p>
  * Subclasses obtain the following capabilities:
  * </p>
  * <p>
  * Preferences
  * <ul>
  * <li> The platform core runtime contains general support for plug-in
  *      preferences (<code>org.blueberry.core.runtime.Preferences</code>).
  *      This class provides appropriate conversion to the older JFace preference
  *      API (<code>org.blueberry.jface.preference.IPreferenceStore</code>).</li>
  * <li> The method <code>getPreferenceStore</code> returns the JFace preference
  *      store (cf. <code>Plugin.getPluginPreferences</code> which returns
  *      a core runtime preferences object.</li>
  * <li> Subclasses may reimplement <code>initializeDefaultPreferences</code>
  *      to set up any default values for preferences using JFace API. In this
  *      case, <code>initializeDefaultPluginPreferences</code> should not be
  *      overridden.</li>
  * <li> Subclasses may reimplement
  *      <code>initializeDefaultPluginPreferences</code> to set up any default
  *      values for preferences using core runtime API. In this
  *      case, <code>initializeDefaultPreferences</code> should not be
  *      overridden.</li>
  * <li> Preferences are also saved automatically on plug-in shutdown.
  *      However, saving preferences immediately after changing them is
  *      strongly recommended, since that ensures that preference settings
  *      are not lost even in the event of a platform crash.</li>
  * </ul>
  * Dialogs
  * <ul>
  * <li> The dialog store is read the first time <code>getDialogSettings</code>
  *      is called.</li>
  * <li> The dialog store allows the plug-in to "record" important choices made
  *      by the user in a wizard or dialog, so that the next time the
  *      wizard/dialog is used the widgets can be defaulted to better values. A
  *      wizard could also use it to record the last 5 values a user entered into
  *      an editable combo - to show "recent values". </li>
  * <li> The dialog store is found in the file whose name is given by the
  *      constant <code>FN_DIALOG_STORE</code>. A dialog store file is first
  *      looked for in the plug-in's read/write state area; if not found there,
  *      the plug-in's install directory is checked.
  *      This allows a plug-in to ship with a read-only copy of a dialog store
  *      file containing initial values for certain settings.</li>
  * <li> Plug-in code can call <code>saveDialogSettings</code> to cause settings to
  *      be saved in the plug-in's read/write state area. A plug-in may opt to do
  *      this each time a wizard or dialog is closed to ensure the latest
  *      information is always safe on disk. </li>
  * <li> Dialog settings are also saved automatically on plug-in shutdown.</li>
  * </ul>
  * Images
  * <ul>
  * <li> A typical UI plug-in will have some images that are used very frequently
  *      and so need to be cached and shared.  The plug-in's image registry
  *      provides a central place for a plug-in to store its common images.
  *      Images managed by the registry are created lazily as needed, and will be
  *      automatically disposed of when the plug-in shuts down. Note that the
  *      number of registry images should be kept to a minimum since many OSs
  *      have severe limits on the number of images that can be in memory at once.
  * </ul>
  * <p>
  * For easy access to your plug-in object, use the singleton pattern. Declare a
  * static variable in your plug-in class for the singleton. Store the first
  * (and only) instance of the plug-in class in the singleton when it is created.
  * Then access the singleton when needed through a static <code>getDefault</code>
  * method.
  * </p>
  * <p>
  * See the description on {@link Plugin}.
  * </p>
  */
 class BERRY_UI_QT AbstractUICTKPlugin : public Plugin
 {
 
 private:
 
     /**
      * The name of the dialog settings file (value
      * <code>"dialog_settings.xml"</code>).
      */
    static const QString FN_DIALOG_SETTINGS;
 
     /**
      * Storage for dialog and wizard data; <code>null</code> if not yet
      * initialized.
      */
     //DialogSettings dialogSettings = null;
 
     /**
      * Storage for preferences.
      */
     mutable IPreferencesService* preferencesService;
 
     /**
      * The registry for all graphic images; <code>null</code> if not yet
      * initialized.
      */
     //ImageRegistry imageRegistry = null;
 
     /**
      * The bundle listener used for kicking off refreshPluginActions().
      */
     //BundleListener bundleListener;
 
-    ctkPluginContext* context;
-
-
 public:
 
     /**
      * Creates an abstract UI plug-in runtime object.
      * <p>
      * Plug-in runtime classes are <code>ctkPluginActivator</code>s and so must
      * have an default constructor.  This method is called by the runtime when
      * the associated bundle is being activated.
      */
    AbstractUICTKPlugin();
 
     /**
      * Returns the dialog settings for this UI plug-in.
      * The dialog settings is used to hold persistent state data for the various
      * wizards and dialogs of this plug-in in the context of a workbench.
      * <p>
      * If an error occurs reading the dialog store, an empty one is quietly created
      * and returned.
      * </p>
      * <p>
      * Subclasses may override this method but are not expected to.
      * </p>
      *
      * @return the dialog settings
      */
 //    IDialogSettings getDialogSettings();
 
     /**
      * Returns the image registry for this UI plug-in.
      * <p>
      * The image registry contains the images used by this plug-in that are very
      * frequently used and so need to be globally shared within the plug-in. Since
      * many OSs have a severe limit on the number of images that can be in memory at
      * any given time, a plug-in should only keep a small number of images in their
      * registry.
      * <p>
      * Subclasses should reimplement <code>initializeImageRegistry</code> if they have
      * custom graphic images to load.
      * </p>
      * <p>
      * Subclasses may override this method but are not expected to.
      * </p>
      *
      * @return the image registry
      */
 //    ImageRegistry getImageRegistry();
 
     /**
      * Returns the preferences service for this UI plug-in.
      * This preferences service is used to hold persistent settings for this plug-in in
      * the context of a workbench. Some of these settings will be user controlled,
      * whereas others may be internal setting that are never exposed to the user.
      * <p>
      * If an error occurs reading the preferences service, an empty preference service is
      * quietly created, initialized with defaults, and returned.
      * </p>
      *
      * @return the preferences service
      */
     IPreferencesService* GetPreferencesService() const;
 
     SmartPointer<IPreferences> GetPreferences() const;
 
     /**
      * Returns the Platform UI workbench.
      * <p>
      * This method exists as a convenience for plugin implementors.  The
      * workbench can also be accessed by invoking <code>PlatformUI.getWorkbench()</code>.
      * </p>
      * @return IWorkbench the workbench for this plug-in
      */
     IWorkbench* GetWorkbench();
 
 
 protected:
 
     /**
      * Returns a new image registry for this plugin-in.  The registry will be
      * used to manage images which are frequently used by the plugin-in.
      * <p>
      * The default implementation of this method creates an empty registry.
      * Subclasses may override this method if needed.
      * </p>
      *
      * @return ImageRegistry the resulting registry.
      * @see #getImageRegistry
      */
 //    ImageRegistry createImageRegistry();
 
     /**
      * Initializes an image registry with images which are frequently used by the
      * plugin.
      * <p>
      * The image registry contains the images used by this plug-in that are very
      * frequently used and so need to be globally shared within the plug-in. Since
      * many OSs have a severe limit on the number of images that can be in memory
      * at any given time, each plug-in should only keep a small number of images in
      * its registry.
      * </p><p>
      * Implementors should create a JFace image descriptor for each frequently used
      * image.  The descriptors describe how to create/find the image should it be needed.
      * The image described by the descriptor is not actually allocated until someone
      * retrieves it.
      * </p><p>
      * Subclasses may override this method to fill the image registry.
      * </p>
      * @param reg the registry to initalize
      *
      * @see #getImageRegistry
      */
 //    void initializeImageRegistry(ImageRegistry reg);
 
     /**
      * Loads the dialog settings for this plug-in.
      * The default implementation first looks for a standard named file in the
      * plug-in's read/write state area; if no such file exists, the plug-in's
      * install directory is checked to see if one was installed with some default
      * settings; if no file is found in either place, a new empty dialog settings
      * is created. If a problem occurs, an empty settings is silently used.
      * <p>
      * This framework method may be overridden, although this is typically
      * unnecessary.
      * </p>
      */
 //    void loadDialogSettings();
 
 
     /**
      * Refreshes the actions for the plugin.
      * This method is called from <code>startup</code>.
      * <p>
      * This framework method may be overridden, although this is typically
      * unnecessary.
      * </p>
      */
 //    void refreshPluginActions();
 
     /**
      * Saves this plug-in's dialog settings.
      * Any problems which arise are silently ignored.
      */
 //    void saveDialogSettings();
 
 
 public:
 
     /**
      * The <code>AbstractUIPlugin</code> implementation of this <code>Plugin</code>
      * method refreshes the plug-in actions.  Subclasses may extend this method,
      * but must send super <b>first</b>.
      */
     void start(ctkPluginContext* context);
 
     /**
      * The <code>AbstractUIPlugin</code> implementation of this <code>Plugin</code>
      * method saves this plug-in's preference and dialog stores and shuts down
      * its image registry (if they are in use). Subclasses may extend this
      * method, but must send super <b>last</b>. A try-finally statement should
      * be used where necessary to ensure that <code>super.shutdown()</code> is
      * always done.
      */
     void stop(ctkPluginContext* context);
 
     /**
      * Creates and returns a new image descriptor for an image file located
      * within the specified plug-in.
      * <p>
      * This is a convenience method that simply locates the image file in
      * within the plug-in (no image registries are involved). The path is
      * relative to the root of the plug-in, and takes into account files
      * coming from plug-in fragments. The path may include $arg$ elements.
      * However, the path must not have a leading "." or path separator.
      * Clients should use a path like "icons/mysample.gif" rather than
      * "./icons/mysample.gif" or "/icons/mysample.gif".
      * </p>
      *
      * @param pluginId the id of the plug-in containing the image file;
      * <code>null</code> is returned if the plug-in does not exist
      * @param imageFilePath the relative path of the image file, relative to the
      * root of the plug-in; the path must be legal
      * @return an image descriptor, or <code>null</code> if no image
      * could be found
      * @since 3.0
      */
     static SmartPointer<ImageDescriptor> ImageDescriptorFromPlugin(
         const QString& pluginId, const QString& imageFilePath);
 
 };
 
 }  // namespace berry
 
 #endif /*BERRYABSTRACTUICTKPLUGIN_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIActionBars.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIActionBars.h
index ad9b2fc3b3..2236893cea 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIActionBars.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIActionBars.h
@@ -1,171 +1,171 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIACTIONBARS_H
 #define BERRYIACTIONBARS_H
 
 #include <berryObject.h>
 
 namespace berry {
 
 struct IServiceLocator;
 struct IMenuManager;
 struct IStatusLineManager;
 struct IToolBarManager;
 
 class Action;
 
 /**
  * Used by a part to access its menu, toolbar, and status line managers.
  * <p>
  * Within the workbench each part, editor or view, has a private set of action
  * bars.  This set, which contains a menu, toolbar, and status line, appears
  * in the local toolbar for a view and in the window for an editor.  The view
  * may provide an implementation for pre-existing actions or add new actions to
  * the action bars.
  * </p><p>
  * In a workbench window there are a number of actions which are applicable to
  * all parts.  Some common examples are <code>CUT</code>, <code>COPY</code> and
  * <code>PASTE</code>. These actions, known as "global actions", are contributed to
  * the workbench window by the window itself and shared by all parts.  The
  * presentation is owned by the window.  The implementation is delegated to the
  * active part.
  * </p><p>
  * To participate in the global action design an <code>IWorkbenchPart</code> should
  * register a handler for each global action which is implemented by the part.  This
  * can be done by calling <code>setGlobalActionHandler</code>.  For convenience, the
  * standard global actions are defined in
  * <code>IWorkbenchActionConstants</code>.
  * </p><p>
  * Additional work is required for the <code>Delete</code> global action.  In
  * this case the accelerator is defined in the menu item text but is not hooked
  * on the window.  This is to support text editors where the <code>Delete</code>
  * key is functional even when the <code>Delete</code> action is disabled (no text
  * is selected).  An implementation for this accelerator must be defined locally,
  * in each part, by listening for <code>Delete</code> key events.
  * </p><p>
  * A part may also contribute new actions to the action bars as required.  To do
  * this, call <code>getMenuManager</code>, <code>getToolBarManager</code>, or
  * <code>getStatusLineManager</code> as appropriate to get the action target.
  * Add the action(s) to the target and call <code>update</code> to commit
  * any changes to the underlying widgets.
  * </p><p>
  * This interface is not intended to be implemented by clients.
  * </p>
  * @noimplement This interface is not intended to be implemented by clients.
  */
 struct IActionBars : public Object
 {
-  berryInterfaceMacro(IActionBars, berry)
+  berryObjectMacro(berry::IActionBars)
 
   /**
    * Clears the global action handler list.
    * <p>
    * Note: Clients who manipulate the global action list are
    * responsible for calling <code>updateActionBars</code> so that the changes
    * can be propagated throughout the workbench.
    * </p>
    */
   virtual void ClearGlobalActionHandlers() = 0;
 
   /**
    * Returns the global action handler for the action with the given id.
    *
    * @param actionId an action id declared in the registry
    * @return an action handler which implements the action id, or
    *   <code>null</code> if none is registered
    * @see IWorkbenchActionConstants
    * @see #setGlobalActionHandler(String, IAction)
    */
   virtual Action* GetGlobalActionHandler(const QString& actionId) const = 0;
 
   /**
    * Returns the menu manager.
    * <p>
    * Note: Clients who add or remove items from the returned menu manager are
    * responsible for calling <code>updateActionBars</code> so that the changes
    * can be propagated throughout the workbench.
    * </p>
    *
    * @return the menu manager
    */
   virtual IMenuManager* GetMenuManager() = 0;
 
   /**
    * Returns the service locator for these action bars. The locator is found
    * by looking locally, and then ascending the action bar hierarchy.
    *
    * @return The service locator; never <code>null</code>.
    */
   virtual IServiceLocator* GetServiceLocator() = 0;
 
   /**
    * Returns the status line manager.
    * <p>
    * Note: Clients who add or remove items from the returned status line
    * manager are responsible for calling <code>updateActionBars</code> so
    * that the changes can be propagated throughout the workbench.
    * </p>
    *
    * @return the status line manager
    */
   virtual IStatusLineManager* GetStatusLineManager() = 0;
 
   /**
    * Returns the tool bar manager.
    * <p>
    * Note: Clients who add or remove items from the returned tool bar manager are
    * responsible for calling <code>updateActionBars</code> so that the changes
    * can be propagated throughout the workbench.
    * </p>
    *
    * @return the tool bar manager
    */
   virtual IToolBarManager* GetToolBarManager() = 0;
 
   /**
    * Sets the global action handler for the action with the given id.
    * <p>
    * Note: Clients who manipulate the global action list are
    * responsible for calling <code>updateActionBars</code> so that the changes
    * can be propagated throughout the workbench.
    * </p>
    *
    * @param actionId an action id declared in the registry
    * @param handler an action which implements the action id, or
    *  <code>null</code> to clear any existing handler
    * @see IWorkbenchActionConstants
    */
   virtual void SetGlobalActionHandler(const QString& actionId, Action* handler) = 0;
 
   /**
    * Updates the action bars.
    * <p>
    * Clients who add or remove items from the menu, tool bar, or status line
    * managers, or that update global action handlers, should call this method
    * to propagated the changes throughout the workbench.
    * </p>
    *
    * @see #setGlobalActionHandler(String, IAction)
    * @see #clearGlobalActionHandlers()
    */
   virtual void UpdateActionBars() = 0;
 };
 
 }
 
 #endif // BERRYIACTIONBARS_H
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryObjectString.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIContextService.cpp
similarity index 54%
copy from BlueBerry/Bundles/org.blueberry.core.runtime/src/berryObjectString.h
copy to BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIContextService.cpp
index 25a2d7c6a0..25fc8369ca 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryObjectString.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIContextService.cpp
@@ -1,41 +1,26 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
-#ifndef BERRYOSGISTRING_H_
-#define BERRYOSGISTRING_H_
-
-#include "berryMacros.h"
-
-#include <QString>
+#include "berryIContextService.h"
 
 namespace berry {
 
-class ObjectString : public QString, public Object
-{
-
-public:
-
-  berryObjectMacro(berry::ObjectString)
-
-  ObjectString() {}
-  ObjectString(const QString& s) : QString(s) {}
-
-  ~ObjectString() {}
-};
+const QString IContextService::CONTEXT_ID_WORKBENCH_MENU = "org.blueberry.ui.contexts.workbenchMenu";
+const QString IContextService::CONTEXT_ID_DIALOG = "org.blueberry.ui.contexts.dialog";
+const QString IContextService::CONTEXT_ID_DIALOG_AND_WINDOW = "org.blueberry.ui.contexts.dialogAndWindow";
+const QString IContextService::CONTEXT_ID_WINDOW = "org.blueberry.ui.contexts.window";
 
 }
-
-#endif /*BERRYOSGISTRING_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIContextService.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIContextService.h
new file mode 100644
index 0000000000..82462713ce
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIContextService.h
@@ -0,0 +1,382 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYICONTEXTSERVICE_H
+#define BERRYICONTEXTSERVICE_H
+
+#include "berryIServiceWithSources.h"
+
+namespace berry {
+
+struct IContextActivation;
+struct IContextManagerListener;
+
+class Context;
+class Expression;
+class Shell;
+
+/**
+ * <p>
+ * Provides services related to contexts in the blueberry workbench. This provides
+ * access to contexts.
+ * </p>
+ * <p>
+ * This service can be acquired from your service locator:
+ * <pre>
+ *   IContextService service = (IContextService) getSite().getService(IContextService.class);
+ * </pre>
+ * <ul>
+ * <li>This service is available globally.</li>
+ * </ul>
+ * </p>
+ *
+ * @noextend This interface is not intended to be extended by clients.
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+struct IContextService : public IServiceWithSources
+{
+
+  /**
+   * The identifier for the context that is active when a workbench is active.
+   */
+  static const QString CONTEXT_ID_WORKBENCH_MENU; // = "org.blueberry.ui.contexts.workbenchMenu";
+
+  /**
+   * The identifier for the context that is active when a shell registered as
+   * a dialog.
+   */
+  static const QString CONTEXT_ID_DIALOG; // = "org.blueberry.ui.contexts.dialog";
+
+  /**
+   * The identifier for the context that is active when a shell is registered
+   * as either a window or a dialog.
+   */
+  static const QString CONTEXT_ID_DIALOG_AND_WINDOW; // = "org.blueberry.ui.contexts.dialogAndWindow";
+
+  /**
+   * The identifier for the context that is active when a shell is registered
+   * as a window.
+   */
+  static const QString CONTEXT_ID_WINDOW; // = "org.blueberry.ui.contexts.window";
+
+  enum ShellType {
+    /**
+     * The type used for registration indicating that the shell should be
+     * treated as a dialog. When the given shell is active, the "In Dialogs"
+     * context should also be active.
+     */
+    TYPE_DIALOG = 0,
+
+    /**
+     * The type used for registration indicating that the shell should not
+     * receive any key bindings be default. When the given shell is active, we
+     * should not provide any <code>EnabledSubmission</code> instances for the
+     * "In Dialogs" or "In Windows" contexts.
+     *
+     */
+    TYPE_NONE = 1,
+
+    /**
+     * The type used for registration indicating that the shell should be
+     * treated as a window. When the given shell is active, the "In Windows"
+     * context should also be active.
+     */
+    TYPE_WINDOW = 2
+  };
+
+  /**
+   * <p>
+   * Activates the given context within the context of this service. If this
+   * service was retrieved from the workbench, then this context will be
+   * active globally. If the service was retrieved from a nested component,
+   * then the context will only be active within that component.
+   * </p>
+   * <p>
+   * Also, it is guaranteed that the contexts submitted through a particular
+   * service will be cleaned up when that services is destroyed. So, for
+   * example, a service retrieved from a <code>IWorkbenchPartSite</code>
+   * would deactivate all of its contexts when the site is destroyed.
+   * </p>
+   *
+   * @param contextId
+   *            The identifier for the context which should be activated; must
+   *            not be <code>null</code>.
+   * @return A token which can be used to later cancel the activation. Only
+   *         someone with access to this token can cancel the activation. The
+   *         activation will automatically be cancelled if the context from
+   *         which this service was retrieved is destroyed.
+   */
+  virtual SmartPointer<IContextActivation> ActivateContext(const QString& contextId) = 0;
+
+  /**
+   * <p>
+   * Activates the given context within the context of this service. The
+   * context becomes active when <code>expression</code> evaluates to
+   * <code>true</code>. This is the same as calling
+   * {@link #activateContext(String, Expression, boolean)} with global==<code>false</code>.
+   * </p>
+   * <p>
+   * Also, it is guaranteed that the context submitted through a particular
+   * service will be cleaned up when that services is destroyed. So, for
+   * example, a service retrieved from a <code>IWorkbenchPartSite</code>
+   * would deactivate all of its handlers when the site is destroyed.
+   * </p>
+   *
+   * @param contextId
+   *            The identifier for the context which should be activated; must
+   *            not be <code>null</code>.
+   * @param expression
+   *            This expression must evaluate to <code>true</code> before
+   *            this context will really become active. The expression may be
+   *            <code>null</code> if the context should always be active.
+   * @return A token which can be used to later cancel the activation. Only
+   *         someone with access to this token can cancel the activation. The
+   *         activation will automatically be cancelled if the context from
+   *         which this service was retrieved is destroyed.
+   *
+   * @see ISources
+   */
+  virtual SmartPointer<IContextActivation> ActivateContext(const QString& contextId,
+                                                           const SmartPointer<Expression>& expression) = 0;
+
+  /**
+   * <p>
+   * Activates the given context within the context of this service. The
+   * context becomes active when <code>expression</code> evaluates to
+   * <code>true</code>. If global==<code>false</code> then this service
+   * must also be the active service to activate the context.
+   * </p>
+   * <p>
+   * Also, it is guaranteed that the context submitted through a particular
+   * service will be cleaned up when that services is destroyed. So, for
+   * example, a service retrieved from a <code>IWorkbenchPartSite</code>
+   * would deactivate all of its handlers when the site is destroyed.
+   * </p>
+   *
+   * @param contextId
+   *            The identifier for the context which should be activated; must
+   *            not be <code>null</code>.
+   * @param expression
+   *            This expression must evaluate to <code>true</code> before
+   *            this context will really become active. The expression may be
+   *            <code>null</code> if the context should always be active.
+   * @param global
+   *            Indicates that the handler should be activated irrespectively
+   *            of whether the corresponding workbench component (e.g.,
+   *            window, part, etc.) is active.
+   * @return A token which can be used to later cancel the activation. Only
+   *         someone with access to this token can cancel the activation. The
+   *         activation will automatically be cancelled if the context from
+   *         which this service was retrieved is destroyed.
+   *
+   * @see ISources
+   */
+  virtual SmartPointer<IContextActivation> ActivateContext(const QString& contextId,
+                                                           const SmartPointer<Expression>& expression,
+                                                           bool global) = 0;
+
+  /**
+   * Adds a listener to this context service. The listener will be notified
+   * when the set of defined contexts changes. This can be used to track the
+   * global appearance and disappearance of contexts.
+   * <p>
+   * <b>Note:</b> listeners should be removed when no longer necessary. If
+   * not, they will be removed when the IServiceLocator used to acquire this
+   * service is disposed.
+   * </p>
+   *
+   * @param listener
+   *            The listener to attach; must not be <code>null</code>.
+   * @see RemoveContextManagerListener(IContextManagerListener*)
+   */
+  virtual void AddContextManagerListener(IContextManagerListener* listener) = 0;
+
+  /**
+   * Deactivates the given context within the context of this service. If the
+   * handler was context with a different service, then it must be deactivated
+   * from that service instead. It is only possible to retract a context
+   * activation with this method. That is, you must have the same
+   * <code>IContextActivation</code> used to activate the context.
+   *
+   * @param activation
+   *            The token that was returned from a call to
+   *            <code>activateContext</code>; must not be <code>null</code>.
+   */
+  virtual void DeactivateContext(const SmartPointer<IContextActivation>& activation) = 0;
+
+  /**
+   * Deactivates the given contexts within the context of this service. If the
+   * contexts were activated with a different service, then they must be
+   * deactivated from that service instead. It is only possible to retract
+   * context activations with this method. That is, you must have the same
+   * <code>IContextActivation</code> instances used to activate the
+   * contexts.
+   *
+   * @param activations
+   *            The tokens that were returned from a call to
+   *            <code>activateContext</code>. This collection must only
+   *            contain instances of <code>IContextActivation</code>. The
+   *            collection must not be <code>null</code>.
+   */
+  virtual void DeactivateContexts(const QList<SmartPointer<IContextActivation> >& activations) = 0;
+
+  /**
+   * Returns the set of active context identifiers.
+   *
+   * @return The set of active context identifiers; this value may be
+   *         <code>null</code> if no active contexts have been set yet. If
+   *         the set is not <code>null</code>, then it contains only
+   *         instances of <code>String</code>.
+   */
+  virtual QList<QString> GetActiveContextIds() const = 0;
+
+  /**
+   * Retrieves the context with the given identifier. If no such context
+   * exists, then an undefined context with the given id is created.
+   *
+   * @param contextId
+   *            The identifier to find; must not be <code>null</code>.
+   * @return A context with the given identifier, either defined or undefined.
+   */
+  virtual SmartPointer<Context> GetContext(const QString& contextId) const = 0;
+
+  /**
+   * Returns the collection of all of the defined contexts in the workbench.
+   *
+   * @return The collection of contexts (<code>Context</code>) that are
+   *         defined; never <code>null</code>, but may be empty.
+   */
+  virtual QList<SmartPointer<Context> > GetDefinedContexts() const = 0;
+
+  /**
+   * Returns the collection of the identifiers for all of the defined contexts
+   * in the workbench.
+   *
+   * @return The collection of context identifiers (<code>String</code>)
+   *         that are defined; never <code>null</code>, but may be empty.
+   */
+  virtual QList<QString> GetDefinedContextIds() const = 0;
+
+  /**
+   * Returns the shell type for the given shell.
+   *
+   * @param shell
+   *            The shell for which the type should be determined. If this
+   *            value is <code>null</code>, then
+   *            <code>IContextService.TYPE_NONE</code> is returned.
+   * @return <code>IContextService.TYPE_WINDOW</code>,
+   *         <code>IContextService.TYPE_DIALOG</code>, or
+   *         <code>IContextService.TYPE_NONE</code>.
+   */
+  virtual ShellType GetShellType(const SmartPointer<Shell>& shell) const = 0;
+
+  virtual ShellType GetShellType(QWidget* widget) const = 0;
+
+  /**
+   * <p>
+   * Reads the context information from the registry and the preferences. This
+   * will overwrite any of the existing information in the context service.
+   * This method is intended to be called during start-up. When this method
+   * completes, this context service will reflect the current state of the
+   * registry and preference store.
+   * </p>
+   */
+  virtual void ReadRegistry() = 0;
+
+  /**
+   * <p>
+   * Registers a shell to automatically promote or demote some basic types of
+   * contexts. The "In Dialogs" and "In Windows" contexts are provided by the
+   * system. This a convenience method to ensure that these contexts are
+   * promoted when the given is shell is active.
+   * </p>
+   * <p>
+   * If a shell is registered as a window, then the "In Windows" context is
+   * enabled when that shell is active. If a shell is registered as a dialog --
+   * or is not registered, but has a parent shell -- then the "In Dialogs"
+   * context is enabled when that shell is active. If the shell is registered
+   * as none -- or is not registered, but has no parent shell -- then the
+   * neither of the contexts will be enabled (by us -- someone else can always
+   * enabled them).
+   * </p>
+   * <p>
+   * If the provided shell has already been registered, then this method will
+   * change the registration.
+   * </p>
+   *
+   * @param shell
+   *            The shell to register for key bindings; must not be
+   *            <code>null</code>.
+   * @param type
+   *            The type of shell being registered. This value must be one of
+   *            the constants given in this interface.
+   *
+   * @return <code>true</code> if the shell had already been registered
+   *         (i.e., the registration has changed); <code>false</code>
+   *         otherwise.
+   */
+  virtual bool RegisterShell(const SmartPointer<Shell>& shell, ShellType type) = 0;
+
+  /**
+   * Removes a listener from this context service.
+   *
+   * @param listener
+   *            The listener to be removed; must not be <code>null</code>.
+   */
+  virtual void RemoveContextManagerListener(IContextManagerListener* listener) = 0;
+
+  /**
+   * <p>
+   * Unregisters a shell that was previously registered. After this method
+   * completes, the shell will be treated as if it had never been registered
+   * at all. If you have registered a shell, you should ensure that this
+   * method is called when the shell is disposed. Otherwise, a potential
+   * memory leak will exist.
+   * </p>
+   * <p>
+   * If the shell was never registered, or if the shell is <code>null</code>,
+   * then this method returns <code>false</code> and does nothing.
+   *
+   * @param shell
+   *            The shell to be unregistered; does nothing if this value is
+   *            <code>null</code>.
+   *
+   * @return <code>true</code> if the shell had been registered;
+   *         <code>false</code> otherwise.
+   */
+  virtual bool UnregisterShell(const SmartPointer<Shell>& shell) = 0;
+
+  /**
+   * Informs the service that a batch operation has started.
+   * <p>
+   * <b>Note:</b> You must insure that if you call
+   * <code>deferUpdates(true)</code> that nothing in your batched operation
+   * will prevent the matching call to <code>deferUpdates(false)</code>.
+   * </p>
+   *
+   * @param defer
+   *            true when starting a batch operation false when ending the
+   *            operation
+   */
+  virtual void DeferUpdates(bool defer) = 0;
+
+};
+
+}
+
+Q_DECLARE_INTERFACE(berry::IContextService, "org.blueberry.ui.IContextService")
+
+#endif // BERRYICONTEXTSERVICE_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIContributionRoot.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIContributionRoot.h
index 7cd3bff72f..ff15896822 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIContributionRoot.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIContributionRoot.h
@@ -1,71 +1,71 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYICONTRIBUTIONROOT_H
 #define BERRYICONTRIBUTIONROOT_H
 
 #include <berryObject.h>
 
 namespace berry {
 
 struct IContributionItem;
 
 class Expression;
 
 /**
  * Instances of this interface represent a position in the contribution
  * hierarchy into which {@link AbstractContributionFactory} instances may insert
  * elements. Instances of this interface are provided by the platform and this
  * interface should <b>NOT</b> be implemented by clients.
  */
 struct IContributionRoot : public Object
 {
-  berryInterfaceMacro(IContributionRoot, berry)
+  berryObjectMacro(berry::IContributionRoot)
 
   /**
    * Adds a given contribution item with provided visibility expression and
    * kill-switch filtering as a direct child of this container. This should be
    * called for all top-level elements created in
    * {@link AbstractContributionFactory#createContributionItems(org.eclipse.ui.services.IServiceLocator, IContributionRoot)}
    *
    * @param item
    *            the item to add
    * @param visibleWhen
    *            the visibility expression. May be <code>null</code>.
    */
   virtual void AddContributionItem(const SmartPointer<IContributionItem>& item,
                                    const SmartPointer<Expression>& visibleWhen) = 0;
 
   /**
    * Registers visibilty for arbitrary {@link IContributionItem} instances
    * that are <b>NOT</b> direct children of this container. Ie: children of a
    * {@link IContributionManager} that has been previously registered with a
    * call to {{@link #AddContributionItem(IContributionItem, Expression)}.
    *
    * @param item
    *            the item for which to register a visibility clause
    * @param visibleWhen
    *            the visibility expression. May be <code>null</code> in which
    *            case this method is a no-op.
    */
   virtual void RegisterVisibilityForChild(const SmartPointer<IContributionItem>& item,
                                           const SmartPointer<Expression>& visibleWhen) = 0;
 };
 
 }
 
 #endif // BERRYICONTRIBUTIONROOT_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIDropTargetListener.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIDropTargetListener.h
index 8cdcc05a0b..73bb89e410 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIDropTargetListener.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIDropTargetListener.h
@@ -1,85 +1,82 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIDROPTARGETLISTENER_H
 #define BERRYIDROPTARGETLISTENER_H
 
-#include <berryMacros.h>
-#include <berryObject.h>
-
 #include <org_blueberry_ui_qt_Export.h>
 
+#include "berryMessage.h"
 
 class QDragEnterEvent;
 class QDragLeaveEvent;
 class QDragMoveEvent;
 class QDropEvent;
 
 namespace berry {
 
-struct BERRY_UI_QT IDropTargetListener : public Object {
-
-  berryInterfaceMacro(IDropTargetListener, berry);
+struct BERRY_UI_QT IDropTargetListener
+{
 
   struct Events {
 
     enum Type {
       NONE  = 0x00000000,
       ENTER = 0x00000001,
       LEAVE = 0x00000002,
       MOVE  = 0x00000004,
       DROP  = 0x00000008,
 
       ALL   = 0xffffffff
     };
 
     Q_DECLARE_FLAGS(Types, Type)
 
     typedef Message1<QDragEnterEvent*> DragEnterEventType;
     typedef Message1<QDragLeaveEvent*> DragLeaveEventType;
     typedef Message1<QDragMoveEvent*> DragMoveEventType;
     typedef Message1<QDropEvent*> DropEventType;
 
     DragEnterEventType dragEnter;
     DragLeaveEventType dragLeave;
     DragMoveEventType dragMove;
     DropEventType drop;
 
     void AddListener(IDropTargetListener* listener);
     void RemoveListener(IDropTargetListener* listener);
 
   private:
     typedef MessageDelegate1<IDropTargetListener, QDragEnterEvent*> DragEnterDelegate;
     typedef MessageDelegate1<IDropTargetListener, QDragLeaveEvent*> DragLeaveDelegate;
     typedef MessageDelegate1<IDropTargetListener, QDragMoveEvent*> DragMoveDelegate;
     typedef MessageDelegate1<IDropTargetListener, QDropEvent*> DropDelegate;
   };
 
   virtual Events::Types GetDropTargetEventTypes() const = 0;
 
   virtual void DragEnterEvent(QDragEnterEvent* /*event*/) {}
   virtual void DragLeaveEvent(QDragLeaveEvent* /*event*/) {}
   virtual void DragMoveEvent(QDragMoveEvent* /*event*/) {}
   virtual void DropEvent(QDropEvent* /*event*/) {}
 
 };
 
 }
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(berry::IDropTargetListener::Events::Types)
 
 #endif // BERRYIDROPTARGETLISTENER_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIEditorDescriptor.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIEditorDescriptor.h
index dc48ff4586..144a73b17f 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIEditorDescriptor.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIEditorDescriptor.h
@@ -1,123 +1,123 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIEDITORDESCRIPTOR_H_
 #define BERRYIEDITORDESCRIPTOR_H_
 
 #include <org_blueberry_ui_qt_Export.h>
 #include "berryIWorkbenchPartDescriptor.h"
 #include "berryIEditorMatchingStrategy.h"
 
 namespace berry
 {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * Description of an editor in the workbench editor registry. The
  * editor descriptor contains the information needed to create editor instances.
  * <p>
  * An editor descriptor typically represents one of three types of editors:
  * <ul>
  *   <li>a file editor extension for a specific file extension.</li>
  *   <li>a file editor added by the user (via the workbench preference page)</li>
  *   <li>a general editor extension which works on objects other than files.</li>
  * </ul>
  * </p>
  * <p>
  * This interface is not intended to be implemented or extended by clients.
  * </p>
  *
  * @see IEditorRegistry
  * @noimplement This interface is not intended to be implemented by clients.
  */
 struct BERRY_UI_QT IEditorDescriptor : public IWorkbenchPartDescriptor
 {
 
-  berryInterfaceMacro(IEditorDescriptor, berry);
+  berryObjectMacro(berry::IEditorDescriptor)
 
   virtual ~IEditorDescriptor();
 
   /**
    * Returns the editor id.
    * <p>
    * For internal editors, this is the extension id as defined in the workbench
    * registry; for external editors, it is path and file name of the external
    * program.
    * </p>
    *
    * @return the id of the editor
    */
   virtual QString GetId() const = 0;
 
   /**
    * Returns the descriptor of the image for this editor.
    *
    * @return the descriptor of the image to display next to this editor
    */
   //ImageDescriptor getImageDescriptor() = 0;
 
   /**
    * Returns the label to show for this editor.
    *
    * @return the editor label
    */
   virtual QString GetLabel() const = 0;
 
   /**
    * Returns whether this editor descriptor will open a regular editor
    * part inside the editor area.
    *
    * @return <code>true</code> if editor is inside editor area, and
    * <code>false</code> otherwise
    * @since 3.0
    */
   virtual bool IsInternal() const = 0;
 
   /**
    * Returns whether this editor descriptor will open an external
    * editor in-place inside the editor area.
    *
    * @return <code>true</code> if editor is in-place, and <code>false</code>
    * otherwise
    * @since 3.0
    */
   virtual bool IsOpenInPlace() const = 0;
 
   /**
    * Returns whether this editor descriptor will open an external editor
    * in a new window outside the workbench.
    *
    * @return <code>true</code> if editor is external, and <code>false</code>
    * otherwise
    * @since 3.0
    */
   virtual bool IsOpenExternal() const = 0;
 
   /**
    * Returns the editor matching strategy object for editors
    * represented by this editor descriptor, or <code>null</code>
    * if there is no explicit matching strategy specified.
    *
    * @return the editor matching strategy, or <code>null</code> if none
    * @since 3.1
    */
   virtual IEditorMatchingStrategy::Pointer GetEditorMatchingStrategy() = 0;
 };
 
 }
 
 #endif /*BERRYIEDITORDESCRIPTOR_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIEditorInput.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIEditorInput.h
index de21afd1d9..cc4a571f7f 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIEditorInput.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIEditorInput.h
@@ -1,143 +1,143 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIEDITORINPUT_H_
 #define BERRYIEDITORINPUT_H_
 
 #include <berryMacros.h>
 #include <berryObject.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 
 namespace berry
 {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * <code>IEditorInput</code> is a light weight descriptor of editor input,
  * like a file name but more abstract. It is not a model. It is a description of
  * the model source for an <code>IEditorPart</code>.
  * <p>
  * Clients implementing this editor input interface must override
  * <code>Object#operator==(const Object*)</code> to answer true
  * for two inputs that are
  * the same. The <code>IWorbenchPage.openEditor</code> APIs are dependent on
  * this to find an editor with the same input.
  * </p>
  * <p>
  * Clients should extend this interface to declare new types of editor inputs.
  * </p>
  * <p>
  * An editor input is passed to an editor via the <code>IEditorPart.init</code>
  * method. Due to the wide range of valid editor inputs, it is not possible to
  * define generic methods for getting and setting bytes.
  * </p>
  * <p>
  * Editor input must implement the <code>IAdaptable</code> interface;
  * extensions are managed by the platform's adapter manager.
  * </p>
  * <p>
  * Please note that it is important that the editor input be light weight.
  * Within the workbench, the navigation history tends to hold on to editor
  * inputs as a means of reconstructing the editor at a later time. The
  * navigation history can hold on to quite a few inputs (i.e., the default is
  * fifty). The actual data model should probably not be held in the input.
  * </p>
  *
  *
  * @see org.blueberry.ui.IEditorPart
  * @see org.blueberry.ui.IWorkbenchPage#openEditor(IEditorInput, String)
  * @see org.blueberry.ui.IWorkbenchPage#openEditor(IEditorInput, String, boolean)
  */
 struct BERRY_UI_QT IEditorInput : public Object // public IAdaptable
 {
-  berryInterfaceMacro(IEditorInput, berry)
+  berryObjectMacro(berry::IEditorInput)
 
   ~IEditorInput();
 
   /**
    * Returns whether the editor input exists.
    * <p>
    * This method is primarily used to determine if an editor input should
    * appear in the "File Most Recently Used" menu. An editor input will appear
    * in the list until the return value of <code>exists</code> becomes
    * <code>false</code> or it drops off the bottom of the list.
    *
    * @return <code>true</code> if the editor input exists;
    *         <code>false</code> otherwise
    */
   virtual bool Exists() const = 0;
 
   /**
    * Returns the image descriptor for this input.
    *
    * <p>
    * Note: although a null return value has never been permitted from this
    * method, there are many known buggy implementations that return null.
    * Clients that need the image for an editor are advised to use
    * IWorkbenchPart.getImage() instead of IEditorInput.getImageDescriptor(),
    * or to recover from a null return value in a manner that records the ID of
    * the problematic editor input. Implementors that have been returning null
    * from this method should pick some other default return value (such as
    * ImageDescriptor.getMissingImageDescriptor()).
    * </p>
    *
    * @return the image descriptor for this input; may be <code>null</code> if
    * there is no image.
    */
   //virtual ImageDescriptor GetImageDescriptor() = 0;
 
   /**
    * Returns the name of this editor input for display purposes.
    * <p>
    * For instance, when the input is from a file, the return value would
    * ordinarily be just the file name.
    *
    * @return the name string; never <code>null</code>;
    */
   virtual QString GetName() const = 0;
 
   /**
    * Returns an object that can be used to save the state of this editor
    * input.
    *
    * @return the persistable element, or <code>null</code> if this editor
    *         input cannot be persisted
    */
   //virtual IPersistableElement GetPersistable() = 0;
 
   /**
    * Returns the tool tip text for this editor input. This text is used to
    * differentiate between two input with the same name. For instance,
    * MyClass.java in folder X and MyClass.java in folder Y. The format of the
    * text varies between input types.
    * </p>
    *
    * @return the tool tip text; never <code>null</code>.
    */
   virtual QString GetToolTipText() const = 0;
 
   /**
    * Returns true if two editor inputs are the same
    *
    */
   virtual bool operator==(const Object* o) const = 0;
 };
 
 }
 
 #endif /*BERRYIEDITORINPUT_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIEditorMatchingStrategy.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIEditorMatchingStrategy.h
index 732913f901..09e90a4e17 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIEditorMatchingStrategy.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIEditorMatchingStrategy.h
@@ -1,66 +1,65 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIEDITORMATCHINGSTRATEGY_H_
 #define BERRYIEDITORMATCHINGSTRATEGY_H_
 
 #include <berryMacros.h>
 
 #include "berryIEditorReference.h"
 #include "berryIEditorInput.h"
 
 namespace berry {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * An editor matching strategy allows editor extensions to provide their own
  * algorithm for matching the input of an open editor of that type to a
  * given editor input.  This is used to find a matching editor during
  * {@link org.blueberry.ui.IWorkbenchPage#openEditor(IEditorInput, String, boolean)} and
  * {@link org.blueberry.ui.IWorkbenchPage#findEditor(IEditorInput)}.
- *
- * @since 3.1
  */
-struct BERRY_UI_QT IEditorMatchingStrategy : public Object {
+struct BERRY_UI_QT IEditorMatchingStrategy : public Object
+{
 
-  berryInterfaceMacro(IEditorMatchingStrategy, berry);
+  berryObjectMacro(berry::IEditorMatchingStrategy)
 
   ~IEditorMatchingStrategy();
 
   /**
    * Returns whether the editor represented by the given editor reference
    * matches the given editor input.
    * <p>
    * Implementations should inspect the given editor input first,
    * and try to reject it early before calling <code>IEditorReference.getEditorInput()</code>,
    * since that method may be expensive.
    * </p>
    *
    * @param editorRef the editor reference to match against
    * @param input the editor input to match
    * @return <code>true</code> if the editor matches the given editor input,
    *   <code>false</code> if it does not match
    */
   virtual bool Matches(IEditorReference::Pointer editorRef, IEditorInput::Pointer input) = 0;
 
 };
 
 }
 
-Q_DECLARE_INTERFACE(berry::IEditorMatchingStrategy, "org.blueberry.IEditorMatchingStrategy")
+Q_DECLARE_INTERFACE(berry::IEditorMatchingStrategy, "org.blueberry.ui.IEditorMatchingStrategy")
 
 #endif /*BERRYIEDITORMATCHINGSTRATEGY_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIEditorPart.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIEditorPart.h
index c342f107ba..dab8c1b2f2 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIEditorPart.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIEditorPart.h
@@ -1,130 +1,131 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIEDITORPART_H_
 #define BERRYIEDITORPART_H_
 
 #include "berryIWorkbenchPart.h"
 #include "berryISaveablePart.h"
 
 #include <QObject>
 
 namespace berry
 {
 
 struct IEditorInput;
 struct IEditorSite;
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * An editor is a visual component within a workbench page. It is
  * typically used to edit or browse a document or input object. The input
  * is identified using an <code>IEditorInput</code>.  Modifications made
  * in an editor part follow an open-save-close lifecycle model (in contrast
  * to a view part, where modifications are saved to the workbench
  * immediately).
  * <p>
  * An editor is document or input-centric.  Each editor has an input, and only
  * one editor can exist for each editor input within a page.  This policy has
  * been designed to simplify part management.
  * </p><p>
  * An editor should be used in place of a view whenever more than one instance
  * of a document type can exist.
  * </p><p>
  * This interface may be implemented directly.  For convenience, a base
  * implementation is defined in <code>EditorPart</code>.
  * </p>
  * <p>
  * An editor part is added to the workbench in two stages:
  * <ol>
  *  <li>An editor extension is contributed to the workbench registry. This
  *    extension defines the extension id, extension class, and the file
  *    extensions which are supported by the editor.</li>
  *  <li>An editor part based upon the extension is created and added to the
  *    workbench when the user opens a file with one of the supported file
  *    extensions (or some other suitable form of editor input).</li>
  * </ol>
  * </p>
  * <p>
  * All editor parts implement the <code>IAdaptable</code> interface; extensions
  * are managed by the platform's adapter manager.
  * </p>
  *
  * @see org.blueberry.ui.IWorkbenchPage#openEditor(IEditorInput, String)
  * @see org.blueberry.ui.part.EditorPart
  */
 struct BERRY_UI_QT IEditorPart : public virtual IWorkbenchPart,
-                               public ISaveablePart {
+    public ISaveablePart
+{
 
-  berryInterfaceMacro(IEditorPart, berry);
+  berryObjectMacro(berry::IEditorPart)
 
   virtual ~IEditorPart();
 
 
   /**
    * The property id for <code>getEditorInput</code>.
    */
   //static const int PROP_INPUT = IWorkbenchPartConstants.PROP_INPUT;
 
 
   /**
    * Returns the input for this editor.  If this value changes the part must
    * fire a property listener event with <code>PROP_INPUT</code>.
    *
    * @return the editor input
    */
   virtual SmartPointer<IEditorInput> GetEditorInput() const = 0;
 
   /**
    * Returns the site for this editor.
    * This method is equivalent to <code>(IEditorSite) getSite()</code>.
    * <p>
    * The site can be <code>null</code> while the editor is being initialized.
    * After the initialization is complete, this value must be non-<code>null</code>
    * for the remainder of the editor's life cycle.
    * </p>
    *
    * @return the editor site; this value may be <code>null</code> if the editor
    *         has not yet been initialized
    */
   virtual SmartPointer<IEditorSite> GetEditorSite() const = 0;
 
   /**
    * Initializes this editor with the given editor site and input.
    * <p>
    * This method is automatically called shortly after the part is instantiated.
    * It marks the start of the part's lifecycle. The
    * {@link IWorkbenchPart#dispose IWorkbenchPart.dispose} method will be called
    * automically at the end of the lifecycle. Clients must not call this method.
    * </p><p>
    * Implementors of this method must examine the editor input object type to
    * determine if it is understood.  If not, the implementor must throw
    * a <code>PartInitException</code>
    * </p>
    * @param site the editor site
    * @param input the editor input
    * @exception PartInitException if this editor was not initialized successfully
    */
   virtual void Init(SmartPointer<IEditorSite> site,
       SmartPointer<IEditorInput> input) = 0;
 };
 
 }
 
-Q_DECLARE_INTERFACE(berry::IEditorPart, "org.blueberry.IEditorPart")
+Q_DECLARE_INTERFACE(berry::IEditorPart, "org.blueberry.ui.IEditorPart")
 
 #endif /*BERRYIEDITORPART_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIEditorReference.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIEditorReference.h
index 187fd007a3..c97014a035 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIEditorReference.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIEditorReference.h
@@ -1,83 +1,83 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIEDITORREFERENCE_H_
 #define BERRYIEDITORREFERENCE_H_
 
 #include "berryIWorkbenchPartReference.h"
 #include "berryIEditorPart.h"
 #include "berryIEditorInput.h"
 
 namespace berry {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * Implements a reference to a editor.
  * The IEditorPart will not be instanciated until
  * the editor becomes visible or the API getEditor
  * is sent with true;
  * <p>
  * This interface is not intended to be implemented by clients.
  * </p>
  */
 struct BERRY_UI_QT IEditorReference : public virtual IWorkbenchPartReference
 {
 
-  berryInterfaceMacro(IEditorReference, berry);
+  berryObjectMacro(berry::IEditorReference)
 
   ~IEditorReference();
 
     /**
      * Returns the factory id of the factory used to
      * restore this editor. Returns null if the editor
      * is not persistable.
      */
     virtual QString GetFactoryId() = 0;
 
     /**
      * Returns the editor input name. May return null is the
      * name is not available or if the editor failed to be
      * restored.
      */
     virtual QString GetName() = 0;
 
     /**
      * Returns the editor referenced by this object.
      * Returns <code>null</code> if the editor was not instantiated or
      * it failed to be restored. Tries to restore the editor
      * if <code>restore</code> is true.
      */
     virtual IEditorPart::Pointer GetEditor(bool restore) = 0;
 
 
     /**
      * Returns the editor input for the editor referenced by this object.
      * <p>
      * Unlike most of the other methods on this type, this method
      * can trigger plug-in activation.
      * </p>
      *
      * @return the editor input for the editor referenced by this object
      * @throws PartInitException if there was an error restoring the editor input
      * @since 3.1
      */
     virtual IEditorInput::Pointer GetEditorInput() = 0;
 };
 
 } // namespace berry
 
 #endif /*BERRYIEDITORREFERENCE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIEditorSite.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIEditorSite.h
index 190d17d805..a0ceea03f5 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIEditorSite.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIEditorSite.h
@@ -1,133 +1,133 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIEDITORSITE_H_
 #define BERRYIEDITORSITE_H_
 
 #include "berryIWorkbenchPartSite.h"
 
 namespace berry {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * The primary interface between an editor part and the workbench.
  * <p>
  * The workbench exposes its implemention of editor part sites via this
  * interface, which is not intended to be implemented or extended by clients.
  * </p>
  * @noimplement This interface is not intended to be implemented by clients.
  */
 struct BERRY_UI_QT IEditorSite : public virtual IWorkbenchPartSite {
 
-  berryInterfaceMacro(IEditorSite, berry);
+  berryObjectMacro(berry::IEditorSite)
 
   virtual ~IEditorSite();
 
     /**
      * Returns the action bar contributor for this editor.
      * <p>
      * An action contributor is responsable for the creation of actions.
      * By design, this contributor is used for one or more editors of the same type.
      * Thus, the contributor returned by this method is not owned completely
      * by the editor - it is shared.
      * </p>
      *
      * @return the editor action bar contributor, or <code>null</code> if none exists
      */
     //virtual IEditorActionBarContributor getActionBarContributor();
 
     /**
    * Returns the action bars for this part site. Editors of the same type (and
    * in the same window) share the same action bars. Contributions to the
    * action bars are done by the <code>IEditorActionBarContributor</code>.
    *
    * @return the action bars
    * @since 2.1
    */
     //virtual IActionBars getActionBars();
 
     /**
      * <p>
      * Registers a pop-up menu with the default id for extension. The default id
      * is defined as the part id.
      * </p>
      * <p>
      * By default, context menus include object contributions based on the
      * editor input for the current editor. It is possible to override this
      * behaviour by calling this method with <code>includeEditorInput</code>
      * as <code>false</code>. This might be desirable for editors that
      * present a localized view of an editor input (e.g., a node in a model
      * editor).
      * </p>
      * <p>
      * For a detailed description of context menu registration see
      * {@link IWorkbenchPartSite#registerContextMenu(MenuManager, ISelectionProvider)}
      * </p>
      *
      * @param menuManager
      *            the menu manager; must not be <code>null</code>.
      * @param selectionProvider
      *            the selection provider; must not be <code>null</code>.
      * @param includeEditorInput
      *            Whether the editor input should be included when adding object
      *            contributions to this context menu.
      * @see IWorkbenchPartSite#registerContextMenu(MenuManager,
      *      ISelectionProvider)
      * @since 3.1
      */
 //    virtual void registerContextMenu(MenuManager menuManager,
 //            ISelectionProvider selectionProvider, boolean includeEditorInput);
 
     /**
      * <p>
      * Registers a pop-up menu with a particular id for extension. This method
      * should only be called if the target part has more than one context menu
      * to register.
      * </p>
      * <p>
      * By default, context menus include object contributions based on the
      * editor input for the current editor. It is possible to override this
      * behaviour by calling this method with <code>includeEditorInput</code>
      * as <code>false</code>. This might be desirable for editors that
      * present a localized view of an editor input (e.g., a node in a model
      * editor).
      * </p>
      * <p>
      * For a detailed description of context menu registration see
      * {@link IWorkbenchPartSite#registerContextMenu(MenuManager, ISelectionProvider)}
      * </p>
      *
      * @param menuId
      *            the menu id; must not be <code>null</code>.
      * @param menuManager
      *            the menu manager; must not be <code>null</code>.
      * @param selectionProvider
      *            the selection provider; must not be <code>null</code>.
      * @param includeEditorInput
      *            Whether the editor input should be included when adding object
      *            contributions to this context menu.
      * @see IWorkbenchPartSite#registerContextMenu(MenuManager,
      *      ISelectionProvider)
      * @since 3.1
      */
 //    virtual void registerContextMenu(String menuId, MenuManager menuManager,
 //            ISelectionProvider selectionProvider, boolean includeEditorInput);
 };
 
 }
 
 #endif /*BERRYIEDITORSITE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIFileEditorMapping.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIFileEditorMapping.h
index e7676e2c48..450d12df2d 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIFileEditorMapping.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIFileEditorMapping.h
@@ -1,110 +1,111 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIFILEEDITORMAPPING_H_
 #define BERRYIFILEEDITORMAPPING_H_
 
 #include <berryMacros.h>
 
 #include "berryIEditorDescriptor.h"
 
 
 namespace berry {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * An association between a file name/extension and a list of known editors for
  * files of that type.
  * <p>
  * The name and extension can never empty or null. The name may contain
  * the single wild card character (*) to indicate the editor applies to
  * all files with the same extension (e.g. *.doc). The name can never
  * embed the wild card character within itself (i.e. rep*)
  * </p>
  * <p>
  * This interface is not intended to be implemented by clients.
  * </p>
  *
  * @see IEditorRegistry#getFileEditorMappings
  * @noimplement This interface is not intended to be implemented by clients.
  */
-struct BERRY_UI_QT IFileEditorMapping : public Object {
+struct BERRY_UI_QT IFileEditorMapping : public Object
+{
 
-  berryInterfaceMacro(IFileEditorMapping, berry);
+  berryObjectMacro(berry::IFileEditorMapping)
 
   virtual ~IFileEditorMapping();
 
     /**
      * Returns the default editor registered for this type mapping.
      *
      * @return the descriptor of the default editor, or <code>null</code> if there
      *   is no default editor registered. Will also return <code>null</code> if
      *   the default editor exists but fails the Expressions check.
      */
     virtual IEditorDescriptor::Pointer GetDefaultEditor() = 0;
 
     /**
      * Returns the list of editors registered for this type mapping.
      *
      * @return a possibly empty list of editors.
      */
     virtual QList<IEditorDescriptor::Pointer> GetEditors() const = 0;
 
     /**
      * Returns the list of editors formerly registered for this type mapping
      * which have since been deleted.
      *
      * @return a possibly empty list of editors
      */
     virtual QList<IEditorDescriptor::Pointer> GetDeletedEditors() const = 0;
 
     /**
      * Returns the file's extension for this type mapping.
      *
      * @return the extension for this mapping
      */
     virtual QString GetExtension() const = 0;
 
     /**
      * Returns the descriptor of the image to use for a file of this type.
      * <p>
      * The image is obtained from the default editor. A default file image is
      * returned if no default editor is available.
      * </p>
      *
      * @return the descriptor of the image to use for a resource of this type
      */
     //virtual ImageDescriptor GetImageDescriptor() = 0;
 
     /**
      * Returns the label to use for this mapping.
      * Labels have the form "<it>name</it>.<it>extension</it>".
      *
      * @return the label to use for this mapping
      */
     virtual QString GetLabel() const = 0;
 
     /**
      * Returns the file's name for this type mapping.
      *
      * @return the name for this mapping
      */
     virtual QString GetName() const = 0;
 };
 
 }
 #endif /*BERRYIFILEEDITORMAPPING_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIFolderLayout.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIFolderLayout.h
index 565ae8e4bd..4aac14907f 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIFolderLayout.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIFolderLayout.h
@@ -1,56 +1,57 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIFOLDERLAYOUT_H_
 #define BERRYIFOLDERLAYOUT_H_
 
 #include "berryIPlaceholderFolderLayout.h"
 
 namespace berry {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * An <code>IFolderLayout</code> is used to define the initial views within a folder.
  * The folder itself is contained within an <code>IPageLayout</code>.
  * <p>
  * This interface is not intended to be implemented by clients.
  * </p>
  *
  * @see IPageLayout#createFolder
  * @noimplement This interface is not intended to be implemented by clients.
  */
-struct BERRY_UI_QT IFolderLayout : public IPlaceholderFolderLayout {
+struct BERRY_UI_QT IFolderLayout : public IPlaceholderFolderLayout
+{
 
-  berryInterfaceMacro(IFolderLayout, berry);
+  berryObjectMacro(berry::IFolderLayout)
 
   ~IFolderLayout();
 
     /**
      * Adds a view with the given compound id to this folder.
      * See the {@link IPageLayout} type documentation for more details about compound ids.
      * The primary id must name a view contributed to the workbench's view extension point
      * (named <code>"org.blueberry.ui.views"</code>).
      *
      * @param viewId the view id
      */
     virtual void AddView(const QString& viewId) = 0;
 };
 
 }
 
 #endif /*BERRYIFOLDERLAYOUT_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIMemento.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIMemento.h
index f1caa839f5..fad592d2eb 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIMemento.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIMemento.h
@@ -1,250 +1,250 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIMEMENTO_H_
 #define BERRYIMEMENTO_H_
 
 #include <berryMacros.h>
 #include <berryObject.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include <QString>
 
 namespace berry
 {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * Interface to a memento used for saving the important state of an object
  * in a form that can be persisted in the file system.
  * <p>
  * Mementos were designed with the following requirements in mind:
  * <ol>
  *  <li>Certain objects need to be saved and restored across platform sessions.
  *    </li>
  *  <li>When an object is restored, an appropriate class for an object might not
  *    be available. It must be possible to skip an object in this case.</li>
  *  <li>When an object is restored, the appropriate class for the object may be
  *    different from the one when the object was originally saved. If so, the
  *    new class should still be able to read the old form of the data.</li>
  * </ol>
  * </p>
  * <p>
  * Mementos meet these requirements by providing support for storing a
  * mapping of arbitrary string keys to primitive values, and by allowing
  * mementos to have other mementos as children (arranged into a tree).
  * A robust external storage format based on XML is used.
  * </p><p>
  * The key for an attribute may be any alpha numeric value.  However, the
  * value of <code>TAG_ID</code> is reserved for internal use.
  * </p><p>
  * This interface is not intended to be implemented or extended by clients.
  * </p>
  *
  * @see IPersistableElement
  * @see IElementFactory
  * @noimplement This interface is not intended to be implemented by clients.
  *
  **/
 struct BERRY_UI_QT IMemento: public Object
 {
-berryInterfaceMacro(IMemento, berry);
+  berryObjectMacro(berry::IMemento)
 
   /**
    * Special reserved key used to store the memento id
    * (value <code>"IMemento.internal.id"</code>).
    *
    * @see #getID()
    */
   static const QString TAG_ID; // = "IMemento.internal.id";
 
   /**
    * Creates a new child of this memento with the given type.
    * <p>
    * The <code>GetChild</code> and <code>GetChildren</code> methods
    * are used to retrieve children of a given type.
    * </p>
    *
    * @param type the type
    * @return a new child memento
    * @see #GetChild
    * @see #GetChildren
    */
   virtual IMemento::Pointer CreateChild(const QString& type) = 0;
 
   /**
    * Creates a new child of this memento with the given type and id.
    * The id is stored in the child memento (using a special reserved
    * key, <code>TAG_ID</code>) and can be retrieved using <code>GetID</code>.
    * <p>
    * The <code>GetChild</code> and <code>GetChildren</code> methods
    * are used to retrieve children of a given type.
    * </p>
    *
    * @param type the type
    * @param id the child id
    * @return a new child memento with the given type and id
    * @see #GetID
    */
   virtual IMemento::Pointer CreateChild(const QString& type,
       const QString& id) = 0;
 
   /**
    * Returns the first child with the given type id.
    *
    * @param type the type id
    * @return the first child with the given type
    */
   virtual IMemento::Pointer GetChild(const QString& type) const = 0;
 
   /**
    * Returns all children with the given type id.
    *
    * @param type the type id
    * @return an array of children with the given type
    */
   virtual QList<IMemento::Pointer>
       GetChildren(const QString& type) const = 0;
 
   /**
    * Gets the floating point value of the given key.
    *
    * @param key the key
    * @param value the value of the given key
    * @return false if the key was not found or was found
    *   but was not a floating point number, else true
    */
   virtual bool GetFloat(const QString& key, double& value) const = 0;
 
   /**
    * Gets the integer value of the given key.
    *
    * @param key the key
    * @param value the value of the given key
    * @return false if the key was not found or was found
    *   but was not an integer, else true
    */
   virtual bool GetInteger(const QString& key, int& value) const = 0;
 
   /**
    * Gets the string value of the given key.
    *
    * @param key the key
    * @param value the value of the given key
    * @return false if the key was not found, else true
    */
   virtual bool GetString(const QString& key, QString& value) const = 0;
 
   /**
    * Gets the boolean value of the given key.
    *
    * @param key the key
    * @param value the value of the given key
    * @return false if the key was not found, else true
    */
   virtual bool GetBoolean(const QString& key, bool& value) const = 0;
 
   /**
    * Returns the data of the Text node of the memento. Each memento is allowed
    * only one Text node.
    *
    * @return the data of the Text node of the memento, or <code>null</code>
    * if the memento has no Text node.
    */
   virtual QString GetTextData() const = 0;
 
   /**
    * Returns an array of all the attribute keys of the memento. This will not
    * be <code>null</code>. If there are no keys, an array of length zero will
    * be returned.
    * @return an array with all the attribute keys of the memento
    */
   virtual QList<QString> GetAttributeKeys() const = 0;
 
   /**
    * Returns the type for this memento.
    *
    * @return the memento type
    * @see #CreateChild(const QString&)
    * @see #CreateChild(const QString&, const QString&)
    */
   virtual QString GetType() const = 0;
 
   /**
    * Returns the id for this memento.
    *
    * @return the memento id, or <code>""</code> if none
    * @see #CreateChild(const QString&, const QString&)
    */
   virtual QString GetID() const = 0;
 
   /**
    * Sets the value of the given key to the given floating point number.
    *
    * @param key the key
    * @param value the value
    */
   virtual void PutFloat(const QString& key, double value) = 0;
 
   /**
    * Sets the value of the given key to the given integer.
    *
    * @param key the key
    * @param value the value
    */
   virtual void PutInteger(const QString& key, int value) = 0;
 
   /**
    * Copy the attributes and children from  <code>memento</code>
    * to the receiver.
    *
    * @param memento the IMemento to be copied.
    */
   virtual void PutMemento(IMemento::Pointer memento) = 0;
 
   /**
    * Sets the value of the given key to the given const QString&.
    *
    * @param key the key
    * @param value the value
    */
   virtual void PutString(const QString& key, const QString& value) = 0;
 
   /**
    * Sets the value of the given key to the given boolean value.
    *
    * @param key the key
    * @param value the value
    */
   virtual void PutBoolean(const QString& key, bool value) = 0;
 
   /**
    * Sets the memento's Text node to contain the given data. Creates the Text node if
    * none exists. If a Text node does exist, it's current contents are replaced.
    * Each memento is allowed only one text node.
    *
    * @param data the data to be placed on the Text node
    */
   virtual void PutTextData(const QString& data) = 0;
 
   virtual ~IMemento();
 };
 
 } // namespace berry
 
 #endif /*BERRYIMEMENTO_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryINullSelectionListener.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryINullSelectionListener.h
index c967d18a22..3eb43cc838 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryINullSelectionListener.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryINullSelectionListener.h
@@ -1,101 +1,103 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYINULLSELECTIONLISTENER_H_
 #define BERRYINULLSELECTIONLISTENER_H_
 
 #include "berryISelectionListener.h"
 
 namespace berry
 {
 
 /**
  * Interface for listening to <code>null</code> selection changes.
  * <p>
  * This interface should be implemented by selection listeners
  * that want to be notified when the selection becomes <code>null</code>.
  * It has no methods. It simply indicates the desire to receive
  * <code>null</code> selection events through the existing
  * <code>SelectionChanged()</code> method. Either the part or the
  * selection may be <code>null</code>.
  * </p>
  *
  * @see ISelectionListener#SelectionChanged()
  * @see IActionDelegate#SelectionChanged()
  * @see ISelectionListener
  *
  */
-struct BERRY_UI_QT INullSelectionListener : public ISelectionListener {
-  berryInterfaceMacro(INullSelectionListener, berry)
+struct BERRY_UI_QT INullSelectionListener : public ISelectionListener
+{
+  berryObjectMacro(berry::INullSelectionListener)
 
   ~INullSelectionListener();
 };
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * This template can be used like this:
  *
  * <code>
  * class MyClass {
  *
  *   private:
  *     void HandleSelectionChanged(berry::IWorkbenchPart::Pointer part, berry::ISelection::ConstPointer selection)
  *     { // do something }
  *
  *     berry::INullSelectionListener::Pointer m_SelectionListener;
  *
  *   public:
  *     MyClass()
  *     : m_SelectionListener(new berry::NullSelectionChangedAdapter<MyClass>(this, &MyClass::HandleSelectionChanged))
  *     {
  *       // get the selection service
  *       // ...
  *       service->AddPostSelectionListener(m_SelectionListener);
  *     }
  * };
  * </code>
  */
 template<typename R>
 struct NullSelectionChangedAdapter: public INullSelectionListener
 {
 
   typedef R Listener;
   typedef void
-      (R::*Callback)(IWorkbenchPart::Pointer, ISelection::ConstPointer);
+      (R::*Callback)(const IWorkbenchPart::Pointer&, const ISelection::ConstPointer&);
 
   NullSelectionChangedAdapter(R* l, Callback c) :
     listener(l), callback(c)
   {
     poco_assert(listener);
     poco_assert(callback);
   }
 
-  void SelectionChanged(IWorkbenchPart::Pointer part, ISelection::ConstPointer selection)
+  void SelectionChanged(const IWorkbenchPart::Pointer& part,
+                        const ISelection::ConstPointer& selection)
   {
     (listener->*callback)(part, selection);
   }
 
 private:
 
   Listener* listener;
   Callback callback;
 };
 
 }
 
 #endif /* BERRYINULLSELECTIONLISTENER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPageLayout.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPageLayout.h
index bec1dfe34b..2b41762ff0 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPageLayout.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPageLayout.h
@@ -1,502 +1,502 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIPAGELAYOUT_H_
 #define BERRYIPAGELAYOUT_H_
 
 #include "berryIFolderLayout.h"
 #include "berryIPlaceholderFolderLayout.h"
 #include "berryIViewLayout.h"
 #include "berryIPerspectiveDescriptor.h"
 
 #include <string>
 
 namespace berry {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * A page layout defines the initial layout for a perspective within a page
  * in a workbench window.
  * <p>
  * This interface is not intended to be implemented by clients.
  * </p>
  * <p>
  * When a perspective is opened, it creates a new page layout with a single editor area.
  * This layout is then passed to the perspective factory (implementation of
  * {@link org.blueberry.ui.IPerspectiveFactory#createInitialLayout(IPageLayout)}) where
  * additional views and other content can be added, using the existing editor area as
  * the initial point of reference.
  * </p>
  * <p>
  * In some cases, multiple instances of a particular view may need to be added
  * to the same layout.  These are disambiguated using a secondary id.
  * In layout methods taking a view id, the id can have the compound form:
  * <strong>primaryId [':' secondaryId]</strong>.
  * If a secondary id is given, the view must allow multiple instances by
  * having specified <code>allowMultiple="true"</code> in its extension.
  * View placeholders may also have a secondary id.
  * </p>
  * <p>
  * Wildcards are permitted in placeholder ids (but not regular view ids).
  * '*' matches any substring, '?' matches any single character.
  * Wildcards can be specified for the primary id, the secondary id, or both.
  * For example, the placeholder "someView:*" will match any occurrence of the view
  * that has primary id "someView" and that also has some non-null secondary id.
  * Note that this placeholder will not match the view if it has no secondary id,
  * since the compound id in this case is simply "someView".
  * </p>
  * <p>
  * Example of populating a layout with standard workbench views:
  * <pre>
  * IPageLayout layout = ...
  * // Get the editor area.
  * String editorArea = layout.getEditorArea();
  *
  * // Top left: Resource Navigator view and Bookmarks view placeholder
  * IFolderLayout topLeft = layout.createFolder("topLeft", IPageLayout.LEFT, 0.25f,
  *    editorArea);
  * topLeft.addView(IPageLayout.ID_RES_NAV);
  * topLeft.addPlaceholder(IPageLayout.ID_BOOKMARKS);
  *
  * // Bottom left: Outline view and Property Sheet view
  * IFolderLayout bottomLeft = layout.createFolder("bottomLeft", IPageLayout.BOTTOM, 0.50f,
  *     "topLeft");
  * bottomLeft.addView(IPageLayout.ID_OUTLINE);
  * bottomLeft.addView(IPageLayout.ID_PROP_SHEET);
  *
  * // Bottom right: Task List view
  * layout.addView(IPageLayout.ID_TASK_LIST, IPageLayout.BOTTOM, 0.66f, editorArea);
  * </pre>
  * </p>
  * @noimplement This interface is not intended to be implemented by clients.
  */
 struct BERRY_UI_QT IPageLayout : public Object
 {
 
-  berryInterfaceMacro(IPageLayout, berry)
+  berryObjectMacro(berry::IPageLayout)
 
     /**
      * The part id for the workbench's editor area.  This may only be used
      * as a reference part for view addition.
      */
     static const QString ID_EDITOR_AREA; // = "org.blueberry.ui.editors";
 
     /**
      * The view id for the workbench's Resource Navigator standard component.
      */
     static const QString ID_RES_NAV; // = "org.blueberry.ui.views.ResourceNavigator";
 
     /**
      * The view id for the workbench's Property Sheet standard component.
      */
     static const QString ID_PROP_SHEET; // = "org.blueberry.ui.views.PropertySheet";
 
     /**
      * The view id for the workbench's Content Outline standard component.
      */
     static const QString ID_OUTLINE; // = "org.blueberry.ui.views.ContentOutline";
 
     /**
      * The view id for the workbench's Bookmark Navigator standard component.
      */
     static const QString ID_BOOKMARKS; // = "org.blueberry.ui.views.BookmarkView";
 
     /**
      * The view id for the workbench's Problems View standard component.
      * @since 3.0
      */
     static const QString ID_PROBLEM_VIEW; // = "org.blueberry.ui.views.ProblemView";
 
     /**
      * The view id for the workbench's Progress View standard component.
      * @since 3.2
      */
     static const QString ID_PROGRESS_VIEW; // = "org.blueberry.ui.views.ProgressView";
 
     /**
      * The view id for the workbench's Task List standard component.
      */
     static const QString ID_TASK_LIST; // = "org.blueberry.ui.views.TaskList";
 
     /**
      * Id of the navigate action set.
      * (value <code>"org.blueberry.ui.NavigateActionSet"</code>)
      * @since 2.1
      */
     static const QString ID_NAVIGATE_ACTION_SET; // = "org.blueberry.ui.NavigateActionSet";
 
     /**
      * Relationship constant indicating a part should be placed to the left of
      * its relative.
      */
     static const int LEFT; // = 1;
 
     /**
      * Relationship constant indicating a part should be placed to the right of
      * its relative.
      */
     static const int RIGHT; // = 2;
 
     /**
      * Relationship constant indicating a part should be placed above its
      * relative.
      */
     static const int TOP; // = 3;
 
     /**
      * Relationship constant indicating a part should be placed below its
      * relative.
      */
     static const int BOTTOM; // = 4;
 
     /**
      * Minimum acceptable ratio value when adding a view
      * @since 2.0
      */
     static const float RATIO_MIN; // = 0.05f;
 
     /**
      * Maximum acceptable ratio value when adding a view
      * @since 2.0
      */
     static const float RATIO_MAX; // = 0.95f;
 
     /**
      * The default view ratio width for regular (non-fast) views.
      * @since 2.0
      */
     static const float DEFAULT_VIEW_RATIO; // = 0.5f;
 
     /**
      * A variable used to represent invalid  ratios.
      * @since 2.0
      */
     static const float INVALID_RATIO; // = -1f;
 
     /**
      * A variable used to represent a ratio which has not been specified.
      * @since 2.0
      */
     static const float NULL_RATIO; // = -2f;
 
     /**
      * Adds an action set with the given id to this page layout.
      * The id must name an action set contributed to the workbench's extension
      * point (named <code>"org.blueberry.ui.actionSet"</code>).
      *
      * @param actionSetId the action set id
      */
     //virtual void AddActionSet(const QString& actionSetId) = 0;
 
 
     /**
      * Adds a perspective shortcut to the page layout.
      * These are typically shown in the UI to allow rapid navigation to appropriate new wizards.
      * For example, in the Eclipse IDE, these appear as items under the Window > Open Perspective menu.
      * The id must name a perspective extension contributed to the
      * workbench's perspectives extension point (named <code>"org.blueberry.ui.perspectives"</code>).
      *
      * @param id the perspective id
      */
     virtual void AddPerspectiveShortcut(const QString& id) = 0;
 
     /**
      * Adds a view placeholder to this page layout.
      * A view placeholder is used to define the position of a view before the view
      * appears.  Initially, it is invisible; however, if the user ever opens a view
      * whose compound id matches the placeholder, the view will appear at the same
      * location as the placeholder.
      * See the {@link IPageLayout} type documentation for more details about compound ids.
      * If the placeholder contains wildcards, it remains in the layout, otherwise
      * it is replaced by the view.
      * If the primary id of the placeholder has no wildcards, it must refer to a view
      * contributed to the workbench's view extension point
      * (named <code>"org.blueberry.ui.views"</code>).
      *
      * @param viewId the compound view id (wildcards allowed)
      * @param relationship the position relative to the reference part;
      *  one of <code>TOP</code>, <code>BOTTOM</code>, <code>LEFT</code>,
      *  or <code>RIGHT</code>
      * @param ratio a ratio specifying how to divide the space currently occupied by the reference part,
      *    in the range <code>0.05f</code> to <code>0.95f</code>.
      *    Values outside this range will be clipped to facilitate direct manipulation.
      *    For a vertical split, the part on top gets the specified ratio of the current space
      *    and the part on bottom gets the rest.
      *    Likewise, for a horizontal split, the part at left gets the specified ratio of the current space
      *    and the part at right gets the rest.
      * @param refId the id of the reference part; either a view id, a folder id,
      *   or the special editor area id returned by <code>getEditorArea</code>
      */
     virtual void AddPlaceholder(const QString& viewId, int relationship, float ratio,
             const QString& refId) = 0;
 
     /**
      * Adds an item to the Show In prompter.
      * The id must name a view contributed to the workbench's view extension point
      * (named <code>"org.blueberry.ui.views"</code>).
      *
      * @param id the view id
      *
      * @since 2.1
      */
     virtual void AddShowInPart(const QString& id) = 0;
 
     /**
      * Adds a show view shortcut to the page layout.
      * These are typically shown in the UI to allow rapid navigation to appropriate views.
      * For example, in the Eclipse IDE, these appear as items under the Window > Show View menu.
      * The id must name a view contributed to the workbench's views extension point
      * (named <code>"org.blueberry.ui.views"</code>).
      *
      * @param id the view id
      */
     virtual void AddShowViewShortcut(const QString& id) = 0;
 
     /**
      * Adds a view with the given compound id to this page layout.
      * See the {@link IPageLayout} type documentation for more details about compound ids.
      * The primary id must name a view contributed to the workbench's view extension point
      * (named <code>"org.blueberry.ui.views"</code>).
      *
      * @param viewId the compound view id
      * @param relationship the position relative to the reference part;
      *  one of <code>TOP</code>, <code>BOTTOM</code>, <code>LEFT</code>,
      *  or <code>RIGHT</code>
      * @param ratio a ratio specifying how to divide the space currently occupied by the reference part,
      *    in the range <code>0.05f</code> to <code>0.95f</code>.
      *    Values outside this range will be clipped to facilitate direct manipulation.
      *    For a vertical split, the part on top gets the specified ratio of the current space
      *    and the part on bottom gets the rest.
      *    Likewise, for a horizontal split, the part at left gets the specified ratio of the current space
      *    and the part at right gets the rest.
      * @param refId the id of the reference part; either a view id, a folder id,
      *   or the special editor area id returned by <code>getEditorArea</code>
      */
     virtual void AddView(const QString& viewId, int relationship, float ratio,
             const QString& refId) = 0;
 
     /**
      * Creates and adds a new folder with the given id to this page layout.
      * The position and relative size of the folder is expressed relative to
      * a reference part.
      *
      * @param folderId the id for the new folder.  This must be unique within
      *  the layout to avoid collision with other parts.
      * @param relationship the position relative to the reference part;
      *  one of <code>TOP</code>, <code>BOTTOM</code>, <code>LEFT</code>,
      *  or <code>RIGHT</code>
      * @param ratio a ratio specifying how to divide the space currently occupied by the reference part,
      *    in the range <code>0.05f</code> to <code>0.95f</code>.
      *    Values outside this range will be clipped to facilitate direct manipulation.
      *    For a vertical split, the part on top gets the specified ratio of the current space
      *    and the part on bottom gets the rest.
      *    Likewise, for a horizontal split, the part at left gets the specified ratio of the current space
      *    and the part at right gets the rest.
      * @param refId the id of the reference part; either a view id, a folder id,
      *   or the special editor area id returned by <code>getEditorArea</code>
      * @return the new folder
      */
     virtual IFolderLayout::Pointer CreateFolder(const QString& folderId, int relationship,
             float ratio, const QString& refId) = 0;
 
     /**
      * Creates and adds a placeholder for a new folder with the given id to this page layout.
      * The position and relative size of the folder is expressed relative to
      * a reference part.
      *
      * @param folderId the id for the new folder.  This must be unique within
      *  the layout to avoid collision with other parts.
      * @param relationship the position relative to the reference part;
      *  one of <code>TOP</code>, <code>BOTTOM</code>, <code>LEFT</code>,
      *  or <code>RIGHT</code>
      * @param ratio a ratio specifying how to divide the space currently occupied by the reference part,
      *    in the range <code>0.05f</code> to <code>0.95f</code>.
      *    Values outside this range will be clipped to facilitate direct manipulation.
      *    For a vertical split, the part on top gets the specified ratio of the current space
      *    and the part on bottom gets the rest.
      *    Likewise, for a horizontal split, the part at left gets the specified ratio of the current space
      *    and the part at right gets the rest.
      * @param refId the id of the reference part; either a view id, a folder id,
      *   or the special editor area id returned by <code>getEditorArea</code>
      * @return a placeholder for the new folder
      * @since 2.0
      */
     virtual IPlaceholderFolderLayout::Pointer CreatePlaceholderFolder(const QString& folderId,
             int relationship, float ratio, const QString& refId) = 0;
 
     /**
      * Returns the special identifier for the editor area in this page
      * layout.  The identifier for the editor area is also stored in
      * <code>ID_EDITOR_AREA</code>.
      * <p>
      * The editor area is automatically added to each layout before anything else.
      * It should be used as the point of reference when adding views to a layout.
      * </p>
      *
      * @return the special id of the editor area
      */
     virtual QString GetEditorArea() = 0;
 
     /**
      * Returns whether the page's layout will show
      * the editor area.
      *
      * @return <code>true</code> when editor area visible, <code>false</code> otherwise
      */
     virtual bool IsEditorAreaVisible() = 0;
 
     /**
      * Show or hide the editor area for the page's layout.
      *
      * @param showEditorArea <code>true</code> to show the editor area, <code>false</code> to hide the editor area
      */
     virtual void SetEditorAreaVisible(bool showEditorArea) = 0;
 
     /**
      * Sets whether this layout is fixed.
      * In a fixed layout, layout parts cannot be moved or zoomed, and the initial
      * set of views cannot be closed.
      *
      * @param isFixed <code>true</code> if this layout is fixed, <code>false</code> if not
      * @since 3.0
      */
     virtual void SetFixed(bool isFixed) = 0;
 
     /**
      * Returns <code>true</code> if this layout is fixed, <code>false</code> if not.
      * In a fixed layout, layout parts cannot be moved or zoomed, and the initial
      * set of views cannot be closed.
      * The default is <code>false</code>.
      *
      * @return <code>true</code> if this layout is fixed, <code>false</code> if not.
      * @since 3.0
      */
     virtual bool IsFixed() = 0;
 
     /**
      * Returns the layout for the view or placeholder with the given compound id in
      * this page layout.
      * See the {@link IPageLayout} type documentation for more details about compound ids.
      * Returns <code>null</code> if the specified view or placeholder is unknown to the layout.
      *
      * @param id the compound view id or placeholder
      * @return the view layout, or <code>null</code>
      * @since 3.0
      */
     virtual IViewLayout::Pointer GetViewLayout(const QString& id) = 0;
 
     /**
      * Adds a standalone view with the given compound id to this page layout.
      * See the {@link IPageLayout} type documentation for more details about compound ids.
      * A standalone view cannot be docked together with other views.
      * A standalone view's title can optionally be hidden.  If hidden,
      * then any controls typically shown with the title (such as the close button)
      * are also hidden.  Any contributions or other content from the view itself
      * are always shown (e.g. toolbar or view menu contributions, content description).
      * <p>
      * The id must name a view contributed to the workbench's view extension point
      * (named <code>"org.blueberry.ui.views"</code>).
      * </p>
      *
      * @param viewId the compound view id
      * @param showTitle <code>true</code> to show the title and related controls,
      *  <code>false</code> to hide them
      * @param relationship the position relative to the reference part;
      *  one of <code>TOP</code>, <code>BOTTOM</code>, <code>LEFT</code>,
      *  or <code>RIGHT</code>
      * @param ratio a ratio specifying how to divide the space currently occupied by the reference part,
      *    in the range <code>0.05f</code> to <code>0.95f</code>.
      *    Values outside this range will be clipped to facilitate direct manipulation.
      *    For a vertical split, the part on top gets the specified ratio of the current space
      *    and the part on bottom gets the rest.
      *    Likewise, for a horizontal split, the part at left gets the specified ratio of the current space
      *    and the part at right gets the rest.
      * @param refId the id of the reference part; either a view id, a folder id,
      *   or the special editor area id returned by <code>getEditorArea</code>
      *
      * @since 3.0
      */
     virtual void AddStandaloneView(const QString& viewId, bool showTitle,
             int relationship, float ratio, const QString& refId) = 0;
 
     /**
    * Adds a standalone view placeholder to this page layout. A view
    * placeholder is used to define the position of a view before the view
    * appears. Initially, it is invisible; however, if the user ever opens a
    * view whose compound id matches the placeholder, the view will appear at
    * the same location as the placeholder. See the {@link IPageLayout} type
    * documentation for more details about compound ids. If the placeholder
    * contains wildcards, it remains in the layout, otherwise it is replaced by
    * the view. If the primary id of the placeholder has no wildcards, it must
    * refer to a view contributed to the workbench's view extension point
    * (named <code>"org.blueberry.ui.views"</code>).
    *
    * @param viewId
    *            the compound view id (wildcards allowed)
    * @param relationship
    *            the position relative to the reference part; one of
    *            <code>TOP</code>, <code>BOTTOM</code>, <code>LEFT</code>,
    *            or <code>RIGHT</code>
    * @param ratio
    *            a ratio specifying how to divide the space currently occupied
    *            by the reference part, in the range <code>0.05f</code> to
    *            <code>0.95f</code>. Values outside this range will be
    *            clipped to facilitate direct manipulation. For a vertical
    *            split, the part on top gets the specified ratio of the current
    *            space and the part on bottom gets the rest. Likewise, for a
    *            horizontal split, the part at left gets the specified ratio of
    *            the current space and the part at right gets the rest.
    * @param refId
    *            the id of the reference part; either a view id, a folder id,
    *            or the special editor area id returned by
    *            <code>getEditorArea</code>
    * @param showTitle
    *            true to show the view's title, false if not
    *
    * @since 3.2
    */
     virtual void AddStandaloneViewPlaceholder(const QString& viewId, int relationship,
       float ratio, const QString& refId, bool showTitle) = 0;
 
 
     /**
    * Returns the perspective descriptor for the perspective being layed out.
    *
    * @return the perspective descriptor for the perspective being layed out
    * @since 3.2
    */
     virtual IPerspectiveDescriptor::Pointer GetDescriptor() = 0;
 
     /**
    * Returns the folder layout for the view or placeholder with the given
    * compound id in this page layout. See the {@link IPageLayout} type
    * documentation for more details about compound ids. Returns
    * <code>null</code> if the specified view or placeholder is unknown to
    * the layout, or the placeholder was not in a folder.
    *
    * @param id
    *            the compound view id or placeholder. Must not be
    *            <code>null</code>.
    * @return the folder layout, or <code>null</code>
    * @since 3.3
    */
     virtual IPlaceholderFolderLayout::Pointer GetFolderForView(const QString& id) = 0;
 };
 
 }
 
 #endif /*BERRYIPAGELAYOUT_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPageService.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPageService.h
index 2673554a3b..e0dc1c7fca 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPageService.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPageService.h
@@ -1,108 +1,110 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIPAGESERVICE_H_
 #define BERRYIPAGESERVICE_H_
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include  "berryIPerspectiveListener.h"
 
 namespace berry {
 
 struct IWorkbenchPage;
 
 /**
  * A page service tracks the page and perspective lifecycle events
  * within a workbench window.
  * <p>
  * This service can be acquired from your service locator:
  * <pre>
  *  IPageService service = (IPageService) getSite().getService(IPageService.class);
  * </pre>
  * <ul>
  * <li>This service is not available globally, only from the workbench window level down.</li>
  * </ul>
  * </p>
  *
  * @see IWorkbenchWindow
  * @see IPageListener
  * @see IPerspectiveListener
  * @see org.blueberry.ui.services.IServiceLocator#getService(Class)
  * @noimplement This interface is not intended to be implemented by clients.
  */
 struct BERRY_UI_QT IPageService {
 
     virtual ~IPageService();
 
    /**
      * Adds the given listener for page lifecycle events.
      * Has no effect if an identical listener is already registered.
    * <p>
    * <b>Note:</b> listeners should be removed when no longer necessary. If
    * not, they will be removed when the IServiceLocator used to acquire this
    * service is disposed.
    * </p>
      *
      * @param listener a page listener
      * @see #removePageListener(IPageListener)
      */
     //virtual void AddPageListener(IPageListener listener);
 
     /**
      * Adds the given listener for a page's perspective lifecycle events.
      * Has no effect if an identical listener is already registered.
    * <p>
    * <b>Note:</b> listeners should be removed when no longer necessary. If
    * not, they will be removed when the IServiceLocator used to acquire this
    * service is disposed.
    * </p>
      *
      * @param listener a perspective listener
      * @see #removePerspectiveListener(IPerspectiveListener)
      */
-    virtual void AddPerspectiveListener(IPerspectiveListener::Pointer listener) = 0;
+    virtual void AddPerspectiveListener(IPerspectiveListener* listener) = 0;
 
     /**
      * Returns the active page.
      *
      * @return the active page, or <code>null</code> if no page is currently active
      */
-    virtual SmartPointer<IWorkbenchPage> GetActivePage() = 0;
+    virtual SmartPointer<IWorkbenchPage> GetActivePage() const = 0;
 
     /**
      * Removes the given page listener.
      * Has no affect if an identical listener is not registered.
      *
      * @param listener a page listener
      */
     //virtual void RemovePageListener(IPageListener listener);
 
     /**
      * Removes the given page's perspective listener.
      * Has no affect if an identical listener is not registered.
      *
      * @param listener a perspective listener
      */
-    virtual void RemovePerspectiveListener(IPerspectiveListener::Pointer listener) = 0;
+    virtual void RemovePerspectiveListener(IPerspectiveListener* listener) = 0;
 
     virtual IPerspectiveListener::Events& GetPerspectiveEvents() = 0;
 };
 
 }
 
+Q_DECLARE_INTERFACE(berry::IPageService, "org.blueberry.ui.IPageService")
+
 #endif /* BERRYIPAGESERVICE_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPartListener.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPartListener.cpp
index 1cf1d7a88b..f14b561856 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPartListener.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPartListener.cpp
@@ -1,63 +1,67 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryIPartListener.h"
 
 namespace berry {
 
 void
 IPartListener::Events
-::AddListener(IPartListener::Pointer l)
+::AddListener(IPartListener* l)
 {
-  if (l.IsNull()) return;
+  if (l == NULL) return;
 
   Types t = l->GetPartEventTypes();
 
   if (t & ACTIVATED)
-    partActivated += Delegate(l.GetPointer(), &IPartListener::PartActivated);
+    partActivated += Delegate(l, &IPartListener::PartActivated);
   if (t & BROUGHT_TO_TOP)
-    partBroughtToTop += Delegate(l.GetPointer(), &IPartListener::PartBroughtToTop);
+    partBroughtToTop += Delegate(l, &IPartListener::PartBroughtToTop);
   if (t & CLOSED)
-    partClosed += Delegate(l.GetPointer(), &IPartListener::PartClosed);
+    partClosed += Delegate(l, &IPartListener::PartClosed);
   if (t & DEACTIVATED)
-    partDeactivated += Delegate(l.GetPointer(), &IPartListener::PartDeactivated);
+    partDeactivated += Delegate(l, &IPartListener::PartDeactivated);
   if (t & OPENED)
-    partOpened += Delegate(l.GetPointer(), &IPartListener::PartOpened);
+    partOpened += Delegate(l, &IPartListener::PartOpened);
   if (t & HIDDEN)
-    partHidden += Delegate(l.GetPointer(), &IPartListener::PartHidden);
+    partHidden += Delegate(l, &IPartListener::PartHidden);
   if (t & VISIBLE)
-    partVisible += Delegate(l.GetPointer(), &IPartListener::PartVisible);
+    partVisible += Delegate(l, &IPartListener::PartVisible);
   if (t & INPUT_CHANGED)
-    partInputChanged += Delegate(l.GetPointer(), &IPartListener::PartInputChanged);
+    partInputChanged += Delegate(l, &IPartListener::PartInputChanged);
 }
 
 void
 IPartListener::Events
-::RemoveListener(IPartListener::Pointer l)
+::RemoveListener(IPartListener* l)
+{
+  if (l == NULL) return;
+
+  partActivated -= Delegate(l, &IPartListener::PartActivated);
+  partBroughtToTop -= Delegate(l, &IPartListener::PartBroughtToTop);
+  partClosed -= Delegate(l, &IPartListener::PartClosed);
+  partDeactivated -= Delegate(l, &IPartListener::PartDeactivated);
+  partOpened -= Delegate(l, &IPartListener::PartOpened);
+  partHidden -= Delegate(l, &IPartListener::PartHidden);
+  partVisible -= Delegate(l, &IPartListener::PartVisible);
+  partInputChanged -= Delegate(l, &IPartListener::PartInputChanged);
+}
+
+IPartListener::~IPartListener()
 {
-  if (l.IsNull()) return;
-
-  partActivated -= Delegate(l.GetPointer(), &IPartListener::PartActivated);
-  partBroughtToTop -= Delegate(l.GetPointer(), &IPartListener::PartBroughtToTop);
-  partClosed -= Delegate(l.GetPointer(), &IPartListener::PartClosed);
-  partDeactivated -= Delegate(l.GetPointer(), &IPartListener::PartDeactivated);
-  partOpened -= Delegate(l.GetPointer(), &IPartListener::PartOpened);
-  partHidden -= Delegate(l.GetPointer(), &IPartListener::PartHidden);
-  partVisible -= Delegate(l.GetPointer(), &IPartListener::PartVisible);
-  partInputChanged -= Delegate(l.GetPointer(), &IPartListener::PartInputChanged);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPartListener.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPartListener.h
index a6277af4e1..0cce3bc3e1 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPartListener.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPartListener.h
@@ -1,163 +1,164 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIPARTLISTENER_H_
 #define BERRYIPARTLISTENER_H_
 
 #include <berryMacros.h>
 #include <berryMessage.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 #include "berryIWorkbenchPartReference.h"
 
 namespace berry {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * Interface for listening to part lifecycle events.
  * <p>
  * This interface may be implemented by clients.
  * </p>
  *
  * @see IPartService#AddPartListener(IPartListener)
  */
-struct BERRY_UI_QT IPartListener : public virtual Object {
-
-  berryInterfaceMacro(IPartListener, berry);
+struct BERRY_UI_QT IPartListener
+{
 
   struct Events {
 
     enum Type {
       NONE           = 0x00000000,
       ACTIVATED      = 0x00000001,
       BROUGHT_TO_TOP = 0x00000002,
       CLOSED         = 0x00000004,
       DEACTIVATED    = 0x00000008,
       OPENED         = 0x00000010,
       HIDDEN         = 0x00000020,
       VISIBLE        = 0x00000040,
       INPUT_CHANGED  = 0x00000080,
 
       ALL            = 0xffffffff
     };
 
-    BERRY_DECLARE_FLAGS(Types, Type)
+    Q_DECLARE_FLAGS(Types, Type)
 
-    typedef Message1<IWorkbenchPartReference::Pointer> PartEvent;
+    typedef Message1<const IWorkbenchPartReference::Pointer&> PartEvent;
 
     PartEvent partActivated;
     PartEvent partBroughtToTop;
     PartEvent partClosed;
     PartEvent partDeactivated;
     PartEvent partOpened;
     PartEvent partHidden;
     PartEvent partVisible;
     PartEvent partInputChanged;
 
-    void AddListener(IPartListener::Pointer listener);
-    void RemoveListener(IPartListener::Pointer listener);
+    void AddListener(IPartListener* listener);
+    void RemoveListener(IPartListener* listener);
 
   private:
-    typedef MessageDelegate1<IPartListener, IWorkbenchPartReference::Pointer> Delegate;
+    typedef MessageDelegate1<IPartListener, const IWorkbenchPartReference::Pointer&> Delegate;
   };
 
+  virtual ~IPartListener();
+
   virtual Events::Types GetPartEventTypes() const = 0;
 
-    /**
-     * Notifies this listener that the given part has been activated.
-     *
-     * @param partRef the part that was activated
-     * @see IWorkbenchPage#activate
-     */
-    virtual void PartActivated(IWorkbenchPartReference::Pointer /*partRef*/) {};
-
-    /**
-     * Notifies this listener that the given part has been brought to the top.
-     * <p>
-     * These events occur when an editor is brought to the top in the editor area,
-     * or when a view is brought to the top in a page book with multiple views.
-     * They are normally only sent when a part is brought to the top
-     * programmatically (via <code>IPerspective.bringToTop</code>). When a part is
-     * activated by the user clicking on it, only <code>partActivated</code> is sent.
-     * </p>
-     *
-     * @param partRef the part that was surfaced
-     * @see IWorkbenchPage#bringToTop
-     */
-    virtual void PartBroughtToTop(IWorkbenchPartReference::Pointer /*partRef*/) {};
-
-    /**
-     * Notifies this listener that the given part has been closed.
-     * <p>
-     * Note that if other perspectives in the same page share the view,
-     * this notification is not sent.  It is only sent when the view
-     * is being removed from the page entirely (it is being disposed).
-     * </p>
-     *
-     * @param partRef the part that was closed
-     * @see IWorkbenchPage#hideView
-     */
-    virtual void PartClosed(IWorkbenchPartReference::Pointer /*partRef*/) {};
-
-    /**
-     * Notifies this listener that the given part has been deactivated.
-     *
-     * @param partRef the part that was deactivated
-     * @see IWorkbenchPage#activate
-     */
-    virtual void PartDeactivated(IWorkbenchPartReference::Pointer /*partRef*/) {};
-
-    /**
-     * Notifies this listener that the given part has been opened.
-     * <p>
-     * Note that if other perspectives in the same page share the view,
-     * this notification is not sent.  It is only sent when the view
-     * is being newly opened in the page (it is being created).
-     * </p>
-     *
-     * @param partRef the part that was opened
-     * @see IWorkbenchPage#showView
-     */
-    virtual void PartOpened(IWorkbenchPartReference::Pointer /*partRef*/) {};
-
-    /**
-     * Notifies this listener that the given part is hidden or obscured by another part.
-     *
-     * @param partRef the part that is hidden or obscured by another part
-     */
-    virtual void PartHidden(IWorkbenchPartReference::Pointer /*partRef*/) {};
-
-    /**
-     * Notifies this listener that the given part is visible.
-     *
-     * @param partRef the part that is visible
-     */
-    virtual void PartVisible(IWorkbenchPartReference::Pointer /*partRef*/) {};
-
-    /**
-     * Notifies this listener that the given part's input was changed.
-     *
-     * @param partRef the part whose input was changed
-     */
-    virtual void PartInputChanged(IWorkbenchPartReference::Pointer /*partRef*/) {};
+  /**
+   * Notifies this listener that the given part has been activated.
+   *
+   * @param partRef the part that was activated
+   * @see IWorkbenchPage#activate
+   */
+  virtual void PartActivated(const IWorkbenchPartReference::Pointer& /*partRef*/) {}
+
+  /**
+   * Notifies this listener that the given part has been brought to the top.
+   * <p>
+   * These events occur when an editor is brought to the top in the editor area,
+   * or when a view is brought to the top in a page book with multiple views.
+   * They are normally only sent when a part is brought to the top
+   * programmatically (via <code>IPerspective.bringToTop</code>). When a part is
+   * activated by the user clicking on it, only <code>partActivated</code> is sent.
+   * </p>
+   *
+   * @param partRef the part that was surfaced
+   * @see IWorkbenchPage#bringToTop
+   */
+  virtual void PartBroughtToTop(const IWorkbenchPartReference::Pointer& /*partRef*/) {}
+
+  /**
+   * Notifies this listener that the given part has been closed.
+   * <p>
+   * Note that if other perspectives in the same page share the view,
+   * this notification is not sent.  It is only sent when the view
+   * is being removed from the page entirely (it is being disposed).
+   * </p>
+   *
+   * @param partRef the part that was closed
+   * @see IWorkbenchPage#hideView
+   */
+  virtual void PartClosed(const IWorkbenchPartReference::Pointer& /*partRef*/) {}
+
+  /**
+   * Notifies this listener that the given part has been deactivated.
+   *
+   * @param partRef the part that was deactivated
+   * @see IWorkbenchPage#activate
+   */
+  virtual void PartDeactivated(const IWorkbenchPartReference::Pointer& /*partRef*/) {}
+
+  /**
+   * Notifies this listener that the given part has been opened.
+   * <p>
+   * Note that if other perspectives in the same page share the view,
+   * this notification is not sent.  It is only sent when the view
+   * is being newly opened in the page (it is being created).
+   * </p>
+   *
+   * @param partRef the part that was opened
+   * @see IWorkbenchPage#showView
+   */
+  virtual void PartOpened(const IWorkbenchPartReference::Pointer& /*partRef*/) {}
+
+  /**
+   * Notifies this listener that the given part is hidden or obscured by another part.
+   *
+   * @param partRef the part that is hidden or obscured by another part
+   */
+  virtual void PartHidden(const IWorkbenchPartReference::Pointer& /*partRef*/) {}
+
+  /**
+   * Notifies this listener that the given part is visible.
+   *
+   * @param partRef the part that is visible
+   */
+  virtual void PartVisible(const IWorkbenchPartReference::Pointer& /*partRef*/) {}
+
+  /**
+   * Notifies this listener that the given part's input was changed.
+   *
+   * @param partRef the part whose input was changed
+   */
+  virtual void PartInputChanged(const IWorkbenchPartReference::Pointer& /*partRef*/) {}
 };
 
 }  // namespace berry
 
-BERRY_DECLARE_OPERATORS_FOR_FLAGS(berry::IPartListener::Events::Types)
+Q_DECLARE_OPERATORS_FOR_FLAGS(berry::IPartListener::Events::Types)
 
 #endif /*BERRYIPARTLISTENER_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPartService.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPartService.h
index 91387b4c3c..22477ac5df 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPartService.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPartService.h
@@ -1,84 +1,86 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIPARTSERVICE_H_
 #define BERRYIPARTSERVICE_H_
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include "berryIWorkbenchPart.h"
 #include "berryIWorkbenchPartReference.h"
 #include "berryIPartListener.h"
 
 namespace berry {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * A part service tracks the creation and activation of parts within a
  * workbench page.
  * <p>
  * This interface is not intended to be implemented by clients.
  * </p>
  *
  * @see IWorkbenchPage
  */
 struct BERRY_UI_QT IPartService {
 
   virtual ~IPartService();
 
   /**
    * Adds the given observer for part lifecycle events.
    * Has no effect if an identical listener is already registered.
    * <p>
    * <b>Note:</b> listeners should be removed when no longer necessary. If
    * not, they will be removed when the IServiceLocator used to acquire this
    * service is disposed.
    * </p>
    *
    * @param listener a part listener
    * @see #removePartListener(IPartListener)
    */
-    virtual void AddPartListener(IPartListener::Pointer listener) = 0;
+    virtual void AddPartListener(IPartListener* listener) = 0;
 
     /**
      * Returns the active part.
      *
      * @return the active part, or <code>null</code> if no part is currently active
      */
     virtual IWorkbenchPart::Pointer GetActivePart() = 0;
 
     /**
      * Returns the active part reference.
      *
      * @return the active part reference, or <code>null</code> if no part
      * is currently active
      */
     virtual IWorkbenchPartReference::Pointer GetActivePartReference() = 0;
 
     /**
      * Removes the given part listener.
      * Has no affect if an identical listener is not registered.
      *
      * @param listener a part listener
      */
-    virtual void RemovePartListener(IPartListener::Pointer listener) = 0;
+    virtual void RemovePartListener(IPartListener* listener) = 0;
 
 };
 
 }  // namespace berry
 
+Q_DECLARE_INTERFACE(berry::IPartService, "org.blueberry.ui.IPartService")
+
 #endif /*BERRYIPARTSERVICE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPathEditorInput.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPathEditorInput.h
index 3ecea1d5ac..a806ef4170 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPathEditorInput.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPathEditorInput.h
@@ -1,63 +1,63 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIPATHEDITORINPUT_H_
 #define BERRYIPATHEDITORINPUT_H_
 
 #include "berryIEditorInput.h"
 
 #include <Poco/Path.h>
 
 namespace berry {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * This interface defines an editor input based on the local file system path
  * of a file.
  * <p>
  * Clients implementing this editor input interface should override
  * <code>Object.equals(Object)</code> to answer true for two inputs
  * that are the same. The <code>IWorkbenchPage.openEditor</code> APIs
  * are dependent on this to find an editor with the same input.
  * </p><p>
  * Path-oriented editors should support this as a valid input type, and
  * can allow full read-write editing of its content.
  * </p><p>
  * All editor inputs must implement the <code>IAdaptable</code> interface;
  * extensions are managed by the platform's adapter manager.
  * </p>
  *
  * @see org.blueberry.core.runtime.IPath
  * @since 3.0
  */
 struct BERRY_UI_QT IPathEditorInput : public IEditorInput {
 
-  berryInterfaceMacro(IPathEditorInput, berry);
+  berryObjectMacro(berry::IPathEditorInput)
 
   virtual ~IPathEditorInput();
 
     /**
      * Returns the local file system path of the file underlying this editor input.
      *
      * @return a local file system path
      */
    virtual QString GetPath() const = 0;
 };
 
 }
 
 #endif /*BERRYIPATHEDITORINPUT_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPerspectiveDescriptor.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPerspectiveDescriptor.h
index a081aa0caf..ff6426a977 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPerspectiveDescriptor.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPerspectiveDescriptor.h
@@ -1,123 +1,124 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIPERSPECTIVEDESCRIPTOR_H_
 #define BERRYIPERSPECTIVEDESCRIPTOR_H_
 
 #include <berryMacros.h>
 #include <berryObject.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include "berryImageDescriptor.h"
 
 namespace berry {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * A perspective descriptor describes a perspective in an
  * <code>IPerspectiveRegistry</code>.
  * <p>
  * A perspective is a template for view visibility, layout, and action visibility
  * within a workbench page. There are two types of perspective: a predefined
  * perspective and a custom perspective.
  * <ul>
  *   <li>A predefined perspective is defined by an extension to the workbench's
  *     perspective extension point (<code>"org.blueberry.ui.perspectives"</code>).
  *     The extension defines a id, label, and <code>IPerspectiveFactory</code>.
  *     A perspective factory is used to define the initial layout for a page.
  *     </li>
  *   <li>A custom perspective is defined by the user.  In this case a predefined
  *     perspective is modified to suit a particular task and saved as a new
  *     perspective.  The attributes for the perspective are stored in a separate file
  *     in the workbench's metadata directory.
  *     </li>
  * </ul>
  * </p>
  * <p>
  * Within a page the user can open any of the perspectives known
  * to the workbench's perspective registry, typically by selecting one from the
  * workbench's <code>Open Perspective</code> menu. When selected, the views
  * and actions within the active page rearrange to reflect the perspective.
  * </p>
  * <p>
  * This interface is not intended to be implemented by clients.
  * </p>
  * @see IPerspectiveRegistry
  * @noimplement This interface is not intended to be implemented by clients.
  */
-struct BERRY_UI_QT IPerspectiveDescriptor : public Object {
+struct BERRY_UI_QT IPerspectiveDescriptor : public Object
+{
 
-  berryInterfaceMacro(IPerspectiveDescriptor, berry);
+  berryObjectMacro(berry::IPerspectiveDescriptor)
 
   virtual ~IPerspectiveDescriptor();
 
     /**
      * Returns the description of this perspective.
      * This is the value of its <code>"description"</code> attribute.
      *
      * @return the description
      * @since 3.0
      */
     virtual QString GetDescription() const = 0;
 
     /**
      * Returns this perspective's id. For perspectives declared via an extension,
      * this is the value of its <code>"id"</code> attribute.
      *
      * @return the perspective id
      */
     virtual QString GetId() const = 0;
 
     /**
      * Returns the descriptor of the image to show for this perspective.
      * If the extension for this perspective specifies an image, the descriptor
      * for it is returned.  Otherwise a default image is returned.
      *
      * @return the descriptor of the image to show for this perspective
      */
     virtual ImageDescriptor::Pointer GetImageDescriptor() const = 0;
 
     /**
      * Returns this perspective's label. For perspectives declared via an extension,
      * this is the value of its <code>"label"</code> attribute.
      *
      * @return the label
      */
     virtual QString GetLabel() const = 0;
 
     /**
      * Returns <code>true</code> if this perspective is predefined by an
      * extension.
      *
      * @return boolean whether this perspective is predefined by an extension
      */
     virtual bool IsPredefined() const = 0;
 
     /**
      * Return the category path of this descriptor
      *
      * @return the category path of this descriptor
      */
     virtual std::vector<std::string> GetCategoryPath() = 0;
 
     virtual std::vector< std::string> GetKeywordReferences() const = 0;
 };
 
 }
 
 #endif /*BERRYIPERSPECTIVEDESCRIPTOR_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPerspectiveFactory.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPerspectiveFactory.h
index 0fee51d67a..2787f2a849 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPerspectiveFactory.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPerspectiveFactory.h
@@ -1,111 +1,112 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIPERSPECTIVEFACTORY_H_
 #define BERRYIPERSPECTIVEFACTORY_H_
 
 #include <berryMacros.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 #include "berryIPageLayout.h"
 
 #include <QObject>
 
 namespace berry {
 
 /**
  * A perspective factory generates the initial page layout and visible
  * action set for a page.
  * <p>
  * When a new page is created in the workbench a perspective is used to define
  * the initial page layout.  If this is a predefined perspective (based on an extension to
  * the workbench's perspective extension point) an <code>IPerspectiveFactory</code>
  * is used to define the initial page layout.
  * </p><p>
  * The factory for the perspective is created and passed an <code>IPageLayout</code>
  * where views can be added.  The default layout consists of the editor area with no
  * additional views.  Additional views are added to the layout using
  * the editor area as the initial point of reference.  The factory is used only briefly
  * while a new page is created; then discarded.
  * </p><p>
  * To define a perspective clients should implement this interface and
  * include the name of their class in an extension to the workbench's perspective
  * extension point (named <code>"org.blueberry.ui.perspectives"</code>).  For example,
  * the plug-in's XML markup might contain:
  * <pre>
  * &lt;extension point="org.blueberry.ui.perspectives"&gt;
  *   &lt;perspective
  *       id="com.example.plugin.perspective"
  *       name="My Perspective"
  *       class="namespaze::MyPerspective"&gt;
  *   &lt;/perspective&gt;
  * &lt;/extension&gt;
  * </pre>
  * </p><p>
  * Example of populating a page with standard workbench views:
  * <pre>
  * public: void CreateInitialLayout(IPageLayout layout) {
  *    // Get the editor area.
  *    QString editorArea = layout->GetEditorArea();
  *
  *    // Top left: Resource Navigator view and Bookmarks view placeholder
  *    IFolderLayout::Pointer topLeft = layout->CreateFolder("topLeft", IPageLayout::LEFT, 0.25f,
  *      editorArea);
  *    topLeft->AddView(IPageLayout::ID_RES_NAV);
  *    topLeft->AddPlaceholder(IPageLayout::ID_BOOKMARKS);
  *
  *    // Bottom left: Outline view and Property Sheet view
  *    IFolderLayout::Pointer bottomLeft = layout->CreateFolder("bottomLeft", IPageLayout::BOTTOM, 0.50f,
  *      "topLeft");
  *    bottomLeft->AddView(IPageLayout::ID_OUTLINE);
  *    bottomLeft->AddView(IPageLayout::ID_PROP_SHEET);
  *
  *    // Bottom right: Task List view
  *    layout->AddView(IPageLayout::ID_TASK_LIST, IPageLayout::BOTTOM, 0.66f, editorArea);
  *  }
  * </pre>
  * </p><p>
  * Within the workbench a user may override the visible views, layout and
  * action sets of a predefined perspective to create a custom perspective.  In such cases
  * the layout is persisted by the workbench and the factory is not used.
  * </p>
  */
-struct BERRY_UI_QT IPerspectiveFactory : public Object {
+struct BERRY_UI_QT IPerspectiveFactory : public Object
+{
 
-  berryInterfaceMacro(IPerspectiveFactory, berry);
+  berryObjectMacro(berry::IPerspectiveFactory)
 
   ~IPerspectiveFactory();
 
   /**
    * Creates the initial layout for a page.
    * <p>
    * Implementors of this method may add additional views to a
    * perspective.  The perspective already contains an editor folder
    * identified by the result of <code>IPageLayout.getEditorArea()</code>.
    * Additional views should be added to the layout using this value as
    * the initial point of reference.
    * </p>
    *
    * @param layout the page layout
    */
   virtual void CreateInitialLayout(IPageLayout::Pointer layout) = 0;
 };
 
 }
 
-Q_DECLARE_INTERFACE(berry::IPerspectiveFactory, "org.blueberry.IPerspectiveFactory")
+Q_DECLARE_INTERFACE(berry::IPerspectiveFactory, "org.blueberry.ui.IPerspectiveFactory")
 
 #endif /* BERRYIPERSPECTIVEFACTORY_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPerspectiveListener.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPerspectiveListener.cpp
index a9bc44362b..0e05fa426c 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPerspectiveListener.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPerspectiveListener.cpp
@@ -1,99 +1,103 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryIPerspectiveListener.h"
 
 #include "berryIWorkbenchPage.h"
 
 namespace berry {
 
 void
 IPerspectiveListener::Events
-::AddListener(IPerspectiveListener::Pointer listener)
+::AddListener(IPerspectiveListener* listener)
 {
-  if (listener.IsNull()) return;
+  if (listener == NULL) return;
 
   Types types = listener->GetPerspectiveEventTypes();
 
   if (types & ACTIVATED)
-    this->perspectiveActivated += Delegate2(listener.GetPointer(), &IPerspectiveListener::PerspectiveActivated);
+    this->perspectiveActivated += Delegate2(listener, &IPerspectiveListener::PerspectiveActivated);
   if (types & CHANGED)
-    this->perspectiveChanged += PerspChangedDelegate(listener.GetPointer(), &IPerspectiveListener::PerspectiveChanged);
+    this->perspectiveChanged += PerspChangedDelegate(listener, &IPerspectiveListener::PerspectiveChanged);
   if (types & PART_CHANGED)
-    this->perspectivePartChanged += PerspPartChangedDelegate(listener.GetPointer(), &IPerspectiveListener::PerspectiveChanged);
+    this->perspectivePartChanged += PerspPartChangedDelegate(listener, &IPerspectiveListener::PerspectiveChanged);
   if (types & OPENED)
-    this->perspectiveOpened += Delegate2(listener.GetPointer(), &IPerspectiveListener::PerspectiveOpened);
+    this->perspectiveOpened += Delegate2(listener, &IPerspectiveListener::PerspectiveOpened);
   if (types & CLOSED)
-    this->perspectiveClosed += Delegate2(listener.GetPointer(), &IPerspectiveListener::PerspectiveClosed);
+    this->perspectiveClosed += Delegate2(listener, &IPerspectiveListener::PerspectiveClosed);
   if (types & DEACTIVATED)
-    this->perspectiveDeactivated += Delegate2(listener.GetPointer(), &IPerspectiveListener::PerspectiveDeactivated);
+    this->perspectiveDeactivated += Delegate2(listener, &IPerspectiveListener::PerspectiveDeactivated);
   if (types & SAVED_AS)
-    this->perspectiveSavedAs += PerspSavedAsDelegate(listener.GetPointer(), &IPerspectiveListener::PerspectiveSavedAs);
+    this->perspectiveSavedAs += PerspSavedAsDelegate(listener, &IPerspectiveListener::PerspectiveSavedAs);
   if (types & PRE_DEACTIVATE)
-    this->perspectivePreDeactivate += Delegate2(listener.GetPointer(), &IPerspectiveListener::PerspectivePreDeactivate);
+    this->perspectivePreDeactivate += Delegate2(listener, &IPerspectiveListener::PerspectivePreDeactivate);
 }
 
 void
 IPerspectiveListener::Events
-::RemoveListener(IPerspectiveListener::Pointer listener)
+::RemoveListener(IPerspectiveListener* listener)
 {
-  if (listener.IsNull()) return;
-
-  this->perspectiveActivated -= Delegate2(listener.GetPointer(), &IPerspectiveListener::PerspectiveActivated);
-  this->perspectiveChanged -= PerspChangedDelegate(listener.GetPointer(), &IPerspectiveListener::PerspectiveChanged);
-  this->perspectivePartChanged -= PerspPartChangedDelegate(listener.GetPointer(), &IPerspectiveListener::PerspectiveChanged);
-  this->perspectiveOpened -= Delegate2(listener.GetPointer(), &IPerspectiveListener::PerspectiveOpened);
-  this->perspectiveClosed -= Delegate2(listener.GetPointer(), &IPerspectiveListener::PerspectiveClosed);
-  this->perspectiveDeactivated -= Delegate2(listener.GetPointer(), &IPerspectiveListener::PerspectiveDeactivated);
-  this->perspectiveSavedAs -= PerspSavedAsDelegate(listener.GetPointer(), &IPerspectiveListener::PerspectiveSavedAs);
-  this->perspectivePreDeactivate -= Delegate2(listener.GetPointer(), &IPerspectiveListener::PerspectivePreDeactivate);
+  if (listener == NULL) return;
+
+  this->perspectiveActivated -= Delegate2(listener, &IPerspectiveListener::PerspectiveActivated);
+  this->perspectiveChanged -= PerspChangedDelegate(listener, &IPerspectiveListener::PerspectiveChanged);
+  this->perspectivePartChanged -= PerspPartChangedDelegate(listener, &IPerspectiveListener::PerspectiveChanged);
+  this->perspectiveOpened -= Delegate2(listener, &IPerspectiveListener::PerspectiveOpened);
+  this->perspectiveClosed -= Delegate2(listener, &IPerspectiveListener::PerspectiveClosed);
+  this->perspectiveDeactivated -= Delegate2(listener, &IPerspectiveListener::PerspectiveDeactivated);
+  this->perspectiveSavedAs -= PerspSavedAsDelegate(listener, &IPerspectiveListener::PerspectiveSavedAs);
+  this->perspectivePreDeactivate -= Delegate2(listener, &IPerspectiveListener::PerspectivePreDeactivate);
 }
 
-void IPerspectiveListener::PerspectiveActivated(SmartPointer<IWorkbenchPage> /*page*/,
-          IPerspectiveDescriptor::Pointer  /*perspective*/)
+IPerspectiveListener::~IPerspectiveListener()
+{
+}
+
+void IPerspectiveListener::PerspectiveActivated(const SmartPointer<IWorkbenchPage>& /*page*/,
+          const IPerspectiveDescriptor::Pointer&  /*perspective*/)
 {}
 
-void IPerspectiveListener::PerspectiveChanged(SmartPointer<IWorkbenchPage> /*page*/,
-          IPerspectiveDescriptor::Pointer  /*perspective*/, const QString&  /*changeId*/)
+void IPerspectiveListener::PerspectiveChanged(const SmartPointer<IWorkbenchPage>& /*page*/,
+          const IPerspectiveDescriptor::Pointer&  /*perspective*/, const QString&  /*changeId*/)
 {}
 
-void IPerspectiveListener::PerspectiveChanged(SmartPointer<IWorkbenchPage> /*page*/,
-          IPerspectiveDescriptor::Pointer /*perspective*/,
-          IWorkbenchPartReference::Pointer  /*partRef*/, const QString&  /*changeId*/)
+void IPerspectiveListener::PerspectiveChanged(const SmartPointer<IWorkbenchPage>& /*page*/,
+          const IPerspectiveDescriptor::Pointer& /*perspective*/,
+          const IWorkbenchPartReference::Pointer&  /*partRef*/, const QString&  /*changeId*/)
 {}
 
-void IPerspectiveListener::PerspectiveOpened(SmartPointer<IWorkbenchPage> /*page*/,
-          IPerspectiveDescriptor::Pointer  /*perspective*/)
+void IPerspectiveListener::PerspectiveOpened(const SmartPointer<IWorkbenchPage>& /*page*/,
+          const IPerspectiveDescriptor::Pointer&  /*perspective*/)
 {}
 
-void IPerspectiveListener::PerspectiveClosed(SmartPointer<IWorkbenchPage> /*page*/,
-          IPerspectiveDescriptor::Pointer  /*perspective*/)
+void IPerspectiveListener::PerspectiveClosed(const SmartPointer<IWorkbenchPage>& /*page*/,
+          const IPerspectiveDescriptor::Pointer&  /*perspective*/)
 {}
 
-void IPerspectiveListener::PerspectiveDeactivated(SmartPointer<IWorkbenchPage> /*page*/,
-          IPerspectiveDescriptor::Pointer  /*perspective*/)
+void IPerspectiveListener::PerspectiveDeactivated(const SmartPointer<IWorkbenchPage>& /*page*/,
+          const IPerspectiveDescriptor::Pointer&  /*perspective*/)
 {}
 
-void IPerspectiveListener::PerspectiveSavedAs(SmartPointer<IWorkbenchPage> /*page*/,
-          IPerspectiveDescriptor::Pointer /*oldPerspective*/,
-          IPerspectiveDescriptor::Pointer  /*newPerspective*/)
+void IPerspectiveListener::PerspectiveSavedAs(const SmartPointer<IWorkbenchPage>& /*page*/,
+          const IPerspectiveDescriptor::Pointer& /*oldPerspective*/,
+          const IPerspectiveDescriptor::Pointer&  /*newPerspective*/)
 {};
 
-void IPerspectiveListener::PerspectivePreDeactivate(SmartPointer<IWorkbenchPage> /*page*/,
-      IPerspectiveDescriptor::Pointer  /*perspective*/)
+void IPerspectiveListener::PerspectivePreDeactivate(const SmartPointer<IWorkbenchPage>& /*page*/,
+      const IPerspectiveDescriptor::Pointer&  /*perspective*/)
 {}
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPerspectiveListener.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPerspectiveListener.h
index 4ff3943131..cd4e79f300 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPerspectiveListener.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPerspectiveListener.h
@@ -1,200 +1,201 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIPERSPECTIVELISTENER_H_
 #define BERRYIPERSPECTIVELISTENER_H_
 
 #include <org_blueberry_ui_qt_Export.h>
 #include "berryIPerspectiveDescriptor.h"
 #include "berryIWorkbenchPartReference.h"
 
 #include <berryMacros.h>
 
 namespace berry {
 
 struct IWorkbenchPage;
 
 /**
  * Interface for listening to perspective lifecycle events.
  * <p>
  * This interface may be implemented by clients.
  * </p>
  *
  * @see IPageService#addPerspectiveListener(IPerspectiveListener)
  * @see PerspectiveAdapter
  */
-struct BERRY_UI_QT IPerspectiveListener : public virtual Object {
-
-  berryInterfaceMacro(IPerspectiveListener, berry);
+struct BERRY_UI_QT IPerspectiveListener
+{
 
   struct Events {
 
     enum Type {
       NONE           = 0x00000000,
       ACTIVATED      = 0x00000001,
       CHANGED        = 0x00000002,
       PART_CHANGED   = 0x00000004,
       OPENED         = 0x00000008,
       CLOSED         = 0x00000010,
       DEACTIVATED    = 0x00000020,
       SAVED_AS       = 0x00000040,
       PRE_DEACTIVATE = 0x00000080,
 
       ALL            = 0xffffffff
     };
 
-    BERRY_DECLARE_FLAGS(Types, Type)
+    Q_DECLARE_FLAGS(Types, Type)
 
-    Message2<SmartPointer<IWorkbenchPage>, IPerspectiveDescriptor::Pointer> perspectiveActivated;
-    Message3<SmartPointer<IWorkbenchPage>, IPerspectiveDescriptor::Pointer, const QString&> perspectiveChanged;
-    Message4<SmartPointer<IWorkbenchPage>, IPerspectiveDescriptor::Pointer, IWorkbenchPartReference::Pointer, const QString&> perspectivePartChanged;
-    Message2<SmartPointer<IWorkbenchPage>, IPerspectiveDescriptor::Pointer> perspectiveOpened;
-    Message2<SmartPointer<IWorkbenchPage>, IPerspectiveDescriptor::Pointer> perspectiveClosed;
-    Message2<SmartPointer<IWorkbenchPage>, IPerspectiveDescriptor::Pointer> perspectiveDeactivated;
-    Message3<SmartPointer<IWorkbenchPage>, IPerspectiveDescriptor::Pointer, IPerspectiveDescriptor::Pointer> perspectiveSavedAs;
-    Message2<SmartPointer<IWorkbenchPage>, IPerspectiveDescriptor::Pointer> perspectivePreDeactivate;
+    Message2<const SmartPointer<IWorkbenchPage>&, const IPerspectiveDescriptor::Pointer&> perspectiveActivated;
+    Message3<const SmartPointer<IWorkbenchPage>&, const IPerspectiveDescriptor::Pointer&, const QString&> perspectiveChanged;
+    Message4<const SmartPointer<IWorkbenchPage>&, const IPerspectiveDescriptor::Pointer&, const SmartPointer<IWorkbenchPartReference>&, const QString&> perspectivePartChanged;
+    Message2<const SmartPointer<IWorkbenchPage>&, const IPerspectiveDescriptor::Pointer&> perspectiveOpened;
+    Message2<const SmartPointer<IWorkbenchPage>&, const IPerspectiveDescriptor::Pointer&> perspectiveClosed;
+    Message2<const SmartPointer<IWorkbenchPage>&, const IPerspectiveDescriptor::Pointer&> perspectiveDeactivated;
+    Message3<const SmartPointer<IWorkbenchPage>&, const IPerspectiveDescriptor::Pointer&, const IPerspectiveDescriptor::Pointer&> perspectiveSavedAs;
+    Message2<const SmartPointer<IWorkbenchPage>&, const IPerspectiveDescriptor::Pointer&> perspectivePreDeactivate;
 
-    void AddListener(IPerspectiveListener::Pointer l);
-    void RemoveListener(IPerspectiveListener::Pointer l);
+    void AddListener(IPerspectiveListener* l);
+    void RemoveListener(IPerspectiveListener* l);
 
   private:
 
-    typedef MessageDelegate2<IPerspectiveListener, SmartPointer<IWorkbenchPage>, IPerspectiveDescriptor::Pointer > Delegate2;
-    typedef MessageDelegate3<IPerspectiveListener, SmartPointer<IWorkbenchPage>, IPerspectiveDescriptor::Pointer, const QString&> PerspChangedDelegate;
-    typedef MessageDelegate3<IPerspectiveListener, SmartPointer<IWorkbenchPage>, IPerspectiveDescriptor::Pointer, IPerspectiveDescriptor::Pointer> PerspSavedAsDelegate;
-    typedef MessageDelegate4<IPerspectiveListener, SmartPointer<IWorkbenchPage>, IPerspectiveDescriptor::Pointer, IWorkbenchPartReference::Pointer, const QString&> PerspPartChangedDelegate;
+    typedef MessageDelegate2<IPerspectiveListener, const SmartPointer<IWorkbenchPage>&, const IPerspectiveDescriptor::Pointer& > Delegate2;
+    typedef MessageDelegate3<IPerspectiveListener, const SmartPointer<IWorkbenchPage>&, const IPerspectiveDescriptor::Pointer&, const QString&> PerspChangedDelegate;
+    typedef MessageDelegate3<IPerspectiveListener, const SmartPointer<IWorkbenchPage>&, const IPerspectiveDescriptor::Pointer&, const IPerspectiveDescriptor::Pointer&> PerspSavedAsDelegate;
+    typedef MessageDelegate4<IPerspectiveListener, const SmartPointer<IWorkbenchPage>&, const IPerspectiveDescriptor::Pointer&, const SmartPointer<IWorkbenchPartReference>&, const QString&> PerspPartChangedDelegate;
 
   };
 
+  virtual ~IPerspectiveListener();
+
   virtual Events::Types GetPerspectiveEventTypes() const = 0;
 
   /**
    * Notifies this listener that a perspective in the given page
    * has been activated.
    *
    * @param page the page containing the activated perspective
    * @param perspective the perspective descriptor that was activated
    * @see IWorkbenchPage#setPerspective
    */
-  virtual void PerspectiveActivated(SmartPointer<IWorkbenchPage> page,
-          IPerspectiveDescriptor::Pointer perspective);
+  virtual void PerspectiveActivated(const SmartPointer<IWorkbenchPage>& page,
+                                    const IPerspectiveDescriptor::Pointer& perspective);
 
   /**
    * Notifies this listener that a perspective has changed in some way
    * (for example, editor area hidden, perspective reset,
    * view show/hide, editor open/close, etc).
    *
    * @param page the page containing the affected perspective
    * @param perspective the perspective descriptor
    * @param changeId one of the <code>CHANGE_*</code> constants on IWorkbenchPage
    */
-  virtual void PerspectiveChanged(SmartPointer<IWorkbenchPage> page,
-          IPerspectiveDescriptor::Pointer perspective, const QString& changeId);
+  virtual void PerspectiveChanged(const SmartPointer<IWorkbenchPage>& page,
+          const IPerspectiveDescriptor::Pointer& perspective, const QString& changeId);
 
   /**
    * Notifies this listener that a part in the given page's perspective
    * has changed in some way (for example, view show/hide, editor open/close, etc).
    *
    * @param page the workbench page containing the perspective
    * @param perspective the descriptor for the changed perspective
    * @param partRef the reference to the affected part
    * @param changeId one of the <code>CHANGE_*</code> constants on IWorkbenchPage
    */
-  virtual void PerspectiveChanged(SmartPointer<IWorkbenchPage> page,
-          IPerspectiveDescriptor::Pointer perspective,
-          IWorkbenchPartReference::Pointer partRef, const QString& changeId);
+  virtual void PerspectiveChanged(const SmartPointer<IWorkbenchPage>& page,
+          const IPerspectiveDescriptor::Pointer& perspective,
+          const SmartPointer<IWorkbenchPartReference>& partRef, const QString& changeId);
 
   /**
    * Notifies this listener that a perspective in the given page has been
    * opened.
    *
    * @param page
    *            the page containing the opened perspective
    * @param perspective
    *            the perspective descriptor that was opened
    * @see IWorkbenchPage#setPerspective(IPerspectiveDescriptor)
    */
-  virtual void PerspectiveOpened(SmartPointer<IWorkbenchPage> page,
-          IPerspectiveDescriptor::Pointer perspective);
+  virtual void PerspectiveOpened(const SmartPointer<IWorkbenchPage>& page,
+          const IPerspectiveDescriptor::Pointer& perspective);
 
   /**
    * Notifies this listener that a perspective in the given page has been
    * closed.
    *
    * @param page
    *            the page containing the closed perspective
    * @param perspective
    *            the perspective descriptor that was closed
    * @see IWorkbenchPage#closePerspective(IPerspectiveDescriptor, boolean, boolean)
    * @see IWorkbenchPage#closeAllPerspectives(boolean, boolean)
    */
-  virtual void PerspectiveClosed(SmartPointer<IWorkbenchPage> page,
-          IPerspectiveDescriptor::Pointer perspective);
+  virtual void PerspectiveClosed(const SmartPointer<IWorkbenchPage>& page,
+          const IPerspectiveDescriptor::Pointer& perspective);
 
   /**
    * Notifies this listener that a perspective in the given page has been
    * deactivated.
    *
    * @param page
    *            the page containing the deactivated perspective
    * @param perspective
    *            the perspective descriptor that was deactivated
    * @see IWorkbenchPage#setPerspective(IPerspectiveDescriptor)
    */
-  virtual void PerspectiveDeactivated(SmartPointer<IWorkbenchPage> page,
-          IPerspectiveDescriptor::Pointer perspective);
+  virtual void PerspectiveDeactivated(const SmartPointer<IWorkbenchPage>& page,
+          const IPerspectiveDescriptor::Pointer& perspective);
 
   /**
    * Notifies this listener that a perspective in the given page has been
    * saved as a new perspective with a different perspective descriptor.
    *
    * @param page
    *            the page containing the saved perspective
    * @param oldPerspective
    *            the old perspective descriptor
    * @param newPerspective
    *            the new perspective descriptor
    * @see IWorkbenchPage#savePerspectiveAs(IPerspectiveDescriptor)
    */
-  virtual void PerspectiveSavedAs(SmartPointer<IWorkbenchPage> page,
-          IPerspectiveDescriptor::Pointer oldPerspective,
-          IPerspectiveDescriptor::Pointer newPerspective);
+  virtual void PerspectiveSavedAs(const SmartPointer<IWorkbenchPage>& page,
+          const IPerspectiveDescriptor::Pointer& oldPerspective,
+          const IPerspectiveDescriptor::Pointer& newPerspective);
 
   /**
    * <p>
    * Notifies this listener that a perspective in the given page is about to
    * be deactivated.
    * </p>
    * <p>
    * Note: This does not have the ability to veto a perspective deactivation.
    * </p>
    *
    * @param page
    *            the page containing the deactivated perspective
    * @param perspective
    *            the perspective descriptor that was deactivated
    * @see IWorkbenchPage#setPerspective(IPerspectiveDescriptor)
    */
-  virtual void PerspectivePreDeactivate(SmartPointer<IWorkbenchPage> page,
-      IPerspectiveDescriptor::Pointer perspective);
+  virtual void PerspectivePreDeactivate(const SmartPointer<IWorkbenchPage>& page,
+      const IPerspectiveDescriptor::Pointer& perspective);
 };
 
 }
 
-BERRY_DECLARE_OPERATORS_FOR_FLAGS(berry::IPerspectiveListener::Events::Types)
+Q_DECLARE_OPERATORS_FOR_FLAGS(berry::IPerspectiveListener::Events::Types)
 
 #endif /* BERRYIPERSPECTIVELISTENER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPlaceholderFolderLayout.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPlaceholderFolderLayout.h
index 074e361bc9..5f50b47576 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPlaceholderFolderLayout.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPlaceholderFolderLayout.h
@@ -1,101 +1,101 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIPLACEHOLDERFOLDERLAYOUT_H_
 #define BERRYIPLACEHOLDERFOLDERLAYOUT_H_
 
 #include <berryMacros.h>
 #include <berryObject.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 
 namespace berry {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * An <code>IPlaceholderFolderLayout</code> is used to define the initial
  * view placeholders within a folder.
  * The folder itself is contained within an <code>IPageLayout</code>.
  * <p>
  * This interface is not intended to be implemented by clients.
  * </p>
  *
  * @see IPageLayout#createPlaceholderFolder
- * @since 2.0
  * @noimplement This interface is not intended to be implemented by clients.
  */
-struct BERRY_UI_QT IPlaceholderFolderLayout : public Object {
+struct BERRY_UI_QT IPlaceholderFolderLayout : public Object
+{
 
-  berryInterfaceMacro(IPlaceholderFolderLayout, berry);
+  berryObjectMacro(berry::IPlaceholderFolderLayout)
 
   virtual ~IPlaceholderFolderLayout();
 
     /**
      * Adds a view placeholder to this folder.
      * A view placeholder is used to define the position of a view before the view
      * appears.  Initially, it is invisible; however, if the user ever opens a view
      * whose compound id matches the placeholder, the view will appear at the same
      * location as the placeholder.
      * See the {@link IPageLayout} type documentation for more details about compound ids.
      * If the placeholder contains wildcards, it remains in the layout, otherwise
      * it is replaced by the view.
      * If the primary id of the placeholder has no wildcards, it must refer to a view
      * contributed to the workbench's view extension point
      * (named <code>"org.blueberry.ui.views"</code>).
      *
      * @param viewId the compound view id (wildcards allowed)
      */
     virtual void AddPlaceholder(const QString& viewId) = 0;
 
     /**
    * Returns the property with the given id or <code>null</code>. Folder
    * properties are an extensible mechanism for perspective authors to
    * customize the appearance of view stacks. The list of customizable
    * properties is determined by the presentation factory.
    *
    * @param id
    *            Must not be <code>null</code>.
    * @return property value, or <code>null</code> if the property is not
    *         set.
    * @since 3.3
    */
   virtual QString GetProperty(const QString& id) = 0;
 
     /**
    * Sets the given property to the given value. Folder properties are an
    * extensible mechanism for perspective authors to customize the appearance
    * of view stacks. The list of customizable properties is determined by the
    * presentation factory.
    * <p>
    * These folder properties are intended to be set during
    * <code>IPerspectiveFactory#createInitialLayout</code>. Any subsequent
    * changes to property values after this method completes will not fire
    * change notifications and will not be reflected in the presentation.
    * </p>
    *
    * @param id
    *            property id. Must not be <code>null</code>.
    * @param value
    *            property value. <code>null</code> will clear the property.
    * @since 3.3
    */
   virtual void SetProperty(const QString& id, const QString& value) = 0;
 };
 
 }
 
 #endif /*BERRYIPLACEHOLDERFOLDERLAYOUT_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPluginContribution.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPluginContribution.h
index 853e0a01c9..b5469a8f65 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPluginContribution.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPluginContribution.h
@@ -1,52 +1,52 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIPLUGINCONTRIBUTION_H
 #define BERRYIPLUGINCONTRIBUTION_H
 
 #include <berryMacros.h>
 #include <berryObject.h>
 
 namespace berry {
 
 /**
  * An interface that descriptor classes may implement in addition to their
  * descriptor interface. This indicates that they may or may not originate from
  * a plugin contribution. This is useful in various activity filtering
  * scenarios.
  */
 struct IPluginContribution : public virtual Object
 {
-  berryInterfaceMacro(IPluginContribution, berry)
+  berryObjectMacro(berry::IPluginContribution)
 
   /**
    * @return the local id of the contribution. Must not be <code>null</code>.
    *         This should correspond to the extension-specific identifier for
    *         a given contribution.
    */
   virtual QString GetLocalId() const = 0;
 
   /**
    * @return the id of the originating plugin. Can be <code>null</code> if
    *         this contribution did not originate from a plugin.
    */
   virtual QString GetPluginId() const = 0;
 };
 
 }
 
 #endif // BERRYIPLUGINCONTRIBUTION_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPostSelectionProvider.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPostSelectionProvider.h
index 5236b9e84a..9d4ee4c826 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPostSelectionProvider.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPostSelectionProvider.h
@@ -1,67 +1,66 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIPOSTSELECTIONPROVIDER_H_
 #define BERRYIPOSTSELECTIONPROVIDER_H_
 
 #include "berryISelectionProvider.h"
 
 namespace berry
 {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * Selection provider extension interface to allow providers
  * to notify about post selection changed events.
  * A post selection changed event is equivalent to selection changed event
  * if the selection change was triggered by the mouse, but it has a delay
  * if the selection change is triggered by keyboard navigation.
  *
  * @see ISelectionProvider
- *
- * @since 3.0
  */
-struct BERRY_UI_QT IPostSelectionProvider : public ISelectionProvider {
+struct BERRY_UI_QT IPostSelectionProvider : public ISelectionProvider
+{
 
-  berryInterfaceMacro(IPostSelectionProvider, berry);
+  berryObjectMacro(berry::IPostSelectionProvider)
 
   ~IPostSelectionProvider();
 
     /**
      * Adds a listener for post selection changes in this selection provider.
      * Has no effect if an identical listener is already registered.
      *
      * @param listener a selection changed listener
      */
   virtual void AddPostSelectionChangedListener(
-            ISelectionChangedListener::Pointer listener) = 0;
+            ISelectionChangedListener* listener) = 0;
 
     /**
      * Removes the given listener for post selection changes from this selection
      * provider.
      * Has no affect if an identical listener is not registered.
      *
      * @param listener a selection changed listener
      */
     virtual void RemovePostSelectionChangedListener(
-            ISelectionChangedListener::Pointer listener) = 0;
+            ISelectionChangedListener* listener) = 0;
 
 };
 
 }
 
 #endif /*BERRYIPOSTSELECTIONPROVIDER_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPreferencePage.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPreferencePage.h
index 24fad6c834..f0e406aa23 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPreferencePage.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIPreferencePage.h
@@ -1,109 +1,109 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIPREFERENCEPAGE_H_
 #define BERRYIPREFERENCEPAGE_H_
 
 #include "berryObject.h"
 #include "berryIPreferences.h"
 #include "berryIWorkbench.h"
 
 #include <QObject>
 
 namespace berry
 {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * Interface for workbench preference pages.
  * <p>
  * Clients should implement this interface and include the name of their class
  * in an extension contributed to the workbench's preference extension point
  * (named <code>"org.blueberry.ui.preferencePages"</code>).
  * For example, the plug-in's XML markup might contain:
  * <pre>
  * &LT;extension point="org.blueberry.ui.preferencePages"&GT;
  *      &LT;page id="com.example.myplugin.prefs"
  *         name="Knobs"
  *         class="ns::MyPreferencePage" /&GT;
  * &LT;/extension&GT;
  * </pre>
  * </p>
  */
 struct BERRY_UI_QT IPreferencePage: virtual public Object
 {
 
-  berryInterfaceMacro(IPreferencePage, berry);
+  berryObjectMacro(berry::IPreferencePage)
 
   ~IPreferencePage();
 
   /**
      * Initializes this preference page for the given workbench.
      * <p>
      * This method is called automatically as the preference page is being created
      * and initialized. Clients must not call this method.
      * </p>
      *
      * @param workbench the workbench
      */
    virtual void Init(IWorkbench::Pointer workbench) = 0;
 
   /**
    * Creates the top level control for this preference
    * page under the given parent widget.
    * <p>
    * Implementors are responsible for ensuring that
    * the created control can be accessed via <code>GetControl</code>
    * </p>
    *
    * @param parent the parent widget
    */
   virtual void CreateControl(void* parent) = 0;
 
   /**
    * Returns the top level control for this dialog page.
    * <p>
    * May return <code>null</code> if the control
    * has not been created yet.
    * </p>
    *
    * @return the top level control or <code>null</code>
    */
   virtual void* GetControl() const = 0;
 
   ///
   /// Invoked when the OK button was clicked in the preferences dialog
   ///
   virtual bool PerformOk() = 0;
 
   ///
   /// Invoked when the Cancel button was clicked in the preferences dialog
   ///
   virtual void PerformCancel() = 0;
 
   ///
   /// Invoked when the user performed an import. As the values of the preferences may have changed
   /// you should read all values again from the preferences service.
   ///
   virtual void Update() = 0;
 };
 
 }
 
-Q_DECLARE_INTERFACE(berry::IPreferencePage, "org.blueberry.IPreferencePage")
+Q_DECLARE_INTERFACE(berry::IPreferencePage, "org.blueberry.ui.IPreferencePage")
 
 #endif /*BERRYIPREFERENCEPAGE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIQtPreferencePage.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIQtPreferencePage.h
index 838ac05e2d..9dfb9daa2f 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIQtPreferencePage.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIQtPreferencePage.h
@@ -1,57 +1,57 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIQTPREFERENCEPAGE_H_
 #define BERRYIQTPREFERENCEPAGE_H_
 
 #ifdef __MINGW32__
 // We need to include winbase.h here in order to declare
 // atomic intrinsics like InterlockedIncrement correctly.
 // Otherwhise, they would be declared wrong within qatomic_windows.h .
 #include <windows.h>
 #endif
 
 #include <QWidget>
 
 #include "berryIPreferencePage.h"
 
 #include <org_blueberry_ui_qt_Export.h>
 
 namespace berry
 {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  */
 struct BERRY_UI_QT IQtPreferencePage : public IPreferencePage
 {
 
-  berryInterfaceMacro(IQtPreferencePage, berry);
+  berryObjectMacro(berry::IQtPreferencePage);
 
   virtual void CreateQtControl(QWidget* parent) = 0;
   virtual QWidget* GetQtControl() const = 0;
 
 protected:
 
   void CreateControl(void* parent);
   void* GetControl() const;
 
 };
 
 }
 
 #endif /*BERRYIQTPREFERENCEPAGE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIReusableEditor.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIReusableEditor.h
index a3d8657f7b..ff4b4fa5e9 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIReusableEditor.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIReusableEditor.h
@@ -1,54 +1,55 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIREUSABLEEDITOR_H_
 #define BERRYIREUSABLEEDITOR_H_
 
 #include "berryIEditorPart.h"
 #include "berryIEditorInput.h"
 
 namespace berry {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * Interface for reusable editors.
  *
  * An editors may support changing its input so that
  * the workbench may change its contents instead of
  * opening a new editor.
  */
-struct BERRY_UI_QT IReusableEditor : public virtual IEditorPart {
+struct BERRY_UI_QT IReusableEditor : public virtual IEditorPart
+{
 
-  berryInterfaceMacro(IReusableEditor, berry);
+  berryObjectMacro(berry::IReusableEditor)
 
   virtual ~IReusableEditor();
 
     /**
      * Sets the input to this editor.
      *
      * <p><b>Note:</b> Clients must fire the {@link IEditorPart#PROP_INPUT }
      * property change within their implementation of
      * <code>setInput()</code>.<p>
      *
      * @param input the editor input
      */
     virtual void SetInput(IEditorInput::Pointer input) = 0;
 };
 
 }
 
 #endif /*BERRYIREUSABLEEDITOR_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISaveablePart.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISaveablePart.h
index 094e52b3dc..b0304f879e 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISaveablePart.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISaveablePart.h
@@ -1,121 +1,121 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYISAVEABLEPART_H_
 #define BERRYISAVEABLEPART_H_
 
 #include <berryMacros.h>
 #include <berryObject.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include <QtPlugin>
 
 namespace berry {
 
 /**
  * Workbench parts implement or adapt to this interface to participate
  * in the enablement and execution of the <code>Save</code> and
  * <code>Save As</code> actions.
  *
- * @since 2.1
- * @see org.blueberry.ui.IEditorPart
+ * @see IEditorPart
  */
-struct BERRY_UI_QT ISaveablePart : public virtual Object {
+struct BERRY_UI_QT ISaveablePart : public virtual Object
+{
 
-  berryInterfaceMacro(ISaveablePart, berry);
+  berryObjectMacro(berry::ISaveablePart)
 
     /**
      * The property id for <code>isDirty</code>.
      */
     static const int PROP_DIRTY; // = IWorkbenchPartConstants.PROP_DIRTY;
 
     /**
      * Saves the contents of this part.
      * <p>
      * If the save is successful, the part should fire a property changed event
      * reflecting the new dirty state (<code>PROP_DIRTY</code> property).
      * </p>
      * <p>
      * If the save is cancelled through user action, or for any other reason, the
      * part should invoke <code>setCancelled</code> on the <code>IProgressMonitor</code>
      * to inform the caller.
      * </p>
      * <p>
      * This method is long-running; progress and cancellation are provided
      * by the given progress monitor.
      * </p>
      *
      * @param monitor the progress monitor
      */
     virtual void DoSave(/*IProgressMonitor monitor*/) = 0;
 
     /**
      * Saves the contents of this part to another object.
      * <p>
      * Implementors are expected to open a "Save As" dialog where the user will
      * be able to select a new name for the contents. After the selection is made,
      * the contents should be saved to that new name.  During this operation a
      * <code>IProgressMonitor</code> should be used to indicate progress.
      * </p>
      * <p>
      * If the save is successful, the part fires a property changed event
      * reflecting the new dirty state (<code>PROP_DIRTY</code> property).
      * </p>
      */
     virtual void DoSaveAs() = 0;
 
     /**
      * Returns whether the contents of this part have changed since the last save
      * operation. If this value changes the part must fire a property listener
      * event with <code>PROP_DIRTY</code>.
      * <p>
      * <b>Note:</b> this method is called often on a part open or part
      * activation switch, for example by actions to determine their
      * enabled status.
      * </p>
      *
      * @return <code>true</code> if the contents have been modified and need
      *   saving, and <code>false</code> if they have not changed since the last
      *   save
      */
     virtual bool IsDirty() const = 0;
 
     /**
      * Returns whether the "Save As" operation is supported by this part.
      *
      * @return <code>true</code> if "Save As" is supported, and <code>false</code>
      *  if not supported
      */
     virtual bool IsSaveAsAllowed() const = 0;
 
     /**
      * Returns whether the contents of this part should be saved when the part
      * is closed.
      *
      * @return <code>true</code> if the contents of the part should be saved on
      *   close, and <code>false</code> if the contents are expendable
      */
     virtual bool IsSaveOnCloseNeeded() const = 0;
 };
 
 }
 
-Q_DECLARE_INTERFACE(berry::ISaveablePart, "org.blueberry.ISaveablePart")
+Q_DECLARE_INTERFACE(berry::ISaveablePart, "org.blueberry.ui.ISaveablePart")
 
 
 #endif /* BERRYISAVEABLEPART_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISaveablesLifecycleListener.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISaveablesLifecycleListener.cpp
index 188c8508ea..68e9a1f674 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISaveablesLifecycleListener.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISaveablesLifecycleListener.cpp
@@ -1,39 +1,43 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryISaveablesLifecycleListener.h"
 
 namespace berry {
 
 void
 ISaveablesLifecycleListener::Events
-::AddListener(ISaveablesLifecycleListener::Pointer listener)
+::AddListener(ISaveablesLifecycleListener* listener)
 {
-  if (listener.IsNull()) return;
+  if (listener == NULL) return;
 
-  this->lifecycleChange += Delegate(listener.GetPointer(), &ISaveablesLifecycleListener::HandleLifecycleEvent);
+  this->lifecycleChange += Delegate(listener, &ISaveablesLifecycleListener::HandleLifecycleEvent);
 }
 
 void
 ISaveablesLifecycleListener::Events
-::RemoveListener(ISaveablesLifecycleListener::Pointer listener)
+::RemoveListener(ISaveablesLifecycleListener* listener)
 {
-  if (listener.IsNull()) return;
+  if (listener == NULL) return;
 
-  this->lifecycleChange -= Delegate(listener.GetPointer(), &ISaveablesLifecycleListener::HandleLifecycleEvent);
+  this->lifecycleChange -= Delegate(listener, &ISaveablesLifecycleListener::HandleLifecycleEvent);
+}
+
+ISaveablesLifecycleListener::~ISaveablesLifecycleListener()
+{
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISaveablesLifecycleListener.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISaveablesLifecycleListener.h
index d8ffe1b297..a75d9371fb 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISaveablesLifecycleListener.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISaveablesLifecycleListener.h
@@ -1,82 +1,81 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYISAVEABLESLIFECYCLELISTENER_H_
 #define BERRYISAVEABLESLIFECYCLELISTENER_H_
 
 #include "berrySaveablesLifecycleEvent.h"
 
 #include <berryMessage.h>
-#include <berryMacros.h>
 
 namespace berry {
 
 /**
  * Listener for events fired by implementers of {@link ISaveablesSource}.
  *
  * <p>
  * This service can be acquired from a part's service locator:
  *
  * <pre>
  * ISaveablesLifecycleListener listener = (ISaveablesLifecycleListener) getSite()
  *    .getService(ISaveablesLifecycleListener.class);
  * </pre>
  *
  * or, in the case of implementers of {@link ISaveablesSource} that are not a
  * part, from the workbench:
  *
  * <pre>
  * ISaveablesLifecycleListener listener = (ISaveablesLifecycleListener) workbench
  *    .getService(ISaveablesLifecycleListener.class);
  * </pre>
  *
  * <ul>
  * <li>This service is available globally.</li>
  * </ul>
  * </p>
- *
- * @since 3.2
  */
-struct ISaveablesLifecycleListener : public virtual Object {
-
-  berryInterfaceMacro(ISaveablesLifecycleListener, berry);
+struct ISaveablesLifecycleListener : public virtual Object
+{
+  berryObjectMacro(berry::ISaveablesLifecycleListener)
 
   struct Events {
-    Message1<SaveablesLifecycleEvent::Pointer> lifecycleChange;
+    Message1<const SaveablesLifecycleEvent::Pointer&> lifecycleChange;
 
-    void AddListener(ISaveablesLifecycleListener::Pointer listener);
-    void RemoveListener(ISaveablesLifecycleListener::Pointer listener);
+    void AddListener(ISaveablesLifecycleListener* listener);
+    void RemoveListener(ISaveablesLifecycleListener* listener);
 
   private:
 
-    typedef MessageDelegate1<ISaveablesLifecycleListener, SaveablesLifecycleEvent::Pointer> Delegate;
+    typedef MessageDelegate1<ISaveablesLifecycleListener, const SaveablesLifecycleEvent::Pointer&> Delegate;
   };
 
+  virtual ~ISaveablesLifecycleListener();
+
   /**
    * Handle the given event. This method must be called on the UI thread.
    *
    * @param event
    */
-  virtual void HandleLifecycleEvent(SaveablesLifecycleEvent::Pointer event) = 0;
+  virtual void HandleLifecycleEvent(const SaveablesLifecycleEvent::Pointer& event) = 0;
 
 };
 
 }
 
-Q_DECLARE_INTERFACE(berry::ISaveablesLifecycleListener, "org.blueberry.ui.qt.ISaveablesLifecycleListener")
+Q_DECLARE_INTERFACE(berry::ISaveablesLifecycleListener, "org.blueberry.ui.ISaveablesLifecycleListener")
 
 #endif /* BERRYISAVEABLESLIFECYCLELISTENER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISaveablesSource.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISaveablesSource.h
index b782234d5c..a3ea39f178 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISaveablesSource.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISaveablesSource.h
@@ -1,124 +1,125 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYISAVEABLESSOURCE_H_
 #define BERRYISAVEABLESSOURCE_H_
 
 #include <berryMacros.h>
 #include <org_blueberry_ui_qt_Export.h>
 #include "berrySaveable.h"
 
 namespace berry {
 
 /**
  * Represents a source of Saveable objects (units of saveability). Workbench
  * parts that show more than one unit of saveability, or whose units of
  * saveability change over time, should implement this interface in order to
  * provide better integration with workbench facilities like the Save command,
  * prompts to save on part close or shutdown, etc.
  * <p>
  * IMPORTANT: As of 3.2, implementers of <code>ISaveablesSource</code> must
  * satisfy the following conditions:
  * <ul>
  * <li>If ISaveablesSource is implemented by an IWorkbenchPart:
  * <ul>
  * <li>the part must implement <code>ISaveablePart</code></li>
  * <li>if any of its Saveable objects are dirty, the part must return
  * <code>true</code> from {@link ISaveablePart#isDirty()}</li>
  * <li>the part must return <code>true</code> from
  * {@link ISaveablePart#isSaveOnCloseNeeded()} if it is dirty (the default
  * behaviour implemented by {@link EditorPart})</li>
  * <li>the part must not implement {@link ISaveablePart2}</li>
  * </ul>
  * </li>
  * <li>If ISaveablesSource is implemented by a non-part (possible as of 3.2.1 and 3.3):
  * <ul>
  * <li>the Workbench's {@link ISaveablesLifecycleListener} (obtained from the
  * Workbench by calling
  * <code>workbench.getService(ISaveablesLifecycleListener.class)</code>) must
  * be notified of any change to the result of {@link #getSaveables()} </li>
  * <li>getActiveSaveables() should be implemented to return an empty array
  * </li>
  * </ul>
  * </ul>
  * If any of these conditions are not met, it is undefined whether the Workbench
  * will prompt to save dirty Saveables when closing parts or the Workbench.
  * </p>
  * <p>
  * These conditions may be relaxed in future releases.
  * </p>
  *
  * @since 3.2
  */
-struct BERRY_UI_QT ISaveablesSource : public virtual Object {
+struct BERRY_UI_QT ISaveablesSource : public virtual Object
+{
 
-  berryInterfaceMacro(ISaveablesSource, berry);
+  berryObjectMacro(berry::ISaveablesSource)
 
   ~ISaveablesSource();
 
   /**
    * Returns the saveables presented by the workbench part. If the return
    * value of this method changes during the lifetime of
    * this part (i.e. after initialization and control creation but before disposal)
    * the part must notify an implicit listener using
    * {@link ISaveablesLifecycleListener#handleLifecycleEvent(SaveablesLifecycleEvent)}.
    * <p>
    * Additions of saveables to the list of saveables of this part are
    * announced using an event of type
    * {@link SaveablesLifecycleEvent#POST_OPEN}. Removals are announced in a
    * two-stage process, first using an event of type
    * {@link SaveablesLifecycleEvent#PRE_CLOSE} followed by an event of type
    * {@link SaveablesLifecycleEvent#POST_CLOSE}. Since firing the
    * <code>PRE_CLOSE</code> event may trigger prompts to save dirty
    * saveables, the cancellation status of the event must be checked by the
    * part after the notification. When removing only non-dirty saveables,
    * <code>POST_CLOSE</code> notification is sufficient.
    * </p>
    * <p>
    * The listener is obtained from the part site by calling
    * <code>partSite.getService(ISaveablesLifecycleListener.class)</code>.
    * </p>
    * <p>
    * The part must not notify from its initialization methods (e.g. <code>init</code>
    * or <code>createPartControl</code>), or from its dispose method. Parts that
    * implement {@link IReusableEditor} must notify when their input is changed
    * through {@link IReusableEditor#setInput(IEditorInput)}.
    * </p>
    *
    * @return the saveables presented by the workbench part
    *
    * @see ISaveablesLifecycleListener
    */
   virtual QList<Saveable::Pointer> GetSaveables() = 0;
 
   /**
    * Returns the saveables currently active in the workbench part.
    * <p>
    * Certain workbench actions, such as Save, target only the active saveables
    * in the active part. For example, the active saveables could be determined
    * based on the current selection in the part.
    * </p>
    *
    * @return the saveables currently active in the workbench part
    */
   virtual QList<Saveable::Pointer> GetActiveSaveables() = 0;
 };
 
 }
 
 
 #endif /* BERRYISAVEABLESSOURCE_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelection.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelection.h
index e28f2881ee..46fabc93d0 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelection.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelection.h
@@ -1,55 +1,55 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYISELECTION_H_
 #define BERRYISELECTION_H_
 
 #include <berryMacros.h>
 #include <berryObject.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 
 namespace berry {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * Interface for a selection.
  *
  * @see ISelectionProvider
  * @see ISelectionChangedListener
  * @see SelectionChangedEvent
  *
  **/
 struct BERRY_UI_QT ISelection : public Object
 {
-  berryInterfaceMacro(ISelection, berry);
+  berryObjectMacro(berry::ISelection)
 
   ~ISelection();
 
   /**
    * Returns whether this selection is empty.
    *
    * @return <code>true</code> if this selection is empty,
    *   and <code>false</code> otherwise
    */
   virtual bool IsEmpty() const = 0;
 
 };
 
 }
 
 #endif /*BERRYISELECTION_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelectionChangedListener.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelectionChangedListener.cpp
index 613ff7fdc2..c3f64cbe0c 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelectionChangedListener.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelectionChangedListener.cpp
@@ -1,40 +1,44 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryISelectionChangedListener.h"
 #include "berryISelectionProvider.h"
 
 namespace berry {
 
 void
 ISelectionChangedListener::Events
-::AddListener(ISelectionChangedListener::Pointer listener)
+::AddListener(ISelectionChangedListener* listener)
 {
-  if (listener.IsNull()) return;
+  if (listener == NULL) return;
 
-  this->selectionChanged += Delegate(listener.GetPointer(), &ISelectionChangedListener::SelectionChanged);
+  this->selectionChanged += Delegate(listener, &ISelectionChangedListener::SelectionChanged);
 }
 
 void
 ISelectionChangedListener::Events
-::RemoveListener(ISelectionChangedListener::Pointer listener)
+::RemoveListener(ISelectionChangedListener* listener)
 {
-  if (listener.IsNull()) return;
+  if (listener == NULL) return;
 
-  this->selectionChanged -= Delegate(listener.GetPointer(), &ISelectionChangedListener::SelectionChanged);
+  this->selectionChanged -= Delegate(listener, &ISelectionChangedListener::SelectionChanged);
+}
+
+ISelectionChangedListener::~ISelectionChangedListener()
+{
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelectionChangedListener.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelectionChangedListener.h
index 7194248ba8..a0c6f3b01b 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelectionChangedListener.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelectionChangedListener.h
@@ -1,67 +1,68 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYISELECTIONCHANGEDLISTENER_H_
 #define BERRYISELECTIONCHANGEDLISTENER_H_
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include <berryMacros.h>
 #include <berryMessage.h>
 
 #include "berrySelectionChangedEvent.h"
 
 namespace berry
 {
 
 class SelectionChangedEvent;
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * A listener which is notified when a viewer's selection changes.
  *
  * @see ISelection
  * @see ISelectionProvider
  * @see SelectionChangedEvent
  */
-struct BERRY_UI_QT ISelectionChangedListener : public virtual Object {
-
-  berryInterfaceMacro(ISelectionChangedListener, berry);
+struct BERRY_UI_QT ISelectionChangedListener
+{
 
   struct BERRY_UI_QT Events {
 
-    Message1<SelectionChangedEvent::Pointer > selectionChanged;
+    Message1<const SelectionChangedEvent::Pointer&> selectionChanged;
 
-    void AddListener(ISelectionChangedListener::Pointer listener);
-    void RemoveListener(ISelectionChangedListener::Pointer listener);
+    void AddListener(ISelectionChangedListener* listener);
+    void RemoveListener(ISelectionChangedListener* listener);
 
   private:
 
-    typedef MessageDelegate1<ISelectionChangedListener, SelectionChangedEvent::Pointer> Delegate;
+    typedef MessageDelegate1<ISelectionChangedListener, const SelectionChangedEvent::Pointer&> Delegate;
   };
 
+  virtual ~ISelectionChangedListener();
+
     /**
      * Notifies that the selection has changed.
      *
      * @param event event object describing the change
      */
-  virtual void SelectionChanged(SelectionChangedEvent::Pointer event) = 0;
+  virtual void SelectionChanged(const SelectionChangedEvent::Pointer& event) = 0;
 };
 
 }
 
 #endif /*BERRYISELECTIONCHANGEDLISTENER_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelectionListener.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelectionListener.cpp
index b11441e17c..a4dda88fe5 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelectionListener.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelectionListener.cpp
@@ -1,39 +1,43 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryISelectionListener.h"
 
 namespace berry {
 
 void
 ISelectionListener::Events
-::AddListener(ISelectionListener::Pointer listener)
+::AddListener(ISelectionListener* listener)
 {
-  if (listener.IsNull()) return;
+  if (listener == NULL) return;
 
-  this->selectionChanged += Delegate(listener.GetPointer(), &ISelectionListener::SelectionChanged);
+  this->selectionChanged += Delegate(listener, &ISelectionListener::SelectionChanged);
 }
 
 void
 ISelectionListener::Events
-::RemoveListener(ISelectionListener::Pointer listener)
+::RemoveListener(ISelectionListener* listener)
 {
-  if (listener.IsNull()) return;
+  if (listener == NULL) return;
 
-  this->selectionChanged -= Delegate(listener.GetPointer(), &ISelectionListener::SelectionChanged);
+  this->selectionChanged -= Delegate(listener, &ISelectionListener::SelectionChanged);
+}
+
+ISelectionListener::~ISelectionListener()
+{
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelectionListener.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelectionListener.h
index 573e955dba..dec5ea1905 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelectionListener.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelectionListener.h
@@ -1,131 +1,131 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYISELECTIONLISTENER_H_
 #define BERRYISELECTIONLISTENER_H_
 
 #include <berryMessage.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include "berryIWorkbenchPart.h"
 #include "berryISelection.h"
 
 namespace berry
 {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * Interface for listening to selection changes.
  * <p>
  * This interface may be implemented by clients.
  * </p>
  *
  * @see ISelectionService#AddSelectionListener(ISelectionListener::Pointer)
  * @see ISelectionService#AddSelectionListener(const QString&, ISelectionListener::Pointer)
  * @see INullSelectionListener
  */
-struct BERRY_UI_QT ISelectionListener: public virtual Object
+struct BERRY_UI_QT ISelectionListener
 {
 
-  berryInterfaceMacro(ISelectionListener, berry);
-
   struct Events
   {
 
-    Message2<IWorkbenchPart::Pointer, ISelection::ConstPointer>
+    Message2<const IWorkbenchPart::Pointer&, const ISelection::ConstPointer&>
         selectionChanged;
 
-    void AddListener(ISelectionListener::Pointer listener);
-    void RemoveListener(ISelectionListener::Pointer listener);
+    void AddListener(ISelectionListener* listener);
+    void RemoveListener(ISelectionListener* listener);
 
-    typedef MessageDelegate2<ISelectionListener, IWorkbenchPart::Pointer,
-        ISelection::ConstPointer> Delegate;
+    typedef MessageDelegate2<ISelectionListener, const IWorkbenchPart::Pointer&,
+        const ISelection::ConstPointer&> Delegate;
   };
 
+  virtual ~ISelectionListener();
+
   /**
    * Notifies this listener that the selection has changed.
    * <p>
    * This method is called when the selection changes from one to a
    * <code>non-null</code> value, but not when the selection changes to
    * <code>null</code>. If there is a requirement to be notified in the latter
    * scenario, implement <code>INullSelectionListener</code>. The event will
    * be posted through this method.
    * </p>
    *
    * @param part the workbench part containing the selection
    * @param selection the current selection. This may be <code>null</code>
    *    if <code>INullSelectionListener</code> is implemented.
    */
-  virtual void SelectionChanged(IWorkbenchPart::Pointer part,
-      ISelection::ConstPointer selection) = 0;
+  virtual void SelectionChanged(const IWorkbenchPart::Pointer& part,
+                                const ISelection::ConstPointer& selection) = 0;
 };
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * This template can be used like this:
  *
  * <code>
  * class MyClass {
  *
  *   private:
  *     void HandleSelectionChanged(berry::IWorkbenchPart::Pointer part, berry::ISelection::ConstPointer selection)
  *     { // do something }
  *
  *     berry::ISelectionListener::Pointer m_SelectionListener;
  *
  *   public:
  *     MyClass()
  *     : m_SelectionListener(new berry::SelectionChangedAdapter<MyClass>(this, &MyClass::HandleSelectionChanged))
  *     {
  *       // get the selection service
  *       // ...
  *       service->AddPostSelectionListener(m_SelectionListener);
  *     }
  * };
  * </code>
  */
 template<typename R>
 struct SelectionChangedAdapter: public ISelectionListener
 {
 
   typedef R Listener;
   typedef void
-      (R::*Callback)(IWorkbenchPart::Pointer, ISelection::ConstPointer);
+      (R::*Callback)(const IWorkbenchPart::Pointer&, const ISelection::ConstPointer&);
 
   SelectionChangedAdapter(R* l, Callback c) :
     listener(l), callback(c)
   {
     poco_assert(listener);
     poco_assert(callback);
   }
 
-  void SelectionChanged(IWorkbenchPart::Pointer part, ISelection::ConstPointer selection)
+  void SelectionChanged(const IWorkbenchPart::Pointer& part, const ISelection::ConstPointer& selection)
   {
     (listener->*callback)(part, selection);
   }
 
 private:
 
   Listener* listener;
   Callback callback;
 };
 
 }
 
 #endif /*BERRYISELECTIONLISTENER_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelectionProvider.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelectionProvider.h
index 3f264b7f92..3ba2cb85ac 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelectionProvider.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelectionProvider.h
@@ -1,77 +1,78 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYISELECTIONPROVIDER_H_
 #define BERRYISELECTIONPROVIDER_H_
 
 #include <berryMacros.h>
 
 #include "berryISelectionChangedListener.h"
 #include "berryISelection.h"
 
 namespace berry
 {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * Interface common to all objects that provide a selection.
  *
  * @see ISelection
  * @see ISelectionChangedListener
  * @see SelectionChangedEvent
  */
-struct BERRY_UI_QT ISelectionProvider : public virtual Object {
+struct BERRY_UI_QT ISelectionProvider : public virtual Object
+{
 
-  berryInterfaceMacro(ISelectionProvider, berry);
+  berryObjectMacro(berry::ISelectionProvider)
 
   ~ISelectionProvider();
 
     /**
      * Adds a listener for selection changes in this selection provider.
      * Has no effect if an identical listener is already registered.
      *
      * @param listener a selection changed listener
      */
-    virtual void AddSelectionChangedListener(ISelectionChangedListener::Pointer listener) = 0;
+    virtual void AddSelectionChangedListener(ISelectionChangedListener* listener) = 0;
 
     /**
      * Returns the current selection for this provider.
      *
      * @return the current selection
      */
     virtual ISelection::ConstPointer GetSelection() const = 0;
 
     /**
      * Removes the given selection change listener from this selection provider.
      * Has no affect if an identical listener is not registered.
      *
      * @param listener a selection changed listener
      */
     virtual void RemoveSelectionChangedListener(
-            ISelectionChangedListener::Pointer listener) = 0;
+            ISelectionChangedListener* listener) = 0;
 
     /**
      * Sets the current selection for this selection provider.
      *
      * @param selection the new selection
      */
-    virtual void SetSelection(ISelection::ConstPointer selection) = 0;
+    virtual void SetSelection(const ISelection::ConstPointer& selection) = 0;
 };
 
 }
 
 #endif /*BERRYISELECTIONPROVIDER_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelectionService.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelectionService.h
index 088295170e..60579b7b46 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelectionService.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISelectionService.h
@@ -1,183 +1,185 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYISELECTIONSERVICE_H_
 #define BERRYISELECTIONSERVICE_H_
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include "berryISelection.h"
 #include "berryISelectionListener.h"
 #include "berryIWorkbenchPart.h"
 
 #include <berryMessage.h>
 
 namespace berry {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * A selection service tracks the selection within an object.
  * <p>
  * A listener that wants to be notified when the selection becomes
  * <code>null</code> must implement the <code>INullSelectionListener</code>
  * interface.
  * </p>
  * <p>
  * This interface is not intended to be implemented by clients.
  * </p>
  * @see org.blueberry.ui.ISelectionListener
  * @see org.blueberry.ui.INullSelectionListener
  */
 struct BERRY_UI_QT ISelectionService {
 
   struct SelectionEvents {
 
     typedef Message2<IWorkbenchPart::Pointer, ISelection::ConstPointer> SelectionEvent;
     typedef MessageDelegate2<ISelectionListener, IWorkbenchPart::Pointer, ISelection::ConstPointer> Delegate;
 
     SelectionEvent selectionChanged;
     SelectionEvent postSelectionChanged;
 
   };
 
   virtual ~ISelectionService();
 
   //virtual SelectionEvents& GetSelectionEvents(const QString& partId = "") = 0;
 
   /**
    * Adds the given selection listener.
    * Has no effect if an identical listener is already registered.
    *
    * @param listener a selection listener
    */
-  virtual void AddSelectionListener(ISelectionListener::Pointer listener) = 0;
+  virtual void AddSelectionListener(ISelectionListener* listener) = 0;
 
   /**
    * Adds a part-specific selection listener which is notified when selection changes
    * in the part with the given id. This is independent of part activation - the part
    * need not be active for notification to be sent.
    * <p>
    * When the part is created, the listener is passed the part's initial selection.
    * When the part is disposed, the listener is passed a <code>null</code> selection,
    * but only if the listener implements <code>INullSelectionListener</code>.
    * </p>
    * <p>
    * Note: This will not correctly track editor parts as each editor does
    * not have a unique partId.
    * </p>
    *
    * @param partId the id of the part to track
    * @param listener a selection listener
    * @since 2.0
    */
-  virtual void AddSelectionListener(const QString& partId, ISelectionListener::Pointer listener) = 0;
+  virtual void AddSelectionListener(const QString& partId, ISelectionListener* listener) = 0;
 
   /**
    * Adds the given post selection listener.It is equivalent to selection
    * changed if the selection was triggered by the mouse but it has a
    * delay if the selection is triggered by the keyboard arrows.
    * Has no effect if an identical listener is already registered.
    *
    * Note: Works only for StructuredViewer(s).
    *
    * @param listener a selection listener
    */
-  virtual void AddPostSelectionListener(ISelectionListener::Pointer listener) = 0;
+  virtual void AddPostSelectionListener(ISelectionListener* listener) = 0;
 
   /**
    * Adds a part-specific selection listener which is notified when selection changes
    * in the part with the given id. This is independent of part activation - the part
    * need not be active for notification to be sent.
    * <p>
    * When the part is created, the listener is passed the part's initial selection.
    * When the part is disposed, the listener is passed a <code>null</code> selection,
    * but only if the listener implements <code>INullSelectionListener</code>.
    * </p>
    * <p>
    * Note: This will not correctly track editor parts as each editor does
    * not have a unique partId.
    * </p>
    *
    * @param partId the id of the part to track
    * @param listener a selection listener
    * @since 2.0
    */
   virtual void AddPostSelectionListener(const QString& partId,
-          ISelectionListener::Pointer listener) = 0;
+                                        ISelectionListener* listener) = 0;
 
   /**
    * Returns the current selection in the active part.  If the selection in the
    * active part is <em>undefined</em> (the active part has no selection provider)
    * the result will be <code>null</code>.
    *
    * @return the current selection, or <code>null</code> if undefined
    */
   virtual ISelection::ConstPointer GetSelection() const = 0;
 
   /**
    * Returns the current selection in the part with the given id.  If the part is not open,
    * or if the selection in the active part is <em>undefined</em> (the active part has no selection provider)
    * the result will be <code>null</code>.
    *
    * @param partId the id of the part
    * @return the current selection, or <code>null</code> if undefined
    * @since 2.0
    */
   virtual ISelection::ConstPointer GetSelection(const QString& partId) = 0;
 
   /**
    * Removes the given selection listener.
    * Has no effect if an identical listener is not registered.
    *
    * @param listener a selection listener
    */
-  virtual void RemoveSelectionListener(ISelectionListener::Pointer listener) = 0;
+  virtual void RemoveSelectionListener(ISelectionListener* listener) = 0;
 
   /**
    * Removes the given part-specific selection listener.
    * Has no effect if an identical listener is not registered for the given part id.
    *
    * @param partId the id of the part to track
    * @param listener a selection listener
    * @since 2.0
    */
   virtual void RemoveSelectionListener(const QString& partId,
-          ISelectionListener::Pointer listener) = 0;
+                                       ISelectionListener* listener) = 0;
 
   /**
    * Removes the given post selection listener.
    * Has no effect if an identical listener is not registered.
    *
    * @param listener a selection listener
    */
-  virtual void RemovePostSelectionListener(ISelectionListener::Pointer listener) = 0;
+  virtual void RemovePostSelectionListener(ISelectionListener* listener) = 0;
 
   /**
    * Removes the given part-specific post selection listener.
    * Has no effect if an identical listener is not registered for the given part id.
    *
    * @param partId the id of the part to track
    * @param listener a selection listener
    * @since 2.0
    */
   virtual void RemovePostSelectionListener(const QString& partId,
-          ISelectionListener::Pointer listener) = 0;
+                                           ISelectionListener* listener) = 0;
 };
 
 }  // namespace berry
 
+Q_DECLARE_INTERFACE(berry::ISelectionService, "org.blueberry.ui.ISelectionService")
+
 #endif /*BERRYISELECTIONSERVICE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIShellListener.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIShellListener.cpp
index 884e8cacf5..ef442ffb36 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIShellListener.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIShellListener.cpp
@@ -1,59 +1,63 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryIShellListener.h"
 #include "berryShell.h"
 
 namespace berry {
 
 void
 IShellListener::Events
-::AddListener(IShellListener::Pointer listener)
+::AddListener(IShellListener* listener)
 {
-  if (listener.IsNull()) return;
+  if (listener == NULL) return;
 
-  shellActivated += Delegate(listener.GetPointer(), &IShellListener::ShellActivated);
-  shellClosed += Delegate(listener.GetPointer(), &IShellListener::ShellClosed);
-  shellDeactivated += Delegate(listener.GetPointer(), &IShellListener::ShellDeactivated);
-  shellDeiconified += Delegate(listener.GetPointer(), &IShellListener::ShellDeiconified);
-  shellIconified += Delegate(listener.GetPointer(), &IShellListener::ShellIconified);
+  shellActivated += Delegate(listener, &IShellListener::ShellActivated);
+  shellClosed += Delegate(listener, &IShellListener::ShellClosed);
+  shellDeactivated += Delegate(listener, &IShellListener::ShellDeactivated);
+  shellDeiconified += Delegate(listener, &IShellListener::ShellDeiconified);
+  shellIconified += Delegate(listener, &IShellListener::ShellIconified);
 }
 
 void
 IShellListener::Events
-::RemoveListener(IShellListener::Pointer listener)
+::RemoveListener(IShellListener* listener)
 {
-  if (listener.IsNull()) return;
+  if (listener == NULL) return;
 
-  shellActivated -= Delegate(listener.GetPointer(), &IShellListener::ShellActivated);
-  shellClosed -= Delegate(listener.GetPointer(), &IShellListener::ShellClosed);
-  shellDeactivated -= Delegate(listener.GetPointer(), &IShellListener::ShellDeactivated);
-  shellDeiconified -= Delegate(listener.GetPointer(), &IShellListener::ShellDeiconified);
-  shellIconified -= Delegate(listener.GetPointer(), &IShellListener::ShellIconified);
+  shellActivated -= Delegate(listener, &IShellListener::ShellActivated);
+  shellClosed -= Delegate(listener, &IShellListener::ShellClosed);
+  shellDeactivated -= Delegate(listener, &IShellListener::ShellDeactivated);
+  shellDeiconified -= Delegate(listener, &IShellListener::ShellDeiconified);
+  shellIconified -= Delegate(listener, &IShellListener::ShellIconified);
 }
 
-void IShellListener::ShellActivated(ShellEvent::Pointer  /*e*/)
+IShellListener::~IShellListener()
+{
+}
+
+void IShellListener::ShellActivated(const ShellEvent::Pointer& /*e*/)
 {}
-void IShellListener::ShellClosed(ShellEvent::Pointer  /*e*/)
+void IShellListener::ShellClosed(const ShellEvent::Pointer& /*e*/)
 {}
-void IShellListener::ShellDeactivated(ShellEvent::Pointer  /*e*/)
+void IShellListener::ShellDeactivated(const ShellEvent::Pointer& /*e*/)
 {}
-void IShellListener::ShellDeiconified(ShellEvent::Pointer  /*e*/)
+void IShellListener::ShellDeiconified(const ShellEvent::Pointer& /*e*/)
 {}
-void IShellListener::ShellIconified(ShellEvent::Pointer  /*e*/)
+void IShellListener::ShellIconified(const ShellEvent::Pointer& /*e*/)
 {}
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIShellListener.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIShellListener.h
index 3caf4620ab..ad0014748a 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIShellListener.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIShellListener.h
@@ -1,118 +1,119 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYISHELLLISTENER_H_
 #define BERRYISHELLLISTENER_H_
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include "berryShellEvent.h"
 
 #include <berryMessage.h>
 #include <berryMacros.h>
 
 namespace berry {
 
 /**
  * Classes which implement this interface provide methods
  * that deal with changes in state of <code>Shell</code>s.
  * <p>
  * After creating an instance of a class that implements
  * this interface it can be added to a shell using the
  * <code>AddShellListener</code> method and removed using
  * the <code>RemoveShellListener</code> method. When the
  * state of the shell changes, the appropriate method will
  * be invoked.
  * </p>
  *
  * @see ShellEvent
  */
-struct BERRY_UI_QT IShellListener : public virtual Object {
+struct BERRY_UI_QT IShellListener
+{
 
-  berryInterfaceMacro(IShellListener, berry);
-
-  struct BERRY_UI_QT Events {
-    typedef Message1<ShellEvent::Pointer> ShellEventType;
+  struct Events {
+    typedef Message1<const ShellEvent::Pointer&> ShellEventType;
 
     enum Type {
      NONE        = 0x00000000,
      ACTIVATED   = 0x00000001,
      CLOSED      = 0x00000002,
      DEACTIVATED = 0x00000004,
      DEICONIFIED = 0x00000008,
      ICONIFIED   = 0x00000010,
 
      ALL         = 0xffffffff
     };
 
-    BERRY_DECLARE_FLAGS(Types, Type)
+    Q_DECLARE_FLAGS(Types, Type)
 
     ShellEventType shellActivated;
     ShellEventType shellClosed;
     ShellEventType shellDeactivated;
     ShellEventType shellDeiconified;
     ShellEventType shellIconified;
 
-    void AddListener(IShellListener::Pointer listener);
-    void RemoveListener(IShellListener::Pointer listener);
+    void AddListener(IShellListener* listener);
+    void RemoveListener(IShellListener* listener);
 
   private:
 
-    typedef MessageDelegate1<IShellListener, ShellEvent::Pointer> Delegate;
+    typedef MessageDelegate1<IShellListener, const ShellEvent::Pointer&> Delegate;
   };
 
-/**
- * Sent when a shell becomes the active window.
- *
- * @param e an event containing information about the activation
- */
-virtual void ShellActivated(ShellEvent::Pointer e);
-
-/**
- * Sent when a shell is closed.
- *
- * @param e an event containing information about the close
- */
-virtual void ShellClosed(ShellEvent::Pointer e);
-
-/**
- * Sent when a shell stops being the active window.
- *
- * @param e an event containing information about the deactivation
- */
-virtual void ShellDeactivated(ShellEvent::Pointer e);
-
-/**
- * Sent when a shell is un-minimized.
- *
- * @param e an event containing information about the un-minimization
- */
-virtual void ShellDeiconified(ShellEvent::Pointer e);
-
-/**
- * Sent when a shell is minimized.
- *
- * @param e an event containing information about the minimization
- */
-virtual void ShellIconified(ShellEvent::Pointer e);
+  virtual ~IShellListener();
+
+  /**
+   * Sent when a shell becomes the active window.
+   *
+   * @param e an event containing information about the activation
+   */
+  virtual void ShellActivated(const ShellEvent::Pointer& e);
+
+  /**
+   * Sent when a shell is closed.
+   *
+   * @param e an event containing information about the close
+   */
+  virtual void ShellClosed(const ShellEvent::Pointer& e);
+
+  /**
+   * Sent when a shell stops being the active window.
+   *
+   * @param e an event containing information about the deactivation
+   */
+  virtual void ShellDeactivated(const ShellEvent::Pointer& e);
+
+  /**
+   * Sent when a shell is un-minimized.
+   *
+   * @param e an event containing information about the un-minimization
+   */
+  virtual void ShellDeiconified(const ShellEvent::Pointer& e);
+
+  /**
+   * Sent when a shell is minimized.
+   *
+   * @param e an event containing information about the minimization
+   */
+  virtual void ShellIconified(const ShellEvent::Pointer& e);
 };
 
 }
 
-BERRY_DECLARE_OPERATORS_FOR_FLAGS(berry::IShellListener::Events::Types)
+Q_DECLARE_OPERATORS_FOR_FLAGS(berry::IShellListener::Events::Types)
 
 #endif /* BERRYISHELLLISTENER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIShellProvider.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIShellProvider.h
index a63ae5b679..a5d90564d5 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIShellProvider.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIShellProvider.h
@@ -1,53 +1,54 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYISHELLPROVIDER_H_
 #define BERRYISHELLPROVIDER_H_
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include "berryShell.h"
 #include <berryMacros.h>
 
 namespace berry {
 
 /**
  * Interface for objects that can return a shell. This is normally used for
  * opening child windows. An object that wants to open child shells can take
  * an IShellProvider in its constructor, and the object that implements IShellProvider
  * can dynamically choose where child shells should be opened.
  *
  * @since 3.1
  */
-struct BERRY_UI_QT IShellProvider : public virtual Object {
+struct BERRY_UI_QT IShellProvider : public virtual Object
+{
 
-  berryInterfaceMacro(IShellProvider, berry);
+  berryObjectMacro(berry::IShellProvider)
 
   ~IShellProvider();
 
     /**
      * Returns the current shell (or null if none). This return value may
      * change over time, and should not be cached.
      *
      * @return the current shell or null if none
      */
-   virtual Shell::Pointer GetShell() = 0;
+   virtual Shell::Pointer GetShell() const = 0;
 };
 
 }
 
 #endif /* BERRYISHELLPROVIDER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIShowInSource.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIShowInSource.h
new file mode 100644
index 0000000000..ef72858133
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIShowInSource.h
@@ -0,0 +1,53 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYISHOWINSOURCE_H
+#define BERRYISHOWINSOURCE_H
+
+#include <berryObject.h>
+
+namespace berry {
+
+class ShowInContext;
+
+/**
+ * Parts which need to provide a particular context to a 'Show In' target can
+ * provide this interface.
+ * <p>
+ * The part can either directly implement this interface, or provide it via
+ * <code>IAdaptable#GetAdapter<IShowInSource>()</code>.
+ * </p
+ *
+ * @see IShowInTarget
+ */
+struct IShowInSource : public virtual Object
+{
+  berryObjectMacro(berry::IShowInSource)
+
+  /**
+   * Returns the context to show, or <code>null</code> if there is
+   * currently no valid context to show.
+   *
+   * @return the context to show, or <code>null</code>
+   */
+  virtual SmartPointer<ShowInContext> GetShowInContext() const = 0;
+};
+
+}
+
+Q_DECLARE_INTERFACE(berry::IShowInSource, "org.blueberry.ui.IShowInSource")
+
+#endif // BERRYISHOWINSOURCE_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIShowInTarget.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIShowInTarget.h
new file mode 100644
index 0000000000..c791a5f03e
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIShowInTarget.h
@@ -0,0 +1,56 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYISHOWINTARGET_H
+#define BERRYISHOWINTARGET_H
+
+#include <berryObject.h>
+
+namespace berry {
+
+class ShowInContext;
+
+/**
+ * This interface must be provided by Show In targets (views listed in the 'Show In'
+ * menu).
+ * <p>
+ * The view can either directly implement this interface, or provide it via
+ * <code>IAdaptable.getAdapter(IShowInTarget.class)</code>.
+ * </p>
+ *
+ * @see IPageLayout#AddShowInPart
+ */
+struct IShowInTarget : public virtual Object
+{
+
+  berryObjectMacro(berry::IShowInTarget)
+
+  /**
+   * Shows the given context in this target.
+   * The target should check the context's selection for elements
+   * to show.  If there are no relevant elements in the selection,
+   * then it should check the context's input.
+   *
+   * @param context the context to show
+   * @return <code>true</code> if the context could be shown,
+   *   <code>false</code> otherwise
+   */
+  virtual bool Show(const SmartPointer<ShowInContext>& context) = 0;
+};
+
+}
+
+#endif // BERRYISHOWINTARGET_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISourceProvider.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISourceProvider.h
index 8565b5e1b1..93f565dc71 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISourceProvider.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISourceProvider.h
@@ -1,106 +1,106 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYISOURCEPROVIDER_H_
 #define BERRYISOURCEPROVIDER_H_
 
 #include <berryObject.h>
 
 #include <QHash>
 #include <QStringList>
 
 #include <QObject>
 
 namespace berry {
 
 struct ISourceProviderListener;
 
 /**
  * <p>
  * A provider of notifications for when a change has occurred to a particular
  * type of source. These providers can be given to the appropriate service, and
  * this service will then re-evaluate the appropriate pieces of its internal
  * state in response to these changes.
  * </p>
  * <p>
  * It is recommended that clients subclass <code>AbstractSourceProvider</code>
  * instead, as this provides some common support for listeners.
  * </p>
  *
- * @since 3.1
- * @see org.blueberry.ui.handlers.IHandlerService
- * @see org.blueberry.ui.ISources
+ * @see IHandlerService
+ * @see ISources
  */
-struct ISourceProvider : public virtual Object {
+struct ISourceProvider : public virtual Object
+{
 
-  berryInterfaceMacro(ISourceProvider, berry)
+  berryObjectMacro(berry::ISourceProvider)
 
-  typedef QHash<QString, Object::Pointer> StateMapType;
+  typedef QHash<QString, Object::ConstPointer> StateMapType;
 
   ~ISourceProvider();
 
 
   /**
    * Adds a listener to this source provider. This listener will be notified
    * whenever the corresponding source changes.
    *
    * @param listener
    *            The listener to add; must not be <code>null</code>.
    */
   virtual void AddSourceProviderListener(ISourceProviderListener* listener) = 0;
 
   /**
    * Returns the current state of the sources tracked by this provider. This
    * is used to provide a view of the world if the event loop is busy and
    * things are some state has already changed.
    * <p>
    * For use with core expressions, this map should contain
    * IEvaluationContext#UNDEFINED_VARIABLE for properties which
    * are only sometimes available.
    * </p>
    *
    * @return A map of variable names (<code>String</code>) to variable
    *         values (<code>Object</code>). This may be empty, and may be
    *         <code>null</code>.
    */
-  virtual StateMapType GetCurrentState() = 0;
+  virtual StateMapType GetCurrentState() const = 0;
 
   /**
    * Returns the names of those sources provided by this class. This is used
    * by clients of source providers to determine which source providers they
    * actually need.
    *
    * @return An array of source names. This value should never be
    *         <code>null</code> or empty.
    */
-  virtual QStringList GetProvidedSourceNames() = 0;
+  virtual QList<QString> GetProvidedSourceNames() const = 0;
 
   /**
    * Removes a listener from this source provider. This listener will be
    * notified whenever the corresponding source changes.
    *
    * @param listener
    *            The listener to remove; must not be <code>null</code>.
    */
   virtual void RemoveSourceProviderListener(ISourceProviderListener* listener) = 0;
 };
 
 }
 
-Q_DECLARE_INTERFACE(berry::ISourceProvider, "org.blueberry.ISourceProvider")
+Q_DECLARE_INTERFACE(berry::ISourceProvider, "org.blueberry.ui.ISourceProvider")
 
 #endif /* BERRYISOURCEPROVIDER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISourceProviderListener.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISourceProviderListener.cpp
index 8e3dce5d3b..a42b9b61e4 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISourceProviderListener.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISourceProviderListener.cpp
@@ -1,37 +1,41 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryISourceProviderListener.h"
 
 namespace berry {
 
 void ISourceProviderListener::Events::AddListener(ISourceProviderListener* l)
 {
   if (l == 0) return;
 
   multipleSourcesChanged += Delegate2(l, &ISourceProviderListener::SourceChanged);
   singleSourceChanged += Delegate3(l, &ISourceProviderListener::SourceChanged);
 }
 
 void ISourceProviderListener::Events::RemoveListener(ISourceProviderListener* l)
 {
   if (l == 0) return;
 
   multipleSourcesChanged -= Delegate2(l, &ISourceProviderListener::SourceChanged);
   singleSourceChanged -= Delegate3(l, &ISourceProviderListener::SourceChanged);
 }
 
+ISourceProviderListener::~ISourceProviderListener()
+{
+}
+
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISourceProviderListener.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISourceProviderListener.h
index 9b8108ff58..ca6fffbc3a 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISourceProviderListener.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISourceProviderListener.h
@@ -1,100 +1,100 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYISOURCEPROVIDERLISTENER_H_
 #define BERRYISOURCEPROVIDERLISTENER_H_
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include <berryMacros.h>
 #include <berryObject.h>
 #include <berryMessage.h>
 
 #include <map>
 
 namespace berry {
 
 /**
  * <p>
  * A listener to changes in a particular source of information. This listener is
  * notified as the source changes. Typically, workbench services will implement
  * this interface, and register themselves as listeners to the
  * <code>ISourceProvider</code> instances that are registered with them.
  * </p>
  *
- * @since 3.1
- * @see org.blueberry.ui.ISources
- * @see org.blueberry.ui.ISourceProvider
+ * @see ISources
+ * @see ISourceProvider
  */
-struct BERRY_UI_QT ISourceProviderListener : public virtual Object {
-
-  berryInterfaceMacro(ISourceProviderListener, berry)
+struct BERRY_UI_QT ISourceProviderListener
+{
 
   struct Events {
-    Message2<int, const QHash<QString, Object::Pointer>& > multipleSourcesChanged;
-    Message3<int, const QString&, Object::Pointer> singleSourceChanged;
+    Message2<int, const QHash<QString, Object::ConstPointer>& > multipleSourcesChanged;
+    Message3<int, const QString&, Object::ConstPointer> singleSourceChanged;
 
     void AddListener(ISourceProviderListener* l);
     void RemoveListener(ISourceProviderListener* l);
 
   private:
 
-    typedef MessageDelegate2<ISourceProviderListener, int, const QHash<QString, Object::Pointer>& > Delegate2;
-    typedef MessageDelegate3<ISourceProviderListener, int, const QString&, Object::Pointer> Delegate3;
+    typedef MessageDelegate2<ISourceProviderListener, int, const QHash<QString, Object::ConstPointer>& > Delegate2;
+    typedef MessageDelegate3<ISourceProviderListener, int, const QString&, Object::ConstPointer> Delegate3;
   };
 
+  virtual ~ISourceProviderListener();
+
   /**
    * Handles a change to multiple sources. The source priority should be a bit
    * mask indicating the sources. The map will be used to construct the
    * variables on an <code>IEvaluationContext</code>
    *
    * @param sourcePriority
    *            A bit mask of all the source priorities that have changed.
    * @param sourceValuesByName
    *            A mapping of the source names (<code>String</code>) to the
    *            source values (<code>Object</code>). The names should
    *            never be <code>null</code>, but the values may be. The map
    *            must not be <code>null</code>, and should contain at least
    *            two elements (one for each source).
    * @see org.blueberry.core.expressions.IEvaluationContext
    * @see ISources
    */
   virtual void SourceChanged(int sourcePriority,
-                             const QHash<QString, Object::Pointer>& sourceValuesByName) = 0;
+                             const QHash<QString, Object::ConstPointer>& sourceValuesByName) = 0;
 
   /**
    * Handles a change to one source. The source priority should indicate the
    * source, and the name-value pair will be used to create an
    * <code>IEvaluationContext</code> with a single variable.
    *
    * @param sourcePriority
    *            A bit mask of all the source priorities that have changed.
    * @param sourceName
    *            The name of the source that changed; must not be
    *            <code>null</code>.
    * @param sourceValue
    *            The new value for that source; may be <code>null</code>.
    * @see org.blueberry.core.expressions.IEvaluationContext
    * @see ISources
    */
   virtual void SourceChanged(int sourcePriority,
-                             const QString& sourceName, Object::Pointer sourceValue) = 0;
+                             const QString& sourceName, Object::ConstPointer sourceValue) = 0;
 };
 
 }
 
 #endif /* BERRYISOURCEPROVIDERLISTENER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISources.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISources.cpp
index e46b1704ce..762a7d5380 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISources.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISources.cpp
@@ -1,255 +1,250 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryISources.h"
 
 #include <QString>
 
 namespace berry
 {
 
 int ISources::WORKBENCH()
 {
   static int val = 0;
   return val;
 }
 
-int ISources::LEGACY_LEGACY()
-{
-  static int val = 1;
-  return val;
-}
-
-int ISources::LEGACY_LOW()
-{
-  static int val = 1 << 1;
-  return val;
-}
-
-int ISources::LEGACY_MEDIUM()
-{
-  static int val = 1 << 2;
-  return val;
-}
-
 int ISources::ACTIVE_CONTEXT()
 {
-  static int val = 1 << 6;
+  static int val = 1 << 3;
   return val;
 }
 
 const QString ISources::ACTIVE_CONTEXT_NAME()
 {
   static const QString val = "activeContexts";
   return val;
 }
 
 int ISources::ACTIVE_ACTION_SETS()
 {
-  static int val = 1 << 8;
+  static int val = 1 << 5;
   return val;
 }
 
 const QString ISources::ACTIVE_ACTION_SETS_NAME()
 {
   static const QString val = "activeActionSets";
   return val;
 }
 
 int ISources::ACTIVE_SHELL()
 {
-  static int val = 1 << 10;
+  static int val = 1 << 7;
   return val;
 }
 
 const QString ISources::ACTIVE_SHELL_NAME()
 {
   static const QString val = "activeShell";
   return val;
 }
 
 int ISources::ACTIVE_WORKBENCH_WINDOW_SHELL()
 {
-  static int val = 1 << 12;
+  static int val = 1 << 9;
   return val;
 }
 
 const QString ISources::ACTIVE_WORKBENCH_WINDOW_SHELL_NAME()
 {
   static const QString val = "activeWorkbenchWindowShell";
   return val;
 }
 
 int ISources::ACTIVE_WORKBENCH_WINDOW()
 {
-  static int val = 1 << 14;
+  static int val = 1 << 11;
   return val;
 }
 
 const QString ISources::ACTIVE_WORKBENCH_WINDOW_NAME()
 {
   static const QString val = "activeWorkbenchWindow";
   return val;
 }
 
 int ISources::ACTIVE_WORKBENCH_WINDOW_SUBORDINATE()
 {
-  static int val = 1 << 15;
+  static int val = 1 << 12;
   return val;
 }
 
-const QString ISources::ACTIVE_WORKBENCH_WINDOW_IS_COOLBAR_VISIBLE_NAME()
+const QString ISources::ACTIVE_WORKBENCH_WINDOW_IS_TOOLBAR_VISIBLE_NAME()
 {
   static const QString val = ISources::ACTIVE_WORKBENCH_WINDOW_NAME()
-      + ".isCoolbarVisible";
+      + ".isToolbarVisible";
   return val;
 }
 
 const QString ISources::ACTIVE_WORKBENCH_WINDOW_IS_PERSPECTIVEBAR_VISIBLE_NAME()
 {
   static const QString val = ISources::ACTIVE_WORKBENCH_WINDOW_NAME()
       + ".isPerspectiveBarVisible";
   return val;
 }
 
+const QString ISources::ACTIVE_WORKBENCH_WINDOW_IS_STATUS_LINE_VISIBLE_NAME()
+{
+  static const QString val = ISources::ACTIVE_WORKBENCH_WINDOW_NAME()
+      + ".isStatusLineVisible";
+  return val;
+}
+
 const QString ISources::ACTIVE_WORKBENCH_WINDOW_ACTIVE_PERSPECTIVE_NAME()
 {
   static const QString val = ISources::ACTIVE_WORKBENCH_WINDOW_NAME()
       + ".activePerspective";
   return val;
 }
 
 int ISources::ACTIVE_EDITOR()
 {
-  static int val = 1 << 16;
+  static int val = 1 << 13;
   return val;
 }
 
 const QString ISources::ACTIVE_EDITOR_NAME()
 {
   static const QString val = "activeEditor";
   return val;
 }
 
+const QString ISources::ACTIVE_EDITOR_INPUT_NAME()
+{
+  static const QString val = "activeEditorInput";
+  return val;
+}
+
 int ISources::ACTIVE_EDITOR_ID()
 {
-  static int val = 1 << 18;
+  static int val = 1 << 15;
   return val;
 }
 
 const QString ISources::ACTIVE_EDITOR_ID_NAME()
 {
   static const QString val = "activeEditorId";
   return val;
 }
 
 int ISources::ACTIVE_PART()
 {
-  static int val = 1 << 20;
+  static int val = 1 << 17;
   return val;
 }
 
 const QString ISources::ACTIVE_PART_NAME()
 {
   static const QString val = "activePart";
   return val;
 }
 
 int ISources::ACTIVE_PART_ID()
 {
-  static int val = 1 << 22;
+  static int val = 1 << 19;
   return val;
 }
 
 const QString ISources::ACTIVE_PART_ID_NAME()
 {
   static const QString val = "activePartId";
   return val;
 }
 
 int ISources::ACTIVE_SITE()
 {
-  static int val = 1 << 26;
+  static int val = 1 << 23;
   return val;
 }
 
 const QString ISources::ACTIVE_SITE_NAME()
 {
   static const QString val = "activeSite";
   return val;
 }
 
 const QString ISources::SHOW_IN_SELECTION()
 {
   static const QString val = "showInSelection";
   return val;
 }
 
 const QString ISources::SHOW_IN_INPUT()
 {
   static const QString val = "showInInput";
   return val;
 }
 
 int ISources::ACTIVE_CURRENT_SELECTION()
 {
-  static int val = 1 << 30;
+  static int val = 1 << 27;
   return val;
 }
 
 const QString ISources::ACTIVE_CURRENT_SELECTION_NAME()
 {
   static const QString val = "selection";
   return val;
 }
 
 int ISources::ACTIVE_MENU()
 {
-  static int val = 1 << 31;
+  static int val = 1 << 30;
   return val;
 }
 
 const QString ISources::ACTIVE_MENU_NAME()
 {
   static const QString val = "activeMenu";
   return val;
 }
 
 const QString ISources::ACTIVE_MENU_SELECTION_NAME()
 {
   static const QString val = "activeMenuSelection";
   return val;
 }
 
 const QString ISources::ACTIVE_MENU_EDITOR_INPUT_NAME()
 {
   static const QString val = "activeMenuEditorInput";
   return val;
 }
 
 const QString ISources::ACTIVE_FOCUS_CONTROL_NAME()
 {
   static const QString val = "activeFocusControl";
   return val;
 }
 
 const QString ISources::ACTIVE_FOCUS_CONTROL_ID_NAME()
 {
   static const QString val = "activeFocusControlId";
   return val;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISources.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISources.h
index 40c2234855..dbfc13f96e 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISources.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryISources.h
@@ -1,340 +1,296 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYISOURCES_H_
 #define BERRYISOURCES_H_
 
 #include <string>
 #include <org_blueberry_ui_qt_Export.h>
 
 namespace berry {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * <p>
  * A source is type of event change that can occur within the workbench. For
  * example, the active workbench window can change, so it is considered a
  * source. Workbench services can track changes to these sources, and thereby
  * try to resolve conflicts between a variety of possible options. This is most
  * commonly used for things like handlers and contexts.
  * </p>
  * <p>
  * This interface defines the source that are known to the workbench at
  * compile-time. These sources can be combined in a bit-wise fashion. So, for
  * example, a <code>ACTIVE_PART | ACTIVE_CONTEXT</code> source includes change
  * to both the active context and the active part.
  * </p>
  * <p>
  * The values assigned to each source indicates its relative priority. The
  * higher the value, the more priority the source is given in resolving
  * conflicts. Another way to look at this is that the higher the value, the more
  * "local" the source is to what the user is currently doing. This is similar
  * to, but distinct from the concept of components. The nesting support provided
  * by components represent only one source (<code>ACTIVE_SITE</code>) that
  * the workbench understands.
  * </p>
  * <p>
  * Note that for backward compatibility, we must reserve the lowest three bits
  * for <code>Priority</code> instances using the old
  * <code>HandlerSubmission</code> mechanism. This mechanism was used in
  * Eclipse 3.0.
  * </p>
  * <p>
  * <b>Note in 3.3:</b>
  * </p>
  * <p>
  * Currently, source variables are not extensible by user plugins, and
  * the number of bits available for resolving conflicts is limited.  When
  * the variable sources become user extensible a new conflict resolution
  * mechanism will be implemented.
  * </p>
  * @noimplement This interface is not intended to be implemented by clients.
  * @noextend This interface is not intended to be extended by clients.
  *
  * @see org.blueberry.ui.ISourceProvider
- * @since 3.1
  */
-struct BERRY_UI_QT ISources {
+struct BERRY_UI_QT ISources
+{
 
   /**
    * The priority given to default handlers and handlers that are active
    * across the entire workbench.
    */
   static int WORKBENCH(); // = 0;
 
-  /**
-   * The priority given when the activation is defined by a handler submission
-   * with a legacy priority.
-   */
-  static int LEGACY_LEGACY(); // = 1;
-
-  /**
-   * The priority given when the activation is defined by a handler submission
-   * with a low priority.
-   */
-  static int LEGACY_LOW(); // = 1 << 1;
-
-  /**
-   * The priority given when the activation is defined by a handler submission
-   * with a medium priority.
-   */
-  static int LEGACY_MEDIUM(); // = 1 << 2;
-
   /**
    * The priority given when the source includes a particular context.
    */
-  static int ACTIVE_CONTEXT(); // = 1 << 6;
+  static int ACTIVE_CONTEXT(); // = 1 << 3;
 
   /**
    * The variable name for the active contexts. This is for use with the
    * <code>ISourceProvider</code> and <code>IEvaluationContext</code>.
-   * @since 3.2
    */
-  static const QString ACTIVE_CONTEXT_NAME(); // = "activeContexts";
+  static const QString ACTIVE_CONTEXT_NAME();
 
   /**
    * The priority given when the source includes a particular action set.
-   * @since 3.2
    */
-  static int ACTIVE_ACTION_SETS(); // = 1 << 8;
+  static int ACTIVE_ACTION_SETS(); // = 1 << 5;
 
   /**
    * The variable name for the active action sets. This is for use with the
    * {@link ISourceProvider} and {@link IEvaluationContext}.
-   * @since 3.2
    */
-  static const QString ACTIVE_ACTION_SETS_NAME(); // = "activeActionSets"();
+  static const QString ACTIVE_ACTION_SETS_NAME();
 
   /**
    * The priority given when the source includes the currently active shell.
    */
-  static int ACTIVE_SHELL(); // = 1 << 10();
+  static int ACTIVE_SHELL(); // = 1 << 7();
 
   /**
    * The variable name for the active shell. This is for use with the
    * <code>ISourceProvider</code> and <code>IEvaluationContext</code>.
    */
-  static const QString ACTIVE_SHELL_NAME(); // = "activeShell"();
+  static const QString ACTIVE_SHELL_NAME();
 
   /**
    * The priority given when the source includes the currently active
    * workbench window shell.
-   * @since 3.2
    */
-  static int ACTIVE_WORKBENCH_WINDOW_SHELL(); // = 1 << 12();
+  static int ACTIVE_WORKBENCH_WINDOW_SHELL(); // = 1 << 9();
 
   /**
    * The variable name for the active workbench window shell. This is for use
    * with the <code>ISourceProvider</code> and
    * <code>IEvaluationContext</code>.
-   * @since 3.2
    */
-  static const QString ACTIVE_WORKBENCH_WINDOW_SHELL_NAME(); // = "activeWorkbenchWindowShell"();
+  static const QString ACTIVE_WORKBENCH_WINDOW_SHELL_NAME();
 
   /**
    * The priority given when the source includes the currently active
    * workbench window.
    */
-  static int ACTIVE_WORKBENCH_WINDOW(); // = 1 << 14();
+  static int ACTIVE_WORKBENCH_WINDOW(); // = 1 << 11();
 
   /**
    * The variable name for the active workbench window. This is for use with
    * the <code>ISourceProvider</code> and <code>IEvaluationContext</code>.
    */
-  static const QString ACTIVE_WORKBENCH_WINDOW_NAME(); // = "activeWorkbenchWindow"();
+  static const QString ACTIVE_WORKBENCH_WINDOW_NAME();
 
   /**
    * The priority given when the source includes subordinate properties of the currently active
    * workbench window.
-   *
-   * @since 3.3
    */
-  static int ACTIVE_WORKBENCH_WINDOW_SUBORDINATE(); // = 1 << 15();
+  static int ACTIVE_WORKBENCH_WINDOW_SUBORDINATE(); // = 1 << 12();
 
   /**
    * The variable name for the coolbar visibility state of the active
    * workbench window. This is for use with the <code>ISourceProvider</code>
    * and <code>IEvaluationContext</code>.
-   *
-   * @since 3.3
    */
-  static const QString ACTIVE_WORKBENCH_WINDOW_IS_COOLBAR_VISIBLE_NAME(); // = ACTIVE_WORKBENCH_WINDOW_NAME
-     // + ".isCoolbarVisible"();
+  static const QString ACTIVE_WORKBENCH_WINDOW_IS_TOOLBAR_VISIBLE_NAME();
 
   /**
    * The variable name for the perspective bar visibility state of the active
    * workbench window. This is for use with the <code>ISourceProvider</code>
    * and <code>IEvaluationContext</code>.
-   *
-   * @since 3.3
    */
-  static const QString ACTIVE_WORKBENCH_WINDOW_IS_PERSPECTIVEBAR_VISIBLE_NAME(); // = ACTIVE_WORKBENCH_WINDOW_NAME
-     // + ".isPerspectiveBarVisible"();
+  static const QString ACTIVE_WORKBENCH_WINDOW_IS_PERSPECTIVEBAR_VISIBLE_NAME();
+
+  /**
+   * The variable name for the status line visibility state of the active
+   * workbench window. This is for use with the <code>ISourceProvider</code>
+   * and <code>IEvaluationContext</code>.
+   */
+  static const QString ACTIVE_WORKBENCH_WINDOW_IS_STATUS_LINE_VISIBLE_NAME();
 
   /**
    * The variable name for the current perspective of the active workbench
    * window. This is for use with the <code>ISourceProvider</code> and
    * <code>IEvaluationContext</code>.
-   *
-   * @since 3.4
    */
-  static const QString ACTIVE_WORKBENCH_WINDOW_ACTIVE_PERSPECTIVE_NAME(); // = ACTIVE_WORKBENCH_WINDOW_NAME
-   //+ ".activePerspective"();
+  static const QString ACTIVE_WORKBENCH_WINDOW_ACTIVE_PERSPECTIVE_NAME();
 
   /**
    * The priority given when the source includes the active editor part.
    */
-  static int ACTIVE_EDITOR(); // = 1 << 16();
+  static int ACTIVE_EDITOR(); // = 1 << 13();
 
   /**
    * The variable name for the active editor part. This is for use with the
    * <code>ISourceProvider</code> and <code>IEvaluationContext</code>.
-   * @since 3.2
    */
-  static const QString ACTIVE_EDITOR_NAME(); // = "activeEditor"();
+  static const QString ACTIVE_EDITOR_NAME();
+
+  /**
+   * The editor input of the currently active editor.
+   */
+  static const QString ACTIVE_EDITOR_INPUT_NAME();
 
   /**
    * The priority given when the source includes the active editor identifier.
-   *
-   * @since 3.2
    */
-  static int ACTIVE_EDITOR_ID(); // = 1 << 18();
+  static int ACTIVE_EDITOR_ID(); // = 1 << 15();
 
   /**
    * The variable name for the active editor identifier. This is for use with
    * the <code>ISourceProvider</code> and <code>IEvaluationContext</code>.
-   *
-   * @since 3.2
    */
-  static const QString ACTIVE_EDITOR_ID_NAME(); // = "activeEditorId"();
+  static const QString ACTIVE_EDITOR_ID_NAME();
 
   /**
    * The priority given when the source includes the active part.
    */
-  static int ACTIVE_PART(); // = 1 << 20();
+  static int ACTIVE_PART(); // = 1 << 17();
 
   /**
    * The variable name for the active part. This is for use with the
    * <code>ISourceProvider</code> and <code>IEvaluationContext</code>.
    */
-  static const QString ACTIVE_PART_NAME(); // = "activePart"();
+  static const QString ACTIVE_PART_NAME();
 
   /**
    * The priority given when the source includes the active part id.
-   *
-   * @since 3.2
    */
-  static int ACTIVE_PART_ID(); // = 1 << 22();
+  static int ACTIVE_PART_ID(); // = 1 << 19();
 
   /**
    * The variable name for the active part id. This is for use with the
    * <code>ISourceProvider</code> and <code>IEvaluationContext</code>.
-   *
-   * @since 3.2
    */
-  static const QString ACTIVE_PART_ID_NAME(); // = "activePartId"();
+  static const QString ACTIVE_PART_ID_NAME();
 
   /**
    * The priority given when the source includes the active workbench site. In
    * the case of nesting components, one should be careful to only activate
    * the most nested component.
    */
-  static int ACTIVE_SITE(); // = 1 << 26();
+  static int ACTIVE_SITE(); // = 1 << 23();
 
   /**
    * The variable name for the active workbench site. This is for use with the
    * <code>ISourceProvider</code> and <code>IEvaluationContext</code>.
    */
-  static const QString ACTIVE_SITE_NAME(); // = "activeSite"();
+  static const QString ACTIVE_SITE_NAME();
 
   /**
    * The variable for the showIn selection.  This is for use with the
    * <code>ISourceProvider</code> and <code>IEvaluationContext</code>.
-   * @since 3.4
    * @see IShowInSource
    */
-  static const QString SHOW_IN_SELECTION(); // = "showInSelection"();
+  static const QString SHOW_IN_SELECTION();
 
   /**
    * The variable for the showIn input.  This is for use with the
    * <code>ISourceProvider</code> and <code>IEvaluationContext</code>.
-   * @since 3.4
    * @see IShowInSource
    */
-  static const QString SHOW_IN_INPUT(); // = "showInInput"();
+  static const QString SHOW_IN_INPUT();
 
   /**
    * The priority given when the source includes the current selection.
    */
-  static int ACTIVE_CURRENT_SELECTION(); // = 1 << 30();
+  static int ACTIVE_CURRENT_SELECTION(); // = 1 << 27();
 
   /**
    * The variable name for the active selection. This is for use with the
    * <code>ISourceProvider</code> and <code>IEvaluationContext</code>.
-   * @since 3.2
    */
-  static const QString ACTIVE_CURRENT_SELECTION_NAME(); // = "selection"();
+  static const QString ACTIVE_CURRENT_SELECTION_NAME();
 
   /**
    * The priority given when the source includes the current menu.
-   * @since 3.2
    */
-  static int ACTIVE_MENU(); // = 1 << 31();
+  static int ACTIVE_MENU(); // = 1 << 30();
 
   /**
    * The variable name for the active menu. This is for use with the
    * {@link ISourceProvider} and {@link IEvaluationContext}.
-   * @since 3.2
    */
-  static const QString ACTIVE_MENU_NAME(); // = "activeMenu"();
+  static const QString ACTIVE_MENU_NAME();
 
   /**
    * The variable name for the <b>local</b> selection, available while a
    * context menu is visible.
-   *
-   * @since 3.3
    */
-  static const QString ACTIVE_MENU_SELECTION_NAME(); // = "activeMenuSelection"();
+  static const QString ACTIVE_MENU_SELECTION_NAME();
 
   /**
    * The variable name for the <b>local</b> editor input which is sometimes
    * available while a context menu is visible.
-   *
-   * @since 3.3
    */
-  static const QString ACTIVE_MENU_EDITOR_INPUT_NAME(); // = "activeMenuEditorInput"();
+  static const QString ACTIVE_MENU_EDITOR_INPUT_NAME();
 
   /**
    * The variable name for the active focus Control, when provided by the
    * IFocusService.
-   *
-   * @since 3.3
    */
-  static const QString ACTIVE_FOCUS_CONTROL_NAME(); // = "activeFocusControl"();
+  static const QString ACTIVE_FOCUS_CONTROL_NAME();
 
   /**
    * The variable name for the active focus Control id, when provided by the
    * IFocusService.
-   *
-   * @since 3.3
    */
-  static const QString ACTIVE_FOCUS_CONTROL_ID_NAME(); // = "activeFocusControlId"();
+  static const QString ACTIVE_FOCUS_CONTROL_ID_NAME();
 };
 
 }
 
 #endif /*BERRYISOURCES_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIStructuredSelection.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIStructuredSelection.h
index 3c625210f2..71d287b808 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIStructuredSelection.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIStructuredSelection.h
@@ -1,88 +1,88 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYISTRUCTUREDSELECTION_H_
 #define BERRYISTRUCTUREDSELECTION_H_
 
 #include "berryISelection.h"
 
 #include <berryObjectList.h>
 #include <org_blueberry_ui_qt_Export.h>
 
 namespace berry
 {
 
 /**
  * A selection containing elements.
  */
 struct BERRY_UI_QT IStructuredSelection : public ISelection {
 
   typedef ObjectList<Object::Pointer> ContainerType;
   typedef ContainerType::const_iterator iterator;
 
-  berryInterfaceMacro(IStructuredSelection, berry)
+  berryObjectMacro(berry::IStructuredSelection)
 
   /**
    * Returns the first element in this selection, or <code>null</code>
    * if the selection is empty.
    *
    * @return an element, or <code>null</code> if none
    */
   virtual Object::Pointer GetFirstElement() const = 0;
 
   /**
    * Returns an iterator to the beginning of the elements of this selection.
    *
    * @return an iterator over the selected elements
    */
   virtual iterator Begin() const = 0;
 
   /**
    * Returns an iterator to the end of the elements of this selection.
    *
    * @return an iterator over the selected elements
    */
   virtual iterator End() const = 0;
 
   /**
    * Returns the number of elements selected in this selection.
    *
    * @return the number of elements selected
    */
   virtual int Size() const = 0;
 
   /**
    * Returns the elements in this selection as a vector.
    *
    * @return the selected elements as a vector
    */
   virtual ContainerType::Pointer ToVector() const = 0;
 
   /*
    * We need to define at least the destructor in this compilation unit
    * because of the export macro above. Otherwise Windows throws
    * a linker error in dependent librraies. The export macro is needed
    * for gcc < 4.5 to correctly mark the type_info object of this class
    * as visible (we have default visibility 'hidden') so that dynamic_cast calls work.
    */
   virtual ~IStructuredSelection();
 
 };
 
 }
 
 #endif /* BERRYISTRUCTUREDSELECTION_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIViewCategory.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIViewCategory.h
index a231857fc0..6a3d267a31 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIViewCategory.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIViewCategory.h
@@ -1,45 +1,45 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIVIEWCATEGORY_H_
 #define BERRYIVIEWCATEGORY_H_
 
 #include "berryIViewDescriptor.h"
 
 #include <berryMacros.h>
 
 
 namespace berry {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  */
 struct BERRY_UI_QT IViewCategory : public Object
 {
-  berryInterfaceMacro(IViewCategory, berry);
+  berryObjectMacro(berry::IViewCategory)
 
   virtual QString GetId() const = 0;
   virtual QString GetLabel() const = 0;
   virtual QStringList GetPath() const = 0;
   virtual QList<IViewDescriptor::Pointer> GetViews() const = 0;
 
   virtual ~IViewCategory();
 };
 
 }
 
 #endif /*BERRYIVIEWCATEGORY_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIViewDescriptor.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIViewDescriptor.h
index c95eb1abb3..8d34d15f69 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIViewDescriptor.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIViewDescriptor.h
@@ -1,107 +1,109 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIVIEWDESCRIPTOR_H_
 #define BERRYIVIEWDESCRIPTOR_H_
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include "berryIWorkbenchPartDescriptor.h"
 #include "berryIViewPart.h"
 
 #include <berryIConfigurationElement.h>
 #include <berryIAdaptable.h>
 #include "berryImageDescriptor.h"
 
 #include <string>
 #include <vector>
 
 namespace berry
 {
+
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * This is a view descriptor. It provides a "description" of a given
  * given view so that the view can later be constructed.
  * <p>
  * The view registry provides facilities to map from an extension
  * to a IViewDescriptor.
  * </p>
  * <p>
  * This interface is not intended to be implemented by clients.
  * </p>
  *
  * @see org.blueberry.ui.IViewRegistry
  */
 struct BERRY_UI_QT IViewDescriptor : public IWorkbenchPartDescriptor, public IAdaptable
 {
-  berryInterfaceMacro(IViewDescriptor, berry);
+
+  berryObjectMacro(berry::IViewDescriptor)
 
   ~IViewDescriptor();
 
   /**
    * Creates an instance of the view defined in the descriptor.
    *
    * @return the view part
    * @throws CoreException thrown if there is a problem creating the part
    */
   virtual IViewPart::Pointer CreateView() = 0;
 
-
   virtual std::vector< std::string> GetKeywordReferences() const = 0;
 
   /**
    * Returns an array of strings that represent
    * view's category path. This array will be used
    * for hierarchical presentation of the
    * view in places like submenus.
    * @return array of category tokens or null if not specified.
    */
   virtual const QList<QString>& GetCategoryPath() const = 0;
 
   /**
    * Returns the description of this view.
    *
    * @return the description
    */
   virtual QString GetDescription() const = 0;
 
 
   /**
    * Returns the descriptor for the icon to show for this view.
    */
   virtual SmartPointer<ImageDescriptor> GetImageDescriptor() const = 0;
 
 
   /**
    * Returns whether this view allows multiple instances.
    *
    * @return whether this view allows multiple instances
    */
   virtual bool GetAllowMultiple() const = 0;
 
   /**
    * Returns whether this view can be restored upon workbench restart.
    *
    * @return whether whether this view can be restored upon workbench restart
    */
   virtual bool IsRestorable() const = 0;
 
   virtual bool operator==(const Object*) const = 0;
 };
+
 }
 
 #endif /*BERRYIVIEWDESCRIPTOR_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIViewLayout.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIViewLayout.h
index d66bd24d2d..6dffc9ad18 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIViewLayout.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIViewLayout.h
@@ -1,92 +1,92 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIVIEWLAYOUT_H_
 #define BERRYIVIEWLAYOUT_H_
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include <berryMacros.h>
 #include <berryObject.h>
 
 namespace berry {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * Represents the layout info for a view or placeholder in an {@link IPageLayout}.
  * <p>
  * This interface is not intended to be implemented by clients.
  * </p>
  *
- * @since 3.0
  * @noimplement This interface is not intended to be implemented by clients.
  */
-struct BERRY_UI_QT IViewLayout : public Object {
+struct BERRY_UI_QT IViewLayout : public Object
+{
 
-  berryInterfaceMacro(IViewLayout, berry);
+  berryObjectMacro(berry::IViewLayout)
 
   virtual  ~IViewLayout();
 
     /**
      * Returns whether the view is closeable.
      * The default is <code>true</code>.
      *
      * @return <code>true</code> if the view is closeable, <code>false</code> if not
      */
     virtual bool IsCloseable() = 0;
 
     /**
      * Sets whether the view is closeable.
      *
      * @param closeable <code>true</code> if the view is closeable, <code>false</code> if not
      */
   virtual void SetCloseable(bool closeable) = 0;
 
     /**
      * Returns whether the view is moveable.
      * The default is <code>true</code>.
      *
      * @return <code>true</code> if the view is moveable, <code>false</code> if not
      */
   virtual bool IsMoveable() = 0;
 
     /**
      * Sets whether the view is moveable.
      *
      * @param moveable <code>true</code> if the view is moveable, <code>false</code> if not
      */
   virtual void SetMoveable(bool moveable) = 0;
 
     /**
      * Returns whether the view is a standalone view.
      *
      * @see IPageLayout#addStandaloneView
      */
   virtual bool IsStandalone() = 0;
 
     /**
      * Returns whether the view shows its title.
      * This is only applicable to standalone views.
      *
      * @see IPageLayout#addStandaloneView
      */
   virtual bool GetShowTitle() = 0;
 };
 
 }
 
 #endif /*BERRYIVIEWLAYOUT_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIViewPart.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIViewPart.h
index 08281534ed..c1d428b5f8 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIViewPart.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIViewPart.h
@@ -1,124 +1,125 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIVIEWPART_H_
 #define BERRYIVIEWPART_H_
 
 #include <org_blueberry_ui_qt_Export.h>
 #include "berryMacros.h"
 
 #include "berryIMemento.h"
 #include "berryIWorkbenchPart.h"
 #include "berryIViewSite.h"
 
 #include <QObject>
 
 namespace berry {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * A view is a visual component within a workbench page. It is typically used to
  * navigate a hierarchy of information (like the workspace), open an editor, or
  * display properties for the active editor. Modifications made in a view are
  * saved immediately (in contrast to an editor part, which conforms to a more
  * elaborate open-save-close lifecycle).
  * <p>
  * Only one instance of a particular view type may exist within a workbench
  * page. This policy is designed to simplify part management for a user.
  * </p>
  * <p>
  * This interface may be implemented directly. For convenience, a base
  * implementation is defined in <code>ViewPart</code>.
  * </p>
  * <p>
  * A view is added to the workbench in two steps:
  * <ol>
  * <li>A view extension is contributed to the workbench registry. This
  * extension defines the extension id and extension class.</li>
  * <li>The view is included in the default layout for a perspective.
  * Alternatively, the user may open the view from the Perspective menu.</li>
  * </ol>
  * </p>
  * <p>
  * Views implement the <code>IAdaptable</code> interface; extensions are
  * managed by the platform's adapter manager.
  * </p>
  * <p>
  * As of 3.4, views may optionally adapt to {@link ISizeProvider} if they have
  * a preferred size. The default presentation will make a best effort to
  * allocate the preferred size to a view if it is the only part in a stack. If
  * there is more than one part in the stack, the constraints will be disabled
  * for that stack. The size constraints are adjusted for the size of the tab and
  * border trim. Note that this is considered to be a hint to the presentation,
  * and not all presentations may honor size constraints.
  * </p>
  *
  * @see IWorkbenchPage#showView
  * @see org.blueberry.ui.part.ViewPart
  * @see ISizeProvider
  */
-struct BERRY_UI_QT IViewPart : public virtual IWorkbenchPart {
+struct BERRY_UI_QT IViewPart : public virtual IWorkbenchPart
+{
 
-  berryInterfaceMacro(IViewPart, berry);
+  berryObjectMacro(berry::IViewPart)
 
   virtual ~IViewPart();
 
     /**
      * Returns the site for this view.
      * This method is equivalent to <code>(IViewSite) getSite()</code>.
      * <p>
      * The site can be <code>null</code> while the view is being initialized.
      * After the initialization is complete, this value must be non-<code>null</code>
      * for the remainder of the view's life cycle.
      * </p>
      *
      * @return the view site; this value may be <code>null</code> if the view
      *         has not yet been initialized
      */
     virtual IViewSite::Pointer GetViewSite() = 0;
 
 
     /**
      * Initializes this view with the given view site.  A memento is passed to
      * the view which contains a snapshot of the views state from a previous
      * session.  Where possible, the view should try to recreate that state
      * within the part controls.
      * <p>
      * This method is automatically called by the workbench shortly after the part
      * is instantiated.  It marks the start of the views's lifecycle. Clients must
      * not call this method.
      * </p>
      *
      * @param site the view site
      * @param memento the IViewPart state or null if there is no previous saved state
      * @exception PartInitException if this view was not initialized successfully
      */
     virtual void Init(IViewSite::Pointer site, IMemento::Pointer memento = IMemento::Pointer(0)) = 0;
 
     /**
      * Saves the object state within a memento.
      *
      * @param memento a memento to receive the object state
      */
     virtual void SaveState(IMemento::Pointer memento) = 0;
 };
 
 }
 
-Q_DECLARE_INTERFACE(berry::IViewPart, "org.blueberry.IViewPart")
+Q_DECLARE_INTERFACE(berry::IViewPart, "org.blueberry.ui.IViewPart")
 
 #endif /*BERRYIVIEWPART_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIViewReference.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIViewReference.h
index b067d9b551..a6334e853f 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIViewReference.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIViewReference.h
@@ -1,60 +1,60 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIVIEWREFERENCE_H_
 #define BERRYIVIEWREFERENCE_H_
 
 #include "berryIWorkbenchPartReference.h"
 #include "berryIViewPart.h"
 
 namespace berry {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * Defines a reference to an IViewPart.
  * <p>
  * This interface is not intended to be implemented by clients.
  * </p>
  */
 struct BERRY_UI_QT IViewReference : virtual public IWorkbenchPartReference {
 
-  berryInterfaceMacro(IViewReference, berry)
+  berryObjectMacro(berry::IViewReference)
 
   ~IViewReference();
 
     /**
      * Returns the secondary ID for the view.
      *
      * @return the secondary ID, or <code>null</code> if there is no secondary id
      * @see IWorkbenchPage#showView(String, String, int)
      * @since 3.0
      */
     virtual QString GetSecondaryId() = 0;
 
     /**
      * Returns the <code>IViewPart</code> referenced by this object.
      * Returns <code>null</code> if the view was not instantiated or
      * it failed to be restored.  Tries to restore the view
      * if <code>restore</code> is true.
      */
     virtual IViewPart::Pointer GetView(bool restore) = 0;
 
 };
 
 }  // namespace berry
 
 #endif /*BERRYIVIEWREFERENCE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIViewSite.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIViewSite.h
index e498799f8a..e53e8e29f5 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIViewSite.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIViewSite.h
@@ -1,62 +1,62 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIVIEWSITE_H_
 #define BERRYIVIEWSITE_H_
 
 #include "berryIWorkbenchPartSite.h"
 
 #include <string>
 
 namespace berry {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * The primary interface between a view part and the workbench.
  * <p>
  * The workbench exposes its implemention of view part sites via this interface,
  * which is not intended to be implemented or extended by clients.
  * </p>
  * @noimplement This interface is not intended to be implemented by clients.
  */
-struct BERRY_UI_QT IViewSite : public virtual IWorkbenchPartSite {
+struct BERRY_UI_QT IViewSite : public virtual IWorkbenchPartSite
+{
 
-  berryInterfaceMacro(IViewSite, berry);
+  berryObjectMacro(berry::IViewSite)
 
   virtual ~IViewSite();
 
     /**
      * Returns the action bars for this part site.
      * Views have exclusive use of their site's action bars.
      *
      * @return the action bars
      */
     //IActionBars getActionBars();
 
     /**
      * Returns the secondary id for this part site's part,
      * or <code>null</code> if it has none.
      *
      * @see IWorkbenchPage#showView(String, String, int)
-     * @since 3.0
      */
     virtual QString GetSecondaryId() = 0;
 };
 
 }
 
 #endif /*BERRYIVIEWSITE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWindowListener.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWindowListener.cpp
index 4a66d63adf..41774cfdf6 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWindowListener.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWindowListener.cpp
@@ -1,45 +1,49 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryIWindowListener.h"
 
 namespace berry {
 
 void
 IWindowListener::Events
-::AddListener(IWindowListener::Pointer listener)
+::AddListener(IWindowListener* listener)
 {
-  if (listener.IsNull()) return;
+  if (listener == NULL) return;
 
-  windowActivated += Delegate(listener.GetPointer(), &IWindowListener::WindowActivated);
-  windowDeactivated += Delegate(listener.GetPointer(), &IWindowListener::WindowDeactivated);
-  windowClosed += Delegate(listener.GetPointer(), &IWindowListener::WindowClosed);
-  windowOpened += Delegate(listener.GetPointer(), &IWindowListener::WindowOpened);
+  windowActivated += Delegate(listener, &IWindowListener::WindowActivated);
+  windowDeactivated += Delegate(listener, &IWindowListener::WindowDeactivated);
+  windowClosed += Delegate(listener, &IWindowListener::WindowClosed);
+  windowOpened += Delegate(listener, &IWindowListener::WindowOpened);
 }
 
 void
 IWindowListener::Events
-::RemoveListener(IWindowListener::Pointer listener)
+::RemoveListener(IWindowListener* listener)
 {
-  if (listener.IsNull()) return;
+  if (listener == NULL) return;
 
-  windowActivated -= Delegate(listener.GetPointer(), &IWindowListener::WindowActivated);
-  windowDeactivated -= Delegate(listener.GetPointer(), &IWindowListener::WindowDeactivated);
-  windowClosed -= Delegate(listener.GetPointer(), &IWindowListener::WindowClosed);
-  windowOpened -= Delegate(listener.GetPointer(), &IWindowListener::WindowOpened);
+  windowActivated -= Delegate(listener, &IWindowListener::WindowActivated);
+  windowDeactivated -= Delegate(listener, &IWindowListener::WindowDeactivated);
+  windowClosed -= Delegate(listener, &IWindowListener::WindowClosed);
+  windowOpened -= Delegate(listener, &IWindowListener::WindowOpened);
+}
+
+IWindowListener::~IWindowListener()
+{
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWindowListener.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWindowListener.h
index 753928e7d4..cc94cb605b 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWindowListener.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWindowListener.h
@@ -1,99 +1,99 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIWINDOWLISTENER_H_
 #define BERRYIWINDOWLISTENER_H_
 
 #include <org_blueberry_ui_qt_Export.h>
 
-#include <berryMacros.h>
 #include <berryMessage.h>
 
 #include "berryIWorkbenchWindow.h"
 
 namespace berry
 {
 
 /**
  * Interface for listening to window lifecycle events.
  * <p>
  * This interface may be implemented by clients.
  * </p>
  */
-struct BERRY_UI_QT IWindowListener : public virtual Object {
-
-  berryInterfaceMacro(IWindowListener, berry);
+struct BERRY_UI_QT IWindowListener
+{
 
   struct Events {
-    typedef Message1<IWorkbenchWindow::Pointer> WindowEvent;
+    typedef Message1<const IWorkbenchWindow::Pointer&> WindowEvent;
 
     WindowEvent windowActivated;
     WindowEvent windowDeactivated;
     WindowEvent windowClosed;
     WindowEvent windowOpened;
 
-    void AddListener(IWindowListener::Pointer listener);
-    void RemoveListener(IWindowListener::Pointer listener);
+    void AddListener(IWindowListener* listener);
+    void RemoveListener(IWindowListener* listener);
 
   private:
 
-    typedef MessageDelegate1<IWindowListener, IWorkbenchWindow::Pointer> Delegate;
+    typedef MessageDelegate1<IWindowListener, const IWorkbenchWindow::Pointer&> Delegate;
   };
 
+  virtual ~IWindowListener();
+
   /**
    * Notifies this listener that the given window has been activated.
    * <p>
    * <b>Note:</b> This event is not fired if no perspective is
    * open (the window is empty).
    * </p>
    *
    * @param window the window that was activated
    */
-  virtual void WindowActivated(IWorkbenchWindow::Pointer /*window*/) {};
+  virtual void WindowActivated(const IWorkbenchWindow::Pointer& /*window*/) {}
 
   /**
    * Notifies this listener that the given window has been deactivated.
    * <p>
    * <b>Note:</b> This event is not fired if no perspective is
    * open (the window is empty).
    * </p>
    *
    * @param window the window that was activated
    */
-  virtual void WindowDeactivated(IWorkbenchWindow::Pointer /*window*/) {};
+  virtual void WindowDeactivated(const IWorkbenchWindow::Pointer& /*window*/) {}
 
   /**
    * Notifies this listener that the given window has been closed.
    *
    * @param window the window that was closed
    * @see IWorkbenchWindow#close
    */
-  virtual void WindowClosed(IWorkbenchWindow::Pointer /*window*/) {};
+  virtual void WindowClosed(const IWorkbenchWindow::Pointer& /*window*/) {}
 
   /**
    * Notifies this listener that the given window has been opened.
    *
    * @param window the window that was opened
    * @see IWorkbench#openWorkbenchWindow
    */
-  virtual void WindowOpened(IWorkbenchWindow::Pointer /*window*/) {};
+  virtual void WindowOpened(const IWorkbenchWindow::Pointer& /*window*/) {}
 
 };
 
 }
 
 #endif /* BERRYIWINDOWLISTENER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbench.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbench.h
index cd3ad8fe5e..08257c56ef 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbench.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbench.h
@@ -1,400 +1,400 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIWORKBENCH_H_
 #define BERRYIWORKBENCH_H_
 
 #include <berryMacros.h>
 
 #include "services/berryIServiceLocator.h"
 #include "dialogs/berryIDialog.h"
 #include "berryIViewRegistry.h"
 #include "berryIEditorRegistry.h"
 #include "intro/berryIIntroManager.h"
 #include "berryIPerspectiveRegistry.h"
 #include "berryIWorkbenchWindow.h"
 #include "berryIWorkbenchListener.h"
 #include "berryIWindowListener.h"
 #include "berryDisplay.h"
 
 namespace berry {
 
 struct IWorkbenchPage;
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * A workbench is the root object for the BlueBerry Platform user interface.
  * <p>
  * A <b>workbench</b> has one or more main windows which present to the end
  * user information based on some underlying model, typically on resources in an
  * underlying workspace. A workbench usually starts with a single open window,
  * and automatically closes when its last window closes.
  * </p>
  * <p>
  * Each <b>workbench window</b> has a collection of <b>pages</b>; the active
  * page is the one that is being presented to the end user; at most one page is
  * active in a window at a time.
  * </p>
  * <p>
  * Each workbench page has a collection of <b>workbench parts</b>, of which
  * there are two kinds: views and editors. A page's parts are arranged (tiled or
  * stacked) for presentation on the screen. The arrangement is not fixed; the
  * user can arrange the parts as they see fit. A <b>perspective</b> is a
  * template for a page, capturing a collection of parts and their arrangement.
  * </p>
  * <p>
  * The platform creates a workbench when the workbench plug-in is activated;
  * since this happens at most once during the life of the running platform,
  * there is only one workbench instance. Due to its singular nature, it is
  * commonly referred to as <it>the</it> workbench.
  * </p>
  * <p>
  * The workbench supports a few {@link IServiceLocator services} by default. If
  * these services are used to allocate resources, it is important to remember to
  * clean up those resources after you are done with them. Otherwise, the
  * resources will exist until the workbench shuts down. The supported services
  * are:
  * </p>
  * <ul>
  * <li>{@link IBindingService}</li>
  * <li>{@link ICommandService}</li>
  * <li>{@link IContextService}</li>
  * <li>{@link IHandlerService}</li>
  * </ul>
  * <p>
  * This interface is not intended to be implemented by clients.
  * </p>
  *
  * @see PlatformUI#getWorkbench
  * @noimplement This interface is not intended to be implemented by clients.
  */
 struct BERRY_UI_QT IWorkbench : public IServiceLocator {
 
-  berryInterfaceMacro(IWorkbench, berry);
+  berryObjectMacro(berry::IWorkbench)
 
   virtual ~IWorkbench();
 
   /**
    * Returns the display for this workbench.
    * <p>
    * Code should always ask the workbench for the display rather than rely on
    * {@link Display#getDefault Display.getDefault()}.
    * </p>
    *
    * @return the display to be used for all UI interactions with this
    *         workbench
    */
   virtual Display* GetDisplay() = 0;
 
   /**
    * Adds a workbench listener.
    *
    * @param listener
    *            the workbench listener to add
    * @since 3.2
    */
-  virtual void AddWorkbenchListener(IWorkbenchListener::Pointer listener) = 0;
+  virtual void AddWorkbenchListener(IWorkbenchListener* listener) = 0;
 
   /**
    * Removes a workbench listener.
    *
    * @param listener
    *            the workbench listener to remove
    * @since 3.2
    */
-  virtual void RemoveWorkbenchListener(IWorkbenchListener::Pointer listener) = 0;
+  virtual void RemoveWorkbenchListener(IWorkbenchListener* listener) = 0;
 
   /**
    * Returns the workbench events object
    */
   virtual IWorkbenchListener::Events& GetWorkbenchEvents() = 0;
 
   /**
    * Adds a window listener.
    *
    * @param listener
    *            the window listener to add
    * @since 2.0
    */
-  virtual void AddWindowListener(IWindowListener::Pointer listener) = 0;
+  virtual void AddWindowListener(IWindowListener* listener) = 0;
 
   /**
    * Removes a window listener.
    *
    * @param listener
    *            the window listener to remove
    * @since 2.0
    */
-  virtual void RemoveWindowListener(IWindowListener::Pointer listener) = 0;
+  virtual void RemoveWindowListener(IWindowListener* listener) = 0;
 
   /**
    * Returns the window events object
    *
    */
   virtual IWindowListener::Events& GetWindowEvents() = 0;
 
   /**
    * Closes this workbench and all its open windows.
    * <p>
    * If the workbench has an open editor with unsaved content, the user will
    * be given the opportunity to save it.
    * </p>
    *
    * @return <code>true</code> if the workbench was successfully closed, and
    *         <code>false</code> if it is still open
    */
   virtual bool Close() = 0;
 
   /**
    * Returns the currently active window for this workbench (if any). Returns
    * <code>null</code> if there is no active workbench window. Returns
    * <code>null</code> if called from a non-UI thread.
    *
    * @return the active workbench window, or <code>null</code> if there is
    *         no active workbench window or if called from a non-UI thread
    */
-  virtual IWorkbenchWindow::Pointer GetActiveWorkbenchWindow() = 0;
+  virtual IWorkbenchWindow::Pointer GetActiveWorkbenchWindow() const = 0;
 
   /**
    * Returns the perspective registry for the workbench.
    *
    * @return the workbench perspective registry
    */
   virtual IPerspectiveRegistry* GetPerspectiveRegistry() = 0;
 
   /**
    * Returns the view registry for the workbench.
    *
    * @return the workbench view registry
    * @since 3.1
    */
   virtual IViewRegistry* GetViewRegistry() = 0;
 
   /**
    * Returns the editor registry for the workbench.
    *
    * @return the workbench editor registry
    */
   virtual IEditorRegistry* GetEditorRegistry() = 0;
 
   /**
    * Returns the number of open main windows associated with this workbench.
    * Note that wizards and dialogs are not included in this list since they
    * are not considered main windows.
    *
    * @return the number of open windows
    * @since 3.0
    */
   virtual std::size_t GetWorkbenchWindowCount() = 0;
 
   /**
    * Returns a list of the open main windows associated with this workbench.
    * Note that wizards and dialogs are not included in this list since they
    * are not considered main windows.
    *
    * @return a list of open windows
    */
   virtual QList<IWorkbenchWindow::Pointer> GetWorkbenchWindows() = 0;
 
   /**
    * Creates and opens a new workbench window with one page. The perspective
    * of the new page is defined by the specified perspective ID. The new
    * window and new page become active.
    * <p>
    * <b>Note:</b> The caller is responsible to ensure the action using this
    * method will explicitly inform the user a new window will be opened.
    * Otherwise, callers are strongly recommended to use the
    * <code>openPerspective</code> APIs to programmatically show a
    * perspective to avoid confusing the user.
    * </p>
    * <p>
    * In most cases where this method is used the caller is tightly coupled to
    * a particular perspective. They define it in the registry and contribute
    * some user interface action to open or activate it. In situations like
    * this a static variable is often used to identify the perspective ID.
    * </p>
    *
    * @param perspectiveId
    *            the perspective id for the window's initial page, or
    *            <code>null</code> for no initial page
    * @param input
    *            the page input, or <code>null</code> if there is no current
    *            input. This is used to seed the input for the new page's
    *            views.
    * @return the new workbench window
    * @exception WorkbenchException
    *                if a new window and page could not be opened
    *
    * @see IWorkbench#showPerspective(String, IWorkbenchWindow, IAdaptable)
    */
   virtual IWorkbenchWindow::Pointer OpenWorkbenchWindow(const QString& perspectiveId,
       IAdaptable* input) = 0;
 
   /**
    * Creates and opens a new workbench window with one page. The perspective
    * of the new page is defined by the default perspective ID. The new window
    * and new page become active.
    * <p>
    * <b>Note:</b> The caller is responsible to ensure the action using this
    * method will explicitly inform the user a new window will be opened.
    * Otherwise, callers are strongly recommended to use the
    * <code>openPerspective</code> APIs to programmatically show a
    * perspective to avoid confusing the user.
    * </p>
    *
    * @param input
    *            the page input, or <code>null</code> if there is no current
    *            input. This is used to seed the input for the new page's
    *            views.
    * @return the new workbench window
    * @exception WorkbenchException
    *                if a new window and page could not be opened
    *
    * @see IWorkbench#showPerspective(String, IWorkbenchWindow, IAdaptable)
    */
   virtual IWorkbenchWindow::Pointer OpenWorkbenchWindow(IAdaptable* input) = 0;
 
   /**
    * Shows the specified perspective to the user. The caller should use this
    * method when the perspective to be shown is not dependent on the page's
    * input. That is, the perspective can open in any page depending on user
    * preferences.
    * <p>
    * The perspective may be shown in the specified window, in another existing
    * window, or in a new window depending on user preferences. The exact
    * policy is controlled by the workbench to ensure consistency to the user.
    * The policy is subject to change. The current policy is as follows:
    * <ul>
    * <li>If the specified window has the requested perspective open, then the
    * window is given focus and the perspective is shown. The page's input is
    * ignored.</li>
    * <li>If another window that has the workspace root as input and the
    * requested perspective open and active, then the window is given focus.
    * </li>
    * <li>Otherwise the requested perspective is opened and shown in the
    * specified window or in a new window depending on the current user
    * preference for opening perspectives, and that window is given focus.
    * </li>
    * </ul>
    * </p>
    * <p>
    * The workbench also defines a number of menu items to activate or open
    * each registered perspective. A complete list of these perspectives is
    * available from the perspective registry found on <code>IWorkbench</code>.
    * </p>
    *
    * @param perspectiveId
    *            the perspective ID to show
    * @param window
    *            the workbench window of the action calling this method.
    * @return the workbench page that the perspective was shown
    * @exception WorkbenchException
    *                if the perspective could not be shown
    *
    * @since 2.0
    */
   virtual SmartPointer<IWorkbenchPage> ShowPerspective(const QString& perspectiveId,
       IWorkbenchWindow::Pointer window) = 0;
 
   /**
    * Shows the specified perspective to the user. The caller should use this
    * method when the perspective to be shown is dependent on the page's input.
    * That is, the perspective can only open in any page with the specified
    * input.
    * <p>
    * The perspective may be shown in the specified window, in another existing
    * window, or in a new window depending on user preferences. The exact
    * policy is controlled by the workbench to ensure consistency to the user.
    * The policy is subject to change. The current policy is as follows:
    * <ul>
    * <li>If the specified window has the requested perspective open and the
    * same requested input, then the window is given focus and the perspective
    * is shown.</li>
    * <li>If another window has the requested input and the requested
    * perspective open and active, then that window is given focus.</li>
    * <li>If the specified window has the same requested input but not the
    * requested perspective, then the window is given focus and the perspective
    * is opened and shown on condition that the user preference is not to open
    * perspectives in a new window.</li>
    * <li>Otherwise the requested perspective is opened and shown in a new
    * window, and the window is given focus.</li>
    * </ul>
    * </p>
    * <p>
    * The workbench also defines a number of menu items to activate or open
    * each registered perspective. A complete list of these perspectives is
    * available from the perspective registry found on <code>IWorkbench</code>.
    * </p>
    *
    * @param perspectiveId
    *            the perspective ID to show
    * @param window
    *            the workbench window of the action calling this method.
    * @param input
    *            the page input, or <code>null</code> if there is no current
    *            input. This is used to seed the input for the page's views
    * @return the workbench page that the perspective was shown
    * @exception WorkbenchException
    *                if the perspective could not be shown
    *
    * @since 2.0
    */
   virtual SmartPointer<IWorkbenchPage> ShowPerspective(const QString& perspectiveId,
       IWorkbenchWindow::Pointer window, IAdaptable* input) = 0;
 
   /**
    * Save all dirty editors in the workbench. Opens a dialog to prompt the
    * user if <code>confirm</code> is true. Return true if successful. Return
    * false if the user has canceled the command.
    *
    * @param confirm <code>true</code> to ask the user before saving unsaved
    *            changes (recommended), and <code>false</code> to save
    *            unsaved changes without asking
    * @return <code>true</code> if the command succeeded, and
    *         <code>false</code> if the operation was canceled by the user or
    *         an error occurred while saving
    */
   virtual bool SaveAllEditors(bool confirm) = 0;
 
   /**
    * Return the intro manager for this workbench.
    *
    * @return the intro manager for this workbench. Guaranteed not to be
    *         <code>null</code>.
    */
   virtual IIntroManager* GetIntroManager() = 0;
 
   /**
    * Returns a boolean indicating whether the workbench is in the process of
    * closing.
    *
    * @return <code>true</code> if the workbench is in the process of
    *         closing, <code>false</code> otherwise
    * @since 3.1
    */
   virtual bool IsClosing() = 0;
 
   /**
    * Applies changes of the current theme to the user interface.
    */
   virtual void UpdateTheme() = 0;
 
 };
 
 }
 
 #endif /*BERRYIWORKBENCH_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchListener.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchListener.cpp
index abf5dec244..edcf744649 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchListener.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchListener.cpp
@@ -1,41 +1,45 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryIWorkbenchListener.h"
 
 namespace berry {
 
 void
 IWorkbenchListener::Events
-::AddListener(IWorkbenchListener::Pointer listener)
+::AddListener(IWorkbenchListener* listener)
 {
-  if (listener.IsNull()) return;
+  if (listener == NULL) return;
 
-  preShutdown += Delegate2(listener.GetPointer(), &IWorkbenchListener::PreShutdown);
-  postShutdown += Delegate1(listener.GetPointer(), &IWorkbenchListener::PostShutdown);
+  preShutdown += Delegate2(listener, &IWorkbenchListener::PreShutdown);
+  postShutdown += Delegate1(listener, &IWorkbenchListener::PostShutdown);
 }
 
 void
 IWorkbenchListener::Events
-::RemoveListener(IWorkbenchListener::Pointer listener)
+::RemoveListener(IWorkbenchListener* listener)
 {
-  if (listener.IsNull()) return;
+  if (listener == NULL) return;
 
-  preShutdown -= Delegate2(listener.GetPointer(), &IWorkbenchListener::PreShutdown);
-  postShutdown -= Delegate1(listener.GetPointer(), &IWorkbenchListener::PostShutdown);
+  preShutdown -= Delegate2(listener, &IWorkbenchListener::PreShutdown);
+  postShutdown -= Delegate1(listener, &IWorkbenchListener::PostShutdown);
+}
+
+IWorkbenchListener::~IWorkbenchListener()
+{
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchListener.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchListener.h
index 85249e0acd..3a5951b9e5 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchListener.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchListener.h
@@ -1,101 +1,99 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIWORKBENCHLISTENER_H_
 #define BERRYIWORKBENCHLISTENER_H_
 
 #include <org_blueberry_ui_qt_Export.h>
 
-#include <berryMacros.h>
-#include <berryObject.h>
-#include <berryMessage.h>
+#include "berryMessage.h"
 
 namespace berry
 {
 
 struct IWorkbench;
 
 /**
  * Interface for listening to workbench lifecycle events.
  * <p>
  * This interface may be implemented by clients.
  * </p>
  *
  * @see IWorkbench#addWorkbenchListener
  * @see IWorkbench#removeWorkbenchListener
- * @since 3.2
  */
-struct BERRY_UI_QT IWorkbenchListener : public virtual Object {
-
-  berryInterfaceMacro(IWorkbenchListener, berry);
+struct BERRY_UI_QT IWorkbenchListener
+{
 
   struct Events {
       typedef Message2<IWorkbench*, bool, bool> PreShutdownEvent;
       typedef Message1<IWorkbench*> PostShutdownEvent;
 
       PreShutdownEvent preShutdown;
       PostShutdownEvent postShutdown;
 
-      void AddListener(IWorkbenchListener::Pointer listener);
-      void RemoveListener(IWorkbenchListener::Pointer listener);
+      void AddListener(IWorkbenchListener* listener);
+      void RemoveListener(IWorkbenchListener* listener);
 
   private:
 
     typedef MessageDelegate2<IWorkbenchListener, IWorkbench*, bool, bool> Delegate2;
     typedef MessageDelegate1<IWorkbenchListener, IWorkbench*> Delegate1;
   };
 
+  virtual ~IWorkbenchListener();
+
   /**
    * Notifies that the workbench is about to shut down.
    * <p>
    * This method is called immediately prior to workbench shutdown before any
    * windows have been closed.
    * </p>
    * <p>
    * The listener may veto a regular shutdown by returning <code>false</code>,
    * although this will be ignored if the workbench is being forced to shut down.
    * </p>
    * <p>
    * Since other workbench listeners may veto the shutdown, the listener should
    * not dispose resources or do any other work during this notification that would
    * leave the workbench in an inconsistent state.
    * </p>
    *
    * @param workbench the workbench
    * @param forced <code>true</code> if the workbench is being forced to shutdown,
    *   <code>false</code> for a regular close
    * @return <code>true</code> to allow the workbench to proceed with shutdown,
    *   <code>false</code> to veto a non-forced shutdown
    */
-  virtual bool PreShutdown(IWorkbench*  /*workbench*/, bool  /*forced*/) { return true; };
+  virtual bool PreShutdown(IWorkbench*  /*workbench*/, bool  /*forced*/) { return true; }
 
   /**
    * Performs arbitrary finalization after the workbench stops running.
    * <p>
    * This method is called during workbench shutdown after all windows
    * have been closed.
    * </p>
    *
    * @param workbench the workbench
    */
-  virtual void PostShutdown(IWorkbench*  /*workbench*/) {};
+  virtual void PostShutdown(IWorkbench*  /*workbench*/) {}
 
 };
 
 }
 
 #endif /* BERRYIWORKBENCHLISTENER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchPage.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchPage.h
index a72805e870..5a13e28c6e 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchPage.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchPage.h
@@ -1,853 +1,854 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIWORKBENCHPAGE_H_
 #define BERRYIWORKBENCHPAGE_H_
 
 #include <berryMacros.h>
 
 #include "berryIEditorReference.h"
 #include "berryIViewReference.h"
 #include "berryIPerspectiveDescriptor.h"
 #include "berryIEditorPart.h"
 #include "berryIViewPart.h"
 #include "berryIEditorInput.h"
 #include "berryIPartService.h"
 #include "berryISelectionService.h"
 #include "berryIReusableEditor.h"
 
 #include "berryIWorkbenchWindow.h"
 
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  */
 namespace berry {
 
 /**
  * A workbench page consists of an arrangement of views and editors intended to
  * be presented together to the user in a single workbench window.
  * <p>
  * A page can contain 0 or more views and 0 or more editors. These views and
  * editors are contained wholly within the page and are not shared with other
  * pages. The layout and visible action set for the page is defined by a
  * perspective.
  * <p>
  * The number of views and editors within a page is restricted to simplify part
  * management for the user. In particular:
  * <ul>
  * <li>Unless a view explicitly allows for multiple instances in its plugin
  * declaration there will be only one instance in a given workbench page.</li>
  * <li>Only one editor can exist for each editor input within a page.
  * <li>
  * </ul>
  * </p>
  * <p>
  * This interface is not intended to be implemented by clients.
  * </p>
  *
  * @see IPerspectiveDescriptor
  * @see IEditorPart
  * @see IViewPart
  */
-struct BERRY_UI_QT IWorkbenchPage : public IPartService, public ISelectionService, public Object {
+struct BERRY_UI_QT IWorkbenchPage : public IPartService, public ISelectionService, public Object
+{
 
-  berryInterfaceMacro(IWorkbenchPage, berry)
+  berryObjectMacro(berry::IWorkbenchPage)
 
   ~IWorkbenchPage();
 
   /**
    * An optional attribute within a workspace marker (<code>IMarker</code>)
    * which identifies the preferred editor type to be opened when
    * <code>openEditor</code> is called.
    *
    * @see #openEditor(IEditorInput, String)
    * @see #openEditor(IEditorInput, String, boolean)
    * @deprecated in 3.0 since the notion of markers this is not generally
    *             applicable. Use the IDE-specific constant
    *             <code>IDE.EDITOR_ID_ATTR</code>.
    */
   static const QString EDITOR_ID_ATTR; // = "org.blueberry.ui.editorID";
 
   /**
    * Change event id when the perspective is reset to its original state.
    *
    * @see IPerspectiveListener
    */
   static const QString CHANGE_RESET; // = "reset";
 
   /**
    * Change event id when the perspective has completed a reset to its
    * original state.
    *
    * @since 3.0
    * @see IPerspectiveListener
    */
   static const QString CHANGE_RESET_COMPLETE; // = "resetComplete";
 
   /**
    * Change event id when one or more views are shown in a perspective.
    *
    * @see IPerspectiveListener
    */
   static const QString CHANGE_VIEW_SHOW; // = "viewShow";
 
   /**
    * Change event id when one or more views are hidden in a perspective.
    *
    * @see IPerspectiveListener
    */
   static const QString CHANGE_VIEW_HIDE; // = "viewHide";
 
   /**
    * Change event id when one or more editors are opened in a perspective.
    *
    * @see IPerspectiveListener
    */
   static const QString CHANGE_EDITOR_OPEN; // = "editorOpen";
 
   /**
    * Change event id when one or more editors are closed in a perspective.
    *
    * @see IPerspectiveListener
    */
   static const QString CHANGE_EDITOR_CLOSE; // = "editorClose";
 
   /**
    * Change event id when the editor area is shown in a perspective.
    *
    * @see IPerspectiveListener
    */
   static const QString CHANGE_EDITOR_AREA_SHOW; // = "editorAreaShow";
 
   /**
    * Change event id when the editor area is hidden in a perspective.
    *
    * @see IPerspectiveListener
    */
   static const QString CHANGE_EDITOR_AREA_HIDE; // = "editorAreaHide";
 
   /**
    * Change event id when an action set is shown in a perspective.
    *
    * @see IPerspectiveListener
    */
   static const QString CHANGE_ACTION_SET_SHOW; // = "actionSetShow";
 
   /**
    * Change event id when an action set is hidden in a perspective.
    *
    * @see IPerspectiveListener
    */
   static const QString CHANGE_ACTION_SET_HIDE; // = "actionSetHide";
 
   /**
    * Show view mode that indicates the view should be made visible and
    * activated. Use of this mode has the same effect as calling
    * {@link #showView(String)}.
    */
   static const int VIEW_ACTIVATE; // = 1;
 
   /**
    * Show view mode that indicates the view should be made visible. If the
    * view is opened in the container that contains the active view then this
    * has the same effect as <code>VIEW_CREATE</code>.
    */
   static const int VIEW_VISIBLE; // = 2;
 
   /**
    * Show view mode that indicates the view should be made created but not
    * necessarily be made visible. It will only be made visible in the event
    * that it is opened in its own container. In other words, only if it is not
    * stacked with another view.
    */
   static const int VIEW_CREATE; // = 3;
 
   /**
    * Editor opening match mode specifying that no matching against existing
    * editors should be done.
    */
   static const int MATCH_NONE; // = 0;
 
   /**
    * Editor opening match mode specifying that the editor input should be
    * considered when matching against existing editors.
    */
   static const int MATCH_INPUT; // = 1;
 
   /**
    * Editor opening match mode specifying that the editor id should be
    * considered when matching against existing editors.
    */
   static const int MATCH_ID; // = 2;
 
   /**
    * Activates the given part. The part will be brought to the front and given
    * focus. The part must belong to this page.
    *
    * @param part
    *            the part to activate
    */
   virtual void Activate(IWorkbenchPart::Pointer part) = 0;
 
   /**
    * Adds a property change listener.
    *
    * @param listener
    *            the property change listener to add
    */
   //virtual void addPropertyChangeListener(IPropertyChangeListener listener);
 
   /**
    * Moves the given part forward in the Z order of this page so as to make it
    * visible, without changing which part has focus. The part must belong to
    * this page.
    *
    * @param part
    *            the part to bring forward
    */
   virtual void BringToTop(IWorkbenchPart::Pointer part) = 0;
 
   /**
    * Closes this workbench page. If this page is the active one, this honor is
    * passed along to one of the window's other pages if possible.
    * <p>
    * If the page has an open editor with unsaved content, the user will be
    * given the opportunity to save it.
    * </p>
    *
    * @return <code>true</code> if the page was successfully closed, and
    *         <code>false</code> if it is still open
    */
   virtual bool Close() = 0;
 
   /**
    * Closes all of the editors belonging to this workbench page.
    * <p>
    * If the page has open editors with unsaved content and <code>save</code>
    * is <code>true</code>, the user will be given the opportunity to save
    * them.
    * </p>
    *
    * @param save
    *
    * @return <code>true</code> if all editors were successfully closed, and
    *         <code>false</code> if at least one is still open
    */
   virtual bool CloseAllEditors(bool save) = 0;
 
   /**
    * Closes the given <code>Array</code> of editor references. The editors
    * must belong to this workbench page.
    * <p>
    * If any of the editors have unsaved content and <code>save</code> is
    * <code>true</code>, the user will be given the opportunity to save
    * them.
    * </p>
    *
    * @param editorRefs
    *            the editors to close
    * @param save
    *            <code>true</code> to save the editor contents if required
    *            (recommended), and <code>false</code> to discard any unsaved
    *            changes
    * @return <code>true</code> if the editors were successfully closed, and
    *         <code>false</code> if the editors are still open
    */
   virtual bool CloseEditors(const QList<IEditorReference::Pointer>& editorRefs, bool save) = 0;
 
   /**
    * Closes the given editor. The editor must belong to this workbench page.
    * <p>
    * If the editor has unsaved content and <code>save</code> is
    * <code>true</code>, the user will be given the opportunity to save it.
    * </p>
    *
    * @param editor
    *            the editor to close
    * @param save
    *            <code>true</code> to save the editor contents if required
    *            (recommended), and <code>false</code> to discard any unsaved
    *            changes
    * @return <code>true</code> if the editor was successfully closed, and
    *         <code>false</code> if the editor is still open
    */
   virtual bool CloseEditor(IEditorPart::Pointer editor, bool save) = 0;
 
   /**
    * Returns the view in this page with the specified id. There is at most one
    * view in the page with the specified id.
    *
    * @param viewId
    *            the id of the view extension to use
    * @return the view, or <code>null</code> if none is found
    */
   virtual IViewPart::Pointer FindView(const QString& viewId) = 0;
 
   /**
    * Returns the view reference with the specified id.
    *
    * @param viewId
    *            the id of the view extension to use
    * @return the view reference, or <code>null</code> if none is found
    */
   virtual IViewReference::Pointer FindViewReference(const QString& viewId) = 0;
 
   /**
    * Returns the view reference with the specified id and secondary id.
    *
    * @param viewId
    *            the id of the view extension to use
    * @param secondaryId
    *            the secondary id to use, or <code>null</code> for no
    *            secondary id
    * @return the view reference, or <code>null</code> if none is found
    */
   virtual IViewReference::Pointer FindViewReference(const QString& viewId, const QString& secondaryId) = 0;
 
   /**
    * Returns the active editor open in this page.
    * <p>
    * This is the visible editor on the page, or, if there is more than one
    * visible editor, this is the one most recently brought to top.
    * </p>
    *
    * @return the active editor, or <code>null</code> if no editor is active
    */
   virtual IEditorPart::Pointer GetActiveEditor() = 0;
 
   /**
    * Returns the editor with the specified input. Returns null if there is no
    * opened editor with that input.
    *
    * @param input
    *            the editor input
    * @return an editor with input equals to <code>input</code>
    */
   virtual IEditorPart::Pointer FindEditor(IEditorInput::Pointer input) = 0;
 
   /**
    * Returns an array of editor references that match the given input and/or
    * editor id, as specified by the given match flags. Returns an empty array
    * if there are no matching editors, or if matchFlags is MATCH_NONE.
    *
    * @param input
    *            the editor input, or <code>null</code> if MATCH_INPUT is not
    *            specified in matchFlags
    * @param editorId
    *            the editor id, or <code>null</code> if MATCH_ID is not
    *            specified in matchFlags
    * @param matchFlags
    *            a bit mask consisting of zero or more of the MATCH_* constants
    *            OR-ed together
    * @return the references for the matching editors
    *
    * @see #MATCH_NONE
    * @see #MATCH_INPUT
    * @see #MATCH_ID
    */
   virtual QList<IEditorReference::Pointer> FindEditors(IEditorInput::Pointer input, const QString& editorId,
       int matchFlags) = 0;
 
   /**
    * Returns a list of the editors open in this page.
    * <p>
    * Note that each page has its own editors; editors are never shared between
    * pages.
    * </p>
    *
    * @return a list of open editors
    *
    * @deprecated use #getEditorReferences() instead
    */
   virtual QList<IEditorPart::Pointer> GetEditors() = 0;
 
   /**
    * Returns an array of references to open editors in this page.
    * <p>
    * Note that each page has its own editors; editors are never shared between
    * pages.
    * </p>
    *
    * @return a list of open editors
    */
   virtual QList<IEditorReference::Pointer> GetEditorReferences() = 0;
 
   /**
    * Returns a list of dirty editors in this page.
    *
    * @return a list of dirty editors
    */
   virtual QList<IEditorPart::Pointer> GetDirtyEditors() = 0;
 
   /**
    * Returns the input for this page.
    *
    * @return the input for this page, or <code>null</code> if none
    */
   virtual IAdaptable* GetInput() = 0;
 
   /**
    * Returns the page label. This will be a unique identifier within the
    * containing workbench window.
    *
    * @return the page label
    */
   virtual QString GetLabel() = 0;
 
   /**
    * Returns the current perspective descriptor for this page, or
    * <code>null</code> if there is no current perspective.
    *
    * @return the current perspective descriptor or <code>null</code>
    * @see #setPerspective
    * @see #savePerspective
    */
   virtual IPerspectiveDescriptor::Pointer GetPerspective() = 0;
 
   /**
    * Returns a list of the reference to views visible on this page.
    * <p>
    * Note that each page has its own views; views are never shared between
    * pages.
    * </p>
    *
    * @return a list of references to visible views
    */
   virtual QList<IViewReference::Pointer> GetViewReferences() = 0;
 
   /**
    * Returns a list of the views visible on this page.
    * <p>
    * Note that each page has its own views; views are never shared between
    * pages.
    * </p>
    *
    * @return a list of visible views
    *
    * @deprecated use #getViewReferences() instead.
    */
   virtual QList<IViewPart::Pointer> GetViews() = 0;
 
   /**
    * Returns the workbench window of this page.
    *
    * @return the workbench window
    */
   virtual IWorkbenchWindow::Pointer GetWorkbenchWindow() = 0;
 
   /**
    * Hides the given view. The view must belong to this page.
    *
    * @param view
    *            the view to hide
    */
   virtual void HideView(IViewPart::Pointer view) = 0;
 
   /**
    * Hides the given view that belongs to the reference, if any.
    *
    * @param view
    *            the references whos view is to be hidden
    */
   virtual void HideView(IViewReference::Pointer view) = 0;
 
   /**
    * Returns true if perspective with given id contains view with given id
    */
   virtual bool HasView(const std::string& perspectiveId, const std::string& viewId) = 0;
 
   /**
    * Returns whether the specified part is visible.
    *
    * @param part
    *            the part to test
    * @return boolean <code>true</code> if part is visible
    */
   virtual bool IsPartVisible(IWorkbenchPart::Pointer part) = 0;
 
   /**
    * Removes the perspective specified by desc.
    *
    * @param desc
    *            the perspective that will be removed
    */
   virtual void RemovePerspective(IPerspectiveDescriptor::Pointer desc) = 0;
 
   /**
    * Reuses the specified editor by setting its new input.
    *
    * @param editor
    *            the editor to be reused
    * @param input
    *            the new input for the reusable editor
    */
   virtual void ReuseEditor(IReusableEditor::Pointer editor, IEditorInput::Pointer input) = 0;
 
   /**
    * Opens an editor on the given input.
    * <p>
    * If this page already has an editor open on the target input that editor
    * is activated; otherwise, a new editor is opened. Two editor inputs,
    * input1 and input2, are considered the same if
    *
    * <pre>
    * input1.equals(input2) == true
    * </pre>.
    * </p>
    * <p>
    * The editor type is determined by mapping <code>editorId</code> to an
    * editor extension registered with the workbench. An editor id is passed
    * rather than an editor object to prevent the accidental creation of more
    * than one editor for the same input. It also guarantees a consistent
    * lifecycle for editors, regardless of whether they are created by the user
    * or restored from saved data.
    * </p>
    *
    * @param input
    *            the editor input
    * @param editorId
    *            the id of the editor extension to use
    * @return an open and active editor, or <code>null</code> if an external
    *         editor was opened
    * @exception PartInitException
    *                if the editor could not be created or initialized
    */
   virtual IEditorPart::Pointer OpenEditor(IEditorInput::Pointer input, const QString& editorId) = 0;
 
   /**
    * Opens an editor on the given input.
    * <p>
    * If this page already has an editor open on the target input that editor
    * is brought to the front; otherwise, a new editor is opened. Two editor
    * inputs are considered the same if they equal. See
    * <code>Object.equals(Object)<code>
    * and <code>IEditorInput</code>. If <code>activate == true</code> the editor
    * will be activated.
    * </p><p>
    * The editor type is determined by mapping <code>editorId</code> to an editor
    * extension registered with the workbench.  An editor id is passed rather than
    * an editor object to prevent the accidental creation of more than one editor
    * for the same input. It also guarantees a consistent lifecycle for editors,
    * regardless of whether they are created by the user or restored from saved
    * data.
    * </p>
    *
    * @param input the editor input
    * @param editorId the id of the editor extension to use
    * @param activate if <code>true</code> the editor will be activated
    * @return an open editor, or <code>null</code> if an external editor was opened
    * @exception PartInitException if the editor could not be created or initialized
    */
   virtual IEditorPart::Pointer OpenEditor(IEditorInput::Pointer input, const QString& editorId,
       bool activate) = 0;
 
   /**
    * Opens an editor on the given input.
    * <p>
    * If this page already has an editor open that matches the given input
    * and/or editor id (as specified by the matchFlags argument), that editor
    * is brought to the front; otherwise, a new editor is opened. Two editor
    * inputs are considered the same if they equal. See
    * <code>Object.equals(Object)<code>
    * and <code>IEditorInput</code>. If <code>activate == true</code> the editor
    * will be activated.
    * </p><p>
    * The editor type is determined by mapping <code>editorId</code> to an editor
    * extension registered with the workbench.  An editor id is passed rather than
    * an editor object to prevent the accidental creation of more than one editor
    * for the same input. It also guarantees a consistent lifecycle for editors,
    * regardless of whether they are created by the user or restored from saved
    * data.
    * </p>
    *
    * @param input the editor input
    * @param editorId the id of the editor extension to use
    * @param activate if <code>true</code> the editor will be activated
    * @param matchFlags a bit mask consisting of zero or more of the MATCH_* constants OR-ed together
    * @return an open editor, or <code>null</code> if an external editor was opened
    * @exception PartInitException if the editor could not be created or initialized
    *
    * @see #MATCH_NONE
    * @see #MATCH_INPUT
    * @see #MATCH_ID
    */
   virtual IEditorPart::Pointer OpenEditor(IEditorInput::Pointer input,
       const QString& editorId, bool activate, int matchFlags) = 0;
 
   /**
    * Removes the property change listener.
    *
    * @param listener
    *            the property change listener to remove
    */
   //virtual void removePropertyChangeListener(IPropertyChangeListener listener);
 
   /**
    * Changes the visible views, their layout, and the visible action sets
    * within the page to match the current perspective descriptor. This is a
    * rearrangement of components and not a replacement. The contents of the
    * current perspective descriptor are unaffected.
    * <p>
    * For more information on perspective change see
    * <code>setPerspective()</code>.
    * </p>
    */
   virtual void ResetPerspective() = 0;
 
   /**
    * Saves the contents of all dirty editors belonging to this workbench page.
    * If there are no dirty editors this method returns without effect.
    * <p>
    * If <code>confirm</code> is <code>true</code> the user is prompted to
    * confirm the command.
    * </p>
    * <p>
    * Note that as of 3.2, this method also saves views that implement
    * ISaveablePart and are dirty.
    * </p>
    *
    * @param confirm <code>true</code> to ask the user before saving unsaved
    *            changes (recommended), and <code>false</code> to save
    *            unsaved changes without asking
    * @return <code>true</code> if the command succeeded, and
    *         <code>false</code> if the operation was canceled by the user or
    *         an error occurred while saving
    */
   virtual bool SaveAllEditors(bool confirm) = 0;
 
   /**
    * Saves the contents of the given editor if dirty. If not, this method
    * returns without effect.
    * <p>
    * If <code>confirm</code> is <code>true</code> the user is prompted to
    * confirm the command. Otherwise, the save happens without prompt.
    * </p>
    * <p>
    * The editor must belong to this workbench page.
    * </p>
    *
    * @param editor
    *            the editor to close
    * @param confirm
    *            <code>true</code> to ask the user before saving unsaved
    *            changes (recommended), and <code>false</code> to save
    *            unsaved changes without asking
    * @return <code>true</code> if the command succeeded, and
    *         <code>false</code> if the editor was not saved
    */
   virtual bool SaveEditor(IEditorPart::Pointer editor, bool confirm) = 0;
 
   /**
    * Saves the visible views, their layout, and the visible action sets for
    * this page to the current perspective descriptor. The contents of the
    * current perspective descriptor are overwritten.
    */
   virtual void SavePerspective() = 0;
 
   /**
    * Saves the visible views, their layout, and the visible action sets for
    * this page to the given perspective descriptor. The contents of the given
    * perspective descriptor are overwritten and it is made the current one for
    * this page.
    *
    * @param perspective
    *            the perspective descriptor to save to
    */
   virtual void SavePerspectiveAs(IPerspectiveDescriptor::Pointer perspective) = 0;
 
 
   /**
    * Changes the visible views, their layout, and the visible action sets
    * within the page to match the given perspective descriptor. This is a
    * rearrangement of components and not a replacement. The contents of the
    * old perspective descriptor are unaffected.
    * <p>
    * When a perspective change occurs the old perspective is deactivated
    * (hidden) and cached for future reference. Then the new perspective is
    * activated (shown). The views within the page are shared by all existing
    * perspectives to make it easy for the user to switch between one
    * perspective and another quickly without loss of context.
    * </p>
    * <p>
    * During activation the action sets are modified. If an action set is
    * specified in the new perspective which is not visible in the old one it
    * will be created. If an old action set is not specified in the new
    * perspective it will be disposed.
    * </p>
    * <p>
    * The visible views and their layout within the page also change. If a view
    * is specified in the new perspective which is not visible in the old one a
    * new instance of the view will be created. If an old view is not specified
    * in the new perspective it will be hidden. This view may reappear if the
    * user selects it from the View menu or if they switch to a perspective
    * (which may be the old one) where the view is visible.
    * </p>
    * <p>
    * The open editors are not modified by this method.
    * </p>
    *
    * @param perspective
    *            the perspective descriptor
    */
   virtual void SetPerspective(IPerspectiveDescriptor::Pointer perspective) = 0;
 
   /**
    * Shows the view identified by the given view id in this page and gives it
    * focus. If there is a view identified by the given view id (and with no
    * secondary id) already open in this page, it is given focus.
    *
    * @param viewId
    *            the id of the view extension to use
    * @return the shown view
    * @exception PartInitException
    *                if the view could not be initialized
    */
   virtual IViewPart::Pointer ShowView(const QString& viewId) = 0;
 
   /**
    * Shows a view in this page with the given id and secondary id. The
    * behaviour of this method varies based on the supplied mode. If
    * <code>VIEW_ACTIVATE</code> is supplied, the view is focus. If
    * <code>VIEW_VISIBLE</code> is supplied, then it is made visible but not
    * given focus. Finally, if <code>VIEW_CREATE</code> is supplied the view
    * is created and will only be made visible if it is not created in a folder
    * that already contains visible views.
    * <p>
    * This allows multiple instances of a particular view to be created. They
    * are disambiguated using the secondary id. If a secondary id is given, the
    * view must allow multiple instances by having specified
    * allowMultiple="true" in its extension.
    * </p>
    *
    * @param viewId
    *            the id of the view extension to use
    * @param secondaryId
    *            the secondary id to use, or <code>null</code> for no
    *            secondary id
    * @param mode
    *            the activation mode. Must be {@link #VIEW_ACTIVATE},
    *            {@link #VIEW_VISIBLE} or {@link #VIEW_CREATE}
    * @return a view
    * @exception PartInitException
    *                if the view could not be initialized
    * @exception IllegalArgumentException
    *                if the supplied mode is not valid
    */
   virtual IViewPart::Pointer ShowView(const QString& viewId, const QString& secondaryId, int mode) = 0;
 
   /**
    * Returns <code>true</code> if the editor is pinned and should not be
    * reused.
    *
    * @param editor
    *            the editor to test
    * @return boolean whether the editor is pinned
    */
   virtual bool IsEditorPinned(IEditorPart::Pointer editor) = 0;
 
   /**
    * Returns the perspective shortcuts associated with the current
    * perspective. Returns an empty array if there is no current perspective.
    *
    * @see IPageLayout#addPerspectiveShortcut(String)
    * @return an array of perspective identifiers
    */
   virtual QList<QString> GetPerspectiveShortcuts() = 0;
 
   /**
    * Returns the show view shortcuts associated with the current perspective.
    * Returns an empty array if there is no current perspective.
    *
    * @see IPageLayout#addShowViewShortcut(String)
    * @return an array of view identifiers
    */
   virtual QList<QString> GetShowViewShortcuts() = 0;
 
   /**
    * Returns the descriptors for the perspectives that are open in this page,
    * in the order in which they were opened.
    *
    * @return the open perspective descriptors, in order of opening
    */
   virtual QList<IPerspectiveDescriptor::Pointer> GetOpenPerspectives() = 0;
 
   /**
    * Returns the descriptors for the perspectives that are open in this page,
    * in the order in which they were activated (oldest first).
    *
    * @return the open perspective descriptors, in order of activation
    */
   virtual QList<IPerspectiveDescriptor::Pointer> GetSortedPerspectives() = 0;
 
   /**
    * Closes current perspective. If last perspective, then entire page
    * is closed.
    *
    * @param saveParts
    *            whether the page's parts should be saved if closed
    * @param closePage
    *            whether the page itself should be closed if last perspective
    */
   virtual void CloseCurrentPerspective(bool saveParts, bool closePage) = 0;
 
   /**
    * Closes the specified perspective in this page. If the last perspective in
    * this page is closed, then all editors are closed. Views that are not
    * shown in other perspectives are closed as well. If <code>saveParts</code>
    * is <code>true</code>, the user will be prompted to save any unsaved
    * changes for parts that are being closed. The page itself is closed if
    * <code>closePage</code> is <code>true</code>.
    *
    * @param desc
    *            the descriptor of the perspective to be closed
    * @param saveParts
    *            whether the page's parts should be saved if closed
    * @param closePage
    *            whether the page itself should be closed if last perspective
    */
   virtual void ClosePerspective(IPerspectiveDescriptor::Pointer desc,
                                 bool saveParts, bool closePage) = 0;
 
   /**
    * Closes all perspectives in this page. All editors are closed, prompting
    * to save any unsaved changes if <code>saveEditors</code> is
    * <code>true</code>. The page itself is closed if <code>closePage</code>
    * is <code>true</code>.
    *
    * @param saveEditors
    *            whether the page's editors should be saved
    * @param closePage
    *            whether the page itself should be closed
    */
   virtual void CloseAllPerspectives(bool saveEditors, bool closePage) = 0;
 
   /**
    * Find the part reference for the given part. A convenience method to
    * quickly go from part to part reference.
    *
    * @param part
    *            The part to search for. It can be <code>null</code>.
    * @return The reference for the given part, or <code>null</code> if no
    *         reference can be found.
    */
   virtual IWorkbenchPartReference::Pointer GetReference(IWorkbenchPart::Pointer part) = 0;
 };
 
 }  // namespace berry
 
 #endif /*BERRYIWORKBENCHPAGE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchPart.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchPart.h
index b2dc0d6c15..fb9327fe28 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchPart.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchPart.h
@@ -1,270 +1,270 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef IWORKBENCHPART_H_
 #define IWORKBENCHPART_H_
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include "berryIPropertyChangeListener.h"
 
 #include <berryMacros.h>
 
 
 namespace berry {
 
 struct IWorkbenchPartSite;
 
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * A workbench part is a visual component within a workbench page.  There
  * are two subtypes: view and editor, as defined by <code>IViewPart</code> and
  * <code>IEditorPart</code>.
  * <p>
  * A view is typically used to navigate a hierarchy of information (like the
  * workspace), open an editor, or display properties for the active editor.
  * Modifications made in a view are saved immediately.
  * </p><p>
  * An editor is typically used to edit or browse a document or input object.
  * The input is identified using an <code>IEditorInput</code>.  Modifications made
  * in an editor part follow an open-save-close lifecycle model.
  * </p><p>
  * This interface may be implemented directly.  For convenience, a base
  * implementation is defined in <code>WorkbenchPart</code>.
  * </p><p>
  * The lifecycle of a workbench part is as follows:
  * <ul>
  *  <li>When a part extension is created:
  *    <ul>
  *    <li>instantiate the part</li>
  *    <li>create a part site</li>
  *    <li>call <code>part.init(site)</code></li>
  *    </ul>
  *  <li>When a part becomes visible in the workbench:
  *    <ul>
  *    <li>add part to presentation by calling
  *        <code>part.createControl(parent)</code> to create actual widgets</li>
  *    <li>fire <code>partOpened</code> event to all listeners</li>
  *    </ul>
  *   </li>
  *  <li>When a part is activated or gets focus:
  *    <ul>
  *    <li>call <code>part.setFocus()</code></li>
  *    <li>fire <code>partActivated</code> event to all listeners</li>
  *    </ul>
  *   </li>
  *  <li>When a part is closed:
  *    <ul>
  *    <li>if save is needed, do save; if it fails or is canceled return</li>
  *    <li>if part is active, deactivate part</li>
  *    <li>fire <code>partClosed</code> event to all listeners</li>
  *    <li>remove part from presentation; part controls are disposed as part
  *         of the SWT widget tree
  *    <li>call <code>part.dispose()</code></li>
  *    </ul>
  *   </li>
  * </ul>
  * </p>
  * <p>
  * After <code>createPartControl</code> has been called, the implementor may
  * safely reference the controls created.  When the part is closed
  * these controls will be disposed as part of an SWT composite.  This
  * occurs before the <code>IWorkbenchPart.dispose</code> method is called.
  * If there is a need to free SWT resources the part should define a dispose
  * listener for its own control and free those resources from the dispose
  * listener.  If the part invokes any method on the disposed SWT controls
  * after this point an <code>SWTError</code> will be thrown.
  * </p>
  * <p>
  * The last method called on <code>IWorkbenchPart</code> is <code>dispose</code>.
  * This signals the end of the part lifecycle.
  * </p>
  * <p>
  * An important point to note about this lifecycle is that following
  * a call to init, createControl may never be called. Thus in the dispose
  * method, implementors must not assume controls were created.
  * </p>
  * <p>
  * Workbench parts implement the <code>IAdaptable</code> interface; extensions
  * are managed by the platform's adapter manager.
  * </p>
  *
  * @see IViewPart
  * @see IEditorPart
  */
 struct BERRY_UI_QT IWorkbenchPart : public virtual Object { // public IAdaptable {
 
-  berryInterfaceMacro(IWorkbenchPart, berry);
+  berryObjectMacro(berry::IWorkbenchPart)
 
   virtual ~IWorkbenchPart();
 
     /**
      * The property id for <code>getTitle</code>, <code>getTitleImage</code>
      * and <code>getTitleToolTip</code>.
      */
     //static const int PROP_TITLE = IWorkbenchPartConstants.PROP_TITLE;
 
     /**
      * Adds a listener for changes to properties of this workbench part.
      * Has no effect if an identical listener is already registered.
      * <p>
      * The property ids are defined in {@link IWorkbenchPartConstants}.
      * </p>
      *
      * @param listener a property listener
      */
     virtual void AddPropertyListener(IPropertyChangeListener* listener) = 0;
 
     /**
      * Creates the controls for this workbench part.
      * <p>
      * Clients should not call this method (the workbench calls this method when
      * it needs to, which may be never).
      * </p>
      * <p>
      * For implementors this is a multi-step process:
      * <ol>
      *   <li>Create one or more controls within the parent.</li>
      *   <li>Set the parent layout as needed.</li>
      *   <li>Register any global actions with the site's <code>IActionBars</code>.</li>
      *   <li>Register any context menus with the site.</li>
      *   <li>Register a selection provider with the site, to make it available to
      *     the workbench's <code>ISelectionService</code> (optional). </li>
      * </ol>
      * </p>
      *
      * @param parent the parent control
      */
     virtual void CreatePartControl(void* parent) = 0;
 
     /**
      * Returns the site for this workbench part. The site can be
      * <code>null</code> while the workbench part is being initialized. After
      * the initialization is complete, this value must be non-<code>null</code>
      * for the remainder of the part's life cycle.
      *
      * @return The part site; this value may be <code>null</code> if the part
      *         has not yet been initialized
      */
     virtual SmartPointer<IWorkbenchPartSite> GetSite() const = 0;
 
 
     /**
      * Returns the name of this part. If this value changes the part must fire a
      * property listener event with {@link IWorkbenchPartConstants#PROP_PART_NAME}.
      *
      * @return the name of this view, or the empty string if the name is being managed
      * by the workbench (not <code>null</code>)
      */
     virtual QString GetPartName() const = 0;
 
     /**
      * Returns the content description of this part. The content description is an optional
      * user-readable string that describes what is currently being displayed in the part.
      * By default, the workbench will display the content description in a line
      * near the top of the view or editor.
      * An empty string indicates no content description
      * text. If this value changes the part must fire a property listener event
      * with {@link IWorkbenchPartConstants#PROP_CONTENT_DESCRIPTION}.
      *
      * @return the content description of this part (not <code>null</code>)
      */
     virtual QString GetContentDescription() const = 0;
 
     /**
      * Returns the title image of this workbench part.  If this value changes
      * the part must fire a property listener event with
      * <code>PROP_TITLE</code>.
      * <p>
      * The title image is usually used to populate the title bar of this part's
      * visual container. Since this image is managed by the part itself, callers
      * must <b>not</b> dispose the returned image.
      * </p>
      *
      * @return the title image
      */
     virtual void* GetTitleImage() const = 0;
 
     /**
      * Returns the title tool tip text of this workbench part.
      * An empty string result indicates no tool tip.
      * If this value changes the part must fire a property listener event with
      * <code>PROP_TITLE</code>.
      * <p>
      * The tool tip text is used to populate the title bar of this part's
      * visual container.
      * </p>
      *
      * @return the workbench part title tool tip (not <code>null</code>)
      */
     virtual QString GetTitleToolTip() const = 0;
 
     /**
      * Removes the given property listener from this workbench part.
      * Has no affect if an identical listener is not registered.
      *
      * @param listener a property listener
      */
     virtual void RemovePropertyListener(IPropertyChangeListener* listener) = 0;
 
     /**
      * Return the value for the arbitrary property key, or <code>null</code>.
      *
      * @param key
      *            the arbitrary property. Must not be <code>null</code>.
      * @return the property value, or <code>null</code>.
      */
     virtual QString GetPartProperty(const QString& key) const = 0;
 
     /**
      * Set an arbitrary property on the part. It is the implementor's
      * responsibility to fire the corresponding PropertyChangeEvent.
      * <p>
      * A default implementation has been added to WorkbenchPart.
      * </p>
      *
      * @param key
      *            the arbitrary property. Must not be <code>null</code>.
      * @param value
      *            the property value. A <code>null</code> value will remove
      *            that property.
      */
     virtual void SetPartProperty(const QString& key, const QString& value) = 0;
 
     /**
      * Return an unmodifiable map of the arbitrary properties. This method can
      * be used to save the properties during workbench save/restore.
      *
      * @return A Map of the properties. Must not be <code>null</code>.
      */
     virtual const QHash<QString, QString>& GetPartProperties() const = 0;
 
     /**
      * Asks this part to take focus within the workbench.
      * <p>
      * Clients should not call this method (the workbench calls this method at
      * appropriate times).  To have the workbench activate a part, use
      * <code>IWorkbenchPage.activate(IWorkbenchPart) instead</code>.
      * </p>
      */
     virtual void SetFocus() = 0;
 };
 
 }  // namespace berry
 
 #endif /*IWORKBENCHPART_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchPartDescriptor.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchPartDescriptor.h
index b608694aab..cb1abba10d 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchPartDescriptor.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchPartDescriptor.h
@@ -1,71 +1,71 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIWORKBENCHPARTDESCRIPTOR_H_
 #define BERRYIWORKBENCHPARTDESCRIPTOR_H_
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include <berryMacros.h>
 #include <berryObject.h>
 
 #include "berryImageDescriptor.h"
 
 
 namespace berry
 {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * Description of a workbench part. The part descriptor contains
  * the information needed to create part instances.
  * <p>
  * This interface is not intended to be implemented by clients.
  * </p>
  */
 struct BERRY_UI_QT IWorkbenchPartDescriptor : public virtual Object
 {
 
-  berryInterfaceMacro(IWorkbenchPartDescriptor, berry);
+  berryObjectMacro(berry::IWorkbenchPartDescriptor)
 
   /**
    * Returns the part id.
    *
    * @return the id of the part
    */
   virtual QString GetId() const = 0;
 
   /**
    * Returns the descriptor of the image for this part.
    *
    * @return the descriptor of the image to display next to this part
    */
   virtual SmartPointer<ImageDescriptor> GetImageDescriptor() const = 0;
 
   /**
    * Returns the label to show for this part.
    *
    * @return the part label
    */
   virtual QString GetLabel() const = 0;
 
   virtual ~IWorkbenchPartDescriptor();
 };
 
 } // namespace berry
 
 #endif /*BERRYIWORKBENCHPARTDESCRIPTOR_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchPartReference.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchPartReference.h
index 2a3935ec42..5ac92dc8ed 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchPartReference.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchPartReference.h
@@ -1,152 +1,152 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIWORKBENCHPARTREFERENCE_H_
 #define BERRYIWORKBENCHPARTREFERENCE_H_
 
 #include <berryMacros.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 #include "berryIPropertyChangeListener.h"
 
 namespace berry {
 
 struct IWorkbenchPart;
 struct IWorkbenchPage;
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * Implements a reference to a IWorkbenchPart.
  * The IWorkbenchPart will not be instanciated until the part
  * becomes visible or the API getPart is sent with true;
  * <p>
  * This interface is not intended to be implemented by clients.
  * </p>
  */
 struct BERRY_UI_QT IWorkbenchPartReference : public Object
 {
 
-  berryInterfaceMacro(IWorkbenchPartReference, berry)
+  berryObjectMacro(berry::IWorkbenchPartReference)
 
   ~IWorkbenchPartReference();
 
     /**
      * Returns the IWorkbenchPart referenced by this object.
      * Returns <code>null</code> if the editors was not instantiated or
      * it failed to be restored. Tries to restore the editor
      * if <code>restore</code> is true.
      */
     virtual SmartPointer<IWorkbenchPart> GetPart(bool restore) = 0;
 
 
     /**
      * @see IWorkbenchPart#getTitleImage
      */
     virtual void* GetTitleImage() = 0;
 
     /**
      * @see IWorkbenchPart#getTitleToolTip
      */
     virtual QString GetTitleToolTip() const = 0;
 
     /**
      * @see IWorkbenchPartSite#getId
      */
     virtual QString GetId() const = 0;
 
     /**
      * @see IWorkbenchPart#addPropertyListener
      */
     virtual void AddPropertyListener(IPropertyChangeListener* listener) = 0;
 
     /**
      * @see IWorkbenchPart#removePropertyListener
      */
     virtual void RemovePropertyListener(IPropertyChangeListener* listener) = 0;
 
     /**
      * Returns the workbench page that contains this part
      */
     virtual SmartPointer<IWorkbenchPage> GetPage() const = 0;
 
     /**
      * Returns the name of the part, as it should be shown in tabs.
      *
      * @return the part name
      *
      * @since 3.0
      */
     virtual QString GetPartName() const = 0;
 
     /**
      * Returns the content description for the part (or the empty string if none)
      *
      * @return the content description for the part
      *
      * @since 3.0
      */
     virtual QString GetContentDescription() const = 0;
 
     /**
       * Returns true if the part is pinned otherwise returns false.
       */
     virtual bool IsPinned() const = 0;
 
     /**
      * Returns whether the part is dirty (i.e. has unsaved changes).
      *
      * @return <code>true</code> if the part is dirty, <code>false</code> otherwise
      *
      * @since 3.2 (previously existed on IEditorReference)
      */
     virtual bool IsDirty() const = 0;
 
     /**
    * Return an arbitrary property from the reference. If the part has been
    * instantiated, it just delegates to the part. If not, then it looks in its
    * own cache of properties. If the property is not available or the part has
    * never been instantiated, it can return <code>null</code>.
    *
    * @param key
    *            The property to return. Must not be <code>null</code>.
    * @return The String property, or <code>null</code>.
    * @since 3.3
    */
    virtual QString GetPartProperty(const QString& key) const = 0;
 
     /**
    * Add a listener for changes in the arbitrary properties set.
    *
    * @param listener
    *            Must not be <code>null</code>.
    * @since 3.3
    */
     //virtual void addPartPropertyListener(IPropertyChangeListener listener) = 0;
 
     /**
    * Remove a listener for changes in the arbitrary properties set.
    *
    * @param listener
    *            Must not be <code>null</code>.
    * @since 3.3
    */
     //virtual void removePartPropertyListener(IPropertyChangeListener listener) = 0;
 };
 
 }  // namespace berry
 
 #endif /*BERRYIWORKBENCHPARTREFERENCE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchPartSite.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchPartSite.h
index ae670cd522..59b44ad6a4 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchPartSite.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchPartSite.h
@@ -1,85 +1,85 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef IWORKBENCHPARTSITE_H_
 #define IWORKBENCHPARTSITE_H_
 
 
 #include "berryIWorkbenchSite.h"
 
 namespace berry {
 
 struct IWorkbenchPart;
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * The primary interface between a workbench part and the workbench.
  * <p>
  * This interface is not intended to be implemented or extended by clients.
  * </p>
  * @noimplement This interface is not intended to be implemented by clients.
  */
 struct BERRY_UI_QT IWorkbenchPartSite : public IWorkbenchSite
 {
 
-  berryInterfaceMacro(IWorkbenchPartSite, berry)
+  berryObjectMacro(berry::IWorkbenchPartSite)
 
   ~IWorkbenchPartSite();
 
   /**
    * Returns the part registry extension id for this workbench site's part.
    * <p>
    * The name comes from the <code>id</code> attribute in the configuration
    * element.
    * </p>
    *
    * @return the registry extension id
    */
-  virtual QString GetId() = 0;
+  virtual QString GetId() const = 0;
 
   /**
    * Returns the part associated with this site
    *
    * @return the part associated with this site
    */
   virtual SmartPointer<IWorkbenchPart> GetPart() = 0;
 
   /**
    * Returns the unique identifier of the plug-in that defines this workbench
    * site's part.
    *
    * @return the unique identifier of the declaring plug-in
    */
-  virtual QString GetPluginId() = 0;
+  virtual QString GetPluginId() const = 0;
 
   /**
    * Returns the registered name for this workbench site's part.
    * <p>
    * The name comes from the <code>name</code> attribute in the configuration
    * element.
    * </p>
    *
    * @return the part name
    */
-  virtual QString GetRegisteredName() = 0;
+  virtual QString GetRegisteredName() const = 0;
 
 };
 
 } // namespace berry
 
 
 #endif /*IWORKBENCHPARTSITE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchSite.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchSite.h
index 1c35c919b1..82eb8e7d80 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchSite.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchSite.h
@@ -1,109 +1,109 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIWORKBENCHSITE_H_
 #define BERRYIWORKBENCHSITE_H_
 
 #include <berryMacros.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include "services/berryIServiceLocator.h"
 
 namespace berry {
 
 struct IWorkbenchPage;
 struct ISelectionProvider;
 struct IWorkbenchWindow;
 class  Shell;
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * The common interface between the workbench and its parts, including pages
  * within parts.
  * <p>
  * The workbench site supports a few {@link IServiceLocator services} by
  * default. If these services are used to allocate resources, it is important to
  * remember to clean up those resources after you are done with them. Otherwise,
  * the resources will exist until the workbench site is disposed. The supported
  * services are:
  * </p>
  * <ul>
  * <li>{@link ICommandService}</li>
  * <li>{@link IContextService}</li>
  * <li>{@link IHandlerService}</li>
  * <li>{@link IBindingService}. Resources allocated through this service will
  * not be cleaned up until the workbench shuts down.</li>
  * </ul>
  * <p>
  * This interface is not intended to be implemented or extended by clients.
  * </p>
  *
  * @see org.blueberry.ui.IWorkbenchPartSite
  * @see org.blueberry.ui.part.IPageSite
  * @since 2.0
  * @noimplement This interface is not intended to be implemented by clients.
  */
 struct BERRY_UI_QT IWorkbenchSite : public IServiceLocator { // IAdaptable, IShellProvider {
 
-  berryInterfaceMacro(IWorkbenchSite, berry);
+  berryObjectMacro(berry::IWorkbenchSite)
 
   virtual ~IWorkbenchSite();
 
   /**
    * Returns the page containing this workbench site.
    *
    * @return the page containing this workbench site
    */
   virtual SmartPointer<IWorkbenchPage> GetPage() = 0;
 
   /**
    * Returns the selection provider for this workbench site.
    *
    * @return the selection provider, or <code>null</code> if none
    */
   virtual SmartPointer<ISelectionProvider> GetSelectionProvider() = 0;
 
   /**
    * Returns the shell for this workbench site. Not intended to be called from
    * outside the UI thread. Clients should call IWorkbench.getDisplay() to
    * gain access to the display rather than calling getShell().getDisplay().
    *
    * @return the shell for this workbench site
    */
   virtual SmartPointer<Shell> GetShell() = 0;
 
   /**
    * Returns the workbench window containing this workbench site.
    *
    * @return the workbench window containing this workbench site
    */
   virtual SmartPointer<IWorkbenchWindow> GetWorkbenchWindow() = 0;
 
   /**
    * Sets the selection provider for this workbench site.
    *
    * @param provider
    *            the selection provider, or <code>null</code> to clear it
    */
   virtual void SetSelectionProvider(SmartPointer<ISelectionProvider> provider) = 0;
 
 };
 
 }
 
 #endif /*BERRYIWORKBENCHSITE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchWindow.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchWindow.h
index ee7751bfe9..16e689863e 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchWindow.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryIWorkbenchWindow.h
@@ -1,213 +1,213 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIWORKBENCHWINDOW_H_
 #define BERRYIWORKBENCHWINDOW_H_
 
 #include <berryMacros.h>
 #include <berryIAdaptable.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include "berryIPageService.h"
 #include "berryShell.h"
 
 #include "services/berryIServiceLocator.h"
 
 namespace berry {
 
 struct IPartService;
 struct ISelectionService;
 struct IWorkbenchPage;
 struct IWorkbench;
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * A workbench window is a top level window in a workbench. Visually, a
  * workbench window has a menubar, a toolbar, a status bar, and a main area for
  * displaying a single page consisting of a collection of views and editors.
  * <p>
  * Each workbench window has a collection of 0 or more pages; the active page is
  * the one that is being presented to the end user; at most one page is active
  * in a window at a time.
  * </p>
  * <p>
  * The workbench window supports a few {@link IServiceLocator services} by
  * default. If these services are used to allocate resources, it is important to
  * remember to clean up those resources after you are done with them. Otherwise,
  * the resources will exist until the workbench window is closed. The supported
  * services are:
  * </p>
  * <ul>
  * <li>{@link ICommandService}</li>
  * <li>{@link IContextService}</li>
  * <li>{@link IHandlerService}</li>
  * <li>{@link IBindingService}. Resources allocated through this service will
  * not be cleaned up until the workbench shuts down.</li>
  * </ul>
  * <p>
  * This interface is not intended to be implemented by clients.
  * </p>
  *
  * @see IWorkbenchPage
  * @noimplement This interface is not intended to be implemented by clients.
  *
  */
 struct BERRY_UI_QT IWorkbenchWindow : public IPageService, public IServiceLocator, public virtual Object
 {
 
-  berryInterfaceMacro(IWorkbenchWindow, berry);
+  berryObjectMacro(berry::IWorkbenchWindow)
 
   /**
    * Closes this workbench window.
    * <p>
    * If the window has an open editor with unsaved content, the user will be
    * given the opportunity to save it.
    * </p>
    *
    * @return <code>true</code> if the window was successfully closed, and
    *         <code>false</code> if it is still open
    */
   virtual bool Close() = 0;
 
   virtual SmartPointer<IWorkbenchPage> GetPage(int i) = 0;
 
   /**
    * Returns the currently active page for this workbench window.
    *
    * @return the active page, or <code>null</code> if none
    */
-  virtual SmartPointer<IWorkbenchPage> GetActivePage() = 0;
+  virtual SmartPointer<IWorkbenchPage> GetActivePage() const = 0;
 
   /**
    * Sets or clears the currently active page for this workbench window.
    *
    * @param page
    *            the new active page
    */
   virtual void SetActivePage(SmartPointer<IWorkbenchPage> page) = 0;
 
   /**
    * Returns the part service which tracks part activation within this
    * workbench window.
    *
    * @return the part service
    */
   virtual IPartService* GetPartService() = 0;
 
   /**
    * Returns the selection service which tracks selection within this
    * workbench window.
    *
    * @return the selection service
    */
   virtual ISelectionService* GetSelectionService() = 0;
 
   /**
    * Returns this workbench window's shell.
    *
    * @return the shell containing this window's controls or <code>null</code>
    *   if the shell has not been created yet or if the window has been closed
    */
-  virtual Shell::Pointer GetShell() = 0;
+  virtual Shell::Pointer GetShell() const = 0;
 
   /**
    * Returns the workbench for this window.
    *
    * @return the workbench
    */
   virtual IWorkbench* GetWorkbench() = 0;
 
   /**
    * Returns whether the specified menu is an application menu as opposed to
    * a part menu. Application menus contain items which affect the workbench
    * or window. Part menus contain items which affect the active part (view
    * or editor).
    * <p>
    * This is typically used during "in place" editing. Application menus
    * should be preserved during menu merging. All other menus may be removed
    * from the window.
    * </p>
    *
    * @param menuId
    *            the menu id
    * @return <code>true</code> if the specified menu is an application
    *         menu, and <code>false</code> if it is not
    */
   //virtual bool IsApplicationMenu(const QString& menuId) = 0;
 
   /**
    * Creates and opens a new workbench page. The perspective of the new page
    * is defined by the specified perspective ID. The new page become active.
    * <p>
    * <b>Note:</b> Since release 2.0, a window is limited to contain at most
    * one page. If a page exist in the window when this method is used, then
    * another window is created for the new page. Callers are strongly
    * recommended to use the <code>IWorkbench.showPerspective</code> APIs to
    * programmatically show a perspective.
    * </p>
    *
    * @param perspectiveId
    *            the perspective id for the window's initial page
    * @param input
    *            the page input, or <code>null</code> if there is no current
    *            input. This is used to seed the input for the new page's
    *            views.
    * @return the new workbench page
    * @exception WorkbenchException
    *                if a page could not be opened
    *
    * @see IWorkbench#showPerspective(String, IWorkbenchWindow, IAdaptable)
    */
   virtual SmartPointer<IWorkbenchPage> OpenPage(const QString& perspectiveId, IAdaptable* input) = 0;
 
   /**
    * Creates and opens a new workbench page. The default perspective is used
    * as a template for creating the page. The page becomes active.
    * <p>
    * <b>Note:</b> Since release 2.0, a window is limited to contain at most
    * one page. If a page exist in the window when this method is used, then
    * another window is created for the new page. Callers are strongly
    * recommended to use the <code>IWorkbench.showPerspective</code> APIs to
    * programmatically show a perspective.
    * </p>
    *
    * @param input
    *            the page input, or <code>null</code> if there is no current
    *            input. This is used to seed the input for the new page's
    *            views.
    * @return the new workbench window
    * @exception WorkbenchException
    *                if a page could not be opened
    *
    * @see IWorkbench#showPerspective(String, IWorkbenchWindow, IAdaptable)
    */
   virtual SmartPointer<IWorkbenchPage> OpenPage(IAdaptable* input) = 0;
 
   virtual void SetPerspectiveExcludeList(std::vector<std::string> v) = 0;
   virtual std::vector<std::string> GetPerspectiveExcludeList() = 0;
 
   virtual void SetViewExcludeList(std::vector<std::string> v) = 0;
   virtual std::vector<std::string> GetViewExcludeList() = 0;
 
   virtual ~IWorkbenchWindow();
 
 };
 
 }
 
 #endif /*BERRYIWORKBENCHWINDOW_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryPropertyChangeEvent.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryPropertyChangeEvent.h
index 386da90b35..c6e562c612 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryPropertyChangeEvent.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryPropertyChangeEvent.h
@@ -1,128 +1,129 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYPROPERTYCHANGEEVENT_H_
 #define BERRYPROPERTYCHANGEEVENT_H_
 
 #include <berryMacros.h>
 #include <berryObject.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 
 namespace berry {
 
 /**
  * An event object describing a change to a named property.
  * <p>
  * This concrete class was designed to be instantiated, but may
  * also be subclassed if required.
  * </p>
  * <p>
  * The JFace frameworks contain classes that report property
  * change events for internal state changes that may be of interest
  * to external parties. A special listener interface
  * (<code>IPropertyChangeListener</code>) is defined for this purpose,
  * and a typical class allow listeners to be registered via
  * an <code>addPropertyChangeListener</code> method.
  * </p>
  *
  * @see IPropertyChangeListener
  */
-class BERRY_UI_QT PropertyChangeEvent : public Object {
+class BERRY_UI_QT PropertyChangeEvent : public Object
+{
 
 public:
 
-  berryObjectMacro(PropertyChangeEvent);
+  berryObjectMacro(PropertyChangeEvent)
 
 private:
 
     /**
      * The name of the changed property.
      */
     QString propertyName;
 
     /**
      * The old value of the changed property, or <code>null</code> if
      * not known or not relevant.
      */
     Object::Pointer oldValue;
 
     /**
      * The new value of the changed property, or <code>null</code> if
      * not known or not relevant.
      */
     Object::Pointer newValue;
 
     /**
      * The object on which the property change occured
      */
     Object::Pointer source;
 
 public:
 
     /**
      * Creates a new property change event.
      *
      * @param source the object whose property has changed
      * @param property the property that has changed (must not be <code>null</code>)
      * @param oldValue the old value of the property, or <code>null</code> if none
      * @param newValue the new value of the property, or <code>null</code> if none
      */
     PropertyChangeEvent(Object::Pointer source, const QString& property, Object::Pointer oldValue,
             Object::Pointer newValue);
 
     /**
      * Returns the new value of the property.
      *
      * @return the new value, or <code>null</code> if not known
      *  or not relevant (for instance if the property was removed).
      */
     Object::Pointer GetNewValue();
 
     /**
      * Returns the old value of the property.
      *
      * @return the old value, or <code>null</code> if not known
      *  or not relevant (for instance if the property was just
      *  added and there was no old value).
      */
     Object::Pointer GetOldValue();
 
     /**
      * Returns the name of the property that changed.
      * <p>
      * Warning: there is no guarantee that the property name returned
      * is a constant string.  Callers must compare property names using
      * equals, not ==.
      * </p>
      *
      * @return the name of the property that changed
      */
     QString GetProperty();
 
     /**
      * Returns the object whose property has changed
      *
      * @return the object whose property has changed
      */
     Object::Pointer GetSource();
 
 };
 
 }
 
 #endif /* BERRYPROPERTYCHANGEEVENT_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryQtSelectionProvider.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryQtSelectionProvider.cpp
index 95426e4e38..b1b9c8dfdd 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryQtSelectionProvider.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryQtSelectionProvider.cpp
@@ -1,108 +1,109 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryLog.h"
 
 #include "berryQtSelectionProvider.h"
 
 #include "berryQtItemSelection.h"
 #include "berryQModelIndexObject.h"
 
 namespace berry {
 
 QtSelectionProvider::QtSelectionProvider() : qSelectionModel(0)
 {
 
 }
 
-void QtSelectionProvider::AddSelectionChangedListener(ISelectionChangedListener::Pointer l)
+void QtSelectionProvider::AddSelectionChangedListener(ISelectionChangedListener* l)
 {
   selectionEvents.AddListener(l);
 }
 
-void QtSelectionProvider::RemoveSelectionChangedListener(ISelectionChangedListener::Pointer l)
+void QtSelectionProvider::RemoveSelectionChangedListener(ISelectionChangedListener* l)
 {
   selectionEvents.RemoveListener(l);
 }
 
 ISelection::ConstPointer QtSelectionProvider::GetSelection() const
 {
   if (qSelectionModel)
   {
     ISelection::Pointer qsel(new QtItemSelection(qSelectionModel->selection()));
     return qsel;
   }
 
   return ISelection::ConstPointer(0);
 }
 
-void QtSelectionProvider::SetSelection(ISelection::ConstPointer selection)
+void QtSelectionProvider::SetSelection(const ISelection::ConstPointer& selection)
 {
   this->SetSelection(selection, QItemSelectionModel::ClearAndSelect);
 }
 
-void QtSelectionProvider::SetSelection(ISelection::ConstPointer selection, QItemSelectionModel::SelectionFlags flags)
+void QtSelectionProvider::SetSelection(const ISelection::ConstPointer& selection,
+                                       QItemSelectionModel::SelectionFlags flags)
 {
   if (!qSelectionModel) return;
 
   if (QtItemSelection::ConstPointer qsel = selection.Cast<const QtItemSelection>())
   {
     qSelectionModel->select(qsel->GetQItemSelection(), flags);
   }
 }
 
 QItemSelection QtSelectionProvider::GetQItemSelection() const
 {
   if (qSelectionModel)
     return qSelectionModel->selection();
 
   return QItemSelection();
 }
 
 void QtSelectionProvider::SetQItemSelection(const QItemSelection& selection)
 {
   if (qSelectionModel)
     qSelectionModel->select(selection, QItemSelectionModel::Select);
 }
 
 QItemSelectionModel* QtSelectionProvider::GetItemSelectionModel() const
 {
   return qSelectionModel;
 }
 
 void QtSelectionProvider::SetItemSelectionModel(QItemSelectionModel* selModel)
 {
   if (qSelectionModel)
   {
     qSelectionModel->disconnect(this);
   }
 
   qSelectionModel = selModel;
 
   if (qSelectionModel)
   {
     this->connect(qSelectionModel, SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), this, SLOT(FireSelectionChanged(const QItemSelection&, const QItemSelection&)));
   }
 }
 
 void QtSelectionProvider::FireSelectionChanged(const QItemSelection&  /*selected*/, const QItemSelection&  /*deselected*/)
 {
   QtItemSelection::Pointer sel(new QtItemSelection(this->GetQItemSelection()));
   SelectionChangedEvent::Pointer event(new SelectionChangedEvent(ISelectionProvider::Pointer(this), sel));
   selectionEvents.selectionChanged(event);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryQtSelectionProvider.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryQtSelectionProvider.h
index dabe661d1d..f62e7e7a02 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryQtSelectionProvider.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryQtSelectionProvider.h
@@ -1,70 +1,70 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYQTSELECTIONPROVIDER_H_
 #define BERRYQTSELECTIONPROVIDER_H_
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include <berryISelectionProvider.h>
 
 #include <QItemSelectionModel>
 #include <QItemSelection>
 #include <QObject>
 
 namespace berry
 {
 
 class BERRY_UI_QT QtSelectionProvider: public QObject,
     public ISelectionProvider
 {
   Q_OBJECT
 
 public:
 
   berryObjectMacro(QtSelectionProvider);
 
   QtSelectionProvider();
 
-  void AddSelectionChangedListener(ISelectionChangedListener::Pointer listener);
+  void AddSelectionChangedListener(ISelectionChangedListener* listener);
 
-  void RemoveSelectionChangedListener(
-      ISelectionChangedListener::Pointer listener);
+  void RemoveSelectionChangedListener(ISelectionChangedListener* listener);
 
   ISelection::ConstPointer GetSelection() const;
-  void SetSelection(ISelection::ConstPointer selection);
+  void SetSelection(const ISelection::ConstPointer& selection);
 
-  virtual void SetSelection(ISelection::ConstPointer selection, QItemSelectionModel::SelectionFlags);
+  virtual void SetSelection(const ISelection::ConstPointer& selection,
+                            QItemSelectionModel::SelectionFlags);
 
   QItemSelection GetQItemSelection() const;
   void SetQItemSelection(const QItemSelection& selection);
 
   QItemSelectionModel* GetItemSelectionModel() const;
   void SetItemSelectionModel(QItemSelectionModel* combo);
 
 protected:
   ISelectionChangedListener::Events selectionEvents;
   QItemSelectionModel* qSelectionModel;
 
 protected slots:
 
   virtual void FireSelectionChanged(const QItemSelection& selected, const QItemSelection& deselected);
 
 };
 
 }
 
 #endif /* BERRYQTSELECTIONPROVIDER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berrySameShellProvider.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berrySameShellProvider.cpp
index c417a513e2..0ab95da142 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berrySameShellProvider.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berrySameShellProvider.cpp
@@ -1,47 +1,47 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "tweaklets/berryGuiWidgetsTweaklet.h"
 
 #include "berrySameShellProvider.h"
 
 namespace berry
 {
 
 SameShellProvider::SameShellProvider(void* target) :
   targetControl(target)
 {
 
 }
 
 SameShellProvider::SameShellProvider(Shell::Pointer sh) :
   targetControl(0), shell(sh)
 {
 
 }
 
-Shell::Pointer SameShellProvider::GetShell()
+Shell::Pointer SameShellProvider::GetShell() const
 {
   if (shell != 0)
   {
     return shell;
   }
 
   return targetControl == 0 ? Shell::Pointer(0)
       : Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetShell(targetControl);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berrySameShellProvider.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berrySameShellProvider.h
index ebff332656..39740b2b84 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berrySameShellProvider.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berrySameShellProvider.h
@@ -1,74 +1,74 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYSAMESHELLPROVIDER_H_
 #define BERRYSAMESHELLPROVIDER_H_
 
 #include <org_blueberry_ui_qt_Export.h>
 #include "berryShell.h"
 
 #include <berryMacros.h>
 
 #include "berryIShellProvider.h"
 
 namespace berry {
 
 /**
  * Standard shell provider that always returns the shell containing the given
  * control. This will always return the correct shell for the control, even if
  * the control is reparented.
  *
  * @since 3.1
  */
 class BERRY_UI_QT SameShellProvider : public IShellProvider {
 
 private:
 
   void* targetControl;
   Shell::Pointer shell;
 
 public:
 
   berryObjectMacro(SameShellProvider);
 
   /**
    * Returns a shell provider that always returns the current
    * shell for the given control.
    *
    * @param targetControl control whose shell will be tracked, or null if getShell() should always
    * return null
    */
   SameShellProvider(void* targetControl);
 
   /**
    * Returns a shell provider that always returns the given shell.
    *
    * @param shell the shell which should always be returned,
    *        or null if GetShell() should alway return null
    */
   SameShellProvider(Shell::Pointer shell);
 
   /* (non-javadoc)
    * @see IShellProvider#getShell()
    */
-  Shell::Pointer GetShell();
+  Shell::Pointer GetShell() const;
 
 };
 
 }
 
 #endif /* BERRYSAMESHELLPROVIDER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berrySaveable.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berrySaveable.cpp
index bf5a120889..ac907723d3 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berrySaveable.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berrySaveable.cpp
@@ -1,79 +1,79 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berrySaveable.h"
 
 #include "berryIWorkbenchPage.h"
 #include "berryIWorkbenchPart.h"
 
 namespace berry
 {
 
 bool Saveable::Show(IWorkbenchPage::Pointer  /*page*/)
 {
   return false;
 }
 
 /*IJobRunnable*/void Saveable::DoSave(/*IProgressMonitor monitor,
  IShellProvider shellProvider*/)
 {
   this->DoSave(/*monitor*/);
   //return 0;
 }
 
 void Saveable::DisableUI(const QList<IWorkbenchPart::Pointer>& /*parts*/,
     bool  /*closing*/)
 {
   //TODO Saveable DisableUI
   //    for (int i = 0; i < parts.length; i++) {
   //      IWorkbenchPart workbenchPart = parts[i];
   //      Composite paneComposite = (Composite) ((PartSite) workbenchPart
   //          .getSite()).getPane().getControl();
   //      Control[] paneChildren = paneComposite.getChildren();
   //      Composite toDisable = ((Composite) paneChildren[0]);
   //      toDisable.setEnabled(false);
   //      if (waitCursor == null) {
   //        waitCursor = new Cursor(workbenchPart.getSite().getWorkbenchWindow().getShell().getDisplay(), SWT.CURSOR_WAIT);
   //      }
   //      originalCursor = paneComposite.getCursor();
   //      paneComposite.setCursor(waitCursor);
   //    }
 }
 
 void Saveable::EnableUI(QList<IWorkbenchPart::Pointer>&  /*parts*/)
 {
   //TODO Saveable EnableUI
   //    for (unsigned int i = 0; i < parts.size(); i++) {
   //      IWorkbenchPart::Pointer workbenchPart = parts[i];
   //      Composite paneComposite = (Composite) ((PartSite) workbenchPart
   //          .getSite()).getPane().getControl();
   //      Control[] paneChildren = paneComposite.getChildren();
   //      Composite toEnable = ((Composite) paneChildren[0]);
   //      paneComposite.setCursor(originalCursor);
   //      if (waitCursor!=null && !waitCursor.isDisposed()) {
   //        waitCursor.dispose();
   //        waitCursor = null;
   //      }
   //      toEnable.setEnabled(true);
   //    }
 }
 
-Poco::Any Saveable::GetAdapter(const QString&  /*adapter*/)
+Object* Saveable::GetAdapter(const QString&  /*adapter*/)
 {
-  return Poco::Any();
+  return NULL;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berrySaveable.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berrySaveable.h
index 702ed007ae..f2474129fa 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berrySaveable.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berrySaveable.h
@@ -1,287 +1,287 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYSAVEABLE_H_
 #define BERRYSAVEABLE_H_
 
 #include <berryMacros.h>
 #include <berryObject.h>
 #include <berryIAdaptable.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 #include "berryImageDescriptor.h"
 
 namespace berry {
 
 struct IWorkbenchPage;
 struct IWorkbenchPart;
 
 /**
  * A <code>Saveable</code> represents a unit of saveability, e.g. an editable
  * subset of the underlying domain model that may contain unsaved changes.
  * Different workbench parts (editors and views) may present the same saveables
  * in different ways. This interface allows the workbench to provide more
  * appropriate handling of operations such as saving and closing workbench
  * parts. For example, if two editors sharing the same saveable with unsaved
  * changes are closed simultaneously, the user is only prompted to save the
  * changes once for the shared saveable, rather than once for each editor.
  * <p>
  * Workbench parts that work in terms of saveables should implement
  * {@link ISaveablesSource}.
  * </p>
  *
  * @see ISaveablesSource
  */
 class BERRY_UI_QT Saveable : /*public InternalSaveable*/ public virtual Object, public IAdaptable
 {
 
 public:
 
   berryObjectMacro(Saveable)
 
 private:
   //Cursor waitCursor;
   //Cursor originalCursor;
 
 public:
 
   typedef QSet<Saveable::Pointer> Set;
 
   /**
    * Attempts to show this saveable in the given page and returns
    * <code>true</code> on success. The default implementation does nothing
    * and returns <code>false</code>.
    *
    * @param page
    *            the workbench page in which to show this saveable
    * @return <code>true</code> if this saveable is now visible to the user
    * @since 3.3
    */
   virtual bool Show(SmartPointer<IWorkbenchPage> page);
 
   /**
    * Returns the name of this saveable for display purposes.
    *
    * @return the model's name; never <code>null</code>.
    */
   virtual QString GetName() const = 0;
 
   /**
    * Returns the tool tip text for this saveable. This text is used to
    * differentiate between two inputs with the same name. For instance,
    * MyClass.java in folder X and MyClass.java in folder Y. The format of the
    * text varies between input types.
    *
    * @return the tool tip text; never <code>null</code>
    */
   virtual  QString GetToolTipText() const = 0;
 
   /**
    * Returns the image descriptor for this saveable.
    *
    * @return the image descriptor for this model; may be <code>null</code>
    *         if there is no image
    */
   virtual SmartPointer<ImageDescriptor> GetImageDescriptor() const = 0;
 
   /**
    * Saves the contents of this saveable.
    * <p>
    * If the save is cancelled through user action, or for any other reason,
    * the part should invoke <code>setCancelled</code> on the
    * <code>IProgressMonitor</code> to inform the caller.
    * </p>
    * <p>
    * This method is long-running; progress and cancellation are provided by
    * the given progress monitor.
    * </p>
    *
    * @param monitor
    *            the progress monitor
    * @throws CoreException
    *             if the save fails; it is the caller's responsibility to
    *             report the failure to the user
    */
   virtual void DoSave(/*IProgressMonitor monitor*/) = 0;
 
   /**
    * Returns whether the contents of this saveable have changed since the last
    * save operation.
    * <p>
    * <b>Note:</b> this method is called frequently, for example by actions to
    * determine their enabled status.
    * </p>
    *
    * @return <code>true</code> if the contents have been modified and need
    *         saving, and <code>false</code> if they have not changed since
    *         the last save
    */
   virtual bool IsDirty() const = 0;
 
   /**
    * Clients must implement equals and hashCode as defined in
    * {@link Object#equals(Object)} and {@link Object#hashCode()}. Two
    * saveables should be equal if their dirty state is shared, and saving one
    * will save the other. If two saveables are equal, their names, tooltips,
    * and images should be the same because only one of them will be shown when
    * prompting the user to save.
    *
    * @param object
    * @return true if this Saveable is equal to the given object
    */
-  virtual bool operator<(const Saveable* object) const = 0;
+  virtual bool operator<(const Object* object) const = 0;
 
   /**
    * Clients must implement equals and hashCode as defined in
    * {@link Object#equals(Object)} and {@link Object#hashCode()}. Two
    * saveables should be equal if their dirty state is shared, and saving one
    * will save the other. If two saveables are equal, their hash codes MUST be
    * the same, and their names, tooltips, and images should be the same
    * because only one of them will be shown when prompting the user to save.
    * <p>
    * IMPORTANT: Implementers should ensure that the hashCode returned is
    * sufficiently unique so as not to collide with hashCodes returned by other
    * implementations. It is suggested that the defining plug-in's ID be used
    * as part of the returned hashCode, as in the following example:
    * </p>
    *
    * <pre>
    *     int PRIME = 31;
    *     int hash = ...; // compute the &quot;normal&quot; hash code, e.g. based on some identifier unique within the defining plug-in
    *     return hash * PRIME + MY_PLUGIN_ID.hashCode();
    * </pre>
    *
    * @return a hash code
    */
-  //virtual int hashCode();
+  virtual uint HashCode() const = 0;
 
   /**
    * Saves this saveable, or prepares this saveable for a background save
    * operation. Returns null if this saveable has been successfully saved, or
    * a job runnable that needs to be run to complete the save in the
    * background. This method is called in the UI thread. If this saveable
    * supports saving in the background, it should do only minimal work.
    * However, since the job runnable returned by this method (if any) will not
    * run on the UI thread, this method should copy any state that can only be
    * accessed from the UI thread so that the job runnable will be able to
    * access it.
    * <p>
    * The supplied shell provider can be used from within this method and from
    * within the job runnable for the purpose of parenting dialogs. Care should
    * be taken not to open dialogs gratuitously and only if user input is
    * required for cases where the save cannot otherwise proceed - note that in
    * any given save operation, many saveable objects may be saved at the same
    * time. In particular, errors should be signaled by throwing an exception,
    * or if an error occurs while running the job runnable, an error status
    * should be returned.
    * </p>
    * <p>
    * If the foreground part of the save is cancelled through user action, or
    * for any other reason, the part should invoke <code>setCancelled</code>
    * on the <code>IProgressMonitor</code> to inform the caller. If the
    * background part of the save is cancelled, the job should return a
    * {@link IStatus#CANCEL} status.
    * </p>
    * <p>
    * This method is long-running; progress and cancellation are provided by
    * the given progress monitor.
    * </p>
    * <p>
    * The default implementation of this method calls
    * {@link #doSave(IProgressMonitor)} and returns <code>null</code>.
    * </p>
    *
    * @param monitor
    *            a progress monitor used for reporting progress and
    *            cancellation
    * @param shellProvider
    *            an object that can provide a shell for parenting dialogs
    * @return <code>null</code> if this saveable has been saved successfully,
    *         or a job runnable that needs to be run to complete the save in
    *         the background.
    *
    * @since 3.3
    */
   //TODO Saveable IJobRunnable, IProgressMonitor, and IShellProvider
 //  virtual /*IJobRunnable*/void DoSave(/*IProgressMonitor monitor,
 //      IShellProvider shellProvider*/);
 
   /**
    * Disables the UI of the given parts containing this saveable if necessary.
    * This method is not intended to be called by clients. A corresponding call
    * to
    * <p>
    * Saveables that can be saved in the background should ensure that the user
    * cannot make changes to their data from the UI, for example by disabling
    * controls, unless they are prepared to handle this case. This method is
    * called on the UI thread after a job runnable has been returned from
    * {@link #doSave(IProgressMonitor, IShellProvider)} and before
    * spinning the event loop. The <code>closing</code> flag indicates that
    * this saveable is currently being saved in response to closing a workbench
    * part, in which case further changes to this saveable through the UI must
    * be prevented.
    * </p>
    * <p>
    * The default implementation calls setEnabled(false) on the given parts'
    * composites.
    * </p>
    *
    * @param parts
    *            the workbench parts containing this saveable
    * @param closing
    *            a boolean flag indicating whether the save was triggered by a
    *            request to close a workbench part, and all of the given parts
    *            will be closed after the save operation finishes successfully.
    *
    * @since 3.3
    */
   virtual void DisableUI(const QList<SmartPointer<IWorkbenchPart> >& parts, bool closing);
 
   /**
    * Enables the UI of the given parts containing this saveable after a
    * background save operation has finished. This method is not intended to be
    * called by clients.
    * <p>
    * The default implementation calls setEnabled(true) on the given parts'
    * composites.
    * </p>
    *
    * @param parts
    *            the workbench parts containing this saveable
    *
    * @since 3.3
    */
   virtual void EnableUI(QList<SmartPointer<IWorkbenchPart> >& parts);
 
 protected:
 
   /**
    * This implementation of {@link IAdaptable#GetAdapterImpl(const std::type_info&)} returns
    * <code>null</code>. Subclasses may override. This allows two unrelated
    * subclasses of Saveable to implement {@link #equals(Object)} and
    * {@link #hashCode()} based on an underlying implementation class that is
    * shared by both Saveable subclasses.
    *
    * @since 3.3
    */
-  virtual Poco::Any GetAdapter(const QString& adapter);
+  virtual Object* GetAdapter(const QString& adapter);
 };
 
 }
 
 
 #endif /* BERRYSAVEABLE_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berrySaveablesLifecycleEvent.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berrySaveablesLifecycleEvent.h
index b9f447ee78..bc6cd32a45 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berrySaveablesLifecycleEvent.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berrySaveablesLifecycleEvent.h
@@ -1,143 +1,142 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYSAVEABLESLIFECYCLEEVENT_H_
 #define BERRYSAVEABLESLIFECYCLEEVENT_H_
 
 #include <berryMacros.h>
 #include <org_blueberry_ui_qt_Export.h>
 
 #include "berrySaveable.h"
 
 #include <vector>
 
 namespace berry {
 
 /**
  * Event object describing a change to a set of Saveable objects.
- *
- * @since 3.2
  */
-class BERRY_UI_QT SaveablesLifecycleEvent : public Object {
+class BERRY_UI_QT SaveablesLifecycleEvent : public Object
+{
 
 public:
 
-  berryObjectMacro(SaveablesLifecycleEvent);
+  berryObjectMacro(SaveablesLifecycleEvent)
 
   /**
    * Event type constant specifying that the given saveables have been opened.
    */
   static const int POST_OPEN; // = 1;
 
   /**
    * Event type constant specifying that the given saveables are about to be
    * closed. Listeners may veto the closing if isForce() is false.
    */
   static const int PRE_CLOSE; // = 2;
 
   /**
    * Event type constant specifying that the given saveables have been closed.
    */
   static const int POST_CLOSE; // = 3;
 
   /**
    * Event type constant specifying that the dirty state of the given saveables
    * has changed.
    */
   static const int DIRTY_CHANGED; // = 4;
 
 
 private:
 
   int eventType;
 
   QList<Saveable::Pointer> saveables;
 
   bool force;
 
   bool veto;
 
   Object::Pointer source;
 
 
 public:
 
   /**
    * Creates a new SaveablesLifecycleEvent.
    *
    * @param source
    *            The source of the event. If an ISaveablesSource notifies
    *            about changes to the saveables returned by
    *            {@link ISaveablesSource#getSaveables()}, the source must be
    *            the ISaveablesSource object.
    * @param eventType
    *            the event type, currently one of POST_OPEN, PRE_CLOSE,
    *            POST_CLOSE, DIRTY_CHANGED
    * @param saveables
    *            The affected saveables
    * @param force
    *            true if the event type is PRE_CLOSE and this is a closed force
    *            that cannot be canceled.
    */
   SaveablesLifecycleEvent(Object::Pointer source_, int eventType_,
       const QList<Saveable::Pointer>& saveables_, bool force_);
 
   /**
    * Returns the eventType, currently one of POST_OPEN, PRE_CLOSE, POST_CLOSE,
    * DIRTY_CHANGED. Listeners should silently ignore unknown event types since
    * new event types might be added in the future.
    *
    * @return the eventType
    */
   int GetEventType();
 
   Object::Pointer GetSource();
 
   /**
    * Returns the affected saveables.
    *
    * @return the saveables
    */
   QList<Saveable::Pointer> GetSaveables();
 
   /**
    * Returns the veto. This value is ignored for POST_OPEN,POST_CLOSE, and
    * DIRTY_CHANGED.
    *
    * @return Returns the veto.
    */
   bool IsVeto();
 
   /**
    * @param veto
    *            The veto to set.
    */
   void SetVeto(bool veto);
 
   /**
    * Sets the force flag. This value is ignored for POST_OPEN, POST_CLOSE, and
    * DIRTY_CHANGED.
    *
    * @return Returns the force.
    */
   bool IsForce();
 
 };
 
 }
 
 #endif /* BERRYSAVEABLESLIFECYCLEEVENT_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryShell.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryShell.cpp
index 372a5ce39d..7eab010ffe 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryShell.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryShell.cpp
@@ -1,39 +1,54 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryShell.h"
 
 namespace berry {
 
+Shell::Shell()
+  : extraShellListener(NULL)
+{
+}
+
 Object::Pointer Shell::GetData(const QString& id) const
 {
   QHash<QString, Object::Pointer>::const_iterator iter = data.find(id);
   if (iter == data.end()) return Object::Pointer(0);
   return iter.value();
 }
 
-void Shell::SetData(Object::Pointer data, const QString& id)
+void Shell::SetData(const Object::Pointer& data, const QString& id)
 {
   this->data[id] = data;
 }
 
+IShellListener* Shell::GetExtraShellListener() const
+{
+  return extraShellListener;
+}
+
+void Shell::SetExtraShellListener(IShellListener* l)
+{
+  extraShellListener = l;
+}
+
 void Shell::SetBounds(int x, int y, int width, int height)
 {
   Rectangle rect(x, y, width, height);
   this->SetBounds(rect);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryShell.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryShell.h
index 3ed7d6cbee..b179bcd881 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryShell.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryShell.h
@@ -1,329 +1,338 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYSHELL_H_
 #define BERRYSHELL_H_
 
 #include <berryMacros.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 #include "berryIShellListener.h"
 #include "guitk/berryGuiTkIControlListener.h"
 #include "berryRectangle.h"
 #include "berryPoint.h"
 
 #include <map>
 
 namespace berry {
 
 /**
  * Instances of this class represent the "windows"
  * which the desktop or "window manager" is managing.
  * Instances that do not have a parent (that is, they
  * are built using the constructor, which takes a
  * <code>Display</code> as the argument) are described
  * as <em>top level</em> shells. Instances that do have
  * a parent are described as <em>secondary</em> or
  * <em>dialog</em> shells.
  * <p>
  * Instances are always displayed in one of the maximized,
  * minimized or normal states:
  * <ul>
  * <li>
  * When an instance is marked as <em>maximized</em>, the
  * window manager will typically resize it to fill the
  * entire visible area of the display, and the instance
  * is usually put in a state where it can not be resized
  * (even if it has style <code>RESIZE</code>) until it is
  * no longer maximized.
  * </li><li>
  * When an instance is in the <em>normal</em> state (neither
  * maximized or minimized), its appearance is controlled by
  * the style constants which were specified when it was created
  * and the restrictions of the window manager (see below).
  * </li><li>
  * When an instance has been marked as <em>minimized</em>,
  * its contents (client area) will usually not be visible,
  * and depending on the window manager, it may be
  * "iconified" (that is, replaced on the desktop by a small
  * simplified representation of itself), relocated to a
  * distinguished area of the screen, or hidden. Combinations
  * of these changes are also possible.
  * </li>
  * </ul>
  * </p><p>
  * The <em>modality</em> of an instance may be specified using
  * style bits. The modality style bits are used to determine
  * whether input is blocked for other shells on the display.
  * The <code>PRIMARY_MODAL</code> style allows an instance to block
  * input to its parent. The <code>APPLICATION_MODAL</code> style
  * allows an instance to block input to every other shell in the
  * display. The <code>SYSTEM_MODAL</code> style allows an instance
  * to block input to all shells, including shells belonging to
  * different applications.
  * </p><p>
  * Note: The styles supported by this class are treated
  * as <em>HINT</em>s, since the window manager for the
  * desktop on which the instance is visible has ultimate
  * control over the appearance and behavior of decorations
  * and modality. For example, some window managers only
  * support resizable windows and will always assume the
  * RESIZE style, even if it is not set. In addition, if a
  * modality style is not supported, it is "upgraded" to a
  * more restrictive modality style that is supported. For
  * example, if <code>PRIMARY_MODAL</code> is not supported,
  * it would be upgraded to <code>APPLICATION_MODAL</code>.
  * A modality style may also be "downgraded" to a less
  * restrictive style. For example, most operating systems
  * no longer support <code>SYSTEM_MODAL</code> because
  * it can freeze up the desktop, so this is typically
  * downgraded to <code>APPLICATION_MODAL</code>.
  * <dl>
  * <dt><b>Styles:</b></dt>
  * <dd>BORDER, CLOSE, MIN, MAX, NO_TRIM, RESIZE, TITLE, ON_TOP, TOOL</dd>
  * <dd>APPLICATION_MODAL, MODELESS, PRIMARY_MODAL, SYSTEM_MODAL</dd>
  * <dt><b>Events:</b></dt>
  * <dd>Activate, Close, Deactivate, Deiconify, Iconify</dd>
  * </dl>
  * Class <code>SWT</code> provides two "convenience constants"
  * for the most commonly required style combinations:
  * <dl>
  * <dt><code>SHELL_TRIM</code></dt>
  * <dd>
  * the result of combining the constants which are required
  * to produce a typical application top level shell: (that
  * is, <code>CLOSE | TITLE | MIN | MAX | RESIZE</code>)
  * </dd>
  * <dt><code>DIALOG_TRIM</code></dt>
  * <dd>
  * the result of combining the constants which are required
  * to produce a typical application dialog shell: (that
  * is, <code>TITLE | CLOSE | BORDER</code>)
  * </dd>
  * </dl>
  * </p>
  * <p>
  * Note: Only one of the styles APPLICATION_MODAL, MODELESS,
  * PRIMARY_MODAL and SYSTEM_MODAL may be specified.
  * </p><p>
  * IMPORTANT: This class is not intended to be subclassed.
  * </p>
  *
  * @see Decorations
  * @see SWT
  * @see <a href="http://www.blueberry.org/swt/snippets/#shell">Shell snippets</a>
  * @see <a href="http://www.blueberry.org/swt/examples.php">SWT Example: ControlExample</a>
  * @see <a href="http://www.blueberry.org/swt/">Sample code and further information</a>
  */
 class BERRY_UI_QT Shell : public virtual Object
 {
 public:
 
-  berryObjectMacro(Shell);
+  berryObjectMacro(Shell)
+
+  Shell();
 
   Object::Pointer GetData(const QString& id = "") const;
-  void SetData(Object::Pointer data, const QString& id = "");
+  void SetData(const Object::Pointer& data, const QString& id = "");
+
+  IShellListener* GetExtraShellListener() const;
+
+  void SetExtraShellListener(IShellListener* l);
 
   void SetBounds(int x, int y, int width, int height);
 
   virtual void SetBounds(const Rectangle& bounds) = 0;
   virtual Rectangle GetBounds() const = 0;
 
   virtual void SetLocation(int x, int y) = 0;
 
   virtual Point ComputeSize(int wHint, int hHint, bool changed) = 0;
 
   /**
    * Returns the receiver's text, which is the string that the
    * window manager will typically display as the receiver's title.
    * If the text has not previously been set, returns an empty string.
    *
    * @return the text
    */
   virtual QString GetText() const = 0;
 
   /**
    * Sets the receiver's text, which is the string that the window manager
    * will typically display as the receiver's title, to the argument.
    */
   virtual void SetText(const QString& text) = 0;
 
   virtual bool IsVisible() = 0;
   virtual void SetVisible(bool visible) = 0;
 
   virtual QWidget* GetControl() = 0;
 
   virtual void SetImages(const QList<void*>& images) = 0;
 
   /**
    * Returns <code>true</code> if the receiver is currently
    * maximized, and false otherwise.
    * <p>
    *
    * @return the maximized state
    *
    * @see #SetMaximized
    */
   virtual bool GetMaximized() = 0;
 
   /**
    * Returns <code>true</code> if the receiver is currently
    * minimized, and false otherwise.
    * <p>
    *
    * @return the minimized state
    *
    * @see #SetMinimized
    */
   virtual bool GetMinimized() = 0;
 
   /**
    * Sets the minimized stated of the receiver.
    * If the argument is <code>true</code> causes the receiver
    * to switch to the minimized state, and if the argument is
    * <code>false</code> and the receiver was previously minimized,
    * causes the receiver to switch back to either the maximized
    * or normal states.
    * <p>
    * Note: The result of intermixing calls to <code>setMaximized(true)</code>
    * and <code>setMinimized(true)</code> will vary by platform. Typically,
    * the behavior will match the platform user's expectations, but not
    * always. This should be avoided if possible.
    * </p>
    *
    * @param minimized the new maximized state
    *
    * @see #SetMaximized
    */
   virtual void SetMinimized(bool minimized) = 0;
 
   /**
    * Sets the maximized state of the receiver.
    * If the argument is <code>true</code> causes the receiver
    * to switch to the maximized state, and if the argument is
    * <code>false</code> and the receiver was previously maximized,
    * causes the receiver to switch back to either the minimized
    * or normal states.
    * <p>
    * Note: The result of intermixing calls to <code>setMaximized(true)</code>
    * and <code>setMinimized(true)</code> will vary by platform. Typically,
    * the behavior will match the platform user's expectations, but not
    * always. This should be avoided if possible.
    * </p>
    *
    * @param maximized the new maximized state
    *
    * @see #SetMinimized
    */
   virtual void SetMaximized(bool maximized) = 0;
 
   /**
    * Adds the listener to the collection of listeners who will
    * be notified when operations are performed on the receiver,
    * by sending the listener one of the messages defined in the
    * <code>IShellListener</code> interface.
    *
    * @param listener the listener which should be notified
    *
    * @see IShellListener
    * @see #RemoveShellListener
    */
-  virtual void AddShellListener(IShellListener::Pointer listener) = 0;
+  virtual void AddShellListener(IShellListener* listener) = 0;
 
   /**
    * Removes the listener from the collection of listeners who will
    * be notified when operations are performed on the receiver.
    *
    * @param listener the listener which should no longer be notified
    *
    * @see IShellListener
    * @see #AddShellListener
    */
-  virtual void RemoveShellListener(IShellListener::Pointer listener) = 0;
+  virtual void RemoveShellListener(IShellListener* listener) = 0;
 
   /**
    * Moves the receiver to the top of the drawing order for
    * the display on which it was created (so that all other
    * shells on that display, which are not the receiver's
    * children will be drawn behind it), marks it visible,
    * sets the focus and asks the window manager to make the
    * shell active.
    */
   virtual void Open(bool block = false) = 0;
 
   /**
    * Requests that the window manager close the receiver in
    * the same way it would be closed when the user clicks on
    * the "close box" or performs some other platform specific
    * key or mouse combination that indicates the window
    * should be removed.
    */
   virtual void Close() = 0;
 
   /**
    * If the receiver is visible, moves it to the top of the
    * drawing order for the display on which it was created
    * (so that all other shells on that display, which are not
    *  the receiver's children will be drawn behind it) and
    *  asks the window manager to make the shell active.
    */
   virtual void SetActive() = 0;
 
   /**
     * Returns an array containing all shells which are
     * descendants of the receiver.
     * <p>
     * @return the dialog shells
     *
     * @exception SWTException <ul>
     *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
     *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
     * </ul>
     */
    virtual QList<Shell::Pointer> GetShells() = 0;
 
    /**
      * Returns the receiver's style information.
      * <p>
      * Note that the value which is returned by this method <em>may
      * not match</em> the value which was provided to the constructor
      * when the receiver was created. This can occur when the underlying
      * operating system does not support a particular combination of
      * requested styles. For example, if the platform widget used to
      * implement a particular SWT widget always has scroll bars, the
      * result of calling this method would always have the
      * <code>SWT.H_SCROLL</code> and <code>SWT.V_SCROLL</code> bits set.
      * </p>
      *
      * @return the style bits
      *
      * @exception SWTException <ul>
      *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
      *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
      * </ul>
      */
     virtual Qt::WindowFlags GetStyle () const = 0;
 
 private:
 
   QHash<QString, Object::Pointer> data;
+  IShellListener* extraShellListener;
 
 };
 
 }
 
+Q_DECLARE_METATYPE(berry::Shell*)
+
 #endif /* BERRYSHELL_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryShowInContext.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryShowInContext.cpp
new file mode 100644
index 0000000000..1f633c4ef4
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryShowInContext.cpp
@@ -0,0 +1,49 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berryShowInContext.h"
+
+#include "berryISelection.h"
+
+namespace berry {
+
+ShowInContext::ShowInContext(const Object::Pointer& input, const SmartPointer<const ISelection>& selection)
+  : input(input)
+  , selection(selection)
+{
+}
+
+Object::Pointer ShowInContext::GetInput() const
+{
+  return input;
+}
+
+SmartPointer<const ISelection> ShowInContext::GetSelection() const
+{
+  return selection;
+}
+
+void ShowInContext::SetInput(const Object::Pointer& input)
+{
+  this->input = input;
+}
+
+void ShowInContext::SetSelection(const SmartPointer<const ISelection>& selection)
+{
+  this->selection = selection;
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryShowInContext.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryShowInContext.h
new file mode 100644
index 0000000000..eefe64da75
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryShowInContext.h
@@ -0,0 +1,89 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYSHOWINCONTEXT_H
+#define BERRYSHOWINCONTEXT_H
+
+#include "berryObject.h"
+
+#include <org_blueberry_ui_qt_Export.h>
+
+namespace berry {
+
+struct ISelection;
+
+/**
+ * Carries the context for the Show In action.
+ * The default implementation carries an input and a selection.
+ * Subclasses may extend.
+ *
+ * @see IShowInSource
+ * @see IShowInTarget
+ */
+class BERRY_UI_QT ShowInContext : public virtual Object
+{
+
+private:
+
+  Object::Pointer input;
+  SmartPointer<const ISelection> selection;
+
+public:
+
+  berryObjectMacro(berry::ShowInContext)
+
+  /**
+   * Constructs a new <code>ShowInContext</code> with the given input and
+   * selection.
+   *
+   * @param input the input or <code>null</code>
+   * @param selection the selection or <code>null</code>
+   */
+  ShowInContext(const Object::Pointer& input, const SmartPointer<const ISelection>& selection);
+
+  /**
+   * Returns the input, or <code>null</code> to indicate no input
+   *
+   * @return the input or <code>null</code>.
+   */
+  Object::Pointer GetInput() const;
+
+  /**
+   * Returns the selection, or <code>null</code> to indicate no selection.
+   *
+   * @return the selection or <code>null</code>
+   */
+  SmartPointer<const ISelection> GetSelection() const;
+
+  /**
+   * Sets the input, or <code>null</code> to indicate no input.
+   *
+   * @param input the input or <code>null</code>
+   */
+  void SetInput(const Object::Pointer& input);
+
+  /**
+   * Sets the selection, or <code>null</code> to indicate no selection.
+   *
+   * @param selection the selection or <code>null</code>
+   */
+  void SetSelection(const SmartPointer<const ISelection>& selection);
+
+};
+
+}
+
+#endif // BERRYSHOWINCONTEXT_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryWindow.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryWindow.cpp
index 5b6f214b69..531caa4669 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryWindow.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryWindow.cpp
@@ -1,580 +1,580 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "tweaklets/berryGuiWidgetsTweaklet.h"
 
 #include "berryWindow.h"
 
 #include "berryConstants.h"
 #include "berrySameShellProvider.h"
 #include "berryMenuManager.h"
 
 #include <QMainWindow>
 
 namespace berry
 {
 
 const int Window::OK = 0;
 const int Window::CANCEL = 1;
 
 QList<void*> Window::defaultImages = QList<void*>();
 
 Window::IExceptionHandler::Pointer Window::exceptionHandler(new DefaultExceptionHandler());
 IShellProvider::Pointer Window::defaultModalParent(new DefaultModalParent());
 
 Window::WindowShellListener::WindowShellListener(Window* wnd)
  : window(wnd)
  {
 
  }
 
-void Window::WindowShellListener::ShellClosed(ShellEvent::Pointer event)
+void Window::WindowShellListener::ShellClosed(const ShellEvent::Pointer& event)
 {
   event->doit = false; // don't close now
   if (window->CanHandleShellCloseEvent())
   {
     window->HandleShellCloseEvent();
   }
 }
 
 void Window::DefaultExceptionHandler::HandleException(const std::exception& t)
 {
   // Try to keep running.
   std::cerr << t.what();
 }
 
-Shell::Pointer Window::DefaultModalParent::GetShell()
+Shell::Pointer Window::DefaultModalParent::GetShell() const
 {
   Shell::Pointer parent = Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetActiveShell();
 
   // Make sure we don't pick a parent that has a modal child (this can lock the app)
   if (parent == 0)
   {
     // If this is a top-level window, then there must not be any open modal windows.
     parent = Window::GetModalChild(Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetShells());
   }
   else
   {
     // If we picked a parent with a modal child, use the modal child instead
     Shell::Pointer modalChild = Window::GetModalChild(parent->GetShells());
     if (modalChild != 0)
     {
       parent = modalChild;
     }
   }
 
   return parent;
 }
 
 Shell::Pointer Window::GetModalChild(const QList<Shell::Pointer>& toSearch)
 {
   int modal = Constants::APPLICATION_MODAL | Constants::SYSTEM_MODAL | Constants::PRIMARY_MODAL;
 
   size_t size = toSearch.size();
   for (size_t i = size - 1; i < size; i--)
   {
     Shell::Pointer shell = toSearch[i];
 
     // Check if this shell has a modal child
     QList<Shell::Pointer> children = shell->GetShells();
     Shell::Pointer modalChild = GetModalChild(children);
     if (modalChild != 0)
     {
       return modalChild;
     }
 
     // If not, check if this shell is modal itself
     if (shell->IsVisible() && (shell->GetStyle() & modal) != 0)
     {
       return shell;
     }
   }
 
   return Shell::Pointer(0);
 }
 
 //void Window::RunEventLoop()
 //{
 //
 //  //Use the display provided by the shell if possible
 //  Display display;
 //  if (shell == null)
 //  {
 //    display = Display.getCurrent();
 //  }
 //  else
 //  {
 //    display = loopShell.getDisplay();
 //  }
 //
 //  while (loopShell != null && !loopShell.isDisposed())
 //  {
 //    try
 //    {
 //      if (!display.readAndDispatch())
 //      {
 //        display.sleep();
 //      }
 //    } catch (Throwable e)
 //    {
 //      exceptionHandler.handleException(e);
 //    }
 //  }
 //  display.update();
 //}
 
 Window::Window(Shell::Pointer parentShell)
 {
   this->parentShell = new SameShellProvider(parentShell);
   this->Init();
 }
 
 Window::Window(IShellProvider::Pointer shellProvider)
 {
   poco_assert(shellProvider != 0);
   this->parentShell = shellProvider;
   this->Init();
 }
 
 Window::~Window()
 {
 
 }
 
 void Window::Init()
 {
   this->shellStyle = Constants::SHELL_TRIM;
   this->returnCode = OK;
   this->block = false;
 }
 
 bool Window::CanHandleShellCloseEvent()
 {
   return true;
 }
 
 void Window::ConfigureShell(Shell::Pointer newShell)
 {
 
   // The single image version of this code had a comment related to bug
   // 46624,
   // and some code that did nothing if the stored image was already
   // disposed.
   // The equivalent in the multi-image version seems to be to remove the
   // disposed images from the array passed to the shell.
   if (defaultImages.size() > 0)
   {
 //    ArrayList nonDisposedImages = new ArrayList(defaultImages.length);
 //    for (int i = 0; i < defaultImages.length; ++i)
 //    {
 //      if (defaultImages[i] != null && !defaultImages[i].isDisposed())
 //      {
 //        nonDisposedImages.add(defaultImages[i]);
 //      }
 //    }
 //
 //    if (nonDisposedImages.size() <= 0)
 //    {
 //      System.err.println("Window.configureShell: images disposed"); //$NON-NLS-1$
 //    }
 //    else
 //    {
 //      //Image[] array = new Image[nonDisposedImages.size()];
 //      nonDisposedImages.toArray(array);
       newShell->SetImages(defaultImages);
 //    }
   }
 
 //  Layout layout = getLayout();
 //  if (layout != null)
 //  {
 //    newShell.setLayout(layout);
 //  }
   CreateTrimWidgets(newShell);
 }
 
 //voidWindow::ConstrainShellSize()
 //{
 //  // limit the shell size to the display size
 //  Rectangle bounds = shell.getBounds();
 //  Rectangle constrained = getConstrainedShellBounds(bounds);
 //  if (!bounds.equals(constrained))
 //  {
 //    shell.setBounds(constrained);
 //  }
 //}
 
 void* Window::CreateContents(Shell::Pointer parent)
 {
   // by default, just create a composite
   //return new Composite(parent, SWT.NONE);
   return parent->GetControl();
 }
 
 Shell::Pointer Window::CreateShell()
 {
 
   Shell::Pointer newParent = this->GetParentShell();
 //  if (newParent != 0 && newParent.isDisposed())
 //  {
 //    parentShell = new SameShellProvider(null);
 //    newParent = getParentShell();//Find a better parent
 //  }
 
   //Create the shell
   Shell::Pointer newShell = Tweaklets::Get(GuiWidgetsTweaklet::KEY)->CreateShell(newParent, this->GetShellStyle());
 
   //    resizeListener = new Listener() {
   //      public void handleEvent(Event e) {
   //        resizeHasOccurred = true;
   //      }
   //    };
 
   //newShell.addListener(SWT.Resize, resizeListener);
   newShell->SetData(Object::Pointer(this));
 
   //Add a listener
   newShell->AddShellListener(this->GetShellListener());
 
   //Set the layout
   this->ConfigureShell(newShell);
 
 //  //Register for font changes
 //  if (fontChangeListener == null)
 //  {
 //    fontChangeListener = new FontChangeListener();
 //  }
 //  JFaceResources.getFontRegistry().addListener(fontChangeListener);
 
   return newShell;
 }
 
 void* Window::GetContents()
 {
   return contents;
 }
 
 Point Window::GetInitialLocation(const Point& initialSize)
 {
   void* parent = Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetParent(shell->GetControl());
 
   Point centerPoint(0,0);
   Rectangle parentBounds(0,0,0,0);
   if (parent != 0)
   {
     parentBounds = Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetBounds(parent);
     centerPoint.x = parentBounds.x + parentBounds.width/2;
     centerPoint.y = parentBounds.y - parentBounds.height/2;
   }
   else
   {
     parentBounds = Tweaklets::Get(GuiWidgetsTweaklet::KEY)
       ->GetScreenSize(Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetPrimaryScreenNumber());
     centerPoint.x = parentBounds.width/2;
     centerPoint.y = parentBounds.height/2;
   }
 
   return Point(centerPoint.x - (initialSize.x / 2),
               std::max<int>(parentBounds.y,
                             std::min<int>(centerPoint.y - (initialSize.y * 2 / 3),
                                           parentBounds.y + parentBounds.height - initialSize.y)));
 }
 
 Point Window::GetInitialSize()
 {
   return shell->ComputeSize(Constants::DEFAULT, Constants::DEFAULT, true);
 }
 
 Shell::Pointer Window::GetParentShell()
 {
   Shell::Pointer parent = parentShell->GetShell();
 
   int modal = Constants::APPLICATION_MODAL | Constants::SYSTEM_MODAL | Constants::PRIMARY_MODAL;
 
   if ((this->GetShellStyle() & modal) != 0)
   {
     // If this is a modal shell with no parent, pick a shell using defaultModalParent.
     if (parent == 0)
     {
       parent = defaultModalParent->GetShell();
     }
   }
 
   return parent;
 }
 
-IShellListener::Pointer Window::GetShellListener()
+IShellListener* Window::GetShellListener()
 {
-  if (windowShellListener == 0)
-    windowShellListener = new WindowShellListener(this);
+  if (windowShellListener.isNull())
+    windowShellListener.reset(new WindowShellListener(this));
 
-  return windowShellListener;
+  return windowShellListener.data();
 }
 
 int Window::GetShellStyle()
 {
   return shellStyle;
 }
 
 void Window::HandleShellCloseEvent()
 {
   this->SetReturnCode(CANCEL);
   this->Close();
 }
 
 void Window::InitializeBounds()
 {
 //  if (resizeListener != null)
 //  {
 //    shell.removeListener(SWT.Resize, resizeListener);
 //  }
 //  if (resizeHasOccurred)
 //  { // Check if shell size has been set already.
 //    return;
 //  }
 
   Point size = this->GetInitialSize();
   Point location = this->GetInitialLocation(size);
   shell->SetBounds(this->GetConstrainedShellBounds(Rectangle(location.x, location.y, size.x, size.y)));
 }
 
 Rectangle Window::GetConstrainedShellBounds(const Rectangle& preferredSize)
 {
   Rectangle result(preferredSize);
 
   GuiWidgetsTweaklet* guiTweaklet(Tweaklets::Get(GuiWidgetsTweaklet::KEY));
   int screenNum = guiTweaklet->GetClosestScreenNumber(result);
   Rectangle bounds(guiTweaklet->GetAvailableScreenSize(screenNum));
 
   if (result.height > bounds.height) {
     result.height = bounds.height;
   }
 
   if (result.width > bounds.width) {
     result.width = bounds.width;
   }
 
   result.x = std::max<int>(bounds.x, std::min<int>(result.x, bounds.x
     + bounds.width - result.width));
   result.y = std::max<int>(bounds.y, std::min<int>(result.y, bounds.y
     + bounds.height - result.height));
 
   return result;
 }
 
 void Window::SetParentShell(Shell::Pointer newParentShell)
 {
   poco_assert(shell == 0); // "There must not be an existing shell."; //$NON-NLS-1$
   parentShell = new SameShellProvider(newParentShell);
 }
 
 void Window::SetReturnCode(int code)
 {
   returnCode = code;
 }
 
 void Window::SetShellStyle(int newShellStyle)
 {
   shellStyle = newShellStyle;
 }
 
 void Window::AddMenuBar()
 {
   if (GetShell().IsNull() && menuBarManager.IsNull())
   {
     menuBarManager = CreateMenuManager();
   }
 }
 
 SmartPointer<MenuManager> Window::CreateMenuManager()
 {
   MenuManager::Pointer manager(new MenuManager());
   return manager;
 }
 
 void Window::CreateTrimWidgets(SmartPointer<Shell> shell)
 {
   if (menuBarManager.IsNotNull())
   {
     QMainWindow* mw = qobject_cast<QMainWindow*>(shell->GetControl());
     if (mw)
     {
       mw->setMenuBar(menuBarManager->CreateMenuBar(shell->GetControl()));
       menuBarManager->UpdateAll(true);
     }
   }
 
 //  if (showTopSeperator())
 //  {
 //    seperator1 = new Label(shell, SWT.SEPARATOR | SWT.HORIZONTAL);
 //  }
 
   //CreateToolBarControl(shell);
   //CreateStatusLine(shell);
 }
 
 bool Window::Close()
 {
 
 //  BERRY_INFO << "Window::Close()";
 
 //  // stop listening for font changes
 //  if (fontChangeListener != null)
 //  {
 //    JFaceResources.getFontRegistry().removeListener(fontChangeListener);
 //    fontChangeListener = null;
 //  }
 
   // remove this window from a window manager if it has one
   if (windowManager != 0)
   {
     windowManager->Remove(Window::Pointer(this));
     windowManager = 0;
   }
 
   if (shell == 0)
   {
     return true;
   }
 
   shell->RemoveShellListener(this->GetShellListener());
   shell->SetData(Object::Pointer(0));
 
   // If we "close" the shell recursion will occur.
   // Instead, we need to "dispose" the shell to remove it from the
   // display.
   Tweaklets::Get(GuiWidgetsTweaklet::KEY)->DisposeShell(shell);
   shell = 0;
   contents = 0;
 
   return true;
 }
 
 void Window::Create()
 {
   shell = this->CreateShell();
   contents = this->CreateContents(shell);
 
   //initialize the bounds of the shell to that appropriate for the
   // contents
   this->InitializeBounds();
 }
 
 void* Window::GetDefaultImage()
 {
   return (defaultImages.size() < 1) ? 0
       : defaultImages[0];
 }
 
 QList<void*> Window::GetDefaultImages()
 {
   return defaultImages;
 }
 
 int Window::GetReturnCode()
 {
   return returnCode;
 }
 
-Shell::Pointer Window::GetShell()
+Shell::Pointer Window::GetShell() const
 {
   return shell;
 }
 
 WindowManager* Window::GetWindowManager()
 {
   return windowManager;
 }
 
 MenuManager *Window::GetMenuBarManager() const
 {
   return menuBarManager.GetPointer();
 }
 
 int Window::Open()
 {
 
   if (shell == 0)
   {
     // create the window
     this->Create();
   }
 
   // limit the shell size to the display size
   //constrainShellSize();
 
   // open the window
   shell->Open(block);
 
 //  // run the event loop if specified
 //  if (block)
 //  {
 //    this->RunEventLoop();
 //  }
 
   return returnCode;
 }
 
 void Window::SetBlockOnOpen(bool shouldBlock)
 {
   block = shouldBlock;
 }
 
 void Window::SetDefaultImage(void* image)
 {
   if (image != 0)
     defaultImages.push_back(image);
 }
 
 void Window::SetDefaultImages(const QList<void*>& images)
 {
   defaultImages = images;
 }
 
 void Window::SetWindowManager(WindowManager* manager)
 {
   windowManager = manager;
 
   // Code to detect invalid usage
 
   if (manager != 0)
   {
     QList<Window::Pointer> windows = manager->GetWindows();
-    for (unsigned int i = 0; i < windows.size(); i++)
+    for (int i = 0; i < windows.size(); i++)
     {
       if (windows[i] == this)
       {
         return;
       }
     }
     manager->Add(Window::Pointer(this));
   }
 }
 
 void Window::SetExceptionHandler(IExceptionHandler::Pointer handler)
 {
   if (exceptionHandler == 0)
   {
     exceptionHandler = handler;
   }
 }
 
 void Window::SetDefaultModalParent(IShellProvider::Pointer provider)
 {
   defaultModalParent = provider;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryWindow.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryWindow.h
index 0250e0332a..ea8a17c847 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryWindow.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryWindow.h
@@ -1,731 +1,732 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYWINDOW_H_
 #define BERRYWINDOW_H_
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include "berryIShellProvider.h"
 #include "berryIShellListener.h"
 #include "berryPoint.h"
 
 #include "internal/berryWindowManager.h"
 #include "tweaklets/berryGuiWidgetsTweaklet.h"
 
 #include <berryMacros.h>
 #include <vector>
 
 namespace berry
 {
 
 //struct IToolBarManager;
 
 class MenuManager;
 //class StatusLineManager;
 
 /**
  * A JFace window is an object that has no visual representation (no widgets)
  * until it is told to open.
  * <p>
  * Creating a window involves the following steps:
  * <ul>
  * <li>creating an instance of a concrete subclass of <code>Window</code>
  * </li>
  * <li>creating the window's shell and widget tree by calling
  * <code>create</code> (optional)</li>
  * <li>assigning the window to a window manager using
  * <code>WindowManager.add</code> (optional)</li>
  * <li>opening the window by calling <code>open</code></li>
  * </ul>
  * Opening the window will create its shell and widget tree if they have not
  * already been created. When the window is closed, the shell and widget tree
  * are disposed of and are no longer referenced, and the window is automatically
  * removed from its window manager. A window may be reopened.
  * </p>
  * <p>
  * The JFace window framework (this package) consists of this class,
  * <code>Window</code>, the abstract base of all windows, and one concrete
  * window classes (<code>ApplicationWindow</code>) which may also be
  * subclassed. Clients may define additional window subclasses as required.
  * </p>
  * <p>
  * The <code>Window</code> class provides methods that subclasses may
  * override to configure the window, including:
  * <ul>
  * <li><code>close</code>- extend to free other SWT resources</li>
  * <li><code>configureShell</code>- extend or reimplement to set shell
  * properties before window opens</li>
  * <li><code>createContents</code>- extend or reimplement to create controls
  * before window opens</li>
  * <li><code>getInitialSize</code>- reimplement to give the initial size for
  * the shell</li>
  * <li><code>getInitialLocation</code>- reimplement to give the initial
  * location for the shell</li>
  * <li><code>getShellListener</code>- extend or reimplement to receive shell
  * events</li>
  * <li><code>handleFontChange</code>- reimplement to respond to font changes
  * </li>
  * <li><code>handleShellCloseEvent</code>- extend or reimplement to handle
  * shell closings</li>
  * </ul>
  * </p>
  */
 class BERRY_UI_QT Window: public IShellProvider
 {
 
 public:
 
   berryObjectMacro(Window);
 
   /**
    * Standard return code constant (value 0) indicating that the window was
    * opened.
    *
    * @see #open
    */
   static const int OK; // = 0;
 
   /**
    * Standard return code constant (value 1) indicating that the window was
    * canceled.
    *
    * @see #open
    */
   static const int CANCEL; // = 1;
 
   /**
    * An array of images to be used for the window. It is expected that the
    * array will contain the same icon rendered at different resolutions.
    */
   static QList<void*> defaultImages;
 
   /**
    * This interface defines a Exception Handler which can be set as a global
    * handler and will be called if an exception happens in the event loop.
    */
   struct IExceptionHandler: public Object
   {
 
     berryObjectMacro(IExceptionHandler)
 
     /**
      * Handle the exception.
      *
      * @param t
      *            The exception that occured.
      */
     virtual void HandleException(const std::exception& t) = 0;
   };
 
 private:
 
   struct WindowShellListener : public IShellListener
   {
     WindowShellListener(Window* wnd);
 
-    void ShellClosed(ShellEvent::Pointer event);
+    void ShellClosed(const ShellEvent::Pointer& event);
 
   private:
     Window* window;
   };
 
-  IShellListener::Pointer windowShellListener;
+  QScopedPointer<IShellListener> windowShellListener;
 
   /**
    * Defines a default exception handler.
    */
   struct DefaultExceptionHandler: public IExceptionHandler
   {
     /*
      * (non-Javadoc)
      *
      * @see org.blueberry.jface.window.Window.IExceptionHandler#handleException(java.lang.Throwable)
      */
     void HandleException(const std::exception& t);
   };
 
   /**
    * Menu bar manager, or <code>null</code> if none (default).
    *
    * @see #addMenuBar
    */
   SmartPointer<MenuManager> menuBarManager;
 
   /**
    * Tool bar manager, or <code>null</code> if none (default).
    *
    * @see #addToolBar
    */
   //SmartPointer<IToolBarManager> toolBarManager;
 
   /**
    * Status line manager, or <code>null</code> if none (default).
    *
    * @see #addStatusLine
    */
   //SmartPointer<StatusLineManager> statusLineManager;
 
   /**
    * The exception handler for this application.
    */
   static IExceptionHandler::Pointer exceptionHandler;
 
   /**
    * Object used to locate the default parent for modal shells
    */
   struct DefaultModalParent: public IShellProvider
   {
-    Shell::Pointer GetShell();
+    Shell::Pointer GetShell() const;
   };
 
   friend struct DefaultModalParent;
 
   static IShellProvider::Pointer defaultModalParent;
 
   /**
    * Object that returns the parent shell.
    */
   IShellProvider::Pointer parentShell;
 
   /**
    * Shell style bits.
    *
    * @see #setShellStyle
    */
   int shellStyle; // = Constants::SHELL_TRIM;
 
   /**
    * Window manager, or <code>null</code> if none.
    *
    * @see #setWindowManager
    */
   WindowManager* windowManager;
 
   /**
    * Window shell, or <code>null</code> if none.
    */
   Shell::Pointer shell;
 
   /**
    * Top level SWT control, or <code>null</code> if none
    */
   void* contents;
 
   /**
    * Window return code; initially <code>OK</code>.
    *
    * @see #setReturnCode
    */
   int returnCode; // = OK;
 
   /**
    * <code>true</code> if the <code>open</code> method should not return
    * until the window closes, and <code>false</code> if the
    * <code>open</code> method should return immediately; initially
    * <code>false</code> (non-blocking).
    *
    * @see #setBlockOnOpen
    */
   bool block; // = false;
 
   //  /**
   //   * Internal class for informing this window when fonts change.
   //   */
   //  class FontChangeListener implements IPropertyChangeListener {
   //    public void propertyChange(PropertyChangeEvent event) {
   //      handleFontChange(event);
   //    }
   //  }
 
   //  /**
   //   * Internal font change listener.
   //   */
   //  private FontChangeListener fontChangeListener;
 
   /**
    * Internal fields to detect if shell size has been set
    */
   //bool resizeHasOccurred = false;
 
   //Listener resizeListener;
 
 
   /**
    * Returns the most specific modal child from the given list of Shells.
    *
    * @param toSearch shells to search for modal children
    * @return the most specific modal child, or null if none
    *
    * @since 3.1
    */
   static Shell::Pointer GetModalChild(
       const QList<Shell::Pointer>& toSearch);
 
   /**
    * Runs the event loop for the given shell.
    *
    * @param loopShell
    *            the shell
    */
   //void RunEventLoop();
 
 protected:
 
   /**
    * Creates a window instance, whose shell will be created under the given
    * parent shell. Note that the window will have no visual representation
    * until it is told to open. By default, <code>open</code> does not block.
    *
    * @param parentShell
    *            the parent shell, or <code>null</code> to create a top-level
    *            shell. Try passing "(Shell)null" to this method instead of "null"
    *            if your compiler complains about an ambiguity error.
    * @see #setBlockOnOpen
    * @see #getDefaultOrientation()
    */
   Window(Shell::Pointer parentShell);
 
   /**
    * Creates a new window which will create its shell as a child of whatever
    * the given shellProvider returns.
    *
    * @param shellProvider object that will return the current parent shell. Not null.
    *
    */
   Window(IShellProvider::Pointer shellProvider);
 
   ~Window();
 
   /**
    * Given the desired position of the window, this method returns an adjusted
    * position such that the window is no larger than its monitor, and does not
    * extend beyond the edge of the monitor. This is used for computing the
    * initial window position, and subclasses can use this as a utility method
    * if they want to limit the region in which the window may be moved.
    *
    * @param preferredSize
    *            the preferred position of the window
    * @return a rectangle as close as possible to preferredSize that does not
    *         extend outside the monitor
    *
    */
   Rectangle GetConstrainedShellBounds(const Rectangle& preferredSize);
 
   /**
    * Initializes this windows variables
    */
   virtual void Init();
 
   /**
    * Determines if the window should handle the close event or do nothing.
    * <p>
    * The default implementation of this framework method returns
    * <code>true</code>, which will allow the
    * <code>handleShellCloseEvent</code> method to be called. Subclasses may
    * extend or reimplement.
    * </p>
    *
    * @return whether the window should handle the close event.
    */
   virtual bool CanHandleShellCloseEvent();
 
   /**
    * Configures the given shell in preparation for opening this window in it.
    * <p>
    * The default implementation of this framework method sets the shell's
    * image and gives it a grid layout. Subclasses may extend or reimplement.
    * </p>
    *
    * @param newShell
    *            the shell
    */
   virtual void ConfigureShell(Shell::Pointer newShell);
 
   /**
    * Constrain the shell size to be no larger than the display bounds.
    *
    * @since 2.0
    */
   //void ConstrainShellSize();
 
   /**
    * Creates and returns this window's contents. Subclasses may attach any
    * number of children to the parent. As a convenience, the return value of
    * this method will be remembered and returned by subsequent calls to
    * getContents(). Subclasses may modify the parent's layout if they overload
    * getLayout() to return null.
    *
    * <p>
    * It is common practise to create and return a single composite that
    * contains the entire window contents.
    * </p>
    *
    * <p>
    * The default implementation of this framework method creates an instance
    * of <code>Composite</code>. Subclasses may override.
    * </p>
    *
    * @param parent
    *            the parent composite for the controls in this window. The type
    *            of layout used is determined by getLayout()
    *
    * @return the control that will be returned by subsequent calls to
    *         getContents()
    */
   virtual void* CreateContents(Shell::Pointer parent);
 
   /**
    * Creates and returns this window's shell.
    * <p>
    * The default implementation of this framework method creates a new shell
    * and configures it using <code>configureShell</code>. Rather than
    * override this method, subclasses should instead override
    * <code>configureShell</code>.
    * </p>
    *
    * @return the shell
    */
   virtual Shell::Pointer CreateShell();
 
   /**
    * Returns the top level control for this window. The parent of this control
    * is the shell.
    *
    * @return the top level control, or <code>null</code> if this window's
    *         control has not been created yet
    */
   virtual void* GetContents();
 
   /**
    * Returns the initial location to use for the shell. The default
    * implementation centers the shell horizontally (1/2 of the difference to
    * the left and 1/2 to the right) and vertically (1/3 above and 2/3 below)
    * relative to the parent shell, or display bounds if there is no parent
    * shell.
    *
    * @param initialSize
    *            the initial size of the shell, as returned by
    *            <code>getInitialSize</code>.
    * @return the initial location of the shell
    */
   virtual Point GetInitialLocation(const Point& initialSize);
 
   /**
    * Returns the initial size to use for the shell. The default implementation
    * returns the preferred size of the shell, using
    * <code>Shell.computeSize(SWT.DEFAULT, SWT.DEFAULT, true)</code>.
    *
    * @return the initial size of the shell
    */
   virtual Point GetInitialSize();
 
   /**
    * Returns parent shell, under which this window's shell is created.
    *
    * @return the parent shell, or <code>null</code> if there is no parent
    *         shell
    */
   Shell::Pointer GetParentShell();
 
   /**
    * Returns a shell listener. This shell listener gets registered with this
    * window's shell.
    * <p>
    * The default implementation of this framework method returns a new
    * listener that makes this window the active window for its window manager
    * (if it has one) when the shell is activated, and calls the framework
    * method <code>handleShellCloseEvent</code> when the shell is closed.
    * Subclasses may extend or reimplement.
    * </p>
    *
    * @return a shell listener
    */
-  virtual IShellListener::Pointer GetShellListener();
+  virtual IShellListener* GetShellListener();
 
   /**
    * Returns the shell style bits.
    * <p>
    * The default value is <code>SWT.CLOSE|SWT.MIN|SWT.MAX|SWT.RESIZE</code>.
    * Subclassers should call <code>setShellStyle</code> to change this
    * value, rather than overriding this method.
    * </p>
    *
    * @return the shell style bits
    */
   int GetShellStyle();
 
   /**
    * Notifies that the window's close button was pressed, the close menu was
    * selected, or the ESCAPE key pressed.
    * <p>
    * The default implementation of this framework method sets the window's
    * return code to <code>CANCEL</code> and closes the window using
    * <code>close</code>. Subclasses may extend or reimplement.
    * </p>
    */
   virtual void HandleShellCloseEvent();
 
   /**
    * Initializes the location and size of this window's SWT shell after it has
    * been created.
    * <p>
    * This framework method is called by the <code>create</code> framework
    * method. The default implementation calls <code>getInitialSize</code>
    * and <code>getInitialLocation</code> and passes the results to
    * <code>Shell.setBounds</code>. This is only done if the bounds of the
    * shell have not already been modified. Subclasses may extend or
    * reimplement.
    * </p>
    */
   virtual void InitializeBounds();
 
   /**
    * Changes the parent shell. This is only safe to use when the shell is not
    * yet realized (i.e., created). Once the shell is created, it must be
    * disposed (i.e., closed) before this method can be called.
    *
    * @param newParentShell
    *            The new parent shell; this value may be <code>null</code> if
    *            there is to be no parent.
    * @since 3.1
    */
   void SetParentShell(Shell::Pointer newParentShell);
 
   /**
    * Sets this window's return code. The return code is automatically returned
    * by <code>open</code> if block on open is enabled. For non-blocking
    * opens, the return code needs to be retrieved manually using
    * <code>getReturnCode</code>.
    *
    * @param code
    *            the return code
    */
   void SetReturnCode(int code);
 
   /**
    * Sets the shell style bits. This method has no effect after the shell is
    * created.
    * <p>
    * The shell style bits are used by the framework method
    * <code>createShell</code> when creating this window's shell.
    * </p>
    *
    * @param newShellStyle
    *            the new shell style bits
    */
   void SetShellStyle(int newShellStyle);
 
   /**
    * Configures this window to have a menu bar.
    * Does nothing if it already has one.
    * This method must be called before this window's shell is created.
    */
   void AddMenuBar();
 
   /**
    * Returns a new menu manager for the window.
    * <p>
    * Subclasses may override this method to customize the menu manager.
    * </p>
    * @return a menu manager
    */
   virtual SmartPointer<MenuManager> CreateMenuManager();
 
   /**
    * Creates the trim widgets around the content area.
    *
    * @param shell the shell
    */
   virtual void CreateTrimWidgets(SmartPointer<Shell> shell);
 
 public:
 
   /**
    * Closes this window, disposes its shell, and removes this window from its
    * window manager (if it has one).
    * <p>
    * This framework method may be extended (<code>super.close</code> must
    * be called).
    * </p>
    * <p>
    *  Note that in order to prevent recursive calls to this method
    *  it does not call <code>Shell#close()</code>. As a result <code>ShellListener</code>s
    *  will not receive a <code>shellClosed</code> event.
    *  </p>
    *
    * @return <code>true</code> if the window is (or was already) closed, and
    *         <code>false</code> if it is still open
    */
   virtual bool Close();
 
   /**
    * Creates this window's widgetry in a new top-level shell.
    * <p>
    * The default implementation of this framework method creates this window's
    * shell (by calling <code>createShell</code>), and its controls (by
    * calling <code>createContents</code>), then initializes this window's
    * shell bounds (by calling <code>initializeBounds</code>).
    * </p>
    */
   virtual void Create();
 
   /**
    * Returns the default image. This is the image that will be used for
    * windows that have no shell image at the time they are opened. There is no
    * default image unless one is installed via <code>setDefaultImage</code>.
    *
    * @return the default image, or <code>null</code> if none
    * @see #setDefaultImage
    */
   static void* GetDefaultImage();
 
   /**
    * Returns the array of default images to use for newly opened windows. It
    * is expected that the array will contain the same icon rendered at
    * different resolutions.
    *
    * @see org.blueberry.swt.widgets.Decorations#setImages(org.blueberry.swt.graphics.Image[])
    *
    * @return the array of images to be used when a new window is opened
    * @see #setDefaultImages
    * @since 3.0
    */
   static QList<void*> GetDefaultImages();
 
   /**
    * Returns this window's return code. A window's return codes are
    * window-specific, although two standard return codes are predefined:
    * <code>OK</code> and <code>CANCEL</code>.
    *
    * @return the return code
    */
   int GetReturnCode();
 
   /**
    * Returns this window's shell.
    *
    * @return this window's shell, or <code>null</code> if this window's
    *         shell has not been created yet
    */
-  Shell::Pointer GetShell();
+  Shell::Pointer GetShell() const;
 
   /**
    * Returns the window manager of this window.
    *
    * @return the WindowManager, or <code>null</code> if none
    */
   WindowManager* GetWindowManager();
 
   /**
    * Returns the menu bar manager for this window (if it has one).
    *
    * @return the menu bar manager, or <code>null</code> if
    *   this window does not have a menu bar
    * @see #addMenuBar()
    */
   MenuManager* GetMenuBarManager() const;
 
   /**
    * Opens this window, creating it first if it has not yet been created.
    * <p>
    * If this window has been configured to block on open (
    * <code>setBlockOnOpen</code>), this method waits until the window is
    * closed by the end user, and then it returns the window's return code;
    * otherwise, this method returns immediately. A window's return codes are
    * window-specific, although two standard return codes are predefined:
    * <code>OK</code> and <code>CANCEL</code>.
    * </p>
    *
    * @return the return code
    *
    * @see #create()
    */
   int Open();
 
   /**
    * Sets whether the <code>open</code> method should block until the window
    * closes.
    *
    * @param shouldBlock
    *            <code>true</code> if the <code>open</code> method should
    *            not return until the window closes, and <code>false</code>
    *            if the <code>open</code> method should return immediately
    */
   void SetBlockOnOpen(bool shouldBlock);
 
   /**
    * Sets the default image. This is the image that will be used for windows
    * that have no shell image at the time they are opened. There is no default
    * image unless one is installed via this method.
    *
    * @param image
    *            the default image, or <code>null</code> if none
    */
   static void SetDefaultImage(void* image);
 
   /**
    * Sets the array of default images to use for newly opened windows. It is
    * expected that the array will contain the same icon rendered at different
    * resolutions.
    *
    * @see org.blueberry.swt.widgets.Decorations#setImages(org.blueberry.swt.graphics.Image[])
    *
    * @param images
    *            the array of images to be used when this window is opened
    * @since 3.0
    */
   static void SetDefaultImages(const QList<void*>& images);
 
   /**
    * Sets the window manager of this window.
    * <p>
    * Note that this method is used by <code>WindowManager</code> to maintain
    * a backpointer. Clients must not call the method directly.
    * </p>
    *
    * @param manager
    *            the window manager, or <code>null</code> if none
    */
   void SetWindowManager(WindowManager* manager);
 
   /**
    * Sets the exception handler for this application.
    * <p>
    * Note that the handler may only be set once.  Subsequent calls to this method will be
    * ignored.
    * <p>
    *
    * @param handler
    *            the exception handler for the application.
    */
   static void SetExceptionHandler(IExceptionHandler::Pointer handler);
 
   /**
    * Sets the default parent for modal Windows. This will be used to locate
    * the parent for any modal Window constructed with a null parent.
    *
    * @param provider shell provider that will be used to locate the parent shell
    * whenever a Window is created with a null parent
    * @since 3.1
    */
   static void SetDefaultModalParent(IShellProvider::Pointer provider);
 
 };
 
 }
 
+
 #endif /* BERRYWINDOW_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryXMLMemento.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryXMLMemento.cpp
index 7144804791..4900943ca9 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryXMLMemento.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryXMLMemento.cpp
@@ -1,430 +1,434 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryXMLMemento.h"
 
 #include "internal/berryWorkbenchPlugin.h"
 
 #include <Poco/NumberParser.h>
 #include <Poco/NumberFormatter.h>
 #include <Poco/DOM/NodeList.h>
 #include <Poco/XML/NamePool.h>
 #include <Poco/DOM/NamedNodeMap.h>
 #include <Poco/DOM/Text.h>
 #include <Poco/DOM/Attr.h>
 #include <Poco/DOM/DOMWriter.h>
 #include <Poco/DOM/DOMParser.h>
 #include <Poco/DOM/DOMBuilder.h>
 #include <Poco/SAX/InputSource.h>
 #include <Poco/SAX/SAXException.h>
 
 #include <limits>
 
 const QString EMPTY_STRING;
 
 berry::XMLMemento::XMLMemento(Poco::XML::Document* document,
     Poco::XML::Element* elem) :
   factory(document), element(elem)
 {
   factory->duplicate();
   element->duplicate();
 }
 
 berry::XMLMemento::~XMLMemento()
 {
   element->release();
   factory->release();
 }
 
 berry::XMLMemento::Pointer berry::XMLMemento::CreateReadRoot(
     berry::XMLMemento::XMLByteInputStream& reader)
 {
   return CreateReadRoot(reader, "");
 }
 
 berry::XMLMemento::Pointer berry::XMLMemento::CreateReadRoot(
     berry::XMLMemento::XMLByteInputStream& reader, const QString& baseDir)
 {
   QString errorMessage;
   Poco::Exception exception("");
 
   try
   {
     Poco::XML::DOMParser parser;
     Poco::XML::InputSource source(reader);
 
     source.setSystemId(baseDir.toStdString());
     Poco::XML::Document* doc = parser.parse(&source);
 
     Poco::XML::Element* elem = doc->documentElement();
 
-    XMLMemento::Pointer memento = XMLMemento::New(doc, elem);
+    XMLMemento::Pointer memento(new XMLMemento(doc, elem));
 
     doc->release();
 
     return memento;
   }
   catch (Poco::XML::SAXParseException& e)
   {
     errorMessage = QString("Could not parse content of XML file: ") + QString::fromStdString(e.displayText());
   }
 
   QString problemText = QString::fromStdString(exception.message());
   if (problemText.isEmpty())
   {
     problemText = errorMessage.isEmpty() ? "Could not find root element node of XML file." : errorMessage;
   }
   throw WorkbenchException(problemText);
 
 }
 
 berry::XMLMemento::Pointer berry::XMLMemento::CreateWriteRoot(
     const QString& type)
 {
   // TODO
   //  try{
   Poco::XML::Document* doc = new Poco::XML::Document();
   Poco::XML::Element* elem = doc->createElement(type.toStdString());
   doc->appendChild(elem)->release();
 
-  XMLMemento::Pointer memento = XMLMemento::New(doc, elem);
+  XMLMemento::Pointer memento(new XMLMemento(doc, elem));
   doc->release();
   return memento;
   //}catch() //TODO: look for poco exceptions
   //{
   //}
 }
 
 berry::IMemento::Pointer berry::XMLMemento::CreateChild(
     const QString& type)
 {
   Poco::XML::Element* child = factory->createElement(type.toStdString());
   element->appendChild(child)->release();
-  return XMLMemento::New(factory, child);
+  IMemento::Pointer xmlChild(new XMLMemento(factory,child));
+  return xmlChild;
 }
 
 berry::IMemento::Pointer berry::XMLMemento::CreateChild(
     const QString& type, const QString& id)
 {
   Poco::XML::Element* child = factory->createElement(type.toStdString());
   child->setAttribute(TAG_ID.toStdString(), id.toStdString());
   element->appendChild(child)->release();
-  return XMLMemento::New(factory, child);
+  IMemento::Pointer xmlChild(new XMLMemento(factory,child));
+  return xmlChild;
 }
 
 berry::IMemento::Pointer berry::XMLMemento::CopyChild(IMemento::Pointer child)
 {
   //TODO check any casting errors
   Poco::XML::Element* elem = child.Cast<berry::XMLMemento> ()->GetElement();
   Poco::XML::Element* newElement =
       dynamic_cast<Poco::XML::Element*> (factory->importNode(elem, true));
   element->appendChild(newElement)->release();
-  return XMLMemento::New(factory, newElement);
+  IMemento::Pointer xmlCopy(new XMLMemento(factory, newElement));
+  return xmlCopy;
 
 }
 
 berry::IMemento::Pointer berry::XMLMemento::GetChild(const QString& type) const
 {
   // Get the nodes.
   berry::XMLMemento::Pointer memento;
   Poco::XML::Element* child = element->getChildElement(type.toStdString()); // Find the first node which is a child of this node
   if (child)
   {
-    memento = berry::XMLMemento::New(factory, child);
+    memento = new berry::XMLMemento(factory, child);
     return memento;
   }
   // A child was not found.
   return memento;
 }
 
 QList<berry::IMemento::Pointer> berry::XMLMemento::GetChildren(
     const QString& type) const
 {
   QList<IMemento::Pointer> mementos;
   Poco::XML::NodeList* elementList = element->getElementsByTagName(type.toStdString());
   for (unsigned long i = 0; i < elementList->length(); i++)
   {
     Poco::XML::Element* elem =
         dynamic_cast<Poco::XML::Element*> (elementList->item(i));
-    mementos << berry::XMLMemento::New(factory, elem);
+    IMemento::Pointer child(new berry::XMLMemento(factory, elem));
+    mementos << child;
   }
   elementList->release();
 
   return mementos;
 }
 
 bool berry::XMLMemento::GetFloat(const QString& key, double& value) const
 {
   if (!element->hasAttribute(key.toStdString())) return false;
 
   const std::string& attr = element->getAttribute(key.toStdString());
 
   try
   {
     value = Poco::NumberParser::parseFloat(attr);
-  } catch (const Poco::SyntaxException& e)
+  } catch (const Poco::SyntaxException& /*e*/)
   {
     std::string _qnan = Poco::NumberFormatter::format(std::numeric_limits<double>::quiet_NaN());
     if (_qnan == attr)
     {
       value = std::numeric_limits<double>::quiet_NaN();
       return true;
     }
 
     std::string _inf = Poco::NumberFormatter::format(std::numeric_limits<double>::infinity());
     if (_inf == attr)
     {
       value = std::numeric_limits<double>::infinity();
       return true;
     }
 
     WorkbenchPlugin::Log("Memento problem - invalid float for key: " + key
         + " value: " + QString::fromStdString(attr));
     return false;
   }
 
   return true;
 }
 
 QString berry::XMLMemento::GetType() const
 {
   return QString::fromStdString(element->nodeName());
 }
 
 QString berry::XMLMemento::GetID() const
 {
   //TODO: make error handling!
   return QString::fromStdString(element->getAttribute(TAG_ID.toStdString()));
 }
 
 bool berry::XMLMemento::GetInteger(const QString& key, int& value) const
 {
   if (!element->hasAttribute(key.toStdString())) return false;
 
   const std::string& attr = element->getAttribute(key.toStdString());
 
   try
   {
     value = Poco::NumberParser::parse(attr);
   }
-  catch (const Poco::SyntaxException& e)
+  catch (const Poco::SyntaxException& /*e*/)
   {
     WorkbenchPlugin::Log("Memento problem - invalid integer for key: " + key
                          + " value: " + QString::fromStdString(attr));
     return false;
   }
 
   return true;
 }
 
 bool berry::XMLMemento::GetBoolean(const QString& key, bool& value) const
 {
   const std::string& attr = element->getAttribute(key.toStdString());
   if (attr.empty())
     return false;
   else if (attr == "true")
   {
     value = true;
     return true;
   }
   else
   {
     value = false;
     return true;
   }
 }
 
 bool berry::XMLMemento::GetString(const QString& key, QString& value) const
 {
   QString v = QString::fromStdString(element->getAttribute(key.toStdString()));
   if (v.isEmpty())
     return false;
 
   value = v;
   return true;
 }
 
 QString berry::XMLMemento::GetTextData() const
 {
   Poco::XML::Text* textNode = GetTextNode();
 
   if (textNode != NULL)
   {
     return QString::fromStdString(textNode->getData());
   }
 
   return EMPTY_STRING;
 }
 
 QList<QString> berry::XMLMemento::GetAttributeKeys() const
 {
   QList<QString> values;
   Poco::XML::NamedNodeMap* nnMap = element->attributes();
 
   values.reserve(nnMap->length());
 
   for (unsigned long i = 0; i < nnMap->length(); i++)
   {
     values[i] = QString::fromStdString(nnMap->item(i)->nodeName()); //TODO check if right
   }
 
   return values;
 }
 
 Poco::XML::Text* berry::XMLMemento::GetTextNode() const
 {
 
   //Get the nodes
   Poco::XML::NodeList* nodes = element->childNodes();
 
   unsigned long size = nodes->length();
 
   if (size == 0)
     return NULL;
 
   //Search for the text node
   for (unsigned long index = 0; index < size; index++)
   {
     if (nodes->item(index)->nodeType() == Poco::XML::Node::TEXT_NODE)
     {
       return dynamic_cast<Poco::XML::Text*> (nodes->item(index));
     }
   }
 
   // a Text node was not found
   return NULL;
 
 }
 
 void berry::XMLMemento::PutElement(Poco::XML::Element* element, bool copyText)
 {
   Poco::XML::NamedNodeMap* nodeMap = element->attributes();
   unsigned long size = nodeMap->length();
 
   for (unsigned long index = 0; index < size; index++)
   {
     Poco::XML::Node* node = nodeMap->item(index);
     Poco::XML::Attr* attr = dynamic_cast<Poco::XML::Attr*> (node);
     PutString(QString::fromStdString(attr->nodeName()),
               QString::fromStdString(attr->nodeValue()));
   }
   nodeMap->release();
 
   bool needToCopyText = copyText;
   Poco::XML::Node* child = element->firstChild();
   while (child)
   {
     unsigned short nodeType = child->nodeType();
 
     switch (nodeType)
     {
     case Poco::XML::Node::ELEMENT_NODE:
     {
       Poco::XML::Element* elem = dynamic_cast<Poco::XML::Element*> (child);
       XMLMemento::Pointer child = CreateChild(QString::fromStdString(elem->nodeName())).Cast<
           berry::XMLMemento> ();
       child->PutElement(elem, true);
     }
     break;
     case Poco::XML::Node::TEXT_NODE:
       if (needToCopyText)
       {
         Poco::XML::Text* text = dynamic_cast<Poco::XML::Text*> (child);
         PutTextData(QString::fromStdString(text->getData()));
         needToCopyText = false;
       }
       break;
 
     default:
       break;
     }
 
     child = child->nextSibling();
   }
 }
 
 void berry::XMLMemento::PutFloat(const QString& key, double value)
 {
   std::string xmlValue = Poco::NumberFormatter::format(value);
   element->setAttribute(key.toStdString(), xmlValue);
 }
 
 void berry::XMLMemento::PutInteger(const QString& key, int value)
 {
   std::string xmlValue = Poco::NumberFormatter::format(value);
   element->setAttribute(key.toStdString(), xmlValue);
 }
 
 void berry::XMLMemento::PutMemento(IMemento::Pointer memento)
 {
   // Do not copy the element's top level text node (this would overwrite the existing text).
   // Text nodes of children are copied.
   PutElement(memento.Cast<berry::XMLMemento> ()->GetElement(), false);
 }
 
 void berry::XMLMemento::PutString(const QString& key,
     const QString& value)
 {
   element->setAttribute(key.toStdString(), value.toStdString());
   //if (value == null) {
   //  return;}
   //element.setAttribute(key, value);
 }
 
 void berry::XMLMemento::PutBoolean(const QString& key, bool value)
 {
   if (value)
   {
     element->setAttribute(key.toStdString(), "true");
   }
   else
   {
     element->setAttribute(key.toStdString(), "false");
   }
 }
 
 void berry::XMLMemento::PutTextData(const QString& data)
 {
   Poco::XML::Text* textNode = GetTextNode();
   if (textNode == NULL)
   {
     textNode = factory->createTextNode(data.toStdString());
     element->insertBefore(textNode, element->firstChild())->release();
   }
   else
   {
     textNode->setData(data.toStdString());
   }
 }
 
 void berry::XMLMemento::Save(berry::XMLMemento::XMLByteOutputStream& writer)
 {
   if (writer.good())
   {
     Poco::XML::DOMWriter out;
     out.setOptions(3); //write declaration and pretty print
     out.writeNode(writer, factory);
   }
   else
   {
     //TODO
   }
 }
 Poco::XML::Element* berry::XMLMemento::GetElement() const
 {
   return element;
 }
 
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryXMLMemento.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryXMLMemento.h
index 9dfba7d783..4b814c606a 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryXMLMemento.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryXMLMemento.h
@@ -1,287 +1,287 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYXMLMEMENTO_H_
 #define BERRYXMLMEMENTO_H_
 
 #include <berryMacros.h>
 #include "berryIMemento.h"
 #include "berryUIException.h"
 
 #include "Poco/DOM/Document.h"
 #include "Poco/DOM/Element.h"
 #include "Poco/SAX/XMLReader.h"
 
 
 namespace berry {
 
 /**
  * This class represents the default implementation of the
  * <code>IMemento</code> interface.
  * <p>
  * This class is not intended to be extended by clients.
  * </p>
  *
  * @see IMemento
  */
-class BERRY_UI_QT XMLMemento : public IMemento {
+class BERRY_UI_QT XMLMemento : public IMemento
+{
 
   public:
     berryObjectMacro(XMLMemento)
-    berryNewMacro2Param(XMLMemento, Poco::XML::Document*, Poco::XML::Element*)
 
     /**
      * Defines a std::ostream as XML output stream
      */
     typedef std::ostream XMLByteOutputStream;
 
     /**
      * Defines a std::istream as XML input stream
      */
     typedef std::istream XMLByteInputStream;
 
     /**
     * Creates a memento for the specified document and element.
     * <p>
     * Clients should use <code>CreateReadRoot</code> and
     * <code>CreateWriteRoot</code> to create the initial
     * memento on a document.
     * </p>
     *
     * @param document the document for the memento
     * @param element the element node for the memento
     */
     XMLMemento(Poco::XML::Document* document, Poco::XML::Element* elem);
 
     ~XMLMemento();
 
     /**
      * Creates a <code>Document</code> from the <code>Reader</code>
      * and returns a memento on the first <code>Element</code> for reading
      * the document.
      *
      * @param reader the <code>Reader</code> used to create the memento's document
      * @return a memento on the first <code>Element</code> for reading the document
      * @throws WorkbenchException if IO problems, invalid format, or no element.
     */
     static XMLMemento::Pointer CreateReadRoot(berry::XMLMemento::XMLByteInputStream& reader);
 
     /**
      * Creates a <code>Document</code> from the <code>Reader</code>
      * and returns a memento on the first <code>Element</code> for reading
      * the document.
      *
      * @param reader the <code>Reader</code> used to create the memento's document
      * @param baseDir the directory used to resolve relative file names
      *    in the XML document. This directory must exist and include the
      *    trailing separator. The directory format, including the separators,
      *    must be valid for the platform. Can be <code>null</code> if not
      *    needed.
      * @return a memento on the first <code>Element</code> for reading the document
      * @throws WorkbenchException if IO problems, invalid format, or no element.
     */
     static XMLMemento::Pointer CreateReadRoot(berry::XMLMemento::XMLByteInputStream& reader, const QString& baseDir);
 
     /**
      * Returns a root memento for writing a document.
      *
      * @param type the element node type to create on the document
      * @return the root memento for writing a document
     */
     static XMLMemento::Pointer CreateWriteRoot(const QString& type);
 
     /**
      * Copies another Memento into this memento
      *
      * @param child the new child memento
      * @return the new child memento
     */
     IMemento::Pointer CopyChild(IMemento::Pointer child);
 
     /**
      * Creates a new child of this memento with the given type
      *
      * @param type the type
      * @return a new child memento with the given type
     */
     virtual IMemento::Pointer CreateChild(const QString& type);
 
     /**
      * Creates a new child of this memento with the given type and id.
      * The id is stored in the child memento (using a special reserved
      * key, <code>TAG_ID</code>) and can be retrieved using <code>getId</code>.
      * <p>
      * The <code>getChild</code> and <code>getChildren</code> methods
      * are used to retrieve children of a given type.
      * </p>
      *
      * @param type the type
      * @param id the child id
      * @return a new child memento with the given type and id
      * @see #getID
      */
     virtual IMemento::Pointer CreateChild(const QString& type, const QString& id);
 
     /**
      * Returns the first child with the given type id.
      *
      * @param type the type id
      * @return the first child with the given type
      */
     virtual IMemento::Pointer GetChild(const QString& type) const;
 
     /**
      * Returns all children with the given type id.
      *
      * @param type the type id
      * @return an array of children with the given type
      */
     virtual QList< IMemento::Pointer > GetChildren(const QString& type) const;
 
     /**
      * Returns the Type of this memento
     */
     virtual QString GetType() const;
 
     /**
      * Returns the ID of this memento
      */
     virtual QString GetID() const;
 
     /**
      * @see IMemento#GetInteger
      */
     virtual bool GetInteger(const QString& key, int& value) const;
 
     /**
      * @see IMemento#GetFloat
      */
     virtual bool GetFloat(const QString& key, double& value) const;
 
     /**
      * @see IMemento#GetString
      */
     virtual bool GetString(const QString& key, QString& value) const;
 
     /**
      * @see IMemento#GetString
      */
     virtual bool GetBoolean(const QString& key, bool& value) const;
 
     /**
      * Returns the data of the Text node of the memento. Each memento is allowed
      * only one Text node.
      *
      * @return the data of the Text node of the memento, or <code>null</code>
      * if the memento has no Text node.
      */
     virtual QString GetTextData() const;
 
     /**
      * Returns an array of all the attribute keys of the memento. This will not
      * be <code>null</code>. If there are no keys, an array of length zero will
      * be returned.
      * @return an vector with all the attribute keys of the memento
      */
     virtual QList< QString > GetAttributeKeys() const;
 
     /**
      * Puts a float in this memento
      *
      * @param key the key
      * @param value the value
      */
     virtual void PutFloat(const QString& key, double value);
 
     /**
      * Puts a integer in this memento
      *
      * @param key the key
      * @param value the value
      */
     virtual void PutInteger(const QString& key, int value);
 
     /**
      * Puts another memento in this memento as a child
      *
      * @param key the key
      * @param value the value
      */
     virtual void PutMemento(IMemento::Pointer memento);
 
     /**
      * Puts a string in this memento
      *
      * @param key the key
      * @param value the value
      */
     virtual void PutString(const QString& key, const QString& value);
 
     /**
      * Puts a boolean in this memento
      *
      * @param key the key
      * @param value the value
      */
     virtual void PutBoolean(const QString& key, bool value);
 
     /**
      * Puts a text in this memento
      *
      * @param data the text
      */
     virtual void PutTextData(const QString& data);
 
     /**
      * Saves this memento's document current values to the
      * specified writer.
      *
      * @param writer the writer used to save the memento's document
      * @throws IOException if there is a problem serializing the document to the stream.
      */
     void Save(XMLByteOutputStream& writer); //TODO: throw(IOException)
 
     /**
      * Returns the element of the memento
      *
      * @return the xml element
      */
     virtual Poco::XML::Element* GetElement() const;
 
 private:
 
     /**
      * Returns the Text node of the memento. Each memento is allowed only
      * one Text node.
      *
      * @return the Text node of the memento, or <code>null</code> if
      * the memento has no Text node.
      */
     Poco::XML::Text* GetTextNode() const;
 
     /**
      * Places the element's attributes into the document.
      * @param copyText true if the first text node should be copied
      */
     void PutElement(Poco::XML::Element* element, bool copyText);
 
     Poco::XML::Document* factory;
     Poco::XML::Element* element;
 
 };
 }//namespace berry
 #endif /* BERRYXMLMEMENTO_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/commands/berryICommandImageService.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/commands/berryICommandImageService.h
index 135b918431..6779dcc639 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/commands/berryICommandImageService.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/commands/berryICommandImageService.h
@@ -1,103 +1,103 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYICOMMANDIMAGESERVICE_H_
 #define BERRYICOMMANDIMAGESERVICE_H_
 
 #include "../services/berryIDisposable.h"
 
 #include <QIcon>
 
 namespace berry {
 
 /**
  * <p>
  * Provides a look-up facility for images associated with commands.
  * </p>
  * <p>
  * The <em>type</em> of an image indicates the state of the associated command
  * within the user interface. The supported types are: <code>TYPE_DEFAULT</code>
  * (to be used for an enabled command), <code>TYPE_DISABLED</code> (to be used
  * for a disabled command) and <code>TYPE_HOVER</code> (to be used for an
  * enabled command over which the mouse is hovering).
  * </p>
  * <p>
  * The <em>style</em> of an image is an arbitrary string used to distinguish
  * between sets of images associated with a command. For example, a command may
  * appear in the menus as the default style. However, in the toolbar, the
  * command is simply the default action for a toolbar drop down item. As such,
  * perhaps a different image style is appropriate. The classic case is the "Run
  * Last Launched" command, which appears in the menu and the toolbar, but with
  * different icons in each location.
  * </p>
  * <p>
  * We currently support a default image style (none) and an image style of
  * IMAGE_STYLE_TOOLBAR.
  * </p>
  *
  * @noimplement This interface is not intended to be implemented by clients.
  * @noextend This interface is not intended to be extended by clients.
  *
- * @since 3.4
  */
-struct BERRY_UI_QT ICommandImageService : public IDisposable {
+struct BERRY_UI_QT ICommandImageService : public IDisposable
+{
 
-  berryInterfaceMacro(ICommandImageService, berry)
+  berryObjectMacro(berry::ICommandImageService)
 
   /**
    * The default image style. This is provided when no style is requested or
    * when the requested style is unavailable. (Value is <b>null</b>)
    */
   static const QString IMAGE_STYLE_DEFAULT;
 
   /**
    * The image style used for commands in a toolbar. This is useful if you
    * want the icon for the command in the toolbar to be different than the one
    * that is displayed with menu items. (Value is <b>toolbar</b>)
    */
   static const QString IMAGE_STYLE_TOOLBAR; // = "toolbar";
 
   /**
    * Retrieves the image associated with the given command in the
    * default style.
    *
    * @param commandId
    *            The identifier to find; must not be <code>null</code>.
    * @return An image appropriate for the given command; may be
    *         <code>null</code>.
    */
   virtual QIcon GetImage(const QString& commandId) = 0;
 
   /**
    * Retrieves the image associated with the given command in the
    * given style.
    *
    * @param commandId
    *            The identifier to find; must not be <code>null</code>.
    * @param style
    *            The style of the image to retrieve; may be <code>null</code>.
    * @return An image appropriate for the given command; A null QIcon
    *         if the given image style cannot be found.
    */
   virtual QIcon GetImage(const QString& commandId, const QString& style) = 0;
 };
 
 }
 
-Q_DECLARE_INTERFACE(berry::ICommandImageService, "org.blueberry.ui.qt.ICommandImageService")
+Q_DECLARE_INTERFACE(berry::ICommandImageService, "org.blueberry.ui.ICommandImageService")
 
 #endif /* BERRYICOMMANDIMAGESERVICE_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/commands/berryICommandService.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/commands/berryICommandService.h
index 3647eefe67..0d33acfa3a 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/commands/berryICommandService.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/commands/berryICommandService.h
@@ -1,376 +1,376 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYICOMMANDSERVICE_H_
 #define BERRYICOMMANDSERVICE_H_
 
 #include "../services/berryIDisposable.h"
 
 #include <QHash>
 
 namespace berry {
 
 struct IExecutionListener;
 struct IHandler;
 struct IElementReference;
 
 class UIElement;
 class Command;
 class CommandCategory;
 class ParameterizedCommand;
 class ParameterType;
 
 /**
  * <p>
  * Provides services related to the command architecture within the workbench.
  * This service can be used to access the set of commands and command
  * categories.
  * </p>
  * <p>
  * This service can be acquired from your service locator:
  * <pre>
  *  ICommandService service = (ICommandService) getSite().getService(ICommandService.class);
  * </pre>
  * <ul>
  * <li>This service is available globally.</li>
  * </ul>
  * </p>
  * @noimplement This interface is not intended to be implemented by clients.
  * @noextend This interface is not intended to be extended by clients.
  */
 struct BERRY_UI_QT ICommandService : public IDisposable
 {
 
-  berryInterfaceMacro(ICommandService, berry)
+  berryObjectMacro(berry::ICommandService)
 
   /**
    * The identifier of the category in which all auto-generated commands will
    * appear. This value must never be <code>null</code>.
    */
   static const QString AUTOGENERATED_CATEGORY_ID();
 
   /**
    * Adds an execution listener to the command service. This listener will be
    * notified as commands are executed.
    * <p>
    * <b>Note:</b> listeners should be removed when no longer necessary. If
    * not, they will be removed when the IServiceLocator used to acquire this
    * service is disposed.
    * </p>
    *
    * @param listener
    *            The listener to add; must not be <code>null</code>.
    * @see #removeExecutionListener(IExecutionListener)
    */
   virtual void AddExecutionListener(IExecutionListener* listener) = 0;
 
   /**
    * Sets the name and description of the category for uncategorized commands.
    * This is the category that will be returned if
    * {@link #getCategory(String)} is called with <code>null</code>.
    *
    * @param name
    *            The name of the category for uncategorized commands; must not
    *            be <code>null</code>.
    * @param description
    *            The description of the category for uncategorized commands;
    *            may be <code>null</code>.
    */
   virtual void DefineUncategorizedCategory(const QString& name, const QString& description) = 0;
 
   /**
    * <p>
    * Returns a {@link ParameterizedCommand} with a command and
    * parameterizations as specified in the provided
    * <code>serializedParameterizedCommand</code> string. The
    * <code>serializedParameterizedCommand</code> must use the format
    * returned by {@link ParameterizedCommand#serialize()} and described in the
    * Javadoc for that method.
    * </p>
    * <p>
    * If a parameter id encoded in the
    * <code>serializedParameterizedCommand</code> does not exist in the
    * encoded command, that parameter id and value are ignored. A given
    * parameter id should not be used more than once in
    * <code>serializedParameterizedCommand</code>. This will not result in
    * an exception, but the value of the parameter when the command is executed
    * cannot be specified here.
    * </p>
    * <p>
    * This method will never return <code>null</code>, however it may throw
    * an exception if there is a problem processing the serialization string or
    * the encoded command is undefined.
    * </p>
    *
    * @param serializedParameterizedCommand
    *            a <code>String</code> representing a command id and
    *            parameter ids and values
    * @return a <code>ParameterizedCommand</code> with the command and
    *         parameterizations encoded in the
    *         <code>serializedParameterizedCommand</code>
    * @throws NotDefinedException
    *             if the command indicated in
    *             <code>serializedParameterizedCommand</code> is not defined
    * @throws SerializationException
    *             if there is an error deserializing
    *             <code>serializedParameterizedCommand</code>
    * @see ParameterizedCommand#serialize()
    * @see CommandManager#deserialize(String)
    */
   virtual SmartPointer<ParameterizedCommand> Deserialize(const QString& serializedParameterizedCommand) const = 0;
 
   /**
    * Retrieves the category with the given identifier. If no such category
    * exists, then an undefined category with the given id is created.
    *
    * @param categoryId
    *            The identifier to find. If the category is <code>null</code>,
    *            then a category suitable for uncategorized items is defined
    *            and returned.
    * @return A category with the given identifier, either defined or
    *         undefined.
    */
   virtual SmartPointer<CommandCategory> GetCategory(const QString& categoryId) const = 0;
 
   /**
    * Retrieves the command with the given identifier. If no such command
    * exists, then an undefined command with the given id is created.
    *
    * @param commandId
    *            The identifier to find; must not be <code>null</code>.
    * @return A command with the given identifier, either defined or undefined.
    */
   virtual SmartPointer<Command> GetCommand(const QString& commandId) const = 0;
 
   /**
    * Returns the collection of all of the defined categories in the workbench.
    *
    * @return The collection of categories (<code>Category</code>) that are
    *         defined; never <code>null</code>, but may be empty.
    */
   virtual QList<SmartPointer<CommandCategory> > GetDefinedCategories() const = 0;
 
   /**
    * Returns the collection of the identifiers for all of the defined
    * categories in the workbench.
    *
    * @return The collection of category identifiers (<code>String</code>)
    *         that are defined; never <code>null</code>, but may be empty.
    */
   virtual QStringList GetDefinedCategoryIds() const = 0;
 
   /**
    * Returns the collection of the identifiers for all of the defined commands
    * in the workbench.
    *
    * @return The collection of command identifiers (<code>String</code>)
    *         that are defined; never <code>null</code>, but may be empty.
    */
   virtual QStringList GetDefinedCommandIds() const = 0;
 
   /**
    * Returns the collection of all of the defined commands in the workbench.
    *
    * @return The collection of commands (<code>Command</code>) that are
    *         defined; never <code>null</code>, but may be empty.
    */
   virtual QList<SmartPointer<Command> > GetDefinedCommands() const = 0;
 
   /**
    * Returns the collection of the identifiers for all of the defined command
    * parameter types in the workbench.
    *
    * @return The collection of command parameter type identifiers (<code>String</code>)
    *         that are defined; never <code>null</code>, but may be empty.
    */
   virtual QStringList GetDefinedParameterTypeIds() const = 0;
 
   /**
    * Returns the collection of all of the defined command parameter types in
    * the workbench.
    *
    * @return The collection of command parameter types (<code>ParameterType</code>)
    *         that are defined; never <code>null</code>, but may be empty.
    */
   virtual QList<SmartPointer<ParameterType> > GetDefinedParameterTypes() const = 0;
 
   /**
    * Gets the help context identifier for a particular command. The command's
    * handler is first checked for a help context identifier. If the handler
    * does not have a help context identifier, then the help context identifier
    * for the command is returned. If neither has a help context identifier,
    * then <code>null</code> is returned.
    *
    * @param command
    *            The command for which the help context should be retrieved;
    *            must not be <code>null</code>.
    * @return The help context identifier to use for the given command; may be
    *         <code>null</code>.
    * @throws NotDefinedException
    *             If the given command is not defined.
    */
   virtual QString GetHelpContextId(const SmartPointer<const Command>& command) const = 0;
 
   /**
    * Gets the help context identifier for a particular command. The command's
    * handler is first checked for a help context identifier. If the handler
    * does not have a help context identifier, then the help context identifier
    * for the command is returned. If neither has a help context identifier,
    * then <code>null</code> is returned.
    *
    * @param commandId
    *            The identifier of the command for which the help context
    *            should be retrieved; must not be <code>null</code>.
    * @return The help context identifier to use for the given command; may be
    *         <code>null</code>.
    * @throws NotDefinedException
    *             If the command with the given identifier is not defined.
    */
   virtual QString GetHelpContextId(const QString& commandId) const = 0;
 
   /**
    * Retrieves the command parameter type with the given identifier. If no
    * such parameter type exists, then an undefined parameter type with the
    * given id is created.
    *
    * @param parameterTypeId
    *            The identifier to find; must not be <code>null</code>.
    * @return A command parameter type with the given identifier, either
    *         defined or undefined.
    */
   virtual SmartPointer<ParameterType> GetParameterType(const QString& parameterTypeId) const = 0;
 
   /**
    * <p>
    * Reads the command information from the registry and the preferences. This
    * will overwrite any of the existing information in the command service.
    * This method is intended to be called during start-up. When this method
    * completes, this command service will reflect the current state of the
    * registry and preference store.
    * </p>
    */
   virtual void ReadRegistry() = 0;
 
   /**
    * Removes an execution listener from the command service.
    *
    * @param listener
    *            The listener to remove; must not be <code>null</code>.
    */
   virtual void RemoveExecutionListener(IExecutionListener* listener) = 0;
 
   /**
    * Sets the help context identifier to associate with a particular handler.
    *
    * @param handler
    *            The handler with which to register a help context identifier;
    *            must not be <code>null</code>.
    * @param helpContextId
    *            The help context identifier to register; may be
    *            <code>null</code> if the help context identifier should be
    *            removed.
    */
   virtual void SetHelpContextId(const SmartPointer<IHandler>& handler, const QString& helpContextId) = 0;
 
   /**
    * Register that this element accepts callbacks for this parameterized
    * command.
    * <p>
    * <b>Note:</b> elements should be removed when no longer necessary. If
    * not, they will be removed when the IServiceLocator used to acquire this
    * service is disposed.
    * </p>
    *
    * @param command
    *            The parameterized command that is already specialized. Must
    *            not be <code>null</code>.
    * @param element
    *            The callback to register for this specialized command
    *            instance. Must not be <code>null</code>.
    * @return A reference for the registered element that can be used to
    *         unregister it.
    * @throws NotDefinedException
    *             If the command included in the ParameterizedCommand is not
    *             defined, or the element is <code>null</code>.
    * @see #unregisterElement(IElementReference)
    */
   virtual SmartPointer<IElementReference> RegisterElementForCommand(
       const SmartPointer<ParameterizedCommand>& command,
       const SmartPointer<UIElement>& element) = 0;
 
   /**
    * Re-register a callback element provided by the ICommandService. This
    * element reference must not currently be held by the ICommandService. i.e.
    * it must have been removed using
    * {@link #unregisterElement(IElementReference)}.
    * <p>
    * <b>Note:</b> elements should be removed when no longer necessary. If
    * not, they will be removed when the IServiceLocator used to acquire this
    * service is disposed.
    * </p>
    *
    * @param elementReference
    *            The reference to re-register. Must not be <code>null</code>.
    * @see #unregisterElement(IElementReference)
    */
   virtual void RegisterElement(const SmartPointer<IElementReference>& elementReference) = 0;
 
   /**
    * Unregister an element callback. It will be removed from the
    * ICommandService. The same service that is used to register an element for
    * a command <b>must</b> be used to unregister the element.
    *
    * @param elementReference
    *            The callback reference that was provided by the command
    *            service on registration. Must not be <code>null</code>.
    */
   virtual void UnregisterElement(const SmartPointer<IElementReference>& elementReference) = 0;
 
   /**
    * Refresh any elements registered against the command with the given id.
    * It allows the active handler the opportunity to provide user feedback. If
    * the command is parameterized, some of the parameters can be specified to
    * help narrow down which elements to refresh.
    * <p>
    * The service locator used in registering the element can also be used to
    * scope the search. For example: if you wanted all elements for your
    * command but only within the part's workbench window, you could use:
    *
    * <pre>
    * Map filter = new HashMap();
    * filter.put(IServiceScopes.WINDOW_SCOPE, getSite().getPage()
    *    .getWorkbenchWindow());
    * commandService.refreshElements(commandId, filter);
    * </pre>
    *
    * </p>
    *
    * @param commandId
    *            The command id to refresh if it has registered eleemnts.
    * @param filter
    *            key-value pairs that can narrow down the callbacks to return.
    *            The parameters are <b>AND</b>ed together. This may be
    *            <code>null</code>.
    */
   virtual void RefreshElements(const QString& commandId, const QHash<QString, Object::Pointer>& filter) = 0;
 };
 
 }
 
-Q_DECLARE_INTERFACE(berry::ICommandService, "org.blueberry.ui.qt.ICommandService")
+Q_DECLARE_INTERFACE(berry::ICommandService, "org.blueberry.ui.ICommandService")
 
 #endif /* BERRYICOMMANDSERVICE_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/commands/berryIElementReference.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/commands/berryIElementReference.h
index 5c30824a52..38e89c08b3 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/commands/berryIElementReference.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/commands/berryIElementReference.h
@@ -1,68 +1,68 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIELEMENTREFERENCE_H_
 #define BERRYIELEMENTREFERENCE_H_
 
 #include <berryObject.h>
 
 #include <QHash>
 
 namespace berry {
 
 class UIElement;
 
 /**
  * the ICommandService will return a reference for all callbacks that are
  * registered. This reference can be used to unregister the specific callback.
  * <p>
  * Similar in functionality to an IHandlerActivation.  This interface should
  * not be implemented or extended by clients.
  * </p>
  */
 struct IElementReference : public Object
 {
 
-  berryInterfaceMacro(IElementReference, berry)
+  berryObjectMacro(berry::IElementReference)
 
   /**
    * The command id that this callback was registered against.
    *
    * @return The command id. Will not be <code>null</code>.
    */
   virtual QString GetCommandId() const = 0;
 
   /**
    * The callback that was registered.
    *
    * @return Adapts to provide appropriate user feedback. Will not be
    *         <code>null</code>.
    */
   virtual SmartPointer<UIElement> GetElement() const = 0;
 
   /**
    * Parameters that help scope this callback registration. For example, it
    * can include parameters from the ParameterizedCommand.
    *
    * @return scoping parameters. Will not be <code>null</code>.
    */
   virtual QHash<QString, Object::Pointer> GetParameters() const = 0;
 };
 
 }
 
 #endif /* BERRYIELEMENTREFERENCE_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/commands/berryIElementUpdater.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/commands/berryIElementUpdater.h
index c44bcaa429..5ad6de03d4 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/commands/berryIElementUpdater.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/commands/berryIElementUpdater.h
@@ -1,56 +1,56 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIELEMENTUPDATER_H
 #define BERRYIELEMENTUPDATER_H
 
 #include <berryObject.h>
 
 namespace berry {
 
 class UIElement;
 
 /**
  * An IHandler for a command that expects to provide feedback through the
  * registered element mechanism must implement this interface.
  */
 struct IElementUpdater : public virtual Object
 {
 
-  berryInterfaceMacro(IElementUpdater, berry)
+  berryObjectMacro(berry::IElementUpdater)
 
   /**
    * Whenever the elements for a command are refreshed, this method is called
    * on the active handler for that command.
    * <p>
    * <b>Note:</b> Handlers must never cache the element, which can disappear
    * or be replaced at any time. Everybody should go through the
    * ICommandService refreshElements(*) method.
    * </p>
    *
    * @param element
    *            An element for a specific UI element. Will not be
    *            <code>null</code>.
    * @param parameters
    *            Any parameters registered with the callback. It may be empty.
    */
   virtual void UpdateElement(UIElement* element, const QHash<QString,Object::Pointer>& parameters) = 0;
 };
 
 }
 
 #endif // BERRYIELEMENTUPDATER_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/commands/berryIMenuService.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/commands/berryIMenuService.h
index 48c97fd35d..828574eee1 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/commands/berryIMenuService.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/commands/berryIMenuService.h
@@ -1,122 +1,122 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIMENUSERVICE_H_
 #define BERRYIMENUSERVICE_H_
 
 #include <berryIServiceWithSources.h>
 
 namespace berry {
 
 class AbstractContributionFactory;
 class ContributionManager;
 struct IEvaluationContext;
 
 /**
  * <p>
  * Provides services related to the menu architecture within the workbench. It
  * can be used to contribute additional items to the menu, tool bar and status
  * line.
  * </p>
  * <p>
  * This service can be acquired from your service locator:
  * <pre>
  *  IMenuService service = (IMenuService) getSite().getService(IMenuService.class);
  * </pre>
  * <ul>
  * <li>This service is available globally.</li>
  * </ul>
  * </p>
  *
  * @noimplement This interface is not intended to be implemented by clients.
  * @noextend This interface is not intended to be extended by clients.
  */
 struct IMenuService : public IServiceWithSources
 {
 
-  berryInterfaceMacro(IMenuService, berry)
+  berryObjectMacro(berry::IMenuService)
 
   /**
    * Contribute and initialize the contribution factory. This should only be
    * called once per factory. After the call, the factory should be treated as
    * an unmodifiable object.
    * <p>
    * <b>Note:</b> factories should be removed when no longer necessary. If
    * not, they will be removed when the IServiceLocator used to acquire this
    * service is disposed.
    * </p>
    *
    * @param factory
    *            the contribution factory. Must not be <code>null</code>
    * @see #removeContributionFactory(AbstractContributionFactory)
    */
   virtual void AddContributionFactory(const SmartPointer<AbstractContributionFactory>& factory) = 0;
 
   /**
    * Remove the contributed factory from the menu service. If the factory is
    * not contained by this service, this call does nothing.
    *
    * @param factory
    *            the contribution factory to remove. Must not be
    *            <code>null</code>.
    */
   virtual void RemoveContributionFactory(const SmartPointer<AbstractContributionFactory>& factory) = 0;
 
   /**
    * Populate a <code>ContributionManager</code> at the specified starting
    * location with a set of <code>IContributionItems</code>s. It applies
    * <code>AbstractContributionFactory</code>s that are stored against the
    * provided location.
    *
    * @param mgr
    *            The ContributionManager to populate
    * @param location
    *            The starting location to begin populating this contribution
    *            manager. The format is the Menu API URI format.
    * @see #releaseContributions(ContributionManager)
    */
   virtual void PopulateContributionManager(ContributionManager* mgr,
                                            const QString& location) = 0;
 
   /**
    * Before calling dispose() on a ContributionManager populated by the menu
    * service, you must inform the menu service to release its contributions.
    * This takes care of unregistering any IContributionItems that have their
    * visibleWhen clause managed by this menu service.
    *
    * @param mgr
    *            The manager that was populated by a call to
    *            {@link #populateContributionManager(ContributionManager, String)}
    */
   virtual void ReleaseContributions(ContributionManager* mgr) = 0;
 
   /**
    * Get the current state of eclipse as seen by the menu service.
    *
    * @return an IEvaluationContext containing state variables.
    *
    * @see org.eclipse.ui.ISources
    * @see org.eclipse.ui.services.IEvaluationService
    */
   virtual SmartPointer<IEvaluationContext> GetCurrentState() const = 0;
 };
 
 }
 
-Q_DECLARE_INTERFACE(berry::IMenuService, "org.blueberry.ui.qt.IMenuService")
+Q_DECLARE_INTERFACE(berry::IMenuService, "org.blueberry.ui.IMenuService")
 
 #endif /* BERRYIMENUSERVICE_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/dialogs/berryIDialog.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/dialogs/berryIDialog.h
index f2cc3890db..19d9e856d2 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/dialogs/berryIDialog.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/dialogs/berryIDialog.h
@@ -1,70 +1,70 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYIDIALOG_H_
 #define BERRYIDIALOG_H_
 
 #include <berryMacros.h>
 #include <berryObject.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 
 namespace berry {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  */
 struct BERRY_UI_QT IDialog : public virtual Object
 {
-  berryInterfaceMacro(IDialog, berry);
+  berryObjectMacro(berry::IDialog)
 
   /**
    * Constant for a dialog with no image (value 0).
    */
   const static int NONE; // = 0;
 
   /**
    * Constant for a dialog with an error image (value 1).
    */
   const static int ERR; // = 1;
 
   /**
    * Constant for a dialog with an info image (value 2).
    */
   const static int INFORMATION; // = 2;
 
   /**
    * Constant for a dialog with a question image (value 3).
    */
   const static int QUESTION; // = 3;
 
   /**
    * Constant for a dialog with a warning image (value 4).
    */
   const static int WARNING; // = 4;
 
   enum ReturnCode { OK, CANCEL };
 
   ~IDialog();
 
   virtual int Open() = 0;
 
 };
 
 }
 
 #endif /*BERRYIDIALOG_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/dialogs/berryIShowViewDialog.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/dialogs/berryIShowViewDialog.h
index be9928393a..5b09345395 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/dialogs/berryIShowViewDialog.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/dialogs/berryIShowViewDialog.h
@@ -1,44 +1,44 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYISHOWVIEWDIALOG_H_
 #define BERRYISHOWVIEWDIALOG_H_
 
 #include "berryIDialog.h"
 
 #include <vector>
 #include "berryIViewDescriptor.h"
 
 namespace berry {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  */
 struct BERRY_UI_QT IShowViewDialog : public IDialog
 {
-  berryInterfaceMacro(IShowViewDialog, berry);
+  berryObjectMacro(berry::IShowViewDialog);
 
   ~IShowViewDialog();
 
 
   virtual QList<IViewDescriptor::Pointer> GetSelection() = 0;
 
 };
 
 }
 
 #endif /*BERRYISHOWVIEWDIALOG_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/guitk/berryGuiTkIControlListener.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/guitk/berryGuiTkIControlListener.h
index b160b27c7b..7a019ecb60 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/guitk/berryGuiTkIControlListener.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/guitk/berryGuiTkIControlListener.h
@@ -1,240 +1,240 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYGUITKICONTROLLISTENER_H_
 #define BERRYGUITKICONTROLLISTENER_H_
 
 #include <berryMacros.h>
 #include <berryMessage.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 #include "berryGuiTkControlEvent.h"
 
 namespace berry
 {
 
 namespace GuiTk
 {
 
 /**
  * Classes which implement this interface provide methods
  * that deal with the events that are generated by moving
  * and resizing controls.
  * <p>
  * After creating an instance of a class that implements
  * this interface it can be added to a control using the
  * <code>addControlListener</code> method and removed using
  * the <code>removeControlListener</code> method. When a
  * control is moved or resized, the appropriate method will
  * be invoked.
  * </p>
  *
  * @see ControlAdapter
  * @see ControlEvent
  */
 struct BERRY_UI_QT IControlListener: public virtual Object
 {
 
-  berryInterfaceMacro(IControlListener, berry);
+  berryObjectMacro(berry::GuiTk::IControlListener)
 
   struct BERRY_UI_QT Events {
 
     enum Type {
      NONE      = 0x00000000,
      MOVED     = 0x00000001,
      RESIZED   = 0x00000002,
      ACTIVATED = 0x00000004,
      DESTROYED = 0x00000008,
 
      ALL       = 0xffffffff
     };
 
-    BERRY_DECLARE_FLAGS(Types, Type)
+    Q_DECLARE_FLAGS(Types, Type)
 
     typedef Message1<ControlEvent::Pointer> EventType;
 
     EventType movedEvent;
     EventType resizedEvent;
     EventType activatedEvent;
     EventType destroyedEvent;
 
     void AddListener(IControlListener::Pointer listener);
     void RemoveListener(IControlListener::Pointer listener);
 
   private:
     typedef MessageDelegate1<IControlListener, ControlEvent::Pointer> Delegate;
   };
 
   virtual ~IControlListener();
 
   virtual Events::Types GetEventTypes() const = 0;
 
   /**
    * Sent when the location (x, y) of a control changes relative
    * to its parent (or relative to the display, for <code>Shell</code>s).
    *
    * @param e an event containing information about the move
    */
   virtual void ControlMoved(ControlEvent::Pointer /*e*/)
   {
   }
 
   /**
    * Sent when the size (width, height) of a control changes.
    *
    * @param e an event containing information about the resize
    */
   virtual void ControlResized(ControlEvent::Pointer /*e*/)
   {
   }
 
   virtual void ControlActivated(ControlEvent::Pointer /*e*/)
   {
   }
 
   virtual void ControlDestroyed(ControlEvent::Pointer /*e*/)
   {
   }
 
 };
 
 template<typename R>
 struct ControlMovedAdapter: public IControlListener
 {
   typedef R Listener;
   typedef void
       (R::*Callback)(ControlEvent::Pointer);
 
   ControlMovedAdapter(R* l, Callback c) :
     listener(l), callback(c)
   {
     poco_assert(listener);
     poco_assert(callback);
   }
 
   Events::Types GetEventTypes() const
   {
     return Events::MOVED;
   }
 
   void ControlMoved(ControlEvent::Pointer e)
   {
     (listener->*callback)(e);
   }
 
 private:
 
   Listener* listener;
   Callback callback;
 };
 
 template<typename R>
 struct ControlResizedAdapter: public IControlListener
 {
   typedef R Listener;
   typedef void
       (R::*Callback)(ControlEvent::Pointer);
 
   ControlResizedAdapter(R* l, Callback c) :
     listener(l), callback(c)
   {
     poco_assert(listener);
     poco_assert(callback);
   }
 
   Events::Types GetEventTypes() const
   {
     return Events::RESIZED;
   }
 
   void ControlResized(ControlEvent::Pointer e)
   {
     (listener->*callback)(e);
   }
 
 private:
 
   Listener* listener;
   Callback callback;
 };
 
 template<typename R>
 struct ControlActivatedAdapter: public IControlListener
 {
   typedef R Listener;
   typedef void
       (R::*Callback)(ControlEvent::Pointer);
 
   ControlActivatedAdapter(R* l, Callback c) :
     listener(l), callback(c)
   {
     poco_assert(listener);
     poco_assert(callback);
   }
 
   Events::Types GetEventTypes() const
   {
     return Events::ACTIVATED;
   }
 
   void ControlActivated(ControlEvent::Pointer e)
   {
     (listener->*callback)(e);
   }
 
 private:
 
   Listener* listener;
   Callback callback;
 };
 
 template<typename R>
 struct ControlDestroyedAdapter: public IControlListener
 {
   typedef R Listener;
   typedef void
       (R::*Callback)(ControlEvent::Pointer);
 
   ControlDestroyedAdapter(R* l, Callback c) :
     listener(l), callback(c)
   {
     poco_assert(listener);
     poco_assert(callback);
   }
 
   Events::Types GetEventTypes() const
   {
     return Events::DESTROYED;
   }
 
   void ControlDestroyed(ControlEvent::Pointer e)
   {
     (listener->*callback)(e);
   }
 
 private:
 
   Listener* listener;
   Callback callback;
 };
 
 }
 
 }
 
-BERRY_DECLARE_OPERATORS_FOR_FLAGS(berry::GuiTk::IControlListener::Events::Types)
+Q_DECLARE_OPERATORS_FOR_FLAGS(berry::GuiTk::IControlListener::Events::Types)
 
 #endif /* BERRYGUITKICONTROLLISTENER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/guitk/berryGuiTkIMenuListener.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/guitk/berryGuiTkIMenuListener.h
index c87ecbf2e9..b16bd5a77f 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/guitk/berryGuiTkIMenuListener.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/guitk/berryGuiTkIMenuListener.h
@@ -1,90 +1,78 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYGUITKIMENULISTENER_H_
 #define BERRYGUITKIMENULISTENER_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
 
 #include <berryMessage.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 
 namespace berry
 {
 
 namespace GuiTk
 {
 
 /**
- * Classes which implement this interface provide methods
- * that deal with the events that are generated by moving
- * and resizing controls.
- * <p>
- * After creating an instance of a class that implements
- * this interface it can be added to a control using the
- * <code>addControlListener</code> method and removed using
- * the <code>removeControlListener</code> method. When a
- * control is moved or resized, the appropriate method will
- * be invoked.
- * </p>
+ * A menu listener that gets informed when a menu is about to show.
  *
- * @see ControlAdapter
- * @see ControlEvent
+ * @see MenuManager#addMenuListener
  */
 struct BERRY_UI_QT IMenuListener: public virtual Object
 {
-
-  berryInterfaceMacro(IMenuListener, berry);
+  berryObjectMacro(berry::GuiTk::IMenuListener)
 
   struct Events {
 
     typedef Message<> MenuEvent;
 
     MenuEvent menuAboutToShow;
     MenuEvent menuAboutToHide;
 
     void AddListener(IMenuListener::Pointer listener);
     void RemoveListener(IMenuListener::Pointer listener);
 
   private:
     typedef MessageDelegate<IMenuListener> Delegate;
   };
 
-    /**
-     * Notifies this listener that the menu is about to be shown by
-     * the given menu manager.
-     *
-     * @param manager the menu manager
-     */
-   virtual void MenuAboutToShow() = 0;
+  /**
+   * Notifies this listener that the menu is about to be shown by
+   * the given menu manager.
+   *
+   * @param manager the menu manager
+   */
+  virtual void MenuAboutToShow() = 0;
 
   /**
    * Notifies this listener that the menu is about to be hidden by
    * the given menu manager.
    *
    * @param manager the menu manager
    */
   virtual void MenuAboutToHide() = 0;
 };
 
 }
 
 }
 
 #endif /* BERRYGUITKIMENULISTENER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/guitk/berryGuiTkISelectionListener.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/guitk/berryGuiTkISelectionListener.h
index 44ed5da12f..0e335cdd95 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/guitk/berryGuiTkISelectionListener.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/guitk/berryGuiTkISelectionListener.h
@@ -1,102 +1,102 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYGUITKISELECTIONLISTENER_H_
 #define BERRYGUITKISELECTIONLISTENER_H_
 
 #include <berryMacros.h>
 #include <berryMessage.h>
 
 #include "berryGuiTkSelectionEvent.h"
 
 namespace berry
 {
 
 namespace GuiTk
 {
 
 /**
  * Classes which implement this interface provide methods
  * that deal with the events that are generated when selection
  * occurs in a control.
  * <p>
  * After creating an instance of a class that implements
  * this interface it can be added to a control using the
  * <code>addSelectionListener</code> method and removed using
  * the <code>removeSelectionListener</code> method. When
  * selection occurs in a control the appropriate method
  * will be invoked.
  * </p>
  *
  * @see SelectionAdapter
  * @see SelectionEvent
  */
 struct BERRY_UI_QT ISelectionListener: public virtual Object
 {
 
-  berryInterfaceMacro(ISelectionListener, berry);
+  berryObjectMacro(berry::GuiTk::ISelectionListener)
 
   struct BERRY_UI_QT Events {
 
     typedef Message1<SelectionEvent::Pointer> EventType;
 
     EventType selected;
     EventType defaultSelected;
 
     void AddListener(ISelectionListener::Pointer listener);
     void RemoveListener(ISelectionListener::Pointer listener);
 
   private:
     typedef MessageDelegate1<ISelectionListener, SelectionEvent::Pointer> Delegate;
   };
 
   virtual ~ISelectionListener();
 
   /**
    * Sent when selection occurs in the control.
    * <p>
    * For example, selection occurs in a List when the user selects
    * an item or items with the keyboard or mouse.  On some platforms,
    * the event occurs when a mouse button or key is pressed.  On others,
    * it happens when the mouse or key is released.  The exact key or
    * mouse gesture that causes this event is platform specific.
    * </p>
    *
    * @param e an event containing information about the selection
    */
   virtual void WidgetSelected(SelectionEvent::Pointer  /*e*/) {}
 
   /**
    * Sent when default selection occurs in the control.
    * <p>
    * For example, on some platforms default selection occurs in a List
    * when the user double-clicks an item or types return in a Text.
    * On some platforms, the event occurs when a mouse button or key is
    * pressed.  On others, it happens when the mouse or key is released.
    * The exact key or mouse gesture that causes this event is platform
    * specific.
    * </p>
    *
    * @param e an event containing information about the default selection
    */
   virtual void WidgetDefaultSelected(SelectionEvent::Pointer  /*e*/) {}
 };
 
 }
 
 }
 
 #endif /* BERRYGUITKISELECTIONLISTENER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryHandlerUtil.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryHandlerUtil.cpp
index 18e192433e..ef0e53de46 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryHandlerUtil.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryHandlerUtil.cpp
@@ -1,354 +1,413 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryHandlerUtil.h"
 
 #include <berryIEvaluationContext.h>
 #include <berryCommandExceptions.h>
 
 #include "berryISources.h"
+#include "berryRegistryToggleState.h"
+#include "berryRadioState.h"
+#include "berryObjects.h"
+#include "berryObjectString.h"
 
 namespace berry
 {
 
-void HandlerUtil::NoVariableFound(ExecutionEvent::Pointer event,
+void HandlerUtil::NoVariableFound(const ExecutionEvent::ConstPointer& event,
     const QString& name)
 {
   throw ExecutionException("No " + name +
                            " found while executing " + event->GetCommand()->GetId());
 }
 
-void HandlerUtil::IncorrectTypeFound(ExecutionEvent::Pointer event,
+void HandlerUtil::IncorrectTypeFound(const ExecutionEvent::ConstPointer& event,
     const QString& name, const QString& expectedType,
     const QString& wrongType)
 {
   throw ExecutionException("Incorrect type for "
       + name
       + " found while executing "
       + event->GetCommand()->GetId()
       + ", expected " + expectedType
       + " found " + wrongType);
 }
 
-Object::Pointer HandlerUtil::GetVariable(
-    ExecutionEvent::Pointer event, const QString& name)
+Object::ConstPointer HandlerUtil::GetVariable(
+    const ExecutionEvent::ConstPointer& event, const QString& name)
 {
   if (IEvaluationContext::ConstPointer evalContext = event->GetApplicationContext().Cast<const IEvaluationContext>())
   {
-    Object::Pointer var = evalContext->GetVariable(name);
-    return var == IEvaluationContext::UNDEFINED_VARIABLE ? Object::Pointer() : var;
+    Object::ConstPointer var = evalContext->GetVariable(name);
+    return var == IEvaluationContext::UNDEFINED_VARIABLE ? Object::ConstPointer() : var;
   }
-  return Object::Pointer();
+  return Object::ConstPointer();
 }
 
-Object::Pointer HandlerUtil::GetVariableChecked(
-    ExecutionEvent::Pointer event, const QString& name)
+Object::ConstPointer HandlerUtil::GetVariableChecked(
+    const ExecutionEvent::ConstPointer& event, const QString& name)
 {
-  Object::Pointer o(HandlerUtil::GetVariable(event, name));
+  Object::ConstPointer o(HandlerUtil::GetVariable(event, name));
   if (o.IsNull())
   {
     HandlerUtil::NoVariableFound(event, name);
   }
   return o;
 }
 
-Object::Pointer HandlerUtil::GetVariable(
+Object::ConstPointer HandlerUtil::GetVariable(
     Object::Pointer context, const QString& name)
 {
   IEvaluationContext::Pointer eval(context.Cast<IEvaluationContext>());
   if (eval.IsNotNull())
   {
-    Object::Pointer var = eval->GetVariable(name);
-    return var == IEvaluationContext::UNDEFINED_VARIABLE ? Object::Pointer() : var;
+    Object::ConstPointer var = eval->GetVariable(name);
+    return var == IEvaluationContext::UNDEFINED_VARIABLE ? Object::ConstPointer() : var;
   }
-  return Object::Pointer(0);
+  return Object::ConstPointer(0);
 }
 
-HandlerUtil::StringVectorType::Pointer HandlerUtil::GetActiveContexts(
-    ExecutionEvent::Pointer event)
+HandlerUtil::StringVectorType::ConstPointer HandlerUtil::GetActiveContexts(
+    const ExecutionEvent::ConstPointer& event)
 {
-  Object::Pointer o(HandlerUtil::GetVariable(event,
-      ISources::ACTIVE_CONTEXT_NAME()));
-  return o.Cast<StringVectorType>();
+  Object::ConstPointer o(HandlerUtil::GetVariable(event, ISources::ACTIVE_CONTEXT_NAME()));
+  return o.Cast<const StringVectorType>();
 }
 
-HandlerUtil::StringVectorType::Pointer HandlerUtil::GetActiveContextsChecked(
-    ExecutionEvent::Pointer event)
+HandlerUtil::StringVectorType::ConstPointer HandlerUtil::GetActiveContextsChecked(
+    const ExecutionEvent::ConstPointer& event)
 {
-  Object::Pointer o(HandlerUtil::GetVariableChecked(event,
+  Object::ConstPointer o(HandlerUtil::GetVariableChecked(event,
       ISources::ACTIVE_CONTEXT_NAME()));
-  if (o.Cast<StringVectorType>().IsNull())
+  if (o.Cast<const StringVectorType>().IsNull())
   {
     HandlerUtil::IncorrectTypeFound(event, ISources::ACTIVE_CONTEXT_NAME(),
         "StringVectorType", o->GetClassName());
   }
-  return o.Cast<StringVectorType>();
+  return o.Cast<const StringVectorType>();
 }
 
-//IEditorPart::Pointer HandlerUtil::GetActiveEditor(ExecutionEvent::Pointer event)
+//IEditorPart::Pointer HandlerUtil::GetActiveEditor(const ExecutionEvent::ConstPointer& event)
 //{
 //  Object::Pointer o(HandlerUtil::GetVariable(event,
 //      ISources::ACTIVE_EDITOR_NAME));
 //  return o.Cast<IEditorPart>();
 //}
 
 //IEditorPart::Pointer HandlerUtil::GetActiveEditorChecked(
-//    ExecutionEvent::Pointer event)
+//    const ExecutionEvent::ConstPointer& event)
 //{
 //  Object::Pointer o = HandlerUtil::GetVariableChecked(event,
 //      ISources::ACTIVE_EDITOR_NAME);
 //  if (o.Cast<IEditorPart>().IsNull())
 //  {
 //    HandlerUtil::IncorrectTypeFound(event, ISources::ACTIVE_EDITOR_NAME,
 //        "IEditorPart", o->GetClassName());
 //  }
 //  return (IEditorPart) o;
 //}
 
-ObjectString::Pointer HandlerUtil::GetActiveEditorId(ExecutionEvent::Pointer event)
+ObjectString::ConstPointer HandlerUtil::GetActiveEditorId(const ExecutionEvent::ConstPointer& event)
 {
-  Object::Pointer o = HandlerUtil::GetVariable(event,
-      ISources::ACTIVE_EDITOR_ID_NAME());
-  return o.Cast<ObjectString>();
+  Object::ConstPointer o = HandlerUtil::GetVariable(event,
+                                                    ISources::ACTIVE_EDITOR_ID_NAME());
+  return o.Cast<const ObjectString>();
 }
 
-ObjectString::Pointer HandlerUtil::GetActiveEditorIdChecked(
-    ExecutionEvent::Pointer event)
+ObjectString::ConstPointer HandlerUtil::GetActiveEditorIdChecked(
+    const ExecutionEvent::ConstPointer& event)
 {
-  Object::Pointer o = HandlerUtil::GetVariableChecked(event,
-      ISources::ACTIVE_EDITOR_ID_NAME());
-  if (o.Cast<ObjectString>().IsNull())
+  Object::ConstPointer o = HandlerUtil::GetVariableChecked(event,
+                                                           ISources::ACTIVE_EDITOR_ID_NAME());
+  if (o.Cast<const ObjectString>().IsNull())
   {
     HandlerUtil::IncorrectTypeFound(event, ISources::ACTIVE_EDITOR_ID_NAME(),
-        "QString", o->GetClassName());
+                                    "QString", o->GetClassName());
   }
-  return o.Cast<ObjectString>();
+  return o.Cast<const ObjectString>();
 }
 
-IWorkbenchPart::Pointer HandlerUtil::GetActivePart(ExecutionEvent::Pointer event)
+IWorkbenchPart::ConstPointer HandlerUtil::GetActivePart(const ExecutionEvent::ConstPointer& event)
 {
-  Object::Pointer o = HandlerUtil::GetVariable(event,
-      ISources::ACTIVE_PART_NAME());
-  return o.Cast<IWorkbenchPart>();
+  Object::ConstPointer o = HandlerUtil::GetVariable(event,
+                                                    ISources::ACTIVE_PART_NAME());
+  return o.Cast<const IWorkbenchPart>();
 }
 
-IWorkbenchPart::Pointer HandlerUtil::GetActivePartChecked(
-    ExecutionEvent::Pointer event)
+IWorkbenchPart::ConstPointer HandlerUtil::GetActivePartChecked(
+    const ExecutionEvent::ConstPointer& event)
 {
-  Object::Pointer o = HandlerUtil::GetVariableChecked(event,
+  Object::ConstPointer o = HandlerUtil::GetVariableChecked(event,
       ISources::ACTIVE_PART_NAME());
-  if (o.Cast<IWorkbenchPart>().IsNull())
+  if (o.Cast<const IWorkbenchPart>().IsNull())
   {
     HandlerUtil::IncorrectTypeFound(event, ISources::ACTIVE_PART_NAME(),
-        "IWorkbenchPart", o->GetClassName());
+                                    "IWorkbenchPart", o->GetClassName());
   }
-  return o.Cast<IWorkbenchPart>();
+  return o.Cast<const IWorkbenchPart>();
 }
 
-ObjectString::Pointer HandlerUtil::GetActivePartId(ExecutionEvent::Pointer event)
+ObjectString::ConstPointer HandlerUtil::GetActivePartId(const ExecutionEvent::ConstPointer& event)
 {
-  Object::Pointer o = HandlerUtil::GetVariable(event,
-      ISources::ACTIVE_PART_ID_NAME());
-  return o.Cast<ObjectString>();
+  Object::ConstPointer o = HandlerUtil::GetVariable(event,
+                                                    ISources::ACTIVE_PART_ID_NAME());
+  return o.Cast<const ObjectString>();
 }
 
-ObjectString::Pointer HandlerUtil::GetActivePartIdChecked(
-    ExecutionEvent::Pointer event)
+ObjectString::ConstPointer HandlerUtil::GetActivePartIdChecked(
+    const ExecutionEvent::ConstPointer& event)
 {
-  Object::Pointer o = HandlerUtil::GetVariableChecked(event,
-      ISources::ACTIVE_PART_ID_NAME());
-  if (o.Cast<ObjectString>().IsNull())
+  Object::ConstPointer o = HandlerUtil::GetVariableChecked(event,
+                                                           ISources::ACTIVE_PART_ID_NAME());
+  if (o.Cast<const ObjectString>().IsNull())
   {
     HandlerUtil::IncorrectTypeFound(event, ISources::ACTIVE_PART_ID_NAME(),
-        "QString", o->GetClassName());
+                                    "QString", o->GetClassName());
   }
-  return o.Cast<ObjectString>();
+  return o.Cast<const ObjectString>();
 }
 
-IWorkbenchPartSite::Pointer HandlerUtil::GetActiveSite(
-    ExecutionEvent::Pointer event)
+IWorkbenchPartSite::ConstPointer HandlerUtil::GetActiveSite(
+    const ExecutionEvent::ConstPointer& event)
 {
-  Object::Pointer o = HandlerUtil::GetVariable(event,
-      ISources::ACTIVE_SITE_NAME());
-  return o.Cast<IWorkbenchPartSite>();
+  Object::ConstPointer o = HandlerUtil::GetVariable(event,
+                                                    ISources::ACTIVE_SITE_NAME());
+  return o.Cast<const IWorkbenchPartSite>();
 }
 
-IWorkbenchPartSite::Pointer HandlerUtil::GetActiveSiteChecked(
-    ExecutionEvent::Pointer event)
+IWorkbenchPartSite::ConstPointer HandlerUtil::GetActiveSiteChecked(
+    const ExecutionEvent::ConstPointer& event)
 {
-  Object::Pointer o = HandlerUtil::GetVariableChecked(event,
+  Object::ConstPointer o = HandlerUtil::GetVariableChecked(event,
       ISources::ACTIVE_SITE_NAME());
-  if (o.Cast<IWorkbenchPartSite>().IsNull())
+  if (o.Cast<const IWorkbenchPartSite>().IsNull())
   {
     HandlerUtil::IncorrectTypeFound(event, ISources::ACTIVE_SITE_NAME(),
-        "IWorkbenchSitePart", o->GetClassName());
+                                    "IWorkbenchSitePart", o->GetClassName());
   }
-  return o.Cast<IWorkbenchPartSite>();
+  return o.Cast<const IWorkbenchPartSite>();
 }
 
-ISelection::Pointer HandlerUtil::GetCurrentSelection(
-    ExecutionEvent::Pointer event)
+ISelection::ConstPointer HandlerUtil::GetCurrentSelection(
+    const ExecutionEvent::ConstPointer& event)
 {
-  Object::Pointer o = HandlerUtil::GetVariable(event,
-      ISources::ACTIVE_CURRENT_SELECTION_NAME());
-  return o.Cast<ISelection>();
+  Object::ConstPointer o = HandlerUtil::GetVariable(event,
+                                                    ISources::ACTIVE_CURRENT_SELECTION_NAME());
+  return o.Cast<const ISelection>();
 }
 
-ISelection::Pointer HandlerUtil::GetCurrentSelectionChecked(
-    ExecutionEvent::Pointer event)
+ISelection::ConstPointer HandlerUtil::GetCurrentSelectionChecked(
+    const ExecutionEvent::ConstPointer& event)
 {
-  Object::Pointer o = HandlerUtil::GetVariableChecked(event,
+  Object::ConstPointer o = HandlerUtil::GetVariableChecked(event,
       ISources::ACTIVE_CURRENT_SELECTION_NAME());
-  if (o.Cast<ISelection>().IsNull())
+  if (o.Cast<const ISelection>().IsNull())
   {
     HandlerUtil::IncorrectTypeFound(event,
-        ISources::ACTIVE_CURRENT_SELECTION_NAME(), "ISelection",
-        o->GetClassName());
+                                    ISources::ACTIVE_CURRENT_SELECTION_NAME(), "ISelection",
+                                    o->GetClassName());
   }
-  return o.Cast<ISelection>();
+  return o.Cast<const ISelection>();
 }
 
-HandlerUtil::StringVectorType::Pointer HandlerUtil::GetActiveMenus(
-    ExecutionEvent::Pointer event)
+HandlerUtil::StringVectorType::ConstPointer HandlerUtil::GetActiveMenus(
+    const ExecutionEvent::ConstPointer& event)
 {
-  Object::Pointer o = HandlerUtil::GetVariable(event,
-      ISources::ACTIVE_MENU_NAME());
-  return o.Cast<StringVectorType>();
+  Object::ConstPointer o = HandlerUtil::GetVariable(event,
+                                                    ISources::ACTIVE_MENU_NAME());
+  return o.Cast<const StringVectorType>();
 }
 
-HandlerUtil::StringVectorType::Pointer HandlerUtil::GetActiveMenusChecked(
-    ExecutionEvent::Pointer event)
+HandlerUtil::StringVectorType::ConstPointer HandlerUtil::GetActiveMenusChecked(
+    const ExecutionEvent::ConstPointer& event)
 {
-  Object::Pointer o = HandlerUtil::GetVariableChecked(event,
-      ISources::ACTIVE_MENU_NAME());
-  if (o.Cast<StringVectorType>().IsNull())
+  Object::ConstPointer o = HandlerUtil::GetVariableChecked(event,
+                                                           ISources::ACTIVE_MENU_NAME());
+  if (o.Cast<const StringVectorType>().IsNull())
   {
     HandlerUtil::IncorrectTypeFound(event, ISources::ACTIVE_MENU_NAME(),
-        "StringVectorType", o->GetClassName());
+                                    "StringVectorType", o->GetClassName());
   }
-  return o.Cast<StringVectorType>();
+  return o.Cast<const StringVectorType>();
 }
 
-ISelection::Pointer HandlerUtil::GetActiveMenuSelection(
-    ExecutionEvent::Pointer event)
+ISelection::ConstPointer HandlerUtil::GetActiveMenuSelection(
+    const ExecutionEvent::ConstPointer& event)
 {
-  Object::Pointer o = HandlerUtil::GetVariable(event,
-      ISources::ACTIVE_MENU_SELECTION_NAME());
-  return o.Cast<ISelection>();
+  Object::ConstPointer o = HandlerUtil::GetVariable(event,
+                                                    ISources::ACTIVE_MENU_SELECTION_NAME());
+  return o.Cast<const ISelection>();
 }
 
-ISelection::Pointer HandlerUtil::GetActiveMenuSelectionChecked(
-    ExecutionEvent::Pointer event)
+ISelection::ConstPointer HandlerUtil::GetActiveMenuSelectionChecked(
+    const ExecutionEvent::ConstPointer& event)
 {
-  Object::Pointer o = HandlerUtil::GetVariableChecked(event,
+  Object::ConstPointer o = HandlerUtil::GetVariableChecked(event,
       ISources::ACTIVE_MENU_SELECTION_NAME());
-  if (o.Cast<ISelection>().IsNull())
+  if (o.Cast<const ISelection>().IsNull())
   {
     HandlerUtil::IncorrectTypeFound(event,
-        ISources::ACTIVE_MENU_SELECTION_NAME(), "ISelection", o->GetClassName());
+                                    ISources::ACTIVE_MENU_SELECTION_NAME(),
+                                    "ISelection", o->GetClassName());
   }
-  return o.Cast<ISelection>();
+  return o.Cast<const ISelection>();
 }
 
-IWorkbenchWindow::Pointer HandlerUtil::GetActiveWorkbenchWindow(
-    ExecutionEvent::Pointer event)
+IWorkbenchWindow::ConstPointer HandlerUtil::GetActiveWorkbenchWindow(
+    const ExecutionEvent::ConstPointer& event)
 {
-  Object::Pointer o = HandlerUtil::GetVariable(event,
-      ISources::ACTIVE_WORKBENCH_WINDOW_NAME());
-  return o.Cast<IWorkbenchWindow>();
+  Object::ConstPointer o = HandlerUtil::GetVariable(event,
+                                                    ISources::ACTIVE_WORKBENCH_WINDOW_NAME());
+  return o.Cast<const IWorkbenchWindow>();
 }
 
-IWorkbenchWindow::Pointer HandlerUtil::GetActiveWorkbenchWindowChecked(
-    ExecutionEvent::Pointer event)
+IWorkbenchWindow::ConstPointer HandlerUtil::GetActiveWorkbenchWindowChecked(
+    const ExecutionEvent::ConstPointer& event)
 {
-  Object::Pointer o = HandlerUtil::GetVariableChecked(event,
-      ISources::ACTIVE_WORKBENCH_WINDOW_NAME());
-  if (o.Cast<IWorkbenchWindow>().IsNull())
+  Object::ConstPointer o = HandlerUtil::GetVariableChecked(event,
+                                                           ISources::ACTIVE_WORKBENCH_WINDOW_NAME());
+  if (o.Cast<const IWorkbenchWindow>().IsNull())
   {
     HandlerUtil::IncorrectTypeFound(event,
-        ISources::ACTIVE_WORKBENCH_WINDOW_NAME(), "IWorkbenchWindow",
-        o->GetClassName());
+                                    ISources::ACTIVE_WORKBENCH_WINDOW_NAME(), "IWorkbenchWindow",
+                                    o->GetClassName());
   }
-  return o.Cast<IWorkbenchWindow>();
+  return o.Cast<const IWorkbenchWindow>();
 }
 
-ISelection::Pointer HandlerUtil::GetActiveMenuEditorInput(
-    ExecutionEvent::Pointer event)
+ISelection::ConstPointer HandlerUtil::GetActiveMenuEditorInput(
+    const ExecutionEvent::ConstPointer& event)
 {
-  Object::Pointer o = HandlerUtil::GetVariable(event,
-      ISources::ACTIVE_MENU_EDITOR_INPUT_NAME());
-  return o.Cast<ISelection>();
+  Object::ConstPointer o = HandlerUtil::GetVariable(event,
+                                               ISources::ACTIVE_MENU_EDITOR_INPUT_NAME());
+  return o.Cast<const ISelection>();
 }
 
-ISelection::Pointer HandlerUtil::GetActiveMenuEditorInputChecked(
-    ExecutionEvent::Pointer event)
+ISelection::ConstPointer HandlerUtil::GetActiveMenuEditorInputChecked(
+    const ExecutionEvent::ConstPointer& event)
 {
-  Object::Pointer o = HandlerUtil::GetVariableChecked(event,
+  Object::ConstPointer o = HandlerUtil::GetVariableChecked(event,
       ISources::ACTIVE_MENU_EDITOR_INPUT_NAME());
-  if (o.Cast<ISelection>().IsNull())
+  if (o.Cast<const ISelection>().IsNull())
   {
     HandlerUtil::IncorrectTypeFound(event,
         ISources::ACTIVE_MENU_EDITOR_INPUT_NAME(), "ISelection",
         o->GetClassName());
   }
-  return o.Cast<ISelection>();
+  return o.Cast<const ISelection>();
 }
 
-ISelection::Pointer HandlerUtil::GetShowInSelection(
-    ExecutionEvent::Pointer event)
+ISelection::ConstPointer HandlerUtil::GetShowInSelection(
+    const ExecutionEvent::ConstPointer& event)
 {
-  Object::Pointer o = HandlerUtil::GetVariable(event,
+  Object::ConstPointer o = HandlerUtil::GetVariable(event,
       ISources::SHOW_IN_SELECTION());
-  return o.Cast<ISelection>();
+  return o.Cast<const ISelection>();
 }
 
-ISelection::Pointer HandlerUtil::GetShowInSelectionChecked(
-    ExecutionEvent::Pointer event)
+ISelection::ConstPointer HandlerUtil::GetShowInSelectionChecked(
+    const ExecutionEvent::ConstPointer& event)
 {
-  Object::Pointer o = HandlerUtil::GetVariableChecked(event,
+  Object::ConstPointer o = HandlerUtil::GetVariableChecked(event,
       ISources::SHOW_IN_SELECTION());
-  if (o.Cast<ISelection>().IsNull())
+  if (o.Cast<const ISelection>().IsNull())
   {
     HandlerUtil::IncorrectTypeFound(event, ISources::SHOW_IN_SELECTION(),
         "ISelection", o->GetClassName());
   }
-  return o.Cast<ISelection>();
+  return o.Cast<const ISelection>();
 }
 
-Object::Pointer HandlerUtil::GetShowInInput(
-    ExecutionEvent::Pointer event)
+Object::ConstPointer HandlerUtil::GetShowInInput(
+    const ExecutionEvent::ConstPointer& event)
 {
-  Object::Pointer var = HandlerUtil::GetVariable(event,
+  Object::ConstPointer var = HandlerUtil::GetVariable(event,
       ISources::SHOW_IN_INPUT());
   //    if (var == IEvaluationContext.UNDEFINED_VARIABLE) {
   //      return null;
   //    }
   return var;
 }
 
-Object::Pointer HandlerUtil::GetShowInInputChecked(
-    ExecutionEvent::Pointer event)
+Object::ConstPointer HandlerUtil::GetShowInInputChecked(
+    const ExecutionEvent::ConstPointer& event)
 {
-  Object::Pointer var = HandlerUtil::GetVariableChecked(event,
+  Object::ConstPointer var = HandlerUtil::GetVariableChecked(event,
       ISources::SHOW_IN_INPUT());
   //    if (var == IEvaluationContext.UNDEFINED_VARIABLE) {
   //      HandlerUtil::IncorrectTypeFound(event, ISources::SHOW_IN_INPUT, Object.class, var
   //          .getClass());
   //    }
   return var;
 }
 
+bool HandlerUtil::ToggleCommandState(const SmartPointer<Command>& command)
+{
+  State::Pointer state = command->GetState(RegistryToggleState::STATE_ID);
+  if(state.IsNull())
+  {
+    throw ExecutionException("The command does not have a toggle state");
+  }
+  if(ObjectBool::Pointer boolObj = state->GetValue().Cast<ObjectBool>())
+  {
+    bool oldValue = boolObj->GetValue();
+    Object::Pointer newValue(new ObjectBool(!oldValue));
+    state->SetValue(newValue);
+    return oldValue;
+  }
+  else
+  {
+   throw ExecutionException("The command's toggle state doesn't contain a boolean value");
+  }
+}
+
+bool HandlerUtil::MatchesRadioState(const SmartPointer<ExecutionEvent>& event)
+{
+  QString parameter = event->GetParameter(RadioState::PARAMETER_ID);
+  if (parameter.isNull())
+  {
+    throw ExecutionException("The event does not have the radio state parameter");
+  }
+
+  Command::ConstPointer command = event->GetCommand();
+  State::Pointer state = command->GetState(RadioState::STATE_ID);
+  if (state.IsNull())
+  {
+    throw ExecutionException("The command does not have a radio state");
+  }
+  if (ObjectString::Pointer strObj = state->GetValue().Cast<ObjectString>())
+  {
+    return parameter == *strObj;
+  }
+  else
+  {
+    throw ExecutionException("The command's radio state doesn't contain a String value");
+  }
+}
+
+void HandlerUtil::UpdateRadioState(const SmartPointer<Command>& command, const QString& newState)
+{
+  State::Pointer state = command->GetState(RadioState::STATE_ID);
+  if (state.IsNull())
+  {
+    throw ExecutionException("The command does not have a radio state");
+  }
+  Object::Pointer newValue(new ObjectString(newState));
+  state->SetValue(newValue);
+}
+
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryHandlerUtil.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryHandlerUtil.h
index 1d1c91dc74..6e0c7fa199 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryHandlerUtil.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryHandlerUtil.h
@@ -1,405 +1,444 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYHANDLERUTIL_H_
 #define BERRYHANDLERUTIL_H_
 
 #include <berryExecutionEvent.h>
 #include <berryObjectList.h>
 #include <berryObjectString.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 #include "berryIWorkbenchPart.h"
 #include "berryIWorkbenchPartSite.h"
 #include "berryISelection.h"
 #include "berryIWorkbenchWindow.h"
 
 #include "berryISources.h"
 
 namespace berry {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * Some common utilities for working with handlers in Platform UI.
  * <p>
  * <b>Note</b>: this class should not be instantiated or extended by clients.
  * </p>
  *
  * @since 3.3
  */
 class BERRY_UI_QT HandlerUtil {
 
 private:
 
-  static void NoVariableFound(ExecutionEvent::Pointer event, const QString& name);
+  static void NoVariableFound(const ExecutionEvent::ConstPointer& event, const QString& name);
 
-  static void IncorrectTypeFound(ExecutionEvent::Pointer event, const QString& name,
+  static void IncorrectTypeFound(const ExecutionEvent::ConstPointer& event, const QString& name,
                                  const QString& expectedType, const QString& wrongType);
 
 
 public:
 
   typedef ObjectList<ObjectString::Pointer> StringVectorType;
 
   /**
    * Extract the variable.
    *
    * @param event
    *            The execution event that contains the application context
    * @param name
    *            The variable name to extract.
    * @return The object from the application context, or <code>null</code>
    *         if it could not be found.
    */
-  static Object::Pointer GetVariable(ExecutionEvent::Pointer event, const QString& name);
+  static Object::ConstPointer GetVariable(const ExecutionEvent::ConstPointer& event, const QString& name);
 
   /**
    * Extract the variable.
    *
    * @param event
    *            The execution event that contains the application context
    * @param name
    *            The variable name to extract.
    * @return The object from the application context. Will not return
    *         <code>null</code>.
    * @throws ExecutionException
    *             if the variable is not found.
    */
-  static Object::Pointer GetVariableChecked(ExecutionEvent::Pointer event, const QString& name);
+  static Object::ConstPointer GetVariableChecked(const ExecutionEvent::ConstPointer& event, const QString& name);
 
   /**
    * Extract the variable.
    *
    * @param context
    *            The IEvaluationContext or <code>null</code>
    * @param name
    *            The variable name to extract.
    * @return The object from the application context, or <code>null</code>
    *         if it could not be found.
    */
-  static Object::Pointer GetVariable(Object::Pointer context, const QString& name);
+  static Object::ConstPointer GetVariable(Object::Pointer context, const QString& name);
 
   /**
    * Return the active contexts.
    *
    * @param event
    *            The execution event that contains the application context
    * @return a collection of String contextIds, or <code>null</code>.
    */
-  static StringVectorType::Pointer GetActiveContexts(ExecutionEvent::Pointer event);
+  static StringVectorType::ConstPointer GetActiveContexts(const ExecutionEvent::ConstPointer& event);
 
   /**
    * Return the active contexts.
    *
    * @param event
    *            The execution event that contains the application context
    * @return a collection of String contextIds. Will not return
    *         <code>null</code>.
    * @throws ExecutionException
    *             If the context variable is not found.
    */
-  static StringVectorType::Pointer GetActiveContextsChecked(ExecutionEvent::Pointer event);
+  static StringVectorType::ConstPointer GetActiveContextsChecked(const ExecutionEvent::ConstPointer& event);
 
   /**
    * Return the active shell. Is not necessarily the active workbench window
    * shell.
    *
    * @param event
    *            The execution event that contains the application context
    * @return the active shell, or <code>null</code>.
    */
-//  static Shell GetActiveShell(ExecutionEvent::Pointer event) {
+//  static Shell GetActiveShell(const ExecutionEvent::ConstPointer& event) {
 //    Object::Pointer o = getVariable(event, ISources.ACTIVE_SHELL_NAME);
 //    if (o instanceof Shell) {
 //      return (Shell) o;
 //    }
 //    return null;
 //  }
 
   /**
    * Return the active shell. Is not necessarily the active workbench window
    * shell.
    *
    * @param event
    *            The execution event that contains the application context
    * @return the active shell. Will not return <code>null</code>.
    * @throws ExecutionException
    *             If the active shell variable is not found.
    */
-//  static Shell GetActiveShellChecked(ExecutionEvent::Pointer event)
+//  static Shell GetActiveShellChecked(const ExecutionEvent::ConstPointer& event)
 //       {
 //    Object::Pointer o = getVariableChecked(event, ISources.ACTIVE_SHELL_NAME);
 //    if (!(o instanceof Shell)) {
 //      incorrectTypeFound(event, ISources.ACTIVE_SHELL_NAME, Shell.class,
 //          o.getClass());
 //    }
 //    return (Shell) o;
 //  }
 
   /**
      * Return the active workbench window.
      *
      * @param event
      *            The execution event that contains the application context
      * @return the active workbench window, or <code>null</code>.
      */
-   static IWorkbenchWindow::Pointer GetActiveWorkbenchWindow(ExecutionEvent::Pointer event);
+   static IWorkbenchWindow::ConstPointer GetActiveWorkbenchWindow(const ExecutionEvent::ConstPointer& event);
 
     /**
      * Return the active workbench window.
      *
      * @param event
      *            The execution event that contains the application context
      * @return the active workbench window. Will not return <code>null</code>.
      * @throws ExecutionException
      *             If the active workbench window variable is not found.
      */
-    static IWorkbenchWindow::Pointer GetActiveWorkbenchWindowChecked(
-        ExecutionEvent::Pointer event);
+    static IWorkbenchWindow::ConstPointer GetActiveWorkbenchWindowChecked(
+        const ExecutionEvent::ConstPointer& event);
 
   /**
    * Return the active editor.
    *
    * @param event
    *            The execution event that contains the application context
    * @return the active editor, or <code>null</code>.
    */
-  //static IEditorPart::Pointer GetActiveEditor(ExecutionEvent::Pointer event);
+  //static IEditorPart::Pointer GetActiveEditor(const ExecutionEvent::ConstPointer& event);
 
   /**
    * Return the active editor.
    *
    * @param event
    *            The execution event that contains the application context
    * @return the active editor. Will not return <code>null</code>.
    * @throws ExecutionException
    *             If the active editor variable is not found.
    */
-  //static IEditorPart::Pointer GetActiveEditorChecked(ExecutionEvent::Pointer event);
+  //static IEditorPart::Pointer GetActiveEditorChecked(const ExecutionEvent::ConstPointer& event);
 
   /**
    * Return the part id of the active editor.
    *
    * @param event
    *            The execution event that contains the application context
    * @return the part id of the active editor, or <code>null</code>.
    */
-  static ObjectString::Pointer GetActiveEditorId(ExecutionEvent::Pointer event);
+  static ObjectString::ConstPointer GetActiveEditorId(const ExecutionEvent::ConstPointer& event);
 
   /**
    * Return the part id of the active editor.
    *
    * @param event
    *            The execution event that contains the application context
    * @return the part id of the active editor. Will not return
    *         <code>null</code>.
    * @throws ExecutionException
    *             If the active editor id variable is not found.
    */
-  static ObjectString::Pointer GetActiveEditorIdChecked(ExecutionEvent::Pointer event);
+  static ObjectString::ConstPointer GetActiveEditorIdChecked(const ExecutionEvent::ConstPointer& event);
 
   /**
    * Return the active part.
    *
    * @param event
    *            The execution event that contains the application context
    * @return the active part, or <code>null</code>.
    */
-  static IWorkbenchPart::Pointer GetActivePart(ExecutionEvent::Pointer event);
+  static IWorkbenchPart::ConstPointer GetActivePart(const ExecutionEvent::ConstPointer& event);
 
   /**
    * Return the active part.
    *
    * @param event
    *            The execution event that contains the application context
    * @return the active part. Will not return <code>null</code>.
    * @throws ExecutionException
    *             If the active part variable is not found.
    */
-  static IWorkbenchPart::Pointer GetActivePartChecked(ExecutionEvent::Pointer event);
+  static IWorkbenchPart::ConstPointer GetActivePartChecked(const ExecutionEvent::ConstPointer& event);
 
   /**
    * Return the part id of the active part.
    *
    * @param event
    *            The execution event that contains the application context
    * @return the part id of the active part, or <code>null</code>.
    */
-  static ObjectString::Pointer GetActivePartId(ExecutionEvent::Pointer event);
+  static ObjectString::ConstPointer GetActivePartId(const ExecutionEvent::ConstPointer& event);
 
   /**
    * Return the part id of the active part.
    *
    * @param event
    *            The execution event that contains the application context
    * @return the part id of the active part. Will not return <code>null</code>.
    * @throws ExecutionException
    *             If the active part id variable is not found.
    */
-  static ObjectString::Pointer GetActivePartIdChecked(ExecutionEvent::Pointer event);
+  static ObjectString::ConstPointer GetActivePartIdChecked(const ExecutionEvent::ConstPointer& event);
 
   /**
    * Return the active part site.
    *
    * @param event
    *            The execution event that contains the application context
    * @return the active part site, or <code>null</code>.
    */
-  static IWorkbenchPartSite::Pointer GetActiveSite(ExecutionEvent::Pointer event);
+  static IWorkbenchPartSite::ConstPointer GetActiveSite(const ExecutionEvent::ConstPointer& event);
 
   /**
    * Return the active part site.
    *
    * @param event
    *            The execution event that contains the application context
    * @return the active part site. Will not return <code>null</code>.
    * @throws ExecutionException
    *             If the active part site variable is not found.
    */
-  static IWorkbenchPartSite::Pointer GetActiveSiteChecked(ExecutionEvent::Pointer event);
+  static IWorkbenchPartSite::ConstPointer GetActiveSiteChecked(const ExecutionEvent::ConstPointer& event);
 
   /**
    * Return the current selection.
    *
    * @param event
    *            The execution event that contains the application context
    * @return the current selection, or <code>null</code>.
    */
-  static ISelection::Pointer GetCurrentSelection(ExecutionEvent::Pointer event);
+  static ISelection::ConstPointer GetCurrentSelection(const ExecutionEvent::ConstPointer& event);
 
   /**
    * Return the current selection.
    *
    * @param event
    *            The execution event that contains the application context
    * @return the current selection. Will not return <code>null</code>.
    * @throws ExecutionException
    *             If the current selection variable is not found.
    */
-  static ISelection::Pointer GetCurrentSelectionChecked(ExecutionEvent::Pointer event);
+  static ISelection::ConstPointer GetCurrentSelectionChecked(const ExecutionEvent::ConstPointer& event);
 
   /**
    * Return the menu IDs that were applied to the registered context menu. For
    * example, #CompilationUnitEditorContext.
    *
    * @param event
    *            The execution event that contains the application context
    * @return the menu IDs, or <code>null</code>.
    */
-  static StringVectorType::Pointer GetActiveMenus(ExecutionEvent::Pointer event);
+  static StringVectorType::ConstPointer GetActiveMenus(const ExecutionEvent::ConstPointer& event);
 
   /**
    * Return the menu IDs that were applied to the registered context menu. For
    * example, #CompilationUnitEditorContext.
    *
    * @param event
    *            The execution event that contains the application context
    * @return the menu IDs. Will not return <code>null</code>.
    * @throws ExecutionException
    *             If the active menus variable is not found.
    */
-  static StringVectorType::Pointer GetActiveMenusChecked(ExecutionEvent::Pointer event);
+  static StringVectorType::ConstPointer GetActiveMenusChecked(const ExecutionEvent::ConstPointer& event);
 
   /**
    * Return the active menu selection. The active menu is a registered context
    * menu.
    *
    * @param event
    *            The execution event that contains the application context
    * @return the active menu selection, or <code>null</code>.
    */
-  static ISelection::Pointer GetActiveMenuSelection(ExecutionEvent::Pointer event);
+  static ISelection::ConstPointer GetActiveMenuSelection(const ExecutionEvent::ConstPointer& event);
 
   /**
    * Return the active menu selection. The active menu is a registered context
    * menu.
    *
    * @param event
    *            The execution event that contains the application context
    * @return the active menu selection. Will not return <code>null</code>.
    * @throws ExecutionException
    *             If the active menu selection variable is not found.
    */
-  static ISelection::Pointer GetActiveMenuSelectionChecked(ExecutionEvent::Pointer event);
+  static ISelection::ConstPointer GetActiveMenuSelectionChecked(const ExecutionEvent::ConstPointer& event);
 
   /**
    * Return the active menu editor input, if available. The active menu is a
    * registered context menu.
    *
    * @param event
    *            The execution event that contains the application context
    * @return the active menu editor, or <code>null</code>.
    */
-  static ISelection::Pointer GetActiveMenuEditorInput(ExecutionEvent::Pointer event);
+  static ISelection::ConstPointer GetActiveMenuEditorInput(const ExecutionEvent::ConstPointer& event);
 
   /**
    * Return the active menu editor input. The active menu is a registered
    * context menu. Some context menus do not include the editor input which
    * will throw an exception.
    *
    * @param event
    *            The execution event that contains the application context
    * @return the active menu editor input. Will not return <code>null</code>.
    * @throws ExecutionException
    *             If the active menu editor input variable is not found.
    */
-  static ISelection::Pointer GetActiveMenuEditorInputChecked(
-      ExecutionEvent::Pointer event);
+  static ISelection::ConstPointer GetActiveMenuEditorInputChecked(
+      const ExecutionEvent::ConstPointer& event);
 
   /**
    * Return the ShowInContext selection.
    *
    * @param event
    *            The execution event that contains the application context
    * @return the show in selection, or <code>null</code>.
    */
-  static ISelection::Pointer GetShowInSelection(ExecutionEvent::Pointer event);
+  static ISelection::ConstPointer GetShowInSelection(const ExecutionEvent::ConstPointer& event);
 
   /**
    * Return the ShowInContext selection. Will not return <code>null</code>.
    *
    * @param event
    *            The execution event that contains the application context
    * @return the show in selection, or <code>null</code>.
    * @throws ExecutionException
    *             If the show in selection variable is not found.
    */
-  static ISelection::Pointer GetShowInSelectionChecked(ExecutionEvent::Pointer event);
+  static ISelection::ConstPointer GetShowInSelectionChecked(const ExecutionEvent::ConstPointer& event);
 
   /**
    * Return the ShowInContext input.
    *
    * @param event
    *            The execution event that contains the application context
    * @return the show in input, or <code>null</code>.
    */
-  static Object::Pointer GetShowInInput(ExecutionEvent::Pointer event);
+  static Object::ConstPointer GetShowInInput(const ExecutionEvent::ConstPointer& event);
 
   /**
    * Return the ShowInContext input. Will not return <code>null</code>.
    *
    * @param event
    *            The execution event that contains the application context
    * @return the show in input, or <code>null</code>.
    * @throws ExecutionException
    *             If the show in input variable is not found.
    */
-  static Object::Pointer GetShowInInputChecked(ExecutionEvent::Pointer event);
+  static Object::ConstPointer GetShowInInputChecked(const ExecutionEvent::ConstPointer& event);
+
+  /**
+   * Toggles the command's state.
+   *
+   * @param command The command whose state needs to be toggled
+   * @return the original value before toggling
+   *
+   * @throws ExecutionException
+   * When the command doesn't contain the toggle state or when the state doesn't contain a boolean value
+   */
+  static bool ToggleCommandState(const SmartPointer<Command>& command);
+
+  /**
+   * Checks whether the radio state of the command is same as the radio state
+   * parameter's value
+   *
+   * @param event
+   *            The execution event that contains the application context
+   * @return <code>true</code> whe the values are same, <code>false</code>
+   *         otherwise
+   *
+   * @throws ExecutionException
+   *             When the command doesn't have the radio state or the event
+   *             doesn't have the radio state parameter
+   */
+  static bool MatchesRadioState(const SmartPointer<ExecutionEvent>& event);
+
+  /**
+   * Updates the radio state of the command to the given value
+   *
+   * @param command
+   *            the command whose state should be updated
+   * @param newState
+   *            the new state
+   *
+   * @throws ExecutionException
+   *             When the command doesn't have a radio state
+   */
+  static void UpdateRadioState(const SmartPointer<Command>& command, const QString& newState);
 };
 
 }
 #endif /*BERRYHANDLERUTIL_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryIHandlerActivation.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryIHandlerActivation.h
index 44cd3397bc..c37955fb69 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryIHandlerActivation.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryIHandlerActivation.h
@@ -1,122 +1,104 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIHANDLERACTIVATION_H_
 #define BERRYIHANDLERACTIVATION_H_
 
 #include "internal/berryIEvaluationResultCache.h"
 
 #include <org_blueberry_ui_qt_Export.h>
 
 namespace berry {
 
 struct IHandler;
 struct IHandlerService;
 
 /**
  * <p>
  * A token representing the activation of a handler. This token can later be
  * used to cancel that activation. Without this token, then handler will only
  * become inactive if the component in which the handler was activated is
  * destroyed.
  * </p>
  * <p>
  * This interface is not intended to be implemented or extended by clients.
  * </p>
  *
- * @since 3.1
  * @see org.eclipse.ui.ISources
  * @see org.eclipse.ui.ISourceProvider
  */
-struct BERRY_UI_QT IHandlerActivation : public IEvaluationResultCache {
+struct BERRY_UI_QT IHandlerActivation : public virtual IEvaluationResultCache
+{
 
-  berryInterfaceMacro(IHandlerActivation, berry);
+  berryObjectMacro(berry::IHandlerActivation)
 
   ~IHandlerActivation();
 
   /**
    * The depth at which the root exists.
-   *
-   * @since 3.2
    */
   static const int ROOT_DEPTH; // = 1;
 
   /**
    * Clears the cached computation of the <code>isActive</code> method, if
    * any. This method is only intended for internal use. It provides a
    * mechanism by which <code>ISourceProvider</code> events can invalidate
    * state on a <code>IHandlerActivation</code> instance.
    *
    * @deprecated Use {@link IEvaluationResultCache#clearResult()} instead.
    */
   virtual void ClearActive() = 0;
 
   /**
    * Returns the identifier of the command whose handler is being activated.
    *
    * @return The command identifier; never <code>null</code>.
    */
   virtual QString GetCommandId() const = 0;
 
   /**
    * Returns the depth at which this activation was created within the
    * services hierarchy. The root of the hierarchy is at a depth of
    * <code>1</code>. This is used as the final tie-breaker in the event
    * that no other method can be used to determine a winner.
    *
    * @return The depth at which the handler was inserted into the services
    *         hierarchy; should be a positive integer.
-   * @since 3.2
    */
   virtual int GetDepth() const = 0;
 
   /**
    * Returns the handler that should be activated.
    *
    * @return The handler; may be <code>null</code>.
    */
   virtual SmartPointer<IHandler> GetHandler() const = 0;
 
   /**
    * Returns the handler service from which this activation was requested.
    * This is used to ensure that an activation can only be retracted from the
    * same service which issued it.
    *
    * @return The handler service; never <code>null</code>.
    */
-  virtual SmartPointer<IHandlerService> GetHandlerService() const = 0;
+  virtual IHandlerService* GetHandlerService() const = 0;
 
-  /**
-   * Returns whether this handler activation is currently active -- given the
-   * current state of the workbench. This method should cache its computation.
-   * The cache will be cleared by a call to <code>clearActive</code>.
-   *
-   * @param context
-   *            The context in which this state should be evaluated; must not
-   *            be <code>null</code>.
-   * @return <code>true</code> if the activation is currently active;
-   *         <code>false</code> otherwise.
-   * @deprecated Use
-   *             {@link IEvaluationResultCache#evaluate(IEvaluationContext)}
-   *             instead.
-   */
-  virtual bool IsActive(SmartPointer<IEvaluationContext> context) const = 0;
 };
 
 }
 
 #endif /* BERRYIHANDLERACTIVATION_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryIHandlerService.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryIHandlerService.h
index b762c2d175..943c9261a2 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryIHandlerService.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryIHandlerService.h
@@ -1,435 +1,395 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIHANDLERSERVICE_H_
 #define BERRYIHANDLERSERVICE_H_
 
 #include "services/berryIServiceWithSources.h"
 
 #include "common/berryCommandExceptions.h"
 
 namespace berry {
 
 class Command;
 class ExecutionEvent;
 class ParameterizedCommand;
 class Expression;
 class UIElement;
 
 struct IEvaluationContext;
 struct IHandler;
 struct IHandlerActivation;
 
 /**
  * <p>
  * Provides services related to activating and deactivating handlers within the
  * workbench.
  * </p>
  * <p>
  * This service can be acquired from your service locator:
  * <pre>
  *  IHandlerService service = (IHandlerService) getSite().getService(IHandlerService.class);
  * </pre>
  * <ul>
  * <li>This service is available globally.</li>
  * </ul>
  * </p>
 
  * @noimplement This interface is not intended to be implemented by clients.
  * @noextend This interface is not intended to be extended by clients.
  *
  * @since 3.1
  */
-struct BERRY_UI_QT IHandlerService : public IServiceWithSources {
+struct BERRY_UI_QT IHandlerService : public IServiceWithSources
+{
 
-  berryInterfaceMacro(IHandlerService, berry);
+  berryObjectMacro(berry::IHandlerService)
 
   ~IHandlerService();
 
   /**
    * <p>
    * Activates the given handler from a child service. This is used by slave
    * and nested services to promote handler activations up to the root. By
    * using this method, it is possible for handlers coming from a more nested
    * component to override the nested component.
    * </p>
    *
    * @param activation
    *            The activation that is local to the child service; must not be
    *            <code>null</code>.
    * @return A token which can be used to later cancel the activation. Only
    *         someone with access to this token can cancel the activation. The
    *         activation will automatically be cancelled if the service locator
    *         context from which this service was retrieved is destroyed. This
    *         activation is local to this service (i.e., it is not the
    *         activation that is passed as a parameter).
    * @since 3.2
    */
   virtual SmartPointer<IHandlerActivation> ActivateHandler(const SmartPointer<IHandlerActivation>& activation) = 0;
 
   /**
    * <p>
    * Activates the given handler within the context of this service. If this
    * service was retrieved from the workbench, then this handler will be
    * active globally. If the service was retrieved from a nested component,
    * then the handler will only be active within that component.
    * </p>
    * <p>
    * Also, it is guaranteed that the handlers submitted through a particular
    * service will be cleaned up when that services is destroyed. So, for
    * example, a service retrieved from a <code>IWorkbenchPartSite</code>
    * would deactivate all of its handlers when the site is destroyed.
    * </p>
    *
    * @param commandId
    *            The identifier for the command which this handler handles;
    *            must not be <code>null</code>.
    * @param handler
    *            The handler to activate; must not be <code>null</code>.
    * @return A token which can be used to later cancel the activation. Only
    *         someone with access to this token can cancel the activation. The
    *         activation will automatically be cancelled if the context from
    *         which this service was retrieved is destroyed.
    */
   virtual SmartPointer<IHandlerActivation> ActivateHandler(
       const QString& commandId, const SmartPointer<IHandler>& handler) = 0;
 
   /**
    * <p>
    * Activates the given handler within the context of this service. The
    * handler becomes active when <code>expression</code> evaluates to
    * <code>true</code>. This is the same as calling
    * {@link #activateHandler(String, IHandler, Expression, boolean)} with
    * global==false.
    * </p>
    * <p>
    * Also, it is guaranteed that the handlers submitted through a particular
    * service will be cleaned up when that service is destroyed. So, for
    * example, a service retrieved from a <code>IWorkbenchPartSite</code>
    * would deactivate all of its handlers when the site is destroyed.
    * </p>
    *
    * @param commandId
    *            The identifier for the command which this handler handles;
    *            must not be <code>null</code>.
    * @param handler
    *            The handler to activate; must not be <code>null</code>.
    * @param expression
    *            This expression must evaluate to <code>true</code> before
    *            this handler will really become active. The expression may be
    *            <code>null</code> if the handler should always be active.
    * @return A token which can be used to later cancel the activation. Only
    *         someone with access to this token can cancel the activation. The
    *         activation will automatically be cancelled if the context from
    *         which this service was retrieved is destroyed.
    *
    * @see org.eclipse.ui.ISources
    * @since 3.2
    */
   virtual SmartPointer<IHandlerActivation> ActivateHandler(
       const QString& commandId,
       const SmartPointer<IHandler>& handler,
       const SmartPointer<Expression>& expression) = 0;
 
   /**
    * <p>
    * Activates the given handler within the context of this service. The
    * handler becomes active when <code>expression</code> evaluates to
    * <code>true</code>. if global==<code>false</code>, then this
    * handler service must also be the active service to active the handler.
    * For example, the handler service on a part is active when that part is
    * active.
    * </p>
    * <p>
    * Also, it is guaranteed that the handlers submitted through a particular
    * service will be cleaned up when that services is destroyed. So, for
    * example, a service retrieved from a <code>IWorkbenchPartSite</code>
    * would deactivate all of its handlers when the site is destroyed.
    * </p>
    *
    * @param commandId
    *            The identifier for the command which this handler handles;
    *            must not be <code>null</code>.
    * @param handler
    *            The handler to activate; must not be <code>null</code>.
    * @param expression
    *            This expression must evaluate to <code>true</code> before
    *            this handler will really become active. The expression may be
    *            <code>null</code> if the handler should always be active.
    * @param global
    *            Indicates that the handler should be activated irrespectively
    *            of whether the corresponding workbench component (e.g.,
    *            window, part, etc.) is active.
    * @return A token which can be used to later cancel the activation. Only
    *         someone with access to this token can cancel the activation. The
    *         activation will automatically be cancelled if the context from
    *         which this service was retrieved is destroyed.
    *
    * @see org.eclipse.ui.ISources
    * @since 3.2
    */
   virtual SmartPointer<IHandlerActivation> ActivateHandler(
       const QString& commandId,
       const SmartPointer<IHandler>& handler,
       const SmartPointer<Expression>& expression, bool global) = 0;
 
-  /**
-   * <p>
-   * Activates the given handler within the context of this service. The
-   * handler becomes active when <code>expression</code> evaluates to
-   * <code>true</code>.
-   * </p>
-   * <p>
-   * Also, it is guaranteed that the handlers submitted through a particular
-   * service will be cleaned up when that services is destroyed. So, for
-   * example, a service retrieved from a <code>IWorkbenchPartSite</code>
-   * would deactivate all of its handlers when the site is destroyed.
-   * </p>
-   *
-   * @param commandId
-   *            The identifier for the command which this handler handles;
-   *            must not be <code>null</code>.
-   * @param handler
-   *            The handler to activate; must not be <code>null</code>.
-   * @param expression
-   *            This expression must evaluate to <code>true</code> before
-   *            this handler will really become active. The expression may be
-   *            <code>null</code> if the handler should always be active.
-   * @param sourcePriorities
-   *            The source priorities for the expression.
-   * @return A token which can be used to later cancel the activation. Only
-   *         someone with access to this token can cancel the activation. The
-   *         activation will automatically be cancelled if the context from
-   *         which this service was retrieved is destroyed.
-   *
-   * @see org.eclipse.ui.ISources
-   * @deprecated Use
-   *             {@link IHandlerService#activateHandler(String, IHandler, Expression)}
-   *             instead.
-   */
-  virtual SmartPointer<IHandlerActivation> ActivateHandler(
-      const QString& commandId,
-      const SmartPointer<IHandler>& handler,
-      const SmartPointer<Expression>& expression,
-      int sourcePriorities) = 0;
-
   /**
    * Creates an execution event based on an SWT event. This execution event
    * can then be passed to a command for execution.
    *
    * @param command
    *            The command for which an execution event should be created;
    *            must not be <code>null</code>.
    * @param event
    *            The SWT event triggering the command execution; may be
    *            <code>null</code>.
    * @return An execution event suitable for calling
    *         {@link Command#executeWithChecks(ExecutionEvent)}.
    * @since 3.2
    * @see Command#executeWithChecks(ExecutionEvent)
    */
   virtual SmartPointer<const ExecutionEvent> CreateExecutionEvent(
       const SmartPointer<const Command>& command,
       const SmartPointer<const UIElement>& uielement) = 0;
 
   /**
    * Creates a parameterized execution event based on an SWT event and a
    * parameterized command. This execution event can then be passed to a
    * command for execution.
    *
    * @param command
    *            The parameterized command for which an execution event should
    *            be created; must not be <code>null</code>.
    * @param event
    *            The SWT event triggering the command execution; may be
    *            <code>null</code>.
    * @return An execution event suitable for calling
    *         {@link Command#executeWithChecks(ExecutionEvent)}.
    * @since 3.2
    * @see ParameterizedCommand#getCommand()
    * @see Command#executeWithChecks(ExecutionEvent)
    */
   virtual SmartPointer<const ExecutionEvent> CreateExecutionEvent(
       const SmartPointer<const ParameterizedCommand>& command,
       const SmartPointer<const UIElement>& uielement) = 0;
 
   /**
    * Deactivates the given handler within the context of this service. If the
    * handler was activated with a different service, then it must be
    * deactivated from that service instead. It is only possible to retract a
    * handler activation with this method. That is, you must have the same
    * <code>IHandlerActivation</code> used to activate the handler.
    *
    * @param activation
    *            The token that was returned from a call to
    *            <code>activateHandler</code>; must not be <code>null</code>.
    */
   virtual void DeactivateHandler(const SmartPointer<IHandlerActivation>& activation) = 0;
 
   /**
    * Deactivates the given handlers within the context of this service. If the
    * handler was activated with a different service, then it must be
    * deactivated from that service instead. It is only possible to retract a
    * handler activation with this method. That is, you must have the same
    * <code>IHandlerActivation</code> used to activate the handler.
    *
    * @param activations
    *            The tokens that were returned from a call to
    *            <code>activateHandler</code>. This collection must only
    *            contain instances of <code>IHandlerActivation</code>. The
    *            collection must not be <code>null</code>.
    */
   virtual void DeactivateHandlers(
       const QList<SmartPointer<IHandlerActivation> >& activations) = 0;
 
   /**
    * Executes the command with the given identifier and no parameters.
    *
    * @param commandId
    *            The identifier of the command to execute; must not be
    *            <code>null</code>.
    * @param event
    *            The SWT event triggering the command execution; may be
    *            <code>null</code>.
    * @return The return value from the execution; may be <code>null</code>.
    * @throws ExecutionException
    *             If the handler has problems executing this command.
    * @throws NotDefinedException
    *             If the command you are trying to execute is not defined.
    * @throws NotEnabledException
    *             If the command you are trying to execute is not enabled.
    * @throws NotHandledException
    *             If there is no handler.
    * @since 3.2
    * @see Command#executeWithChecks(ExecutionEvent)
    */
   virtual Object::Pointer ExecuteCommand(const QString& commandId,
                                          const SmartPointer<const UIElement>& uielement) = 0;
 
   /**
    * Executes the given parameterized command.
    *
    * @param command
    *            The parameterized command to be executed; must not be
    *            <code>null</code>.
    * @param event
    *            The SWT event triggering the command execution; may be
    *            <code>null</code>.
    * @return The return value from the execution; may be <code>null</code>.
    * @throws ExecutionException
    *             If the handler has problems executing this command.
    * @throws NotDefinedException
    *             If the command you are trying to execute is not defined.
    * @throws NotEnabledException
    *             If the command you are trying to execute is not enabled.
    * @throws NotHandledException
    *             If there is no handler.
    * @since 3.2
    * @see Command#executeWithChecks(ExecutionEvent)
    */
   virtual Object::Pointer ExecuteCommand(const SmartPointer<ParameterizedCommand>& command,
                                          const SmartPointer<const UIElement>& uielement) = 0;
 
   /**
    * Executes the given parameterized command in the provided context. It
    * takes care of finding the correct active handler given the context, calls
    * {@link IHandler2#setEnabled(Object)} to update the enabled state if
    * supported, and executes with that handler.
    *
    * @param command
    *            The parameterized command to be executed; must not be
    *            <code>null</code>.
    * @param event
    *            The SWT event triggering the command execution; may be
    *            <code>null</code>.
    * @param context
    *            the evaluation context to run against. Must not be
    *            <code>null</code>
    * @return The return value from the execution; may be <code>null</code>.
    * @throws ExecutionException
    *             If the handler has problems executing this command.
    * @throws NotDefinedException
    *             If the command you are trying to execute is not defined.
    * @throws NotEnabledException
    *             If the command you are trying to execute is not enabled.
    * @throws NotHandledException
    *             If there is no handler.
    * @since 3.4
    * @see Command#executeWithChecks(ExecutionEvent)
    * @see #createContextSnapshot(boolean)
    */
   virtual Object::Pointer ExecuteCommandInContext(
       const SmartPointer<ParameterizedCommand>& command,
       const SmartPointer<const UIElement>& uielement,
       const SmartPointer<IEvaluationContext>& context) = 0;
 
   /**
    * This method creates a copy of the application context returned by
    * {@link #getCurrentState()}.
    *
    * @param includeSelection
    *            if <code>true</code>, include the default variable and
    *            selection variables
    * @return an context filled with the current set of variables. If selection
    *         is not included, the default variable is an empty collection
-   * @since 3.4
    */
   virtual SmartPointer<IEvaluationContext> CreateContextSnapshot(bool includeSelection) = 0;
 
   /**
    * Returns an evaluation context representing the current state of the
    * world. This is equivalent to the application context required by
    * {@link ExecutionEvent}.
    *
    * @return the current state of the application; never <code>null</code>.
    * @see ParameterizedCommand#executeWithChecks(Object, Object)
    * @see ExecutionEvent#ExecutionEvent(Command, java.util.Map, Object,
    *      Object)
    * @see org.eclipse.ui.services.IEvaluationService
    */
-  virtual IEvaluationContext* GetCurrentState() const = 0;
+  virtual SmartPointer<IEvaluationContext> GetCurrentState() const = 0;
 
   /**
    * <p>
    * Reads the handler information from the registry. This will overwrite any
    * of the existing information in the handler service. This method is
    * intended to be called during start-up. When this method completes, this
    * handler service will reflect the current state of the registry.
    * </p>
    */
   virtual void ReadRegistry() = 0;
 
   /**
    * Sets the help context identifier to associate with a particular handler.
    *
    * @param handler
    *            The handler with which to register a help context identifier;
    *            must not be <code>null</code>.
    * @param helpContextId
    *            The help context identifier to register; may be
    *            <code>null</code> if the help context identifier should be
    *            removed.
    * @since 3.2
    */
   virtual void SetHelpContextId(const SmartPointer<IHandler>& handler, const QString& helpContextId) = 0;
 };
 
 }
 
-Q_DECLARE_INTERFACE(berry::IHandlerService, "org.blueberry.ui.qt.IHandlerService")
+Q_DECLARE_INTERFACE(berry::IHandlerService, "org.blueberry.ui.IHandlerService")
 
 #endif /* BERRYIHANDLERSERVICE_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryRadioState.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryRadioState.cpp
new file mode 100644
index 0000000000..c8b15da5c7
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryRadioState.cpp
@@ -0,0 +1,91 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berryRadioState.h"
+
+#include "berryObjectString.h"
+#include "berryObjectStringMap.h"
+
+#include "berryIPreferences.h"
+
+namespace berry {
+
+const QString RadioState::STATE_ID = "org.blueberry.ui.commands.radioState";
+const QString RadioState::PARAMETER_ID = "org.blueberry.ui.commands.radioStateParameter";
+
+RadioState::RadioState()
+{
+  SetShouldPersist(true);
+}
+
+void RadioState::SetInitializationData(const SmartPointer<IConfigurationElement>& /*config*/,
+                                       const QString& /*propertyName*/, const Object::Pointer& data)
+{
+  bool shouldPersist = true; // persist by default
+  if (data.Cast<ObjectString>())
+  {
+    SetValue(data);
+  }
+  else if (ObjectStringMap::Pointer parameters = data.Cast<ObjectStringMap>())
+  {
+    const QString defaultString = parameters->value("default");
+    if (!defaultString.isNull())
+    {
+      Object::Pointer value(new ObjectString(defaultString));
+      SetValue(value);
+    }
+
+    const QString persistedString = parameters->value("persisted");
+    if (!persistedString.isNull()
+        && persistedString.compare("false", Qt::CaseInsensitive) == 0)
+      shouldPersist = false;
+  }
+  SetShouldPersist(shouldPersist);
+}
+
+void RadioState::Load(const SmartPointer<IPreferences>& store, const QString& preferenceKey)
+{
+  if (!ShouldPersist())
+    return;
+
+  const QString prefValue = store->Get(preferenceKey, QString());
+  if (!prefValue.isEmpty())
+  {
+    Object::Pointer value(new ObjectString(prefValue));
+    SetValue(value);
+  }
+}
+
+void RadioState::Save(const SmartPointer<IPreferences>& store, const QString& preferenceKey)
+{
+  if (!ShouldPersist())
+    return;
+
+  const Object::Pointer value = GetValue();
+  if (ObjectString::Pointer objStr = value.Cast<ObjectString>())
+  {
+    store->Put(preferenceKey, *objStr);
+  }
+}
+
+void RadioState::SetValue(const Object::Pointer& value)
+{
+  if (!(value.Cast<ObjectString>()))
+    return; // we set only String values
+  PersistentState::SetValue(value);
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryRadioState.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryRadioState.h
new file mode 100644
index 0000000000..d01a580a01
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryRadioState.h
@@ -0,0 +1,75 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYRADIOSTATE_H
+#define BERRYRADIOSTATE_H
+
+#include "internal/berryPersistentState.h"
+#include "berryIExecutableExtension.h"
+
+namespace berry {
+
+/**
+ * This state supports a radio-button like command, where the value of the
+ * parameterized command is stored as state. The command must define a state
+ * using the {@link #STATE_ID} id and a string commandParameter using the
+ * {@link #PARAMETER_ID} id. Menu contributions supplied by
+ * <code>org.eclipse.ui.menus</code> can then set the {@link #PARAMETER_ID}.
+ * <p>
+ * When parsing from the registry, this state understands two parameters:
+ * <code>default</code>, which is the default value for this item; and
+ * <code>persisted</code>, which is whether the state should be persisted
+ * between sessions. The <code>default</code> parameter has no default value and
+ * must be specified in one of its forms, and the <code>persisted</code>
+ * parameter defaults to <code>true</code>. If only one parameter is passed
+ * (i.e., using the class name followed by a colon), then it is assumed to be
+ * the <code>default</code> parameter.
+ * </p>
+ *
+ * @see HandlerUtil#updateRadioState(org.eclipse.core.commands.Command, String)
+ * @see HandlerUtil#matchesRadioState(org.eclipse.core.commands.ExecutionEvent)
+ */
+class RadioState : public PersistentState, public IExecutableExtension
+{
+
+public:
+
+  /**
+   * The state ID for a radio state understood by the system.
+   */
+  static const QString STATE_ID; // = "org.blueberry.ui.commands.radioState";
+
+  /**
+   * The parameter ID for a radio state understood by the system.
+   */
+  static const QString PARAMETER_ID; // = "org.blueberry.ui.commands.radioStateParameter";
+
+  RadioState();
+
+  void SetInitializationData(const SmartPointer<IConfigurationElement>& config,
+                             const QString& propertyName, const Object::Pointer& data);
+
+  void Load(const SmartPointer<IPreferences>& store, const QString& preferenceKey);
+
+  void Save(const SmartPointer<IPreferences>& store, const QString& preferenceKey);
+
+  void SetValue(const Object::Pointer& value);
+
+};
+
+}
+
+#endif // BERRYRADIOSTATE_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryRegistryToggleState.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryRegistryToggleState.cpp
new file mode 100644
index 0000000000..0b90fe69cc
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryRegistryToggleState.cpp
@@ -0,0 +1,78 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berryRegistryToggleState.h"
+
+#include "berryObjects.h"
+#include "berryObjectString.h"
+#include "berryObjectStringMap.h"
+
+namespace berry {
+
+const QString RegistryToggleState::STATE_ID = "org.blueberry.ui.commands.toggleState";
+
+void RegistryToggleState::SetInitializationData(
+    const SmartPointer<IConfigurationElement>& /*configurationElement*/,
+    const QString& /*propertyName*/, const Object::Pointer& data)
+{
+  if (ObjectString::Pointer objStr = data.Cast<ObjectString>())
+  {
+    // This is the default value.
+    ReadDefault(*objStr);
+    SetShouldPersist(true);
+  }
+  else if (ObjectStringMap::Pointer parameters = data.Cast<ObjectStringMap>())
+  {
+    QString defaultObject = parameters->value("default");
+    if (!defaultObject.isNull())
+    {
+      ReadDefault(defaultObject);
+    }
+
+    QString persistedObject = parameters->value("persisted");
+    if (!persistedObject.isNull())
+    {
+      ReadPersisted(persistedObject);
+    }
+  }
+  else
+  {
+    SetShouldPersist(true);
+  }
+}
+
+void RegistryToggleState::ReadDefault(const QString& defaultString)
+{
+  if (defaultString.compare("true", Qt::CaseInsensitive) == 0)
+  {
+    Object::Pointer newValue(new ObjectBool(true));
+    SetValue(newValue);
+  }
+}
+
+void RegistryToggleState::ReadPersisted(const QString& persistedString)
+{
+  if (persistedString.compare("false", Qt::CaseInsensitive) == 0)
+  {
+    SetShouldPersist(false);
+  }
+  else
+  {
+    SetShouldPersist(true);
+  }
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryRegistryToggleState.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryRegistryToggleState.h
new file mode 100644
index 0000000000..cfc8be55ab
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryRegistryToggleState.h
@@ -0,0 +1,83 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYREGISTRYTOGGLESTATE_H
+#define BERRYREGISTRYTOGGLESTATE_H
+
+#include "berryToggleState.h"
+#include "berryIExecutableExtension.h"
+
+namespace berry {
+
+/**
+ * <p>
+ * A toggle state that can be read from the registry. This stores a piece of
+ * boolean state information.
+ * </p>
+ * <p>
+ * When parsing from the registry, this state understands two parameters:
+ * <code>default</code>, which is the default value for this item; and
+ * <code>persisted</code>, which is whether the state should be persisted
+ * between sessions. The <code>default</code> parameter defaults to
+ * <code>false</code>, and the <code>persisted</code> parameter defaults to
+ * <code>true</code>. If only one parameter is passed (i.e., using the class
+ * name followed by a colon), then it is assumed to be the <code>default</code>
+ * parameter.
+ * </p>
+ * <p>
+ * Clients may instantiate this class, but must not extend.
+ * </p>
+ */
+class RegistryToggleState : public ToggleState, public IExecutableExtension
+{
+
+public:
+
+  /**
+   * The state ID for a toggle state understood by the system.
+   */
+  static const QString STATE_ID; // = "org.blueberry.ui.commands.toggleState";
+
+  void SetInitializationData(const SmartPointer<IConfigurationElement>& configurationElement,
+                             const QString& propertyName, const Object::Pointer& data);
+
+private:
+
+  /**
+   * Reads the <code>default</code> parameter from the given string. This
+   * converts the string to a boolean, using <code>true</code> as the
+   * default.
+   *
+   * @param defaultString
+   *            The string to parse; may be <code>null</code>.
+   */
+  void ReadDefault(const QString& defaultString);
+
+  /**
+   * Reads the <code>persisted</code> parameter from the given string. This
+   * converts the string to a boolean, using <code>true</code> as the
+   * default.
+   *
+   * @param persistedString
+   *            The string to parse; may be <code>null</code>.
+   */
+  void ReadPersisted(const QString& persistedString);
+
+};
+
+}
+
+#endif // BERRYREGISTRYTOGGLESTATE_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryShowViewHandler.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryShowViewHandler.cpp
index 45433620e0..53e133686f 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryShowViewHandler.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryShowViewHandler.cpp
@@ -1,118 +1,117 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "tweaklets/berryWorkbenchTweaklet.h"
 
 #include "berryShowViewHandler.h"
 #include "berryHandlerUtil.h"
 
 #include "dialogs/berryIShowViewDialog.h"
 
 #include "berryUIException.h"
 #include "berryIWorkbenchPage.h"
 #include "berryIViewDescriptor.h"
 #include "berryPlatformUI.h"
 
 #include <berryCommandExceptions.h>
 
 #include <vector>
 
 namespace berry
 {
 
-const QString ShowViewHandler::PARAMETER_NAME_VIEW_ID = "org.blueberry.ui.showView.viewId"; //$NON-NLS-1$
+const QString ShowViewHandler::PARAMETER_NAME_VIEW_ID = "org.blueberry.ui.views.showView.viewId";
 
 ShowViewHandler::ShowViewHandler()
 {
 }
 
-Object::Pointer ShowViewHandler::Execute(
-    const ExecutionEvent::Pointer event)
+Object::Pointer ShowViewHandler::Execute(const ExecutionEvent::ConstPointer& event)
 {
-  IWorkbenchWindow::Pointer window = HandlerUtil::GetActiveWorkbenchWindowChecked(event);
+  IWorkbenchWindow::ConstPointer window = HandlerUtil::GetActiveWorkbenchWindowChecked(event);
   // Get the view identifier, if any.
   const ExecutionEvent::ParameterMap& parameters = event->GetParameters();
   ExecutionEvent::ParameterMap::const_iterator result = parameters.find(PARAMETER_NAME_VIEW_ID);
   QString value;
   if (result != parameters.end()) value = result.value();
 
   if (value.isEmpty())
   {
     this->OpenOther(window);
   }
   else
   {
     try
     {
       this->OpenView(value, window);
     }
     catch (const PartInitException& e)
     {
       throw ExecutionException("Part could not be initialized", e);
     }
   }
 
   return Object::Pointer(0);
 }
 
-void ShowViewHandler::OpenOther(IWorkbenchWindow::Pointer window)
+void ShowViewHandler::OpenOther(IWorkbenchWindow::ConstPointer window)
 {
   const IWorkbenchPage::Pointer page = window->GetActivePage();
   if (page.IsNull())
   {
     return;
   }
 
   IShowViewDialog::Pointer dialog = Tweaklets::Get(WorkbenchTweaklet::KEY)->CreateStandardDialog(WorkbenchTweaklet::DIALOG_ID_SHOW_VIEW).Cast<IShowViewDialog>();
   if (dialog.IsNull()) return;
 
   int returnCode = dialog->Open();
 
   if (returnCode == IDialog::CANCEL)
   {
     return;
   }
 
   const QList<IViewDescriptor::Pointer> descriptors =
       dialog->GetSelection();
-  for (unsigned int i = 0; i < descriptors.size(); ++i)
+  for (int i = 0; i < descriptors.size(); ++i)
   {
     try
     {
       this->OpenView(descriptors[i]->GetId(), window);
     }
     catch (PartInitException e)
     {
 //      StatusUtil.handleStatus(e.getStatus(),
 //          WorkbenchMessages.ShowView_errorTitle
 //          + ": " + e.getMessage(), //$NON-NLS-1$
 //          StatusManager.SHOW);
     }
   }
 }
 
-void ShowViewHandler::OpenView(const QString& viewId, IWorkbenchWindow::Pointer activeWorkbenchWindow)
+void ShowViewHandler::OpenView(const QString& viewId, IWorkbenchWindow::ConstPointer activeWorkbenchWindow)
 {
   const IWorkbenchPage::Pointer activePage = activeWorkbenchWindow->GetActivePage();
   if (activePage.IsNull())
   {
     return;
   }
 
   activePage->ShowView(viewId);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryShowViewHandler.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryShowViewHandler.h
index 6c1670da62..0c002d75a4 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryShowViewHandler.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryShowViewHandler.h
@@ -1,80 +1,80 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYSHOWVIEWHANDLER_H_
 #define BERRYSHOWVIEWHANDLER_H_
 
 #include <berryAbstractHandler.h>
 #include <berryExecutionEvent.h>
 
 #include "berryIWorkbenchWindow.h"
 #include <org_blueberry_ui_qt_Export.h>
 
 namespace berry
 {
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * Shows the given view. If no view is specified in the parameters, then this
  * opens the view selection dialog.
  *
  * @since 3.1
  */
 class BERRY_UI_QT ShowViewHandler : public AbstractHandler
 {
+  Q_OBJECT
 
 public:
   berryObjectMacro(ShowViewHandler);
 
 private:
 
   /**
    * The name of the parameter providing the view identifier.
    */
   static const QString PARAMETER_NAME_VIEW_ID;
 
 public:
 
   /**
    * Creates a new ShowViewHandler that will open the view in its default location.
    */
   ShowViewHandler();
 
-  Object::Pointer Execute(
-      const ExecutionEvent::Pointer event);
+  Object::Pointer Execute(const ExecutionEvent::ConstPointer& event);
 
 private:
 
   /**
    * Opens a view selection dialog, allowing the user to chose a view.
    */
-  void OpenOther(IWorkbenchWindow::Pointer window);
+  void OpenOther(IWorkbenchWindow::ConstPointer window);
 
   /**
    * Opens the view with the given identifier.
    *
    * @param viewId
    *            The view to open; must not be <code>null</code>
    * @throws PartInitException
    *             If the part could not be initialized.
    */
-  void OpenView(const QString& viewId, IWorkbenchWindow::Pointer activeWorkbenchWindow);
+  void OpenView(const QString& viewId, IWorkbenchWindow::ConstPointer activeWorkbenchWindow);
 };
 
 }
 
 #endif /*BERRYSHOWVIEWHANDLER_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryToggleState.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryToggleState.cpp
new file mode 100644
index 0000000000..f9c6d8db3a
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryToggleState.cpp
@@ -0,0 +1,72 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berryToggleState.h"
+
+#include "berryObjects.h"
+
+#include "berryIPreferences.h"
+
+#include <QStringList>
+
+namespace berry {
+
+ToggleState::ToggleState()
+{
+  Object::Pointer value(new ObjectBool(false));
+  SetValue(value);
+}
+
+void ToggleState::Load(const SmartPointer<IPreferences>& store,
+                       const QString& preferenceKey)
+{
+  bool currentValue = GetValue().Cast<ObjectBool>()->GetValue();
+  //store.setDefault(preferenceKey, currentValue);
+  if (ShouldPersist() && (store->Keys().contains(preferenceKey)))
+  {
+    const bool value = store->GetBool(preferenceKey, currentValue);
+    if (value != currentValue)
+    {
+      Object::Pointer newValue(new ObjectBool(value));
+      SetValue(newValue);
+    }
+  }
+}
+
+void ToggleState::Save(const SmartPointer<IPreferences>& store,
+                       const QString& preferenceKey)
+{
+  if (ShouldPersist())
+  {
+    const Object::Pointer value = GetValue();
+    if (ObjectBool::Pointer boolValue = value.Cast<ObjectBool>())
+    {
+      store->PutBool(preferenceKey, boolValue->GetValue());
+    }
+  }
+}
+
+void ToggleState::SetValue(const Object::Pointer& value)
+{
+  if (!(value.Cast<ObjectBool>()))
+  {
+    throw ctkInvalidArgumentException("ToggleState takes a Boolean as a value");
+  }
+
+  PersistentState::SetValue(value);
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryToggleState.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryToggleState.h
new file mode 100644
index 0000000000..05831954f9
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/handlers/berryToggleState.h
@@ -0,0 +1,59 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYTOGGLESTATE_H
+#define BERRYTOGGLESTATE_H
+
+#include "internal/berryPersistentState.h"
+
+namespace berry {
+
+/**
+ * <p>
+ * A piece of state storing a \c bool.
+ * </p>
+ * <p>
+ * If this state is registered using {@link IMenuStateIds#STYLE}, then it will
+ * control the presentation of the command if displayed in the menus, tool bars
+ * or status line.
+ * </p>
+ * <p>
+ * Clients may instantiate this class, but must not extend.
+ * </p>
+ */
+class ToggleState : public PersistentState
+{
+
+public:
+
+  /**
+   * Constructs a new <code>ToggleState</code>. By default, the toggle is
+   * off (e.g., <code>false</code>).
+   */
+  ToggleState();
+
+  void Load(const SmartPointer<IPreferences>& store,
+            const QString& preferenceKey);
+
+  void Save(const SmartPointer<IPreferences>& store,
+            const QString& preferenceKey);
+
+  void SetValue(const Object::Pointer& value);
+};
+
+}
+
+#endif // BERRYTOGGLESTATE_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryAbstractPartSelectionTracker.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryAbstractPartSelectionTracker.cpp
index d1e5f61f83..251eaf7fb9 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryAbstractPartSelectionTracker.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryAbstractPartSelectionTracker.cpp
@@ -1,130 +1,131 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryAbstractPartSelectionTracker.h"
 
 #include "berryIPostSelectionProvider.h"
 #include "berryINullSelectionListener.h"
 
 #include "util/berrySafeRunnable.h"
 
 #include <berrySafeRunner.h>
 
 namespace berry
 {
 
 class SafeSelectionRunnable : public SafeRunnable
 {
 public:
 
   berryObjectMacro(SafeSelectionRunnable)
 
-  ISelectionListener::Pointer l;
+  ISelectionListener* l;
 
-  SafeSelectionRunnable(IWorkbenchPart::Pointer part, ISelection::ConstPointer sel)
+  SafeSelectionRunnable(const IWorkbenchPart::Pointer& part,
+                        const ISelection::ConstPointer& sel)
   : p(part), s(sel)
   {}
 
   void Run()
   {
     l->SelectionChanged(p, s);
   }
 
 private:
 
-  IWorkbenchPart::Pointer p;
-  ISelection::ConstPointer s;
+  const IWorkbenchPart::Pointer p;
+  const ISelection::ConstPointer s;
 };
 
 AbstractPartSelectionTracker::AbstractPartSelectionTracker(
     const QString& partId)
 {
   this->SetPartId(partId);
 }
 
 
 void AbstractPartSelectionTracker::AddSelectionListener(
-    ISelectionListener::Pointer listener)
+    ISelectionListener* listener)
 {
   fListeners.push_back(listener);
 }
 
 void AbstractPartSelectionTracker::AddPostSelectionListener(
-    ISelectionListener::Pointer listener)
+    ISelectionListener* listener)
 {
   fPostListeners.push_back(listener);
 }
 
 void AbstractPartSelectionTracker::RemoveSelectionListener(
-    ISelectionListener::Pointer listener)
+    ISelectionListener* listener)
 {
   fListeners.removeAll(listener);
 }
 
 void AbstractPartSelectionTracker::RemovePostSelectionListener(
-    ISelectionListener::Pointer listener)
+    ISelectionListener* listener)
 {
   fPostListeners.removeAll(listener);
 }
 
 AbstractPartSelectionTracker::~AbstractPartSelectionTracker()
 {
 
 }
 
-void AbstractPartSelectionTracker::FireSelection(IWorkbenchPart::Pointer part,
-    ISelection::ConstPointer sel)
+void AbstractPartSelectionTracker::FireSelection(const IWorkbenchPart::Pointer& part,
+                                                 const ISelection::ConstPointer& sel)
 {
   SafeSelectionRunnable::Pointer runnable(new SafeSelectionRunnable(part, sel));
-  for (QList<ISelectionListener::Pointer>::iterator i = fListeners.begin();
+  for (QList<ISelectionListener*>::iterator i = fListeners.begin();
       i != fListeners.end(); ++i)
   {
-    ISelectionListener::Pointer l = *i;
-    if ((part && sel) || l.Cast<INullSelectionListener>())
+    ISelectionListener* l = *i;
+    if ((part && sel) || dynamic_cast<INullSelectionListener*>(l))
     {
       runnable->l = l;
       SafeRunner::Run(runnable);
     }
   }
 }
 
-void AbstractPartSelectionTracker::FirePostSelection(IWorkbenchPart::Pointer part,
-    ISelection::ConstPointer sel)
+void AbstractPartSelectionTracker::FirePostSelection(const IWorkbenchPart::Pointer& part,
+                                                     const ISelection::ConstPointer& sel)
 {
   SafeSelectionRunnable::Pointer runnable(new SafeSelectionRunnable(part, sel));
-  for (QList<ISelectionListener::Pointer>::iterator i = fPostListeners.begin();
+  for (QList<ISelectionListener*>::iterator i = fPostListeners.begin();
       i != fPostListeners.end(); ++i)
   {
-    ISelectionListener::Pointer l = *i;
-    if ((part && sel) || l.Cast<INullSelectionListener>())
+    ISelectionListener* l = *i;
+    if ((part && sel) || dynamic_cast<INullSelectionListener*>(l))
     {
       runnable->l = l;
       SafeRunner::Run(runnable);
     }
   }
 }
 
 QString AbstractPartSelectionTracker::GetPartId()
 {
   return fPartId;
 }
 
 void AbstractPartSelectionTracker::SetPartId(const QString& partId)
 {
   fPartId = partId;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryAbstractPartSelectionTracker.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryAbstractPartSelectionTracker.h
index 953ee7bb7a..0e38fbca1a 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryAbstractPartSelectionTracker.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryAbstractPartSelectionTracker.h
@@ -1,143 +1,143 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYABSTRACTPARTSELECTIONTRACKER_H_
 #define BERRYABSTRACTPARTSELECTIONTRACKER_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
 
 #include "berryISelectionService.h"
 #include "berryISelectionListener.h"
 #include "berryIWorkbenchPart.h"
 
 
 namespace berry {
 
 class AbstractPartSelectionTracker : public virtual Object
 {
 
 public:
   berryObjectMacro(AbstractPartSelectionTracker)
 
 private:
 
   /**
    * List of selection listeners for this tracker
    */
-  QList<ISelectionListener::Pointer> fListeners;
+  QList<ISelectionListener*> fListeners;
 
   /**
    * List of post selection listeners for this tracker
    */
-  QList<ISelectionListener::Pointer> fPostListeners;
+  QList<ISelectionListener*> fPostListeners;
 
   /**
    * The id of the part this tracker tracks
    */
   QString fPartId;
 
 public:
 
   /**
    * Constructs a part selection tracker for the part with the given id.
    *
    * @param id part identifier
    */
   AbstractPartSelectionTracker(const QString& partId);
 
   /**
    * Adds a selection listener to this tracker
    *
    * @param listener the listener to add
    */
-  void AddSelectionListener(ISelectionListener::Pointer listener);
+  void AddSelectionListener(ISelectionListener* listener);
 
   /**
    * Adds a post selection listener to this tracker
    *
    * @param listener the listener to add
    */
-  void AddPostSelectionListener(ISelectionListener::Pointer listener);
+  void AddPostSelectionListener(ISelectionListener* listener);
 
   /**
    * Returns the selection from the part being tracked,
    * or <code>null</code> if the part is closed or has no selection.
    */
   virtual ISelection::ConstPointer GetSelection() = 0;
 
   /**
    * Removes a selection listener from this tracker.
    *
    * @param listener the listener to remove
    */
-  void RemoveSelectionListener(ISelectionListener::Pointer listener);
+  void RemoveSelectionListener(ISelectionListener* listener);
 
   /**
    * Removes a post selection listener from this tracker.
    *
    * @param listener the listener to remove
    */
-  void RemovePostSelectionListener(ISelectionListener::Pointer listener);
+  void RemovePostSelectionListener(ISelectionListener* listener);
 
   /**
    * Disposes this selection tracker. This removes all listeners currently registered.
    */
   ~AbstractPartSelectionTracker();
 
 protected:
 
   /**
    * Fires a selection event to the listeners.
    *
    * @param part the part or <code>null</code> if no active part
    * @param sel the selection or <code>null</code> if no active selection
    * @param listeners the list of listeners to notify
    */
-  void FireSelection(IWorkbenchPart::Pointer part, ISelection::ConstPointer sel);
+  void FireSelection(const IWorkbenchPart::Pointer& part, const ISelection::ConstPointer& sel);
 
   /**
    * Fires a post selection event to the listeners.
    *
    * @param part the part or <code>null</code> if no active part
    * @param sel the selection or <code>null</code> if no active selection
    * @param listeners the list of listeners to notify
    */
-  void FirePostSelection(IWorkbenchPart::Pointer part, ISelection::ConstPointer sel);
+  void FirePostSelection(const IWorkbenchPart::Pointer& part, const ISelection::ConstPointer& sel);
 
   /**
    * Returns the id of the part that this tracks.
    *
    * @return part identifier
    */
   QString GetPartId();
 
 
 private:
 
   /**
    * Sets the id of the part that this tracks.
    *
    * @param id view identifier
    */
   void SetPartId(const QString& partId);
 
 };
 
 }
 
 #endif /* BERRYABSTRACTPARTSELECTIONTRACKER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryAbstractSelectionService.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryAbstractSelectionService.cpp
index 80f2848abd..9ddfe6528c 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryAbstractSelectionService.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryAbstractSelectionService.cpp
@@ -1,264 +1,263 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryAbstractSelectionService.h"
 #include "berryWorkbenchPlugin.h"
 
 #include "berryIPostSelectionProvider.h"
 #include "berryINullSelectionListener.h"
 
 namespace berry
 {
 
 //ISelectionService::SelectionEvents& AbstractSelectionService::GetSelectionEvents(const QString& partId)
 //{
 //  if (partId.empty())
 //  {
 //    return selectionEvents;
 //  }
 //
 //  return this->GetPerPartTracker(partId)->GetSelectionEvents();
 //}
 
 AbstractSelectionService::AbstractSelectionService()
+  : selListener(new SelectionListener(this))
+  , postSelListener(new PostSelectionListener(this))
 {
-  selListener = new SelectionListener(this);
-  postSelListener = new PostSelectionListener(this);
 }
 
 AbstractSelectionService::SelectionListener::SelectionListener(AbstractSelectionService* service)
  : m_SelectionService(service)
 { }
 
-void AbstractSelectionService::SelectionListener::SelectionChanged(SelectionChangedEvent::Pointer event)
+void AbstractSelectionService::SelectionListener::SelectionChanged(const SelectionChangedEvent::Pointer& event)
 {
   m_SelectionService->FireSelection(m_SelectionService->activePart, event->GetSelection());
 }
 
 AbstractSelectionService::PostSelectionListener::PostSelectionListener(AbstractSelectionService* service)
  : m_SelectionService(service)
 { }
 
 void AbstractSelectionService::PostSelectionListener::SelectionChanged(
-    SelectionChangedEvent::Pointer event)
+    const SelectionChangedEvent::Pointer& event)
 {
   m_SelectionService->FirePostSelection(m_SelectionService->activePart, event->GetSelection());
 }
 
-void AbstractSelectionService::AddSelectionListener(ISelectionListener::Pointer l)
+void AbstractSelectionService::AddSelectionListener(ISelectionListener* l)
 {
   fListeners.push_back(l);
 }
 
 void AbstractSelectionService::AddSelectionListener(const QString& partId,
-    ISelectionListener::Pointer listener)
+                                                    ISelectionListener* listener)
 {
   this->GetPerPartTracker(partId)->AddSelectionListener(listener);
 }
 
-void AbstractSelectionService::AddPostSelectionListener(
-    ISelectionListener::Pointer l)
+void AbstractSelectionService::AddPostSelectionListener(ISelectionListener* l)
 {
   fPostListeners.push_back(l);
 }
 
 void AbstractSelectionService::AddPostSelectionListener(const QString& partId,
-    ISelectionListener::Pointer listener)
+                                                        ISelectionListener* listener)
 {
   this->GetPerPartTracker(partId)->AddPostSelectionListener(listener);
 }
 
-void AbstractSelectionService::RemoveSelectionListener(ISelectionListener::Pointer l)
+void AbstractSelectionService::RemoveSelectionListener(ISelectionListener* l)
 {
   fListeners.removeAll(l);
 }
 
 void AbstractSelectionService::RemovePostSelectionListener(
-    const QString& partId, ISelectionListener::Pointer listener)
+    const QString& partId, ISelectionListener* listener)
 {
   this->GetPerPartTracker(partId)->RemovePostSelectionListener(listener);
 }
 
 void AbstractSelectionService::RemovePostSelectionListener(
-    ISelectionListener::Pointer l)
+    ISelectionListener* l)
 {
   fPostListeners.removeAll(l);
 }
 
 void AbstractSelectionService::RemoveSelectionListener(const QString& partId,
-    ISelectionListener::Pointer listener)
+                                                       ISelectionListener* listener)
 {
   this->GetPerPartTracker(partId)->RemoveSelectionListener(listener);
 }
 
-void AbstractSelectionService::FireSelection(IWorkbenchPart::Pointer part,
-    ISelection::ConstPointer sel)
+void AbstractSelectionService::FireSelection(const IWorkbenchPart::Pointer& part,
+                                             const ISelection::ConstPointer& sel)
 {
-  for (QList<ISelectionListener::Pointer>::iterator i = fListeners.begin();
+  for (QList<ISelectionListener*>::iterator i = fListeners.begin();
       i != fListeners.end(); ++i)
   {
-    ISelectionListener::Pointer l = *i;
-    if ((part && sel) || l.Cast<INullSelectionListener>())
+    ISelectionListener* l = *i;
+    if ((part && sel) || dynamic_cast<INullSelectionListener*>(l))
     {
       try
       {
         l->SelectionChanged(part, sel);
       }
       catch (const ctkRuntimeException& rte)
       {
         WorkbenchPlugin::Log(rte);
       }
       catch (const std::exception& e)
       {
         WorkbenchPlugin::Log(e.what());
       }
     }
   }
 }
 
-void AbstractSelectionService::FirePostSelection(IWorkbenchPart::Pointer part,
-    ISelection::ConstPointer sel)
+void AbstractSelectionService::FirePostSelection(const IWorkbenchPart::Pointer& part,
+                                                 const ISelection::ConstPointer& sel)
 {
-  for (QList<ISelectionListener::Pointer>::iterator i = fPostListeners.begin();
+  for (QList<ISelectionListener*>::iterator i = fPostListeners.begin();
       i != fPostListeners.end(); ++i)
   {
-    ISelectionListener::Pointer l = *i;
-    if ((part && sel) || l.Cast<INullSelectionListener>())
+    ISelectionListener* l = *i;
+    if ((part && sel) || dynamic_cast<INullSelectionListener*>(l))
     {
       try
       {
         l->SelectionChanged(part, sel);
       }
       catch (const ctkRuntimeException& rte)
       {
         WorkbenchPlugin::Log(rte);
       }
       catch (const std::exception& e)
       {
         WorkbenchPlugin::Log(e.what());
       }
     }
   }
 }
 
 AbstractPartSelectionTracker::Pointer AbstractSelectionService::GetPerPartTracker(
     const QString& partId)
 {
   AbstractPartSelectionTracker::Pointer tracker;
   QHash<QString, AbstractPartSelectionTracker::Pointer>::const_iterator res = perPartTrackers.find(partId);
   if (res == perPartTrackers.end())
   {
     tracker = this->CreatePartTracker(partId);
     perPartTrackers[partId] = tracker;
   }
   else
   {
     tracker = res.value();
   }
 
   return tracker;
 }
 
 ISelection::ConstPointer AbstractSelectionService::GetSelection() const
 {
   if (activeProvider.IsNotNull())
   {
     return activeProvider->GetSelection();
   }
   else
   {
     return ISelection::ConstPointer(0);
   }
 }
 
 ISelection::ConstPointer AbstractSelectionService::GetSelection(const QString& partId)
 {
   return this->GetPerPartTracker(partId)->GetSelection();
 }
 
 void AbstractSelectionService::SetActivePart(IWorkbenchPart::Pointer newPart)
 {
   // Optimize.
   if (newPart == activePart)
   {
     return;
   }
 
   ISelectionProvider::Pointer selectionProvider;
 
   if (newPart.IsNotNull())
   {
     selectionProvider = newPart->GetSite()->GetSelectionProvider();
 
     if (selectionProvider.IsNull())
     {
       newPart = 0;
     }
   }
 
   if (newPart == activePart)
   {
     return;
   }
 
   if (activePart.IsNotNull())
   {
     if (activeProvider.IsNotNull())
     {
-      activeProvider->RemoveSelectionChangedListener(selListener);
+      activeProvider->RemoveSelectionChangedListener(selListener.data());
       if (activeProvider.Cast<IPostSelectionProvider>().IsNotNull())
       {
         activeProvider.Cast<IPostSelectionProvider>()
-        ->RemovePostSelectionChangedListener(postSelListener);
+        ->RemovePostSelectionChangedListener(postSelListener.data());
       }
       else
       {
         activeProvider
-        ->RemoveSelectionChangedListener(postSelListener);
+        ->RemoveSelectionChangedListener(postSelListener.data());
       }
       activeProvider = 0;
     }
     activePart = 0;
   }
 
   activePart = newPart;
 
   if (newPart.IsNotNull())
   {
     activeProvider = selectionProvider;
     // Fire an event if there's an active provider
-    activeProvider->AddSelectionChangedListener(selListener);
+    activeProvider->AddSelectionChangedListener(selListener.data());
     ISelection::ConstPointer sel = activeProvider->GetSelection();
     this->FireSelection(newPart, sel);
     if (activeProvider.Cast<IPostSelectionProvider>().IsNotNull())
     {
       activeProvider.Cast<IPostSelectionProvider>()
-      ->AddPostSelectionChangedListener(postSelListener);
+      ->AddPostSelectionChangedListener(postSelListener.data());
     }
     else
     {
-      activeProvider->AddSelectionChangedListener(postSelListener);
+      activeProvider->AddSelectionChangedListener(postSelListener.data());
     }
     this->FirePostSelection(newPart, sel);
   }
   else
   {
     this->FireSelection(IWorkbenchPart::Pointer(0), ISelection::ConstPointer(0));
     this->FirePostSelection(IWorkbenchPart::Pointer(0), ISelection::ConstPointer(0));
   }
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryAbstractSelectionService.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryAbstractSelectionService.h
index 0037640d98..36012420b0 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryAbstractSelectionService.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryAbstractSelectionService.h
@@ -1,320 +1,321 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYABSTRACTSELECTIONSERVICE_H_
 #define BERRYABSTRACTSELECTIONSERVICE_H_
 
 #include "berryISelectionService.h"
 #include "berryIWorkbenchPage.h"
 #include "berryISelectionChangedListener.h"
 #include "berryISelectionProvider.h"
 
 #include "berryAbstractPartSelectionTracker.h"
 
 #include <map>
 
 namespace berry
 {
 
 /**
  * \ingroup org_blueberry_ui_internal
  *
  * The selection service for a page
  */
 class AbstractSelectionService : public ISelectionService {
 
 private:
 
     IWorkbenchPage* page;
 
     /**
      * The list of selection listeners (not per-part).
      */
-    QList<ISelectionListener::Pointer> fListeners;
+    QList<ISelectionListener*> fListeners;
 
     /**
      * The list of post selection listeners (not per-part).
      */
-    QList<ISelectionListener::Pointer> fPostListeners;
+    QList<ISelectionListener*> fPostListeners;
 
     /**
      * The currently active part.
      */
     IWorkbenchPart::Pointer activePart;
 
     /**
      * The active part's selection provider, remembered in case the part
      * replaces its selection provider after we hooked a listener.
      */
     ISelectionProvider::Pointer activeProvider;
 
     /**
      * Map from part id (String) to per-part tracker (AbstractPartSelectionTracker).
      */
     QHash<QString, AbstractPartSelectionTracker::Pointer> perPartTrackers;
 
     struct SelectionListener : public ISelectionChangedListener
     {
       SelectionListener(AbstractSelectionService* tracker);
 
-      void SelectionChanged(SelectionChangedEvent::Pointer event);
+      void SelectionChanged(const SelectionChangedEvent::Pointer& event);
 
       AbstractSelectionService* m_SelectionService;
     };
 
     friend class PostSelectionListener;
 
 
     struct PostSelectionListener : public ISelectionChangedListener
     {
       PostSelectionListener(AbstractSelectionService* tracker);
 
-      void SelectionChanged(SelectionChangedEvent::Pointer event);
+      void SelectionChanged(const SelectionChangedEvent::Pointer& event);
 
       AbstractSelectionService* m_SelectionService;
     };
 
     friend struct PostSelectionListener;
 
     /**
      * The JFace selection listener to hook on the active part's selection provider.
      */
-    ISelectionChangedListener::Pointer selListener;
+    QScopedPointer<ISelectionChangedListener> selListener;
 
     /**
      * The JFace post selection listener to hook on the active part's selection provider.
      */
-    ISelectionChangedListener::Pointer postSelListener;
+    QScopedPointer<ISelectionChangedListener> postSelListener;
 
 public:
 
     //SelectionEvents& GetSelectionEvents(const QString& partId = "");
 
     /* (non-Javadoc)
      * Method declared on ISelectionService.
      */
-    void AddSelectionListener(ISelectionListener::Pointer l);
+    void AddSelectionListener(ISelectionListener* l);
 
     /* (non-Javadoc)
      * Method declared on ISelectionService.
      */
-    void AddSelectionListener(const QString& partId, ISelectionListener::Pointer listener);
+    void AddSelectionListener(const QString& partId, ISelectionListener* listener);
 
     /* (non-Javadoc)
      * Method declared on ISelectionService.
      */
-    void AddPostSelectionListener(ISelectionListener::Pointer l);
+    void AddPostSelectionListener(ISelectionListener* l);
 
     /* (non-Javadoc)
      * Method declared on ISelectionService.
      */
     void AddPostSelectionListener(const QString& partId,
-            ISelectionListener::Pointer listener);
+            ISelectionListener* listener);
 
     /* (non-Javadoc)
      * Method declared on ISelectionService.
      */
-    void RemoveSelectionListener(ISelectionListener::Pointer l);
+    void RemoveSelectionListener(ISelectionListener* l);
 
     /*
      * (non-Javadoc)
      * Method declared on ISelectionListener.
      */
     void RemovePostSelectionListener(const QString& partId,
-            ISelectionListener::Pointer listener);
+            ISelectionListener* listener);
 
     /* (non-Javadoc)
      * Method declared on ISelectionService.
      */
-    void RemovePostSelectionListener(ISelectionListener::Pointer l);
+    void RemovePostSelectionListener(ISelectionListener* l);
 
     /*
      * (non-Javadoc)
      * Method declared on ISelectionListener.
      */
     void RemoveSelectionListener(const QString& partId,
-            ISelectionListener::Pointer listener);
+            ISelectionListener* listener);
 
 
 protected:
 
     AbstractSelectionService();
 
     /**
      * Fires a selection event to the given listeners.
      *
      * @param part the part or <code>null</code> if no active part
      * @param sel the selection or <code>null</code> if no active selection
      */
-    void FireSelection(IWorkbenchPart::Pointer part, ISelection::ConstPointer sel);
+    void FireSelection(const IWorkbenchPart::Pointer& part,
+                       const ISelection::ConstPointer& sel);
 
     /**
      * Fires a selection event to the given listeners.
      *
      * @param part the part or <code>null</code> if no active part
      * @param sel the selection or <code>null</code> if no active selection
      */
-    void FirePostSelection(IWorkbenchPart::Pointer part,
-            ISelection::ConstPointer sel);
+    void FirePostSelection(const IWorkbenchPart::Pointer& part,
+                           const ISelection::ConstPointer& sel);
 
     /**
      * Returns the per-part selection tracker for the given part id.
      *
      * @param partId part identifier
      * @return per-part selection tracker
      */
     AbstractPartSelectionTracker::Pointer GetPerPartTracker(const QString& partId);
 
     /**
      * Creates a new per-part selection tracker for the given part id.
      *
      * @param partId part identifier
      * @return per-part selection tracker
      */
     virtual AbstractPartSelectionTracker::Pointer CreatePartTracker(
             const QString& partId) const = 0;
 
 
 public:
 
     /**
      * Returns the selection.
      */
     ISelection::ConstPointer GetSelection() const;
 
     /*
      * @see ISelectionService#getSelection(String)
      */
     ISelection::ConstPointer GetSelection(const QString& partId);
 
     /**
      * Sets the current-active part (or null if none)
      *
      * @since 3.1
      *
      * @param newPart the new active part (or null if none)
      */
     void SetActivePart(IWorkbenchPart::Pointer newPart);
 
 //    /**
 //     * Notifies the listener that a part has been activated.
 //     */
 //    public void partActivated(IWorkbenchPart newPart) {
 //        // Optimize.
 //        if (newPart == activePart)
 //            return;
 //
 //        // Unhook selection from the old part.
 //        reset();
 //
 //        // Update active part.
 //        activePart = newPart;
 //
 //        // Hook selection on the new part.
 //        if (activePart != null) {
 //            activeProvider = activePart.getSite().getSelectionProvider();
 //            if (activeProvider != null) {
 //                // Fire an event if there's an active provider
 //                activeProvider.addSelectionChangedListener(selListener);
 //                ISelection sel = activeProvider.getSelection();
 //                fireSelection(newPart, sel);
 //                if (activeProvider instanceof IPostSelectionProvider)
 //                    ((IPostSelectionProvider) activeProvider)
 //                            .addPostSelectionChangedListener(postSelListener);
 //                else
 //                    activeProvider.addSelectionChangedListener(postSelListener);
 //                firePostSelection(newPart, sel);
 //            } else {
 //                //Reset active part. activeProvider may not be null next time this method is called.
 //                activePart = null;
 //            }
 //        }
 //        // No need to fire an event if no active provider, since this was done in reset()
 //    }
 //
 //    /**
 //     * Notifies the listener that a part has been brought to the front.
 //     */
 //    public void partBroughtToTop(IWorkbenchPart newPart) {
 //        // do nothing, the active part has not changed,
 //        // so the selection is unaffected
 //    }
 //
 //    /**
 //     * Notifies the listener that a part has been closed
 //     */
 //    public void partClosed(IWorkbenchPart part) {
 //        // Unhook selection from the part.
 //        if (part == activePart) {
 //            reset();
 //        }
 //    }
 //
 //    /**
 //     * Notifies the listener that a part has been deactivated.
 //     */
 //    public void partDeactivated(IWorkbenchPart part) {
 //        // Unhook selection from the part.
 //        if (part == activePart) {
 //            reset();
 //        }
 //    }
 //
 //    /**
 //     * Notifies the listener that a part has been opened.
 //     */
 //    public void partOpened(IWorkbenchPart part) {
 //        // Wait for activation.
 //    }
 //
 //    /**
 //     * Notifies the listener that a part has been opened.
 //     */
 //    public void partInputChanged(IWorkbenchPart part) {
 //        // 36501 - only process if part is active
 //        if (activePart == part) {
 //            reset();
 //            partActivated(part);
 //        }
 //    }
 //
 //    /**
 //     * Resets the service.  The active part and selection provider are
 //     * dereferenced.
 //     */
 //    public void reset() {
 //        if (activePart != null) {
 //            fireSelection(null, null);
 //            firePostSelection(null, null);
 //            if (activeProvider != null) {
 //                activeProvider.removeSelectionChangedListener(selListener);
 //                if (activeProvider instanceof IPostSelectionProvider)
 //                    ((IPostSelectionProvider) activeProvider)
 //                            .removePostSelectionChangedListener(postSelListener);
 //                else
 //                    activeProvider
 //                            .removeSelectionChangedListener(postSelListener);
 //                activeProvider = null;
 //            }
 //            activePart = null;
 //        }
 //    }
 
 };
 
 }
 
 #endif /*BERRYABSTRACTSELECTIONSERVICE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryActivePartExpression.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryActivePartExpression.cpp
new file mode 100644
index 0000000000..81177b5223
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryActivePartExpression.cpp
@@ -0,0 +1,71 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berryActivePartExpression.h"
+
+#include "berryISources.h"
+#include "berryIWorkbenchPart.h"
+
+namespace berry {
+
+const int ActivePartExpression::HASH_INITIAL = qHash(ActivePartExpression::GetStaticClassName());
+
+ActivePartExpression::ActivePartExpression(IWorkbenchPart* activePart)
+  : activePart(activePart)
+{
+  if (activePart == NULL)
+  {
+    throw ctkInvalidArgumentException("The active part must not be null");
+  }
+}
+
+void ActivePartExpression::CollectExpressionInfo(ExpressionInfo* info) const
+{
+  info->AddVariableNameAccess(ISources::ACTIVE_PART_NAME());
+}
+
+bool ActivePartExpression::operator==(const Object* object) const
+{
+  if (const ActivePartExpression* that = dynamic_cast<const ActivePartExpression*>(object))
+  {
+    return this->activePart->operator ==(that->activePart);
+  }
+
+  return false;
+}
+
+SmartPointer<const EvaluationResult> ActivePartExpression::Evaluate(IEvaluationContext* context) const
+{
+  const Object::ConstPointer variable = context->GetVariable(ISources::ACTIVE_PART_NAME());
+  if (variable == activePart)
+  {
+    return EvaluationResult::TRUE_EVAL;
+  }
+  return EvaluationResult::FALSE_EVAL;
+}
+
+QString ActivePartExpression::ToString() const
+{
+  QString str = "ActivePartExpression(" + activePart->ToString() + ')';
+  return str;
+}
+
+uint ActivePartExpression::ComputeHashCode() const
+{
+  return HASH_INITIAL * HASH_FACTOR + activePart->HashCode();
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryActivePartExpression.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryActivePartExpression.h
new file mode 100644
index 0000000000..c71e0f2074
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryActivePartExpression.h
@@ -0,0 +1,80 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYACTIVEPARTEXPRESSION_H
+#define BERRYACTIVEPARTEXPRESSION_H
+
+#include "berryExpression.h"
+
+namespace berry {
+
+struct IWorkbenchPart;
+
+/**
+ * <p>
+ * An expression that is bound to a particular part instance.
+ * </p>
+ * <p>
+ * This class is not intended for use outside of the
+ * <code>org.blueberry.ui</code> plug-in.
+ * </p>
+ */
+class ActivePartExpression : public Expression
+{
+
+private:
+
+  /**
+   * The seed for the hash code for all schemes.
+   */
+  static const int HASH_INITIAL;
+
+  /**
+   * The part that must be active for this expression to evaluate to
+   * <code>true</code>. This value is never <code>null</code>.
+   */
+  IWorkbenchPart* const activePart;
+
+public:
+
+  berryObjectMacro(berry::ActivePartExpression)
+
+  /**
+   * Constructs a new instance of <code>ActivePartExpression</code>
+   *
+   * @param activePart
+   *            The part to match with the active part; may be
+   *            <code>null</code>
+   */
+  ActivePartExpression(IWorkbenchPart* activePart);
+
+  void CollectExpressionInfo(ExpressionInfo* info) const;
+
+  bool operator==(const Object* object) const;
+
+  SmartPointer<const EvaluationResult> Evaluate(IEvaluationContext* context) const;
+
+  QString ToString() const;
+
+protected:
+
+  uint ComputeHashCode() const;
+
+};
+
+}
+
+#endif // BERRYACTIVEPARTEXPRESSION_H
diff --git a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryAbstractHandler.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryAndExpression.cpp
similarity index 56%
copy from BlueBerry/Bundles/org.blueberry.core.commands/src/berryAbstractHandler.cpp
copy to BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryAndExpression.cpp
index 512a980a11..0f763ec04c 100644
--- a/BlueBerry/Bundles/org.blueberry.core.commands/src/berryAbstractHandler.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryAndExpression.cpp
@@ -1,48 +1,37 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
-#include "berryAbstractHandler.h"
+#include "berryAndExpression.h"
 
 namespace berry
 {
 
-AbstractHandler::AbstractHandler() :
-  baseEnabled(true)
+bool AndExpression::operator==(const Object* object) const
 {
-
-}
-
-bool AbstractHandler::IsEnabled()
-{
-  return baseEnabled;
-}
-
-bool AbstractHandler::IsHandled()
-{
-  return true;
-}
-
-void AbstractHandler::SetBaseEnabled(bool state)
-{
-  if (baseEnabled == state)
+  if(const AndExpression* that = dynamic_cast<const AndExpression*>(object))
   {
-    return;
+    return this->Equals(this->fExpressions, that->fExpressions);
   }
-  baseEnabled = state;
-  //fireHandlerChanged(new HandlerEvent(this, true, false));
+  return false;
 }
 
+EvaluationResult::ConstPointer
+AndExpression::Evaluate(IEvaluationContext* context) const
+{
+  return this->EvaluateAnd(context);
 }
+
+} // namespace berry
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryObjectString.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryAndExpression.h
old mode 100644
new mode 100755
similarity index 56%
copy from BlueBerry/Bundles/org.blueberry.core.runtime/src/berryObjectString.h
copy to BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryAndExpression.h
index 25a2d7c6a0..9fe6dda807
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryObjectString.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryAndExpression.h
@@ -1,41 +1,36 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
-#ifndef BERRYOSGISTRING_H_
-#define BERRYOSGISTRING_H_
+#ifndef __BERRY_AND_EXPRESSION_H__
+#define __BERRY_AND_EXPRESSION_H__
 
-#include "berryMacros.h"
-
-#include <QString>
+#include "berryCompositeExpression.h"
 
 namespace berry {
 
-class ObjectString : public QString, public Object
-{
+// Copied from org.blueberry.core.commands
+class AndExpression : public CompositeExpression {
 
 public:
 
-  berryObjectMacro(berry::ObjectString)
-
-  ObjectString() {}
-  ObjectString(const QString& s) : QString(s) {}
+  bool operator==(const Object* object) const;
 
-  ~ObjectString() {}
+  EvaluationResult::ConstPointer Evaluate(IEvaluationContext* context) const;
 };
 
-}
+}  // namespace berry
 
-#endif /*BERRYOSGISTRING_H_*/
+#endif // __BERRY_AND_EXPRESSION_H__
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCategory.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCategory.h
index c200ec1e32..6e37e62f03 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCategory.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCategory.h
@@ -1,185 +1,185 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYCATEGORY_H_
 #define BERRYCATEGORY_H_
 
 #include <berryIAdaptable.h>
 #include <berryMacros.h>
 
 namespace berry
 {
 
 /**
  * \ingroup org_blueberry_ui_internal
  *
  * Category provides for hierarchical grouping of elements
  * registered in the registry. One extension normally defines
  * a category, and other reference it via its ID.
  * <p>
  * A category may specify its parent category in order to
  * achieve hierarchy.
  * </p>
  */
 template<class T> class Category : /*IWorkbenchAdapter*/public IAdaptable, public Object
 {
 
 public:
 
   berryObjectMacro(Category<T>)
 
   typedef T ElementType;
 
   /**
    * Name of the miscellaneous category
    */
   const static QString MISC_NAME;
 
   /**
    * Identifier of the miscellaneous category
    */
   const static QString MISC_ID;
 
 private:
 
   QString id;
   QString name;
   QList<QString> parentPath;
 
   QList<ElementType> elements;
 
   IConfigurationElement::Pointer configurationElement;
 
 public:
 
   /**
    * Creates an instance of <code>Category</code> as a
    * miscellaneous category.
    */
   Category();
 
   /**
    * Creates an instance of <code>Category</code> with
    * an ID and label.
    *
    * @param id the unique identifier for the category
    * @param label the presentation label for this category
    */
   Category(const QString& id, const QString& label);
 
   /**
    * Creates an instance of <code>Category</code> using the
    * information from the specified configuration element.
    *
    * @param configElement the <code>IConfigurationElement<code> containing
    *    the ID, label, and optional parent category path.
    * @throws WorkbenchException if the ID or label is <code>null</code
    */
   Category(IConfigurationElement::Pointer configElement);
 
   /**
    * Add an element to this category.
    *
    * @param element the element to add
    */
   void AddElement(ElementType element);
 
   /* (non-Javadoc)
    * Method declared on IWorkbenchAdapter.
    */
   SmartPointer<ImageDescriptor> GetImageDescriptor() const;
 
   /**
    * Return the id for this category.
    * @return the id
    */
   const QString& GetId() const;
 
   /**
    * Return the label for this category.
    *
    * @return the label
    */
   QString GetLabel() const;
 
   /**
    * Return the parent path for this category.
    *
    * @return the parent path
    */
   QList<QString> GetParentPath();
 
   /**
    * Return the unparsed parent path.  May be <code>null</code>.
    *
    * @return the unparsed parent path or <code>null</code>
    */
   QString GetRawParentPath() const;
 
   /**
    * Return the root path for this category.
    *
    * @return the root path
    */
   QString GetRootPath();
 
   /**
    * Return the elements contained in this category.
    *
    * @return the elements
    */
   const QList<ElementType>& GetElements() const;
 
   /**
    * Return whether a given object exists in this category.
    *
    * @param o the object to search for
    * @return whether the object is in this category
    */
   bool HasElement(const ElementType& o) const;
 
   /**
    * Return whether this category has child elements.
    *
    * @return whether this category has child elements
    */
   bool HasElements() const;
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.model.IWorkbenchAdapter#getParent(java.lang.Object)
    */
   ElementType* GetParent(const ElementType& o);
 
   /**
    * Clear all elements from this category.
    *
    */
   void Clear();
 
 protected:
 
   /* (non-Javadoc)
    * Method declared on IAdaptable.
    */
-  Poco::Any GetAdapter(const QString& adapter);
+  Object* GetAdapter(const QString& adapter);
 };
 
 } // namespace berry
 
 
 #include "berryCategory.txx"
 
 #endif /*BERRYCATEGORY_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCategory.txx b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCategory.txx
index 11d2c120fa..ef019a0808 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCategory.txx
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCategory.txx
@@ -1,178 +1,178 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef __BERRY_CATEGORY_TXX__
 #define __BERRY_CATEGORY_TXX__
 
 #include "berryWorkbenchRegistryConstants.h"
 #include "../berryUIException.h"
 
 #include <QStringList>
 
 namespace berry
 {
 
 template<class T>
 const QString Category<T>::MISC_NAME = "Other";
 
 template<class T>
 const QString Category<T>::MISC_ID =
     "org.blueberry.ui.internal.otherCategory";
 
 template<class T> Category<T>::Category()
 {
   this->id = MISC_ID;
   this->name = MISC_NAME;
 }
 
 template<class T> Category<T>::Category(const QString& ID,
     const QString& label)
  : id(ID), name(label)
 {
 }
 
 template<class T>
 Category<T>::Category(IConfigurationElement::Pointer configElement)
  : configurationElement(configElement) {
 
   QString id = configElement->GetAttribute(WorkbenchRegistryConstants::ATT_ID);
 
   if (id == "" || GetLabel() == "")
   {
     throw WorkbenchException(QString("Invalid category: ") + id);
   }
 }
 
 template<class T>
 void Category<T>::AddElement(ElementType element)
 {
   elements.push_back(element);
 }
 
 template<class T>
-Poco::Any Category<T>::GetAdapter(const QString& adapter)
+Object* Category<T>::GetAdapter(const QString& adapter)
 {
-  if (adapter == IConfigurationElement::GetStaticClassName())
+  if (adapter == qobject_interface_iid<IConfigurationElement*>())
   {
-    return Poco::Any(configurationElement);
+    return configurationElement.GetPointer();
   }
   else
   {
-    return Poco::Any();
+    return NULL;
   }
 }
 
 //template<class T>
 //ImageDescriptor Category<T>::GetImageDescriptor()
 //{
 //  return WorkbenchImages.getImageDescriptor(ISharedImages.IMG_OBJ_FOLDER);
 //}
 
 template<class T>
 const QString& Category<T>::GetId() const
 {
   return id;
 }
 
 template<class T>
 QString Category<T>::GetLabel() const
 {
   if (configurationElement.IsNull())
     return name;
 
   return configurationElement->GetAttribute(WorkbenchRegistryConstants::ATT_NAME);
 }
 
 template<class T>
 QList<QString> Category<T>::GetParentPath()
 {
   if (parentPath.size() > 0)
   {
     return parentPath;
   }
 
   QString unparsedPath(this->GetRawParentPath());
   foreach(QString token, unparsedPath.split('/', QString::SkipEmptyParts))
   {
     parentPath.push_back(token.trimmed());
   }
 
   return parentPath;
 }
 
 template<class T>
 QString Category<T>::GetRawParentPath() const
 {
   if (configurationElement.IsNull())
     return QString();
 
   return configurationElement->GetAttribute(WorkbenchRegistryConstants::ATT_PARENT_CATEGORY);
 }
 
 template<class T>
 QString Category<T>::GetRootPath()
 {
   if (this->GetParentPath().size() > 0)
   {
     return GetParentPath()[0];
   }
 
   return id;
 }
 
 template<class T>
 const QList<T>& Category<T>::GetElements() const
 {
   return elements;
 }
 
 template<class T>
 bool Category<T>::HasElement(const ElementType& o) const
 {
   if (elements.empty())
   {
     return false;
   }
 
   for (typename QList<ElementType>::const_iterator iter = elements.begin(); iter != elements.end(); ++iter)
   {
     if (*iter == o) return true;
   }
 
   return false;
 }
 
 template<class T>
 bool Category<T>::HasElements() const
 {
   return !elements.empty();
 }
 
 template<class T>
 T* Category<T>::GetParent(const ElementType& o)
 {
   return 0;
 }
 
 template<class T>
 void Category<T>::Clear()
 {
   elements.clear();
 }
 
 } // namespace berry
 
 #endif // __BERRY_CATEGORY_TXX__
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandContributionItemParameter.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandContributionItemParameter.h
index b0c745d5d2..03dc837172 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandContributionItemParameter.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandContributionItemParameter.h
@@ -1,194 +1,194 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYCOMMANDCONTRIBUTIONITEMPARAMETER_H
 #define BERRYCOMMANDCONTRIBUTIONITEMPARAMETER_H
 
 #include <QHash>
 #include <QIcon>
 
 #include "berryCommandContributionItem.h"
 
 namespace berry {
 
 struct IServiceLocator;
 
 /**
  * A help class for the various parameters that can be used with command
  * contributions. Mandatory parameters are in the constructor, and public fields
  * can be set to fill in other parameters.
  */
-class CommandContributionItemParameter : public Object
+class CommandContributionItemParameter : public virtual Object
 {
 
 public:
 
   berryObjectMacro(CommandContributionItemParameter)
 
   /**
    * a service locator that is most appropriate for this contribution.
    * Typically the local {@link IWorkbenchWindow} or
    * {@link IWorkbenchPartSite} will be sufficient. Must not be
    * <code>null</code>.
    */
   IServiceLocator* serviceLocator;
 
   /**
    * The id for this item. May be <code>null</code>. Items without an id
    * cannot be referenced later.
    */
   QString id;
 
   /**
    * A command id for a defined command. Must not be <code>null</code>.
    */
   QString commandId;
 
   /**
    * A map of strings to strings which represent parameter names to values.
    * The parameter names must match those in the command definition. May be
    * <code>null</code>
    */
   QHash<QString, Object::Pointer> parameters;
 
   /**
    * An icon for this item. May be <code>null</code>.
    */
   QIcon icon;
 
   /**
    * A label for this item. May be <code>null</code>.
    */
   QString label;
 
   /**
    * A mnemonic for this item to be applied to the label. May be
    * <code>null</code>.
    */
   QChar mnemonic;
 
   /**
    * A tooltip for this item. May be <code>null</code>. Tooltips are
    * currently only valid for toolbar contributions.
    */
   QString tooltip;
 
   /**
    * The style of this menu contribution. See the CommandContributionItem
    * STYLE_* contants.
    */
   CommandContributionItem::Style style;
 
   /**
    * The help context id to be applied to this contribution. May be
    * <code>null</code>
    */
   QString helpContextId;
 
   /**
    * The icon style to use.
    */
   QString iconStyle;
 
   /**
    * The visibility tracking for a menu contribution.
    */
   bool visibleEnabled;
 
   /**
    * Any number of mode bits, like
    * {@link CommandContributionItem#MODE_FORCE_TEXT}.
    */
   CommandContributionItem::Modes mode;
 
   /**
    * Create the parameter object. Nullable attributes can be set directly.
    *
    * @param serviceLocator
    *            a service locator that is most appropriate for this
    *            contribution. Typically the local {@link IWorkbenchWindow} or
    *            {@link IWorkbenchPartSite} will be sufficient. Must not be
    *            <code>null</code>.
    * @param id
    *            The id for this item. May be <code>null</code>. Items
    *            without an id cannot be referenced later.
    * @param commandId
    *            A command id for a defined command. Must not be
    *            <code>null</code>.
    * @param style
    *            The style of this menu contribution. See the STYLE_* contants.
    */
   CommandContributionItemParameter(IServiceLocator* serviceLocator,
                                    const QString& id, const QString& commandId,
                                    CommandContributionItem::Style style);
 
   /**
    * Build the parameter object.
    * <p>
    * <b>Note:</b> This constructor should not be called outside the framework.
    * </p>
    *
    * @param serviceLocator
    *            a service locator that is most appropriate for this
    *            contribution. Typically the local {@link IWorkbenchWindow} or
    *            {@link IWorkbenchPartSite} will be sufficient. Must not be
    *            <code>null</code>.
    * @param id
    *            The id for this item. May be <code>null</code>. Items
    *            without an id cannot be referenced later.
    * @param commandId
    *            A command id for a defined command. Must not be
    *            <code>null</code>.
    * @param parameters
    *            A map of strings to strings which represent parameter names to
    *            values. The parameter names must match those in the command
    *            definition. May be <code>null</code>
    * @param icon
    *            An icon for this item. May be <code>null</code>.
    * @param disabledIcon
    *            A disabled icon for this item. May be <code>null</code>.
    * @param hoverIcon
    *            A hover icon for this item. May be <code>null</code>.
    * @param label
    *            A label for this item. May be <code>null</code>.
    * @param mnemonic
    *            A mnemonic for this item to be applied to the label. May be
    *            <code>null</code>.
    * @param tooltip
    *            A tooltip for this item. May be <code>null</code>. Tooltips
    *            are currently only valid for toolbar contributions.
    * @param style
    *            The style of this menu contribution. See the STYLE_* contants.
    * @param helpContextId
    *            the help context id to be applied to this contribution. May be
    *            <code>null</code>
    * @param visibleEnabled
    *            Visibility tracking for the menu contribution.
    * @noreference This constructor is not intended to be referenced by clients.
    */
   CommandContributionItemParameter(IServiceLocator* serviceLocator,
                                    const QString& id, const QString& commandId,
                                    const QHash<QString, Object::Pointer> &parameters,
                                    const QIcon& icon, const QString label,
                                    const QChar &mnemonic, const QString& tooltip,
                                    CommandContributionItem::Style style, const QString& helpContextId,
                                    bool visibleEnabled);
 };
 
 }
 
 #endif // BERRYCOMMANDCONTRIBUTIONITEM_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandParameter.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandParameter.cpp
new file mode 100644
index 0000000000..3c191eed42
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandParameter.cpp
@@ -0,0 +1,147 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berryCommandParameter.h"
+
+#include "berryIConfigurationElement.h"
+#include "berryIParameterValues.h"
+#include "berryCoreException.h"
+#include "berryCommandExceptions.h"
+#include "berryParameterType.h"
+
+namespace berry {
+
+const QString CommandParameter::ATTRIBUTE_VALUES = "values";
+const int CommandParameter::HASH_CODE_NOT_COMPUTED = 0;
+const int CommandParameter::HASH_FACTOR = 89;
+const int CommandParameter::HASH_INITIAL = qHash(CommandParameter::GetStaticClassName());
+
+CommandParameter::CommandParameter(const QString& id, const QString& name,
+                 const SmartPointer<IConfigurationElement>& values,
+                 const SmartPointer<ParameterType>& parameterType,
+                 const bool optional)
+  : name(name)
+  , optional(optional)
+  , parameterType(parameterType)
+  , valuesConfigurationElement(values)
+  , id(id)
+{
+  if (id.isNull())
+  {
+    throw ctkInvalidArgumentException("Cannot create a parameter with a null id");
+  }
+
+  if (name.isNull())
+  {
+    throw ctkInvalidArgumentException("The name of a parameter cannot be null.");
+  }
+
+  if (values.IsNull())
+  {
+    throw ctkInvalidArgumentException("The values for a parameter cannot be null.");
+  }
+}
+
+bool CommandParameter::operator==(const Object* object) const
+{
+  if (this == object)
+  {
+    return true;
+  }
+
+  if (const CommandParameter* parameter = dynamic_cast<const CommandParameter*>(object))
+  {
+    if (id != parameter->id)
+    {
+      return false;
+    }
+    if (name != parameter->name)
+    {
+      return false;
+    }
+    if (values != parameter->values)
+    {
+      return false;
+    }
+
+    return optional == parameter->optional;
+  }
+  else
+  {
+    return false;
+  }
+}
+
+QString CommandParameter::GetId() const
+{
+  return id;
+}
+
+QString CommandParameter::GetName() const
+{
+  return name;
+}
+
+SmartPointer<ParameterType> CommandParameter::GetParameterType() const
+{
+  return parameterType;
+}
+
+IParameterValues* CommandParameter::GetValues() const
+{
+  if (values.isNull())
+  {
+    try
+    {
+      values.reset(valuesConfigurationElement->CreateExecutableExtension<IParameterValues>(ATTRIBUTE_VALUES));
+    }
+    catch (const CoreException& e)
+    {
+      throw ParameterValuesException("Problem creating parameter values", e);
+    }
+
+    if (values.isNull())
+    {
+      throw ParameterValuesException(
+          "Parameter values were not an instance of IParameterValues");
+    }
+  }
+
+  return values.data();
+}
+
+bool CommandParameter::IsOptional() const
+{
+  return optional;
+}
+
+QString CommandParameter::ToString() const
+{
+  if (str.isNull())
+  {
+    QString paramValuesStr;
+    if (!values.isNull())
+    {
+      QDebug dbg(&paramValuesStr);
+      dbg << values->GetParameterValues();
+    }
+    str = "Parameter(" + id + ',' + name + ',' + paramValuesStr + ',' + optional +')';
+  }
+
+  return str;
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandParameter.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandParameter.h
new file mode 100644
index 0000000000..6dedcc5dcb
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandParameter.h
@@ -0,0 +1,191 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYCOMMANDPARAMETER_H
+#define BERRYCOMMANDPARAMETER_H
+
+#include "berryIParameter.h"
+#include "berryITypedParameter.h"
+
+namespace berry {
+
+struct IConfigurationElement;
+
+/**
+ * <p>
+ * A parameter for a command. A parameter identifies a type of information that
+ * the command might accept. For example, a "Show View" command might accept the
+ * id of a view for display. This parameter also identifies possible values, for
+ * display in the user interface.
+ * </p>
+ * <p>
+ * Parameters are mutable, and can change as the command changes. Notifications
+ * will not be sent if the parameter itself changes. Listeners can be attached
+ * to the command.
+ * </p>
+ */
+class CommandParameter : public IParameter, public ITypedParameter
+{
+
+public:
+
+  berryObjectMacro(berry::CommandParameter)
+
+private:
+
+  /**
+   * The name of the configuration element attribute contain the values. This
+   * is used to retrieve the executable extension
+   * <code>IParameterValues</code>.
+   */
+  static const QString ATTRIBUTE_VALUES; // = "values";
+
+  /**
+   * The constant integer hash code value meaning the hash code has not yet
+   * been computed.
+   */
+  static const int HASH_CODE_NOT_COMPUTED; // = 0;
+
+  /**
+   * A factor for computing the hash code for all schemes.
+   */
+  static const int HASH_FACTOR; // = 89;
+
+  /**
+   * The seed for the hash code for all schemes.
+   */
+  static const int HASH_INITIAL;
+
+  /**
+   * The hash code for this object. This value is computed lazily, and marked
+   * as invalid when one of the values on which it is based changes.
+   */
+  mutable int hashCode; // = HASH_CODE_NOT_COMPUTED;
+
+  /**
+   * The non-externalized name of this parameter. The name is used as the in a
+   * name-value parameter map. This value will never be <code>null</code>.
+   */
+  const QString name;
+
+  /**
+   * Whether the parameter is optional (as opposed to required).
+   */
+  const bool optional;
+
+  /**
+   * The type for this parameter. This value may be <code>null</code> if the
+   * parameter is not typed.
+   */
+  const SmartPointer<ParameterType> parameterType;
+
+  /**
+   * The actual <code>IParameterValues</code> implementation. This is lazily
+   * loaded from the <code>valuesConfigurationElement</code>, to avoid
+   * unnecessary class-loading.
+   */
+  mutable QScopedPointer<IParameterValues> values;
+
+  /**
+   * The configuration element providing the executable extension that will
+   * implement <code>IParameterValues</code>. This value will not be
+   * <code>null</code>.
+   */
+  const SmartPointer<IConfigurationElement> valuesConfigurationElement;
+
+protected:
+
+  /**
+   * The identifier for this object. This identifier should be unique across
+   * all objects of the same type and should never change. This value will
+   * never be <code>null</code>.
+   */
+  const QString id;
+
+  /**
+   * The string representation of this object. This string is for debugging
+   * purposes only, and is not meant to be displayed to the user. This value
+   * is computed lazily, and is cleared if one of its dependent values
+   * changes.
+   */
+  mutable QString str;
+
+public:
+
+  /**
+   * Constructs a new instance of <code>Parameter</code> with all of its
+   * values pre-defined.
+   *
+   * @param id
+   *            The identifier for this parameter; must not be
+   *            <code>null</code>.
+   * @param name
+   *            The name for this parameter; must not be <code>null</code>.
+   * @param values
+   *            The values for this parameter; must not be <code>null</code>.
+   * @param parameterType
+   *            the type for this parameter; may be <code>null</code> if the
+   *            parmeter doesn't declare type.
+   * @param optional
+   *            Whether this parameter is optional (as opposed to required).
+   * @param commandService
+   *            The command service from which parameter types can be
+   *            retrieved; must not be <code>null</code>.
+   */
+  CommandParameter(const QString& id, const QString& name,
+                   const SmartPointer<IConfigurationElement>& values,
+                   const SmartPointer<ParameterType>& parameterType,
+                   const bool optional);
+
+  /**
+   * Tests whether this object is equal to another object. A parameter is only
+   * equal to another parameter with the same properties.
+   *
+   * @param object
+   *            The object with which to compare; may be <code>null</code>.
+   * @return <code>true</code> if the objects are equal; <code>false</code>
+   *         otherwise.
+   */
+  bool operator==(const Object* object) const;
+
+  QString GetId() const;
+
+  QString GetName() const;
+
+  SmartPointer<ParameterType> GetParameterType() const;
+
+  IParameterValues* GetValues() const;
+
+  uint HashCode() const
+  {
+    if (hashCode == HASH_CODE_NOT_COMPUTED)
+    {
+      hashCode = HASH_INITIAL * HASH_FACTOR + qHash(id);
+      if (hashCode == HASH_CODE_NOT_COMPUTED)
+      {
+        hashCode++;
+      }
+    }
+    return hashCode;
+  }
+
+  bool IsOptional() const;
+
+  QString ToString() const;
+};
+
+}
+#endif // BERRYCOMMANDPARAMETER_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandPersistence.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandPersistence.cpp
new file mode 100644
index 0000000000..3b4eb4e7f0
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandPersistence.cpp
@@ -0,0 +1,401 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berryCommandPersistence.h"
+
+#include "berryHandleObject.h"
+#include "berryStatus.h"
+#include "berryICommandService.h"
+#include "berryIConfigurationElement.h"
+#include "berryCommandCategory.h"
+#include "berryCommand.h"
+#include "berryCommandParameter.h"
+#include "berryParameterType.h"
+#include "berryParameterValueConverterProxy.h"
+#include "berryCommandStateProxy.h"
+#include "berryIExtensionRegistry.h"
+#include "berryIExtension.h"
+#include "berryPlatform.h"
+#include "berryPlatformUI.h"
+#include "berryWorkbenchPlugin.h"
+#include "berryIPreferencesService.h"
+#include "berryIPreferences.h"
+#include "berryCommandService.h"
+
+namespace berry {
+
+const int CommandPersistence::INDEX_CATEGORY_DEFINITIONS = 0;
+const int CommandPersistence::INDEX_COMMAND_DEFINITIONS = 1;
+const int CommandPersistence::INDEX_PARAMETER_TYPE_DEFINITIONS = 2;
+const int CommandPersistence::INDEX_SIZE = 3;
+
+void CommandPersistence::ReadCategoriesFromRegistry(
+    const QList<SmartPointer<IConfigurationElement> >& configurationElements,
+    ICommandService* const commandService)
+{
+  // Undefine all the previous handle objects.
+  const QList<CommandCategory::Pointer> handleObjects = commandService->GetDefinedCategories();
+  foreach (const CommandCategory::Pointer handleObject, handleObjects)
+  {
+    handleObject->Undefine();
+  }
+
+  // Define the uncategorized category.
+  commandService->DefineUncategorizedCategory(
+        QObject::tr("Uncategorized"),
+        QObject::tr("Commands that were either auto-generated or have no category"));
+
+  QList<IStatus::Pointer> warningsToLog;
+
+  foreach (const IConfigurationElement::Pointer& configurationElement, configurationElements)
+  {
+    // Read out the category identifier.
+    const QString categoryId = ReadRequired(configurationElement,
+                                            ATT_ID, warningsToLog, "Categories need an id");
+    if (categoryId.isNull())
+    {
+      continue;
+    }
+
+    // Read out the name.
+    const QString name = ReadRequired(configurationElement, ATT_NAME,
+                                      warningsToLog, "Categories need a name",
+                                      categoryId);
+    if (name.isNull())
+    {
+      continue;
+    }
+
+    // Read out the description.
+    const QString description = ReadOptional(configurationElement, ATT_DESCRIPTION);
+
+    const CommandCategory::Pointer category = commandService->GetCategory(categoryId);
+    category->Define(name, description);
+  }
+
+  // If there were any warnings, then log them now.
+  LogWarnings(warningsToLog,
+              "Warnings while parsing the commands from the 'org.blueberry.ui.commands' and 'org.blueberry.ui.actionDefinitions' extension points.");
+}
+
+void CommandPersistence::ReadCommandsFromRegistry(
+    const QList<SmartPointer<IConfigurationElement> >& configurationElements,
+    ICommandService* const commandService)
+{
+  // Undefine all the previous handle objects.
+  const QList<Command::Pointer> handleObjects = commandService->GetDefinedCommands();
+  foreach (const Command::Pointer& handleObject, handleObjects)
+  {
+    handleObject->Undefine();
+  }
+
+  QList<IStatus::Pointer> warningsToLog;
+
+  foreach (const IConfigurationElement::Pointer& configurationElement, configurationElements)
+  {
+    // Read out the command identifier.
+    const QString commandId = ReadRequired(configurationElement, ATT_ID,
+                                           warningsToLog, "Commands need an id");
+    if (commandId.isNull())
+    {
+      continue;
+    }
+
+    // Read out the name.
+    const QString name = ReadRequired(configurationElement, ATT_NAME,
+                                      warningsToLog, "Commands need a name");
+    if (name.isNull())
+    {
+      continue;
+    }
+
+    // Read out the description.
+    const QString description = ReadOptional(configurationElement, ATT_DESCRIPTION);
+
+    // Read out the category id.
+    QString categoryId = configurationElement->GetAttribute(ATT_CATEGORY_ID);
+    if (categoryId.isEmpty())
+    {
+      categoryId = configurationElement->GetAttribute(ATT_CATEGORY);
+      if (categoryId.isEmpty())
+      {
+        categoryId = QString();
+      }
+    }
+
+    // Read out the parameters.
+    const QList<IParameter::Pointer> parameters = ReadParameters(configurationElement,
+                                                                 warningsToLog, commandService);
+
+    // Read out the returnTypeId.
+    const QString returnTypeId = ReadOptional(configurationElement, ATT_RETURN_TYPE_ID);
+
+    // Read out the help context identifier.
+    const QString helpContextId = ReadOptional(configurationElement, ATT_HELP_CONTEXT_ID);
+
+    const Command::Pointer command = commandService->GetCommand(commandId);
+    const CommandCategory::Pointer category = commandService->GetCategory(categoryId);
+    if (!category->IsDefined())
+    {
+      AddWarning(warningsToLog, "Commands should really have a category",
+                 configurationElement, commandId, "categoryId", categoryId);
+    }
+
+    ParameterType::Pointer returnType;
+    if (!returnTypeId.isNull())
+    {
+      returnType = commandService->GetParameterType(returnTypeId);
+    }
+
+    command->Define(name, description, category, parameters, returnType, helpContextId);
+    ReadState(configurationElement, warningsToLog, command);
+  }
+
+  // If there were any warnings, then log them now.
+  LogWarnings(warningsToLog,
+              "Warnings while parsing the commands from the 'org.blueberry.ui.commands' and 'org.blueberry.ui.actionDefinitions' extension points.");
+}
+
+QList<SmartPointer<IParameter> > CommandPersistence::ReadParameters(
+    const SmartPointer<IConfigurationElement>& configurationElement,
+    QList<SmartPointer<IStatus> >& warningsToLog,
+    ICommandService* const commandService)
+{
+  const QList<IConfigurationElement::Pointer> parameterElements = configurationElement
+      ->GetChildren(TAG_COMMAND_PARAMETER);
+  if (parameterElements.isEmpty())
+  {
+    return QList<IParameter::Pointer>();
+  }
+
+  QList<IParameter::Pointer> parameters;
+  foreach (const IConfigurationElement::Pointer& parameterElement, parameterElements)
+  {
+    // Read out the id
+    const QString id = ReadRequired(parameterElement, ATT_ID,
+                                    warningsToLog, "Parameters need an id");
+    if (id.isNull())
+    {
+      continue;
+    }
+
+    // Read out the name.
+    const QString name = ReadRequired(parameterElement, ATT_NAME,
+                                      warningsToLog, "Parameters need a name");
+    if (name.isNull())
+    {
+      continue;
+    }
+
+    /*
+     * The IParameterValues will be initialized lazily as an
+     * IExecutableExtension.
+     */
+
+    // Read out the typeId attribute, if present.
+    const QString typeId = ReadOptional(parameterElement, ATT_TYPE_ID);
+
+    // Read out the optional attribute, if present.
+    const bool optional = ReadBoolean(parameterElement, ATT_OPTIONAL, true);
+
+    ParameterType::Pointer type;
+    if (!typeId.isNull())
+    {
+      type = commandService->GetParameterType(typeId);
+    }
+
+    const IParameter::Pointer parameter(new CommandParameter(id, name,
+                                                             parameterElement, type, optional));
+    parameters.push_back(parameter);
+  }
+
+  return parameters;
+}
+
+void CommandPersistence::ReadParameterTypesFromRegistry(
+    const QList<SmartPointer<IConfigurationElement> >& configurationElements,
+    ICommandService* const commandService)
+{
+
+  // Undefine all the previous handle objects.
+  const QList<ParameterType::Pointer> handleObjects = commandService->GetDefinedParameterTypes();
+  foreach (const ParameterType::Pointer& handleObject, handleObjects)
+  {
+    handleObject->Undefine();
+  }
+
+  QList<IStatus::Pointer> warningsToLog;
+
+  foreach (const IConfigurationElement::Pointer configurationElement, configurationElements)
+  {
+    // Read out the commandParameterType identifier.
+    const QString parameterTypeId = ReadRequired(configurationElement,
+                                                 ATT_ID, warningsToLog, "Command parameter types need an id");
+    if (parameterTypeId.isNull())
+    {
+      continue;
+    }
+
+    // Read out the type.
+    const QString type = ReadOptional(configurationElement, ATT_TYPE);
+
+    // Read out the converter.
+    const QString converter = ReadOptional(configurationElement, ATT_CONVERTER);
+
+    /*
+     * if the converter attribute was given, create a proxy
+     * AbstractParameterValueConverter for the ParameterType, otherwise
+     * null indicates there is no converter
+     */
+    const QSharedPointer<IParameterValueConverter> parameterValueConverter(
+        (converter.isNull()) ? NULL : new ParameterValueConverterProxy(configurationElement));
+
+    const ParameterType::Pointer parameterType = commandService->GetParameterType(parameterTypeId);
+    parameterType->Define(type, parameterValueConverter);
+  }
+
+  // If there were any warnings, then log them now.
+  LogWarnings(warningsToLog,
+              "Warnings while parsing the commandParameterTypes from the 'org.blueberry.ui.commands' extension point.");
+
+}
+
+void CommandPersistence::ReadState(
+    const SmartPointer<IConfigurationElement>& configurationElement,
+    QList<SmartPointer<IStatus> >& warningsToLog,
+    const SmartPointer<Command>& command)
+{
+  const QList<IConfigurationElement::Pointer> stateElements = configurationElement
+      ->GetChildren(TAG_STATE);
+  if (stateElements.isEmpty())
+  {
+    return;
+  }
+
+  foreach (const IConfigurationElement::Pointer stateElement, stateElements)
+  {
+    const QString id = ReadRequired(stateElement, ATT_ID, warningsToLog, "State needs an id");
+    if (id.isNull())
+    {
+      continue;
+    }
+
+    if (CheckClass(stateElement, warningsToLog,
+                   "State must have an associated class", id))
+    {
+      const State::Pointer state(
+            new CommandStateProxy(stateElement, ATT_CLASS,
+                                  WorkbenchPlugin::GetDefault()->GetPreferences(),
+                                  CommandService::CreatePreferenceKey(command, id))
+            );
+      command->AddState(id, state);
+    }
+  }
+}
+
+bool CommandPersistence::IsChangeImportant(const QList<SmartPointer<IExtension> >& /*extensions*/,
+                                           RegistryChangeType /*changeType*/)
+{
+  return false;
+}
+
+bool CommandPersistence::IsChangeImportant(const QList<SmartPointer<IExtensionPoint> >& /*extensionPoints*/,
+                                           RegistryChangeType /*changeType*/)
+{
+  return false;
+}
+
+void CommandPersistence::Read()
+{
+  RegistryPersistence::Read();
+  ReRead();
+}
+
+CommandPersistence::CommandPersistence(ICommandService* const commandService)
+  : commandService(commandService)
+{
+  if (commandService == NULL)
+  {
+    throw ctkInvalidArgumentException("The command service cannot be null");
+  }
+}
+
+bool CommandPersistence::CommandsNeedUpdating(const QList<SmartPointer<IExtension> >& extensions)
+{
+  foreach(const IExtension::Pointer& extension, extensions)
+  {
+    if (extension->GetExtensionPointUniqueIdentifier() == EXTENSION_COMMANDS ||
+        extension->GetExtensionPointUniqueIdentifier() == EXTENSION_ACTION_DEFINITIONS)
+    {
+      return true;
+    }
+  }
+  return false;
+}
+
+void CommandPersistence::ReRead()
+{
+  // Create the extension registry mementos.
+  IExtensionRegistry* const registry = Platform::GetExtensionRegistry();
+  QList<QList<IConfigurationElement::Pointer> > indexedConfigurationElements;
+  for (int i = 0; i < INDEX_SIZE; ++i)
+  {
+    indexedConfigurationElements.push_back(QList<IConfigurationElement::Pointer>());
+  }
+
+  // Sort the commands extension point based on element name.
+  QList<IConfigurationElement::Pointer> commandsExtensionPoint = registry
+      ->GetConfigurationElementsFor(EXTENSION_COMMANDS);
+  foreach (const IConfigurationElement::Pointer& configurationElement, commandsExtensionPoint)
+  {
+    const QString name = configurationElement->GetName();
+
+    // Check if it is a binding definition.
+    if (TAG_COMMAND == name)
+    {
+      indexedConfigurationElements[INDEX_COMMAND_DEFINITIONS].push_back(configurationElement);
+    }
+    else if (TAG_CATEGORY == name)
+    {
+      indexedConfigurationElements[INDEX_CATEGORY_DEFINITIONS].push_back(configurationElement);
+    }
+    else if (TAG_COMMAND_PARAMETER_TYPE == name)
+    {
+      indexedConfigurationElements[INDEX_PARAMETER_TYPE_DEFINITIONS].push_back(configurationElement);
+    }
+  }
+
+  const QList<IConfigurationElement::Pointer> actionDefinitionsExtensionPoint = registry
+      ->GetConfigurationElementsFor(EXTENSION_ACTION_DEFINITIONS);
+  foreach (const IConfigurationElement::Pointer& configurationElement, actionDefinitionsExtensionPoint)
+  {
+    const QString name = configurationElement->GetName();
+
+    if (TAG_ACTION_DEFINITION == name)
+    {
+      indexedConfigurationElements[INDEX_COMMAND_DEFINITIONS].push_back(configurationElement);
+    }
+  }
+
+  ReadCategoriesFromRegistry(indexedConfigurationElements[INDEX_CATEGORY_DEFINITIONS],
+                             commandService);
+  ReadCommandsFromRegistry(indexedConfigurationElements[INDEX_COMMAND_DEFINITIONS],
+                           commandService);
+  ReadParameterTypesFromRegistry(indexedConfigurationElements[INDEX_PARAMETER_TYPE_DEFINITIONS],
+                                 commandService);
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandPersistence.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandPersistence.h
new file mode 100644
index 0000000000..af9710bf19
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandPersistence.h
@@ -0,0 +1,200 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYCOMMANDPERSISTENCE_H
+#define BERRYCOMMANDPERSISTENCE_H
+
+#include "berryRegistryPersistence.h"
+
+namespace berry {
+
+struct IParameter;
+
+/**
+ * <p>
+ * A static class for accessing the registry and the preference store.
+ * </p>
+ */
+class CommandPersistence : public RegistryPersistence
+{
+
+private:
+
+  friend class CommandService;
+
+  /**
+   * The index of the category elements in the indexed array.
+   *
+   * @see CommandPersistence#read()
+   */
+  static const int INDEX_CATEGORY_DEFINITIONS; // = 0;
+
+  /**
+   * The index of the command elements in the indexed array.
+   *
+   * @see CommandPersistence#read()
+   */
+  static const int INDEX_COMMAND_DEFINITIONS; // = 1;
+
+  /**
+   * The index of the commandParameterType elements in the indexed array.
+   *
+   * @see CommandPersistence#read()
+   */
+  static const int INDEX_PARAMETER_TYPE_DEFINITIONS; // = 2;
+
+  static const int INDEX_SIZE;
+
+  /**
+   * Reads all of the category definitions from the commands extension point.
+   *
+   * @param configurationElements
+   *            The configuration elements in the commands extension point;
+   *            must not be <code>null</code>, but may be empty.
+   * @param configurationElementCount
+   *            The number of configuration elements that are really in the
+   *            array.
+   * @param commandService
+   *            The command service to which the categories should be added;
+   *            must not be <code>null</code>.
+   */
+  static void ReadCategoriesFromRegistry(
+      const QList<SmartPointer<IConfigurationElement> >& configurationElements,
+      ICommandService* const commandService);
+
+  /**
+   * Reads all of the command definitions from the commands extension point.
+   *
+   * @param configurationElements
+   *            The configuration elements in the commands extension point;
+   *            must not be <code>null</code>, but may be empty.
+   * @param configurationElementCount
+   *            The number of configuration elements that are really in the
+   *            array.
+   * @param commandService
+   *            The command service to which the commands should be added;
+   *            must not be <code>null</code>.
+   */
+  static void ReadCommandsFromRegistry(
+      const QList<SmartPointer<IConfigurationElement> >& configurationElements,
+      ICommandService* const commandService);
+
+  /**
+   * Reads the parameters from a parent configuration element. This is used to
+   * read the parameter sub-elements from a command element. Each parameter is
+   * guaranteed to be valid. If invalid parameters are found, then a warning
+   * status will be appended to the <code>warningsToLog</code> list.
+   *
+   * @param configurationElement
+   *            The configuration element from which the parameters should be
+   *            read; must not be <code>null</code>.
+   * @param warningsToLog
+   *            The list of warnings found during parsing. Warnings found
+   *            while parsing the parameters will be appended to this list.
+   *            This value must not be <code>null</code>.
+   * @param commandService
+   *            The command service from which the parameter can get parameter
+   *            types; must not be <code>null</code>.
+   * @return The array of parameters found for this configuration element;
+   *         <code>null</code> if none can be found.
+   */
+  static QList<SmartPointer<IParameter> > ReadParameters(
+      const SmartPointer<IConfigurationElement>& configurationElement,
+      QList<SmartPointer<IStatus> >& warningsToLog,
+      ICommandService* const commandService);
+
+  /**
+   * Reads all of the commandParameterType definitions from the commands
+   * extension point.
+   *
+   * @param configurationElements
+   *            The configuration elements in the commands extension point;
+   *            must not be <code>null</code>, but may be empty.
+   * @param configurationElementCount
+   *            The number of configuration elements that are really in the
+   *            array.
+   * @param commandService
+   *            The command service to which the commands should be added;
+   *            must not be <code>null</code>.
+   */
+  static void ReadParameterTypesFromRegistry(
+      const QList<SmartPointer<IConfigurationElement> >& configurationElements,
+      ICommandService* const commandService);
+
+  /**
+   * Reads the states from a parent configuration element. This is used to
+   * read the state sub-elements from a command element. Each state is
+   * guaranteed to be valid. If invalid states are found, then a warning
+   * status will be appended to the <code>warningsToLog</code> list.
+   *
+   * @param configurationElement
+   *            The configuration element from which the states should be
+   *            read; must not be <code>null</code>.
+   * @param warningsToLog
+   *            The list of warnings found during parsing. Warnings found
+   *            while parsing the parameters will be appended to this list.
+   *            This value must not be <code>null</code>.
+   * @param command
+   *            The command for which the state is being read; may be
+   *            <code>null</code>.
+   */
+  static void ReadState(
+      const SmartPointer<IConfigurationElement>& configurationElement,
+      QList<SmartPointer<IStatus> >& warningsToLog,
+      const SmartPointer<Command>& command);
+
+  /**
+   * The command service with which this persistence class is associated;
+   * never <code>null</code>.
+   */
+  ICommandService* const commandService;
+
+protected:
+
+  bool IsChangeImportant(const QList<SmartPointer<IExtension> >& extensions,
+                         RegistryChangeType changeType);
+
+  bool IsChangeImportant(const QList<SmartPointer<IExtensionPoint> >& extensionPoints,
+                         RegistryChangeType changeType);
+
+  /**
+   * Reads all of the commands and categories from the registry,
+   *
+   * @param commandService
+   *            The command service which should be populated with the values
+   *            from the registry; must not be <code>null</code>.
+   */
+  void Read();
+
+public:
+
+  /**
+   * Constructs a new instance of <code>CommandPersistence</code>.
+   *
+   * @param commandService
+   *            The command service which should be populated with the values
+   *            from the registry; must not be <code>null</code>.
+   */
+  CommandPersistence(ICommandService* const commandService);
+
+  bool CommandsNeedUpdating(const QList<SmartPointer<IExtension> >& extensions);
+
+  void ReRead();
+};
+
+}
+
+#endif // BERRYCOMMANDPERSISTENCE_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandService.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandService.cpp
index 13a78fb4a3..a85d8e8d60 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandService.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandService.cpp
@@ -1,318 +1,318 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #include "berryCommandService.h"
 
 #include <berryCommand.h>
 #include <berryCommandManager.h>
 #include <berryCommandCategory.h>
 #include <berryParameterizedCommand.h>
 #include <berryUIElement.h>
 
+#include "berryPersistentState.h"
 #include "berryWorkbenchPlugin.h"
 #include "berryElementReference.h"
+#include "berryIPreferences.h"
 
 #include <berryIHandler.h>
 #include <berryIElementUpdater.h>
 #include <berryIElementReference.h>
 #include <berryISafeRunnable.h>
 #include <berrySafeRunner.h>
 #include <berryObjectString.h>
 
 #include <QStringList>
 
 namespace berry {
 
 const QString CommandService::PREFERENCE_KEY_PREFIX = "org.blueberry.ui.commands/state";
 
 const QString CommandService::CreatePreferenceKey(const SmartPointer<Command>& command,
                                                   const QString& stateId)
 {
   return PREFERENCE_KEY_PREFIX + '/' + command->GetId() + '/' + stateId;
 }
 
 CommandService::CommandService( CommandManager* commandManager)
   : commandManager(commandManager)
+  , commandPersistence(this)
 {
   if (commandManager == 0)
   {
     throw std::invalid_argument("Cannot create a command service with a null manager");
   }
-  //this.commandPersistence = new CommandPersistence(this);
 }
 
 CommandService::~CommandService()
 {
   this->Dispose();
 }
 
 void CommandService::AddExecutionListener(IExecutionListener* listener)
 {
   commandManager->AddExecutionListener(listener);
 }
 
 void CommandService::DefineUncategorizedCategory(const QString& name,
                                  const QString& description)
 {
   commandManager->DefineUncategorizedCategory(name, description);
 }
 
 SmartPointer<ParameterizedCommand> CommandService::Deserialize(const QString& serializedParameterizedCommand) const
 {
   return commandManager->Deserialize(serializedParameterizedCommand);
 }
 
 void CommandService::Dispose()
 {
-  //commandPersistence.dispose();
-
   /*
    * All state on all commands neeeds to be disposed. This is so that the
    * state has a chance to persist any changes.
    */
-//  final Command[] commands = commandManager.getAllCommands();
-//  for (int i = 0; i < commands.length; i++) {
-//    final Command command = commands[i];
-//    final String[] stateIds = command.getStateIds();
-//    for (int j = 0; j < stateIds.length; j++) {
-//      final String stateId = stateIds[j];
-//      final State state = command.getState(stateId);
-//      if (state instanceof PersistentState) {
-//        final PersistentState persistentState = (PersistentState) state;
-//        if (persistentState.shouldPersist()) {
-//          persistentState.save(PrefUtil
-//              .getInternalPreferenceStore(),
-//              createPreferenceKey(command, stateId));
-//        }
-//      }
-//    }
-//  }
+  const QList<Command::Pointer> commands = commandManager->GetAllCommands();
+  foreach (const Command::Pointer& command, commands)
+  {
+    const QList<QString> stateIds = command->GetStateIds();
+    foreach(const QString& stateId, stateIds)
+    {
+      const State::Pointer state = command->GetState(stateId);
+      if (PersistentState::Pointer persistentState = state.Cast<PersistentState>())
+      {
+        if (persistentState->ShouldPersist())
+        {
+          persistentState->Save(WorkbenchPlugin::GetDefault()->GetPreferences(),
+                                CreatePreferenceKey(command, stateId));
+        }
+      }
+    }
+  }
   commandCallbacks.clear();
 }
 
 SmartPointer<CommandCategory> CommandService::GetCategory(const QString& categoryId) const
 {
   return commandManager->GetCategory(categoryId);
 }
 
 SmartPointer<Command> CommandService::GetCommand(const QString& commandId) const
 {
   return commandManager->GetCommand(commandId);
 }
 
 QList<SmartPointer<CommandCategory> > CommandService::GetDefinedCategories() const
 {
   return commandManager->GetDefinedCategories();
 }
 
 QStringList CommandService::GetDefinedCategoryIds() const
 {
   return commandManager->GetDefinedCategoryIds().toList();
 }
 
 QStringList CommandService::GetDefinedCommandIds() const
 {
   return commandManager->GetDefinedCommandIds().toList();
 }
 
 QList<SmartPointer<Command> > CommandService::GetDefinedCommands() const
 {
   return commandManager->GetDefinedCommands();
 }
 
 QStringList CommandService::GetDefinedParameterTypeIds() const
 {
   return commandManager->GetDefinedParameterTypeIds().toList();
 }
 
 QList<SmartPointer<ParameterType> > CommandService::GetDefinedParameterTypes() const
 {
   return commandManager->GetDefinedParameterTypes();
 }
 
 QString CommandService::GetHelpContextId(const SmartPointer<const Command>& command) const
 {
   return commandManager->GetHelpContextId(command);
 }
 
 QString CommandService::GetHelpContextId(const QString& commandId) const
 {
   Command::Pointer command = GetCommand(commandId);
   return commandManager->GetHelpContextId(command);
 }
 
 SmartPointer<ParameterType> CommandService::GetParameterType(const QString& parameterTypeId) const
 {
   return commandManager->GetParameterType(parameterTypeId);
 }
 
 void CommandService::ReadRegistry()
 {
-  //commandPersistence.read();
+  commandPersistence.Read();
 }
 
 void CommandService::RemoveExecutionListener(IExecutionListener* listener)
 {
   commandManager->RemoveExecutionListener(listener);
 }
 
 void CommandService::SetHelpContextId(const SmartPointer<IHandler>& handler,
                       const QString& helpContextId)
 {
   commandManager->SetHelpContextId(handler, helpContextId);
 }
 
 void CommandService::RefreshElements(const QString& commandId,
                      const QHash<QString, Object::Pointer>&  filter)
 {
   Command::Pointer cmd = GetCommand(commandId);
 
   if (!cmd->IsDefined() || !(cmd->GetHandler().Cast<IElementUpdater>()))
   {
     return;
   }
   IElementUpdater::Pointer updater = cmd->GetHandler().Cast<IElementUpdater>();
 
   if (commandCallbacks.isEmpty())
   {
     return;
   }
 
   if(!commandCallbacks.contains(commandId))
   {
     return;
   }
 
   foreach (IElementReference::Pointer callbackRef, commandCallbacks[commandId])
   {
     struct _SafeRunnable : public ISafeRunnable
     {
       IElementUpdater* updater;
       IElementReference* callbackRef;
 
       _SafeRunnable(IElementUpdater* updater, IElementReference* callbackRef)
         : updater(updater), callbackRef(callbackRef)
       {}
 
       void HandleException(const std::exception& exc)
       {
         WorkbenchPlugin::Log(QString("Failed to update callback: ") +
                              callbackRef->GetCommandId() + exc.what());
       }
 
       void Run()
       {
         updater->UpdateElement(callbackRef->GetElement().GetPointer(), callbackRef->GetParameters());
       }
     };
 
     QHash<QString,Object::Pointer> parms = callbackRef->GetParameters();
 
     ISafeRunnable::Pointer run(new _SafeRunnable(updater.GetPointer(), callbackRef.GetPointer()));
     if (filter.isEmpty())
     {
       SafeRunner::Run(run);
     }
     else
     {
       bool match = true;
       QHashIterator<QString, Object::Pointer> i(filter);
       while (i.hasNext())
       {
         i.next();
         Object::Pointer value = parms[i.key()];
         if (i.value() != value)
         {
           match = false;
           break;
         }
       }
       if (match)
       {
         SafeRunner::Run(run);
       }
     }
   }
 }
 
 SmartPointer<IElementReference> CommandService::RegisterElementForCommand(
     const SmartPointer<ParameterizedCommand>& command,
     const SmartPointer<UIElement>& element)
 {
   if (!command->GetCommand()->IsDefined())
   {
     throw NotDefinedException(
         "Cannot define a callback for undefined command "
             + command->GetCommand()->GetId());
   }
   if (element.IsNull())
   {
     throw NotDefinedException("No callback defined for command "
         + command->GetCommand()->GetId());
   }
 
   QHash<QString, QString> paramMap = command->GetParameterMap();
   QHash<QString, Object::Pointer> parms;
   for (QHash<QString, QString>::const_iterator i = paramMap.begin();
        i != paramMap.end(); ++i)
   {
     Object::Pointer value(new ObjectString(i.value()));
     parms.insert(i.key(), value);
   }
   IElementReference::Pointer ref(new ElementReference(command->GetId(),
                                                       element, parms));
   RegisterElement(ref);
   return ref;
 }
 
 void CommandService::RegisterElement(const SmartPointer<IElementReference>& elementReference)
 {
   QList<IElementReference::Pointer>& parameterizedCommands = commandCallbacks[elementReference->GetCommandId()];
   parameterizedCommands.push_back(elementReference);
 
   // If the active handler wants to update the callback, it can do
   // so now
   Command::Pointer command = GetCommand(elementReference->GetCommandId());
   if (command->IsDefined())
   {
     if (IElementUpdater::Pointer updater = command->GetHandler().Cast<IElementUpdater>())
     {
       updater->UpdateElement(elementReference->GetElement().GetPointer(),
                              elementReference->GetParameters());
     }
   }
 }
 
 void CommandService::UnregisterElement(const SmartPointer<IElementReference>& elementReference)
 {
   if (commandCallbacks.contains(elementReference->GetCommandId()))
   {
     QList<IElementReference::Pointer>& parameterizedCommands = commandCallbacks[elementReference->GetCommandId()];
     parameterizedCommands.removeAll(elementReference);
     if (parameterizedCommands.isEmpty())
     {
       commandCallbacks.remove(elementReference->GetCommandId());
     }
   }
 }
 
-//CommandPersistence* CommandService::GetCommandPersistence() const
-//{
-//  return commandPersistence;
-//}
+const CommandPersistence* CommandService::GetCommandPersistence() const
+{
+  return &commandPersistence;
+}
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandService.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandService.h
index e689684bc9..dec8f990be 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandService.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandService.h
@@ -1,143 +1,147 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYCOMMANDSERVICE_H
 #define BERRYCOMMANDSERVICE_H
 
 #include <berryICommandService.h>
 
+#include "berryCommandPersistence.h"
+
 namespace berry {
 
 class CommandManager;
 
 /**
  * <p>
  * Provides services related to the command architecture within the workbench.
  * This service can be used to access the set of commands and handlers.
  * </p>
  */
 class CommandService : public ICommandService
 {
 
 private:
 
+  friend class CommandPersistence;
+
   /**
    * The preference key prefix for all handler state.
    */
   static const QString PREFERENCE_KEY_PREFIX;
 
   /**
    * Creates a preference key for the given piece of state on the given
    * command.
    *
    * @param command
    *            The command for which the preference key should be created;
    *            must not be <code>null</code>.
    * @param stateId
    *            The identifier of the state for which the preference key
    *            should be created; must not be <code>null</code>.
    * @return A suitable preference key; never <code>null</code>.
    */
   static const QString CreatePreferenceKey(const SmartPointer<Command>& command,
                                            const QString& stateId);
 
   /**
    * The command manager that supports this service. This value is never
    * <code>null</code>.
    */
   CommandManager* commandManager;
 
   /**
    * The persistence class for this command service.
    */
-  //CommandPersistence commandPersistence;
+  CommandPersistence commandPersistence;
 
   /**
    * This is a map of commandIds to a list containing currently registered
    * callbacks, in the form of IElementReference.
    */
   QHash<QString, QList<SmartPointer<IElementReference> > > commandCallbacks;
 
 
 public:
 
   /**
    * Constructs a new instance of <code>CommandService</code> using a
    * command manager. Takes ownership of the provided CommandManager.
    *
    * @param commandManager
    *            The command manager to use; must not be <code>null</code>.
    */
   CommandService( CommandManager* commandManager);
 
   ~CommandService();
 
   void AddExecutionListener(IExecutionListener* listener);
 
   void DefineUncategorizedCategory(const QString& name,
                                    const QString& description);
 
   SmartPointer<ParameterizedCommand> Deserialize(const QString& serializedParameterizedCommand) const;
 
   void Dispose();
 
   SmartPointer<CommandCategory> GetCategory(const QString& categoryId) const;
 
   SmartPointer<Command> GetCommand(const QString& commandId) const;
 
   QList<SmartPointer<CommandCategory> > GetDefinedCategories() const;
 
   QStringList GetDefinedCategoryIds() const;
 
   QStringList GetDefinedCommandIds() const;
 
   QList<SmartPointer<Command> > GetDefinedCommands() const;
 
   QStringList GetDefinedParameterTypeIds() const;
 
   QList<SmartPointer<ParameterType> > GetDefinedParameterTypes() const;
 
   QString GetHelpContextId(const SmartPointer<const Command>& command) const;
 
   QString GetHelpContextId(const QString& commandId) const;
 
   SmartPointer<ParameterType> GetParameterType(const QString& parameterTypeId) const;
 
   void ReadRegistry();
 
   void RemoveExecutionListener(IExecutionListener* listener);
 
   void SetHelpContextId(const SmartPointer<IHandler>& handler,
                         const QString& helpContextId);
 
   void RefreshElements(const QString& commandId,
                        const QHash<QString, Object::Pointer>&  filter);
 
   SmartPointer<IElementReference> RegisterElementForCommand(
       const SmartPointer<ParameterizedCommand>& command,
       const SmartPointer<UIElement>& element);
 
   void RegisterElement(const SmartPointer<IElementReference>& elementReference);
 
   void UnregisterElement(const SmartPointer<IElementReference>& elementReference);
 
-  //CommandPersistence* GetCommandPersistence() const;
+  const CommandPersistence* GetCommandPersistence() const;
 };
 
 }
 
 #endif // BERRYCOMMANDSERVICE_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandServiceFactory.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandServiceFactory.cpp
new file mode 100644
index 0000000000..f2768da3e8
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandServiceFactory.cpp
@@ -0,0 +1,66 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berryCommandServiceFactory.h"
+
+#include "berryICommandService.h"
+#include "berryIServiceLocator.h"
+#include "berryIServiceScopes.h"
+#include "berryIWorkbenchLocationService.h"
+#include "berryIWorkbenchWindow.h"
+#include "berryIWorkbenchPartSite.h"
+
+#include "berrySlaveCommandService.h"
+
+namespace berry {
+
+Object* CommandServiceFactory::Create(const QString& serviceInterface, IServiceLocator* parentLocator,
+                                      IServiceLocator* locator) const
+{
+  if (serviceInterface != qobject_interface_iid<ICommandService*>())
+  {
+    return NULL;
+  }
+
+  IWorkbenchLocationService* wls = locator->GetService<IWorkbenchLocationService>();
+  IWorkbench* const wb = wls->GetWorkbench();
+  if (wb == NULL)
+  {
+    return NULL;
+  }
+
+  Object* parent = parentLocator->GetService(serviceInterface);
+  if (parent == NULL)
+  {
+    // we are registering the global services in the Workbench
+    return NULL;
+  }
+  IWorkbenchWindow* const window = wls->GetWorkbenchWindow();
+  IWorkbenchPartSite* const site = wls->GetPartSite();
+
+  ICommandService* parentService = dynamic_cast<ICommandService*>(parent);
+
+  if (site == NULL)
+  {
+    return new SlaveCommandService(parentService,
+                                   IServiceScopes::WINDOW_SCOPE, Object::Pointer(window));
+  }
+
+  return new SlaveCommandService(parentService,
+                                 IServiceScopes::PARTSITE_SCOPE, Object::Pointer(site));
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtDnDTweaklet.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandServiceFactory.h
old mode 100755
new mode 100644
similarity index 57%
copy from BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtDnDTweaklet.h
copy to BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandServiceFactory.h
index 57589ad2f8..067e97ee08
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtDnDTweaklet.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandServiceFactory.h
@@ -1,40 +1,38 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
+#ifndef BERRYCOMMANDSERVICEFACTORY_H
+#define BERRYCOMMANDSERVICEFACTORY_H
 
-#ifndef BERRYQTDNDTWEAKLET_H_
-#define BERRYQTDNDTWEAKLET_H_
-
-#include <berryDnDTweaklet.h>
+#include "berryIServiceFactory.h"
 
 namespace berry {
 
-class QtDnDTweaklet : public QObject, public DnDTweaklet
+class CommandServiceFactory : public QObject, public IServiceFactory
 {
   Q_OBJECT
-  Q_INTERFACES(berry::DnDTweaklet)
+  Q_INTERFACES(berry::IServiceFactory)
 
 public:
 
-  QtDnDTweaklet();
-  QtDnDTweaklet(const QtDnDTweaklet& other);
+  Object* Create(const QString& serviceInterface, IServiceLocator* parentLocator,
+                 IServiceLocator* locator) const;
 
-  ITracker* CreateTracker();
 };
 
 }
 
-#endif /* BERRYQTDNDTWEAKLET_H_ */
+#endif // BERRYCOMMANDSERVICEFACTORY_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandStateProxy.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandStateProxy.cpp
new file mode 100644
index 0000000000..6e624811b0
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandStateProxy.cpp
@@ -0,0 +1,233 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berryCommandStateProxy.h"
+
+#include "berryIConfigurationElement.h"
+#include "berryStatus.h"
+#include "berryPlatformUI.h"
+#include "berryWorkbenchPlugin.h"
+#include "berryIPreferences.h"
+
+namespace berry {
+
+CommandStateProxy::CommandStateProxy(const SmartPointer<IConfigurationElement>& configurationElement,
+                                     const QString& stateAttributeName,
+                                     const SmartPointer<IPreferences>& preferenceStore,
+                                     const QString& preferenceKey)
+  : configurationElement(configurationElement)
+  , preferenceKey(preferenceKey)
+  , preferenceStore(preferenceStore)
+  , stateAttributeName(stateAttributeName)
+{
+  if (configurationElement.IsNull())
+  {
+    throw ctkInvalidArgumentException(
+        "The configuration element backing a state proxy cannot be null");
+  }
+
+  if (stateAttributeName.isNull())
+  {
+    throw ctkInvalidArgumentException(
+        "The attribute containing the state class must be known");
+  }
+}
+
+void CommandStateProxy::AddListener(IStateListener* listener)
+{
+  if (state.IsNull())
+  {
+    this->AddListener(listener);
+  }
+  else
+  {
+    state->AddListener(listener);
+  }
+}
+
+CommandStateProxy::~CommandStateProxy()
+{
+  if (state.IsNotNull())
+  {
+    if (PersistentState::Pointer persistableState = state.Cast<PersistentState>())
+    {
+      if (persistableState->ShouldPersist() && preferenceStore.IsNotNull()
+          && !preferenceKey.isNull())
+      {
+        persistableState->Save(preferenceStore, preferenceKey);
+      }
+    }
+  }
+}
+
+Object::Pointer CommandStateProxy::GetValue() const
+{
+  if (const_cast<CommandStateProxy*>(this)->LoadState())
+  {
+    return state->GetValue();
+  }
+
+  return Object::Pointer(0);
+}
+
+void CommandStateProxy::Load(const SmartPointer<IPreferences>& /*store*/,
+                             const QString& preferenceKey)
+{
+  if (LoadState())
+  {
+    if (PersistentState::Pointer persistableState = state.Cast<PersistentState>())
+    {
+      if (persistableState->ShouldPersist() && preferenceStore.IsNotNull()
+          && !preferenceKey.isNull())
+      {
+      persistableState->Load(preferenceStore, preferenceKey);
+      }
+    }
+  }
+}
+
+void CommandStateProxy::RemoveListener(IStateListener* listener)
+{
+  if (state.IsNull())
+  {
+    this->RemoveListener(listener);
+  }
+  else
+  {
+    state->RemoveListener(listener);
+  }
+}
+
+void CommandStateProxy::Save(const SmartPointer<IPreferences>& store,
+                             const QString& preferenceKey)
+{
+  if (LoadState())
+  {
+    if (PersistentState::Pointer persistableState = state.Cast<PersistentState>())
+    {
+      persistableState->Save(store, preferenceKey);
+    }
+  }
+}
+
+void CommandStateProxy::SetId(const QString& id)
+{
+  PersistentState::SetId(id);
+  if (state.IsNotNull())
+  {
+    state->SetId(id);
+  }
+}
+
+void CommandStateProxy::SetShouldPersist(bool persisted)
+{
+  if (LoadState(persisted))
+  {
+    if (PersistentState::Pointer persistableState = state.Cast<PersistentState>())
+    {
+      persistableState->SetShouldPersist(persisted);
+    }
+  }
+}
+
+void CommandStateProxy::SetValue(const Object::Pointer& value)
+{
+  if (LoadState())
+  {
+    state->SetValue(value);
+  }
+}
+
+bool CommandStateProxy::ShouldPersist()
+{
+  if (LoadState())
+  {
+    if (PersistentState::Pointer persistableState = state.Cast<PersistentState>())
+    {
+      return persistableState->ShouldPersist();
+    }
+  }
+
+  return false;
+}
+
+QString CommandStateProxy::ToString() const
+{
+  if (state.IsNull())
+  {
+    return configurationElement->GetAttribute(stateAttributeName);
+  }
+
+  return state->ToString();
+}
+
+bool CommandStateProxy::LoadState(bool readPersistence)
+{
+  if (state.IsNull())
+  {
+    try
+    {
+      state = configurationElement->CreateExecutableExtension<State>(stateAttributeName);
+
+      if (state.IsNull())
+      {
+        const QString message = "The proxied state was the wrong class";
+        const IStatus::Pointer status(new Status(IStatus::ERROR_TYPE,
+                                                 PlatformUI::PLUGIN_ID(), 0, message, BERRY_STATUS_LOC));
+        WorkbenchPlugin::Log(message, status);
+        return false;
+      }
+
+      state->SetId(GetId());
+      configurationElement = 0;
+
+      // Try to load the persistent state, if possible.
+      if (readPersistence)
+      {
+        if (PersistentState::Pointer persistentState = state.Cast<PersistentState>())
+        {
+          persistentState->SetShouldPersist(true);
+        }
+      }
+      Load(preferenceStore, preferenceKey);
+
+      // Transfer the local listeners to the real state.
+      typedef IStateListener::Events::StateEvent::ListenerList ListenerListType;
+      const ListenerListType listenerArray = this->stateEvents.stateChanged.GetListeners();
+      for (ListenerListType::const_iterator i = listenerArray.begin();
+           i != listenerArray.end(); ++i)
+      {
+        state->AddListener(*(*i));
+        this->RemoveListener(*(*i));
+      }
+
+      return true;
+    }
+    catch (const CoreException& e)
+    {
+      const QString message = "The proxied state for '" + configurationElement->GetAttribute(stateAttributeName)
+          + "' could not be loaded";
+      IStatus::Pointer status(new Status(IStatus::ERROR_TYPE, PlatformUI::PLUGIN_ID(), 0,
+                                         message, e, BERRY_STATUS_LOC));
+      WorkbenchPlugin::Log(message, status);
+      return false;
+    }
+  }
+
+  return true;
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandStateProxy.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandStateProxy.h
new file mode 100644
index 0000000000..588c94ab03
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCommandStateProxy.h
@@ -0,0 +1,151 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYCOMMANDSTATEPROXY_H
+#define BERRYCOMMANDSTATEPROXY_H
+
+#include "berryPersistentState.h"
+
+namespace berry {
+
+struct IConfigurationElement;
+struct IPreferences;
+
+/**
+ * <p>
+ * A proxy for handler state that has been defined in XML. This delays the class
+ * loading until the state is really asked for information. Asking a proxy for
+ * anything (except disposing, and adding and removing listeners) will cause the
+ * proxy to instantiate the proxied handler.
+ * </p>
+ * <p>
+ * Loading the proxied state will automatically cause it to load its value from
+ * the preference store. Disposing of the state will cause it to persist its
+ * value.
+ * </p>
+ * <p>
+ * This class is not intended for use outside of the
+ * <code>org.eclipse.ui.workbench</code> plug-in.
+ * </p>
+ */
+class CommandStateProxy : public PersistentState
+{
+
+public:
+
+  berryObjectMacro(berry::CommandStateProxy)
+
+private:
+
+  /**
+   * The configuration element from which the state can be created. This value
+   * will exist until the element is converted into a real class -- at which
+   * point this value will be set to <code>null</code>.
+   */
+  SmartPointer<IConfigurationElement> configurationElement;
+
+  /**
+   * The key in the preference store to locate the persisted state.
+   */
+  const QString preferenceKey;
+
+  /**
+   * The preference store containing the persisted state, if any.
+   */
+  const SmartPointer<IPreferences> preferenceStore;
+
+  /**
+   * The real state. This value is <code>null</code> until the proxy is
+   * forced to load the real state. At this point, the configuration element
+   * is converted, nulled out, and this state gains a reference.
+   */
+  SmartPointer<State> state;
+
+  /**
+   * The name of the configuration element attribute which contains the
+   * information necessary to instantiate the real state.
+   */
+  const QString stateAttributeName;
+
+public:
+
+  /**
+   * Constructs a new instance of <code>HandlerState</code> with all the
+   * information it needs to create the real state later.
+   *
+   * @param configurationElement
+   *            The configuration element from which the real class can be
+   *            loaded at run-time; must not be <code>null</code>.
+   * @param stateAttributeName
+   *            The name of the attribute or element containing the state
+   *            executable extension; must not be <code>null</code>.
+   * @param preferenceStore
+   *            The preference store to which any persistent data should be
+   *            written, and from which it should be loaded; may be
+   *            <code>null</code>.
+   * @param preferenceKey
+   *            The key at which the persistent data is located within the
+   *            preference store.
+   */
+  CommandStateProxy(const SmartPointer<IConfigurationElement>& configurationElement,
+                    const QString& stateAttributeName,
+                    const SmartPointer<IPreferences>& preferenceStore,
+                    const QString& preferenceKey);
+
+  void AddListener(IStateListener* listener);
+
+  ~CommandStateProxy();
+
+  Object::Pointer GetValue() const;
+
+  void Load(const SmartPointer<IPreferences>& store,
+            const QString& preferenceKey);
+
+  using State::RemoveListener;
+  void RemoveListener(IStateListener* listener);
+
+  void Save(const SmartPointer<IPreferences>& store,
+            const QString& preferenceKey);
+
+  void SetId(const QString& id);
+
+  void SetShouldPersist(bool persisted);
+
+  void SetValue(const Object::Pointer& value);
+
+  bool ShouldPersist();
+
+  QString ToString() const;
+
+private:
+
+  /**
+   * Loads the state, if possible. If the state is loaded, then the member
+   * variables are updated accordingly and the state is told to load its value
+   * from the preference store.
+   *
+   * @param readPersistence
+   *            Whether the persistent state for this object should be read.
+   * @return <code>true</code> if the state is now non-null;
+   *         <code>false</code> otherwise.
+   */
+  bool LoadState(bool readPersistence = false);
+
+};
+
+}
+
+#endif // BERRYCOMMANDSTATEPROXY_H
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryCompositeExpression.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCompositeExpression.cpp
similarity index 97%
copy from BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryCompositeExpression.cpp
copy to BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCompositeExpression.cpp
index 9f6e8f93b7..b8a0266b37 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryCompositeExpression.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCompositeExpression.cpp
@@ -1,82 +1,82 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryCompositeExpression.h"
 
 #include "Poco/Hash.h"
 
 namespace berry
 {
 
 const uint CompositeExpression::HASH_INITIAL = Poco::Hash<std::string>()("berry::CompositeExpression");
 
 void CompositeExpression::Add(Expression::Pointer expression)
 {
   fExpressions.push_back(expression);
 }
 
 QList<Expression::Pointer> CompositeExpression::GetChildren()
 {
   return fExpressions;
 }
 
 EvaluationResult::ConstPointer CompositeExpression::EvaluateAnd(IEvaluationContext* scope) const
 {
   if (fExpressions.size() == 0)
     return EvaluationResult::TRUE_EVAL;
   EvaluationResult::ConstPointer result = EvaluationResult::TRUE_EVAL;
   foreach (Expression::Pointer iter, fExpressions)
   {
     result = result->And(iter->Evaluate(scope));
     // keep iterating even if we have a not loaded found. It can be
     // that we find a FALSE_EVAL which will result in a better result.
     if (result == EvaluationResult::FALSE_EVAL)
       return result;
   }
   return result;
 }
 
 EvaluationResult::ConstPointer CompositeExpression::EvaluateOr(IEvaluationContext* scope) const
 {
   if (fExpressions.size() == 0)
     return EvaluationResult::TRUE_EVAL;
   EvaluationResult::ConstPointer result = EvaluationResult::FALSE_EVAL;
   foreach (Expression::Pointer iter, fExpressions)
   {
     result = result->Or(iter->Evaluate(scope));
     if (result == EvaluationResult::TRUE_EVAL)
       return result;
   }
   return result;
 }
 
-void CompositeExpression::CollectExpressionInfo(ExpressionInfo* info)
+void CompositeExpression::CollectExpressionInfo(ExpressionInfo* info) const
 {
   if (fExpressions.size() == 0)
     return;
 
   foreach (Expression::Pointer iter, fExpressions)
   {
     iter->CollectExpressionInfo(info);
   }
 }
 
-uint CompositeExpression::ComputeHashCode()
+uint CompositeExpression::ComputeHashCode() const
 {
   return HASH_INITIAL * HASH_FACTOR + this->HashCode(fExpressions);
 }
 
 } // namespace berry
diff --git a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryCompositeExpression.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCompositeExpression.h
similarity index 89%
copy from BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryCompositeExpression.h
copy to BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCompositeExpression.h
index b1e89cdb2e..da9c604a0f 100644
--- a/BlueBerry/Bundles/org.blueberry.core.expressions/src/internal/berryCompositeExpression.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryCompositeExpression.h
@@ -1,62 +1,62 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYCOMPOSITEEXPRESSION_H_
 #define BERRYCOMPOSITEEXPRESSION_H_
 
 #include "berryExpression.h"
 #include "berryExpressionInfo.h"
 #include "berryEvaluationResult.h"
 #include "berryIEvaluationContext.h"
 
 
 namespace berry
 {
 
 class CompositeExpression : public Expression
 {
 
 public:
-  berryObjectMacro(CompositeExpression);
+  berryObjectMacro(CompositeExpression)
 
 private:
 
   /**
    * The seed for the hash code for all composite expressions.
    */
   static const uint HASH_INITIAL;
 
 protected:
   QList<Expression::Pointer> fExpressions;
 
   virtual EvaluationResult::ConstPointer EvaluateAnd(IEvaluationContext* scope) const;
   virtual EvaluationResult::ConstPointer EvaluateOr(IEvaluationContext* scope) const;
 
-  virtual uint ComputeHashCode();
+  virtual uint ComputeHashCode() const;
 
 public:
 
   virtual void Add(Expression::Pointer expression);
 
   virtual QList<Expression::Pointer> GetChildren();
 
-  virtual void CollectExpressionInfo(ExpressionInfo* info);
+  virtual void CollectExpressionInfo(ExpressionInfo* info) const;
 
 };
 
 } // namespace berry
 
 #endif /*BERRYCOMPOSITEEXPRESSION_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryContributionRoot.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryContributionRoot.cpp
index ca0af6e9f1..5b1745a59e 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryContributionRoot.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryContributionRoot.cpp
@@ -1,96 +1,98 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #include "berryContributionRoot.h"
 
 #include <berryIContributionItem.h>
 #include <berryIEvaluationReference.h>
 #include <berryAbstractContributionFactory.h>
 
 #include "berryAlwaysEnabledExpression.h"
 #include "berryInternalMenuService.h"
 
 namespace berry {
 
 ContributionRoot::ContributionRoot(InternalMenuService* menuService, const QSet<SmartPointer<IEvaluationReference> > &restriction,
                  ContributionManager* mgr, AbstractContributionFactory* factory)
-  : menuService(menuService), restriction(restriction), mgr(mgr),
-    factory(factory)
+  : menuService(menuService)
+  , mgr(mgr)
+  , factory(factory)
+  , restriction(restriction)
 {
 }
 
 void ContributionRoot::AddContributionItem(const SmartPointer<IContributionItem>& item,
                                            const SmartPointer<Expression>& visibleWhen)
 {
   if (item.IsNull())
     throw std::invalid_argument("item must not be null");
 
   topLevelItems.append(item);
   Expression::Pointer visibleWhenTmp = visibleWhen;
   if (visibleWhenTmp.IsNull())
     visibleWhenTmp = AlwaysEnabledExpression::INSTANCE;
 
   menuService->RegisterVisibleWhen(item, visibleWhenTmp, restriction,
                                    CreateIdentifierId(item));
   itemsToExpressions.append(item);
 }
 
 QList<SmartPointer<IContributionItem> > ContributionRoot::GetItems() const
 {
   return topLevelItems;
 }
 
 void ContributionRoot::Release()
 {
   foreach (IContributionItem::Pointer item, itemsToExpressions)
   {
     menuService->UnregisterVisibleWhen(item, restriction);
     //item.dispose();
   }
 }
 
 void ContributionRoot::RegisterVisibilityForChild(const SmartPointer<IContributionItem>& item,
                                 const SmartPointer<Expression>& visibleWhen)
 {
   if (item.IsNull())
     throw std::invalid_argument("item must not be null");
 
   Expression::Pointer visibleWhenTmp = visibleWhen;
   if (visibleWhenTmp.IsNull())
     visibleWhenTmp = AlwaysEnabledExpression::INSTANCE;
 
   menuService->RegisterVisibleWhen(item, visibleWhenTmp, restriction,
                                    CreateIdentifierId(item));
   itemsToExpressions.append(item);
 }
 
 ContributionManager* ContributionRoot::GetManager() const
 {
   return mgr;
 }
 
 QString ContributionRoot::CreateIdentifierId(const SmartPointer<IContributionItem>& item)
 {
   QString namespaze = factory->GetNamespace();
   // create the activity identifier ID. If this factory doesn't have a namespace
   // it will be null.
   QString identifierID = (!namespaze.isEmpty()) ? namespaze + '/' + item->GetId()
                                                 : QString();
   return identifierID;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryContributionRoot.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryContributionRoot.h
index 2f710b7061..7e09de161a 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryContributionRoot.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryContributionRoot.h
@@ -1,94 +1,94 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYCONTRIBUTIONROOT_H
 #define BERRYCONTRIBUTIONROOT_H
 
 #include <berryIContributionRoot.h>
 
 #include <QSet>
 
 namespace berry {
 
 struct IEvaluationReference;
+struct InternalMenuService;
 
-class InternalMenuService;
 class ContributionManager;
 class AbstractContributionFactory;
 
 /**
  * Default implementation.
  */
 class ContributionRoot : public IContributionRoot
 {
 
 private:
 
   QList<SmartPointer<IContributionItem> > topLevelItems;
   QList<SmartPointer<IContributionItem> > itemsToExpressions;
   InternalMenuService* menuService;
   ContributionManager* mgr;
   AbstractContributionFactory* factory;
 
 public:
 
   QSet<SmartPointer<IEvaluationReference> > restriction;
 
   berryObjectMacro(berry::ContributionRoot)
 
   ContributionRoot(InternalMenuService* menuService, const QSet<SmartPointer<IEvaluationReference> >& restriction,
                    ContributionManager* mgr, AbstractContributionFactory* factory);
 
   /*
    * @see IContributionRoot#AddContributionItem(IContributionItem, Expression)
    */
   void AddContributionItem(const SmartPointer<IContributionItem>& item,
                            const SmartPointer<Expression>& visibleWhen);
 
   QList<SmartPointer<IContributionItem> > GetItems() const;
 
   /**
    * Unregister all visible when expressions from the menu service.
    */
   void Release();
 
   /*
    * @see IContributionRoot#RegisterVisibilityForChild(IContributionItem, Expression)
    */
   void RegisterVisibilityForChild(const SmartPointer<IContributionItem>& item,
                                   const SmartPointer<Expression>& visibleWhen);
 
   /**
    * @return Returns the mgr.
    */
   ContributionManager* GetManager() const;
 
 private:
 
   /**
      * Create the activity identifier for this contribution item.
      *
    * @param item the item
    * @return the identifier
    */
   QString CreateIdentifierId(const SmartPointer<IContributionItem>& item);
 
 };
 
 }
 
 #endif // BERRYCONTRIBUTIONROOT_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDefaultSaveable.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDefaultSaveable.cpp
index dea85307d6..f22f2e62d5 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDefaultSaveable.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDefaultSaveable.cpp
@@ -1,116 +1,123 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryDefaultSaveable.h"
 
 #include "berryIWorkbenchPart.h"
 #include "berryIWorkbenchPage.h"
 #include "berryUIException.h"
 #include "berryImageDescriptor.h"
 
 namespace berry
 {
 
 DefaultSaveable::DefaultSaveable(IWorkbenchPart::Pointer _part) :
   part(_part)
 {
 
 }
 
 void DefaultSaveable::DoSave(/*IProgressMonitor monitor*/)
 {
   IWorkbenchPart::Pointer _part(part);
   if (_part.Cast<ISaveablePart> () != 0)
   {
     _part.Cast<ISaveablePart> ()->DoSave(/*monitor*/);
   }
 }
 
 QString DefaultSaveable::GetName() const
 {
   return part.Lock()->GetPartName();
 }
 
 ImageDescriptor::Pointer DefaultSaveable::GetImageDescriptor() const
 {
   //TODO DefaultSaveable GetImageDescriptor
   //  Image image = part.getTitleImage();
   //  if (image == null)
   //  {
   //    return null;
   //  }
   //  return ImageDescriptor.createFromImage(image);
   return ImageDescriptor::Pointer(0);
 }
 
 QString DefaultSaveable::GetToolTipText() const
 {
   return part.Lock()->GetTitleToolTip();
 }
 
 bool DefaultSaveable::IsDirty() const
 {
   IWorkbenchPart::Pointer _part(part);
   if (_part.Cast<ISaveablePart> () != 0)
   {
     return _part.Cast<ISaveablePart> ()->IsDirty();
   }
   return false;
 }
 
-bool DefaultSaveable::operator<(const Saveable* obj) const
+uint DefaultSaveable::HashCode() const
+{
+  return part.Lock()->HashCode();
+}
+
+bool DefaultSaveable::operator<(const Object* obj) const
 {
   if (this == obj)
     return false;
   if (obj == 0)
     return true;
 
   const DefaultSaveable* other = dynamic_cast<const DefaultSaveable*> (obj);
+  if (other == NULL) return true;
+
   if (part.Expired())
   {
     return !other->part.Expired();
   }
   else
     return part < other->part;
 }
 
 bool DefaultSaveable::Show(IWorkbenchPage::Pointer page)
 {
   IWorkbenchPart::Pointer _part(part);
   IWorkbenchPartReference::Pointer reference = page->GetReference(_part);
   if (reference != 0)
   {
     page->Activate(_part);
     return true;
   }
   if (_part.Cast<IViewPart> () != 0)
   {
     IViewPart::Pointer viewPart = _part.Cast<IViewPart> ();
     try
     {
       page->ShowView(viewPart->GetViewSite()->GetId(),
                      viewPart->GetViewSite()->GetSecondaryId(),
                      IWorkbenchPage::VIEW_ACTIVATE);
     } catch (const PartInitException& /*e*/)
     {
       return false;
     }
     return true;
   }
   return false;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDefaultSaveable.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDefaultSaveable.h
index b1e5f4e6c4..5b603210a0 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDefaultSaveable.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDefaultSaveable.h
@@ -1,97 +1,102 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYDEFAULTSAVEABLE_H_
 #define BERRYDEFAULTSAVEABLE_H_
 
 #include "berrySaveable.h"
 
 namespace berry {
 
 /**
  * A default {@link Saveable} implementation that wrappers a regular
  * workbench part (one that does not itself adapt to Saveable).
  *
  * @since 3.2
  */
 class DefaultSaveable : public Saveable {
 
 private:
 
   WeakPointer<IWorkbenchPart> part;
 
 
 public:
 
   /**
    * Creates a new DefaultSaveable.
    *
    * @param part
    *            the part represented by this model
    */
   DefaultSaveable(SmartPointer<IWorkbenchPart> part);
 
   /*
    * (non-Javadoc)
    *
    * @see org.blueberry.ui.Saveable#doSave(org.blueberry.core.runtime.IProgressMonitor)
    */
   void DoSave(/*IProgressMonitor monitor*/);
 
   /*
    * (non-Javadoc)
    *
    * @see org.blueberry.ui.Saveable#getName()
    */
   QString GetName() const;
 
   /*
    * (non-Javadoc)
    *
    * @see org.blueberry.ui.Saveable#getImageDescriptor()
    */
   SmartPointer<ImageDescriptor> GetImageDescriptor() const;
 
   /*
    * (non-Javadoc)
    *
    * @see org.blueberry.ui.Saveable#getToolTipText()
    */
   QString GetToolTipText() const;
 
   /*
    * (non-Javadoc)
    *
    * @see org.blueberry.ui.Saveable#isDirty()
    */
   bool IsDirty() const;
 
+  /* (non-Javadoc)
+   * @see Object#HashCode()
+   */
+  uint HashCode() const;
+
   /* (non-Javadoc)
    * @see java.lang.Object#equals(java.lang.Object)
    */
-  bool operator<(const Saveable* obj) const;
+  bool operator<(const Object* obj) const;
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.Saveable#show(org.blueberry.ui.IWorkbenchPage)
    */
   bool Show(SmartPointer<IWorkbenchPage> page);
 
 };
 
 }
 
 #endif /* BERRYDEFAULTSAVEABLE_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDefaultStackPresentationSite.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDefaultStackPresentationSite.h
index a5a9313780..bb32abdfac 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDefaultStackPresentationSite.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDefaultStackPresentationSite.h
@@ -1,99 +1,101 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYDEFAULTSTACKPRESENTATIONSITE_H_
 #define BERRYDEFAULTSTACKPRESENTATIONSITE_H_
 
 #include "presentations/berryIStackPresentationSite.h"
 #include "presentations/berryStackPresentation.h"
 
 namespace berry
 {
 
 class DefaultStackPresentationSite: public IStackPresentationSite
 {
 
 private:
 
   StackPresentation::Pointer presentation;
 
   int state;
 
   int activeState;
 
 public:
 
-  berryObjectMacro(DefaultStackPresentationSite);
+  berryObjectMacro(DefaultStackPresentationSite)
 
   DefaultStackPresentationSite();
 
   void SetPresentation(StackPresentation::Pointer newPresentation);
 
   StackPresentation::Pointer GetPresentation();
 
   int GetState();
 
   void SetActive(int activeState);
 
   int GetActive();
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.skins.IStackPresentationSite#selectPart(org.blueberry.ui.internal.skins.IPresentablePart)
    */
   void SelectPart(IPresentablePart::Pointer toSelect);
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.skins.IPresentationSite#setState(int)
    */
   void SetState(int newState);
 
   void SetPresentationState(int newState);
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.skins.IPresentablePart#isClosable()
    */
   bool IsCloseable(IPresentablePart::Pointer part);
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.skins.IPresentationSite#dragStart(org.blueberry.ui.internal.skins.IPresentablePart, boolean)
    */
   void DragStart(IPresentablePart::Pointer beingDragged,
       Point& initialPosition, bool keyboard);
 
+  using IStackPresentationSite::Close;
+
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.skins.IPresentationSite#close(org.blueberry.ui.internal.skins.IPresentablePart)
    */
   void Close(IPresentablePart::Pointer toClose);
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.skins.IPresentationSite#dragStart(boolean)
    */
   void DragStart(Point& initialPosition, bool keyboard);
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.presentations.IStackPresentationSite#supportsState(int)
    */
   bool SupportsState(int state);
 
   //    void AddSystemActions(IMenuManager menuManager) {
   //
   //    }
 
 };
 
 }
 
 #endif /* BERRYDEFAULTSTACKPRESENTATIONSITE_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDetachedPlaceHolder.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDetachedPlaceHolder.cpp
index f7243b0eee..3afc3ee7dd 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDetachedPlaceHolder.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDetachedPlaceHolder.cpp
@@ -1,144 +1,146 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryDetachedPlaceHolder.h"
 
 #include "berryILayoutContainer.h"
 #include "berryPartPlaceholder.h"
 #include "berryWorkbenchConstants.h"
 
 namespace berry
 {
 
 DetachedPlaceHolder::DetachedPlaceHolder(const QString& id,
     const Rectangle& b) :
   PartPlaceholder(id), bounds(b)
 {
 
 }
 
 void DetachedPlaceHolder::Add(LayoutPart::Pointer newPart)
 {
   if (newPart.Cast<PartPlaceholder> () == 0)
   {
     return;
   }
   children.push_back(newPart);
 }
 
 bool DetachedPlaceHolder::AllowsBorder()
 {
   return false;
 }
 
 bool DetachedPlaceHolder::AllowsAdd(LayoutPart::Pointer toAdd)
 {
   return PartPlaceholder::AllowsAdd(toAdd);
 }
 
 bool DetachedPlaceHolder::AllowsAutoFocus()
 {
   return PartPlaceholder::AllowsAutoFocus();
 }
 
 Rectangle DetachedPlaceHolder::GetBounds()
 {
   return bounds;
 }
 
 QList<LayoutPart::Pointer> DetachedPlaceHolder::GetChildren()
 {
   return children;
 }
 
 void DetachedPlaceHolder::Remove(LayoutPart::Pointer part)
 {
   children.removeAll(part);
 }
 
 void DetachedPlaceHolder::Replace(LayoutPart::Pointer oldPart,
     LayoutPart::Pointer newPart)
 {
   this->Remove(oldPart);
   this->Add(newPart);
 }
 
 void DetachedPlaceHolder::RestoreState(IMemento::Pointer memento)
 {
   // Read the bounds.
   int x = 0;
   memento->GetInteger(WorkbenchConstants::TAG_X, x);
   int y = 0;
   memento->GetInteger(WorkbenchConstants::TAG_Y, y);
   int width = 0;
   memento->GetInteger(WorkbenchConstants::TAG_WIDTH, width);
   int height = 0;
   memento->GetInteger(WorkbenchConstants::TAG_HEIGHT, height);
 
   bounds = Rectangle(x, y, width, height);
 
   // Restore the placeholders.
   QList<IMemento::Pointer> childrenMem(memento
          ->GetChildren(WorkbenchConstants::TAG_VIEW));
-  for (std::size_t i = 0; i < childrenMem.size(); i++) {
+  for (int i = 0; i < childrenMem.size(); i++)
+  {
      QString id;
      childrenMem[i]->GetString(WorkbenchConstants::TAG_ID, id);
      PartPlaceholder::Pointer holder(new PartPlaceholder(id));
      holder->SetContainer(ILayoutContainer::Pointer(this));
      children.push_back(holder);
   }
 }
 
 void DetachedPlaceHolder::SaveState(IMemento::Pointer memento)
 {
   // Save the bounds.
   memento->PutInteger(WorkbenchConstants::TAG_X, bounds.x);
   memento->PutInteger(WorkbenchConstants::TAG_Y, bounds.y);
   memento->PutInteger(WorkbenchConstants::TAG_WIDTH, bounds.width);
   memento->PutInteger(WorkbenchConstants::TAG_HEIGHT, bounds.height);
 
   // Save the views.
   for (QList<LayoutPart::Pointer>::iterator i = children.begin();
-      i != children.end(); ++i) {
+      i != children.end(); ++i)
+  {
      IMemento::Pointer childMem = memento
              ->CreateChild(WorkbenchConstants::TAG_VIEW);
      childMem->PutString(WorkbenchConstants::TAG_ID, (*i)->GetID());
   }
 }
 
 void DetachedPlaceHolder::FindSashes(LayoutPart::Pointer /*part*/,
     PartPane::Sashes& sashes)
 {
   ILayoutContainer::Pointer container = this->GetContainer();
 
   if (container != 0)
   {
     container->FindSashes(LayoutPart::Pointer(this), sashes);
   }
 }
 
 ILayoutContainer::ChildrenType DetachedPlaceHolder::GetChildren() const
 {
   return children;
 }
 
 void DetachedPlaceHolder::ResizeChild(LayoutPart::Pointer childThatChanged)
 {
   PartPlaceholder::ResizeChild(childThatChanged);
 }
 
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDetachedWindow.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDetachedWindow.cpp
index cf1cff0b4c..58084a7f33 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDetachedWindow.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDetachedWindow.cpp
@@ -1,544 +1,540 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "tweaklets/berryGuiWidgetsTweaklet.h"
 
 #include "berryDetachedWindow.h"
 
 #include "berryIWorkbenchPartConstants.h"
 #include "berryISaveablePart.h"
 
 #include "berryWorkbenchWindow.h"
 
 #include "berryWorkbenchConstants.h"
 #include "berryEditorManager.h"
 #include "berryDragUtil.h"
 
 namespace berry
 {
 
 DetachedWindow::ShellListener::ShellListener(DetachedWindow* wnd) :
   window(wnd)
 {
 
 }
 
-void DetachedWindow::ShellListener::ShellClosed(ShellEvent::Pointer e)
+void DetachedWindow::ShellListener::ShellClosed(const ShellEvent::Pointer& e)
 {
   // hold on to a reference of the DetachedWindow instance
   // (otherwise, wnd->HandleClose() woulde delete the DetachedWindow
   // instance too early, trying to write to members afterwards)
   DetachedWindow::Pointer wnd(window);
 
   // only continue to close if the handleClose
   // wasn't canceled
   e->doit = wnd->HandleClose();
 }
 
 DetachedWindow::ShellControlListener::ShellControlListener(DetachedWindow* wnd) :
   window(wnd)
 {
 
 }
 
 GuiTk::IControlListener::Events::Types DetachedWindow::ShellControlListener::GetEventTypes() const
 {
   return Events::RESIZED;
 }
 
 void DetachedWindow::ShellControlListener::ControlResized(
     GuiTk::ControlEvent::Pointer e)
 {
   window->folder->SetBounds(
       Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetClientArea(e->item));
 }
 
 DetachedWindow::DetachedWindow(WorkbenchPage* workbenchPage)
+  : folder(new PartStack(workbenchPage, false))
+  , page(workbenchPage)
+  , hideViewsOnClose(true)
+  , shellListener(new ShellListener(this))
+  , resizeListener(new ShellControlListener(this))
 {
-  shellListener = new ShellListener(this);
-  resizeListener = new ShellControlListener(this);
-
-  this->page = workbenchPage;
-  hideViewsOnClose = true;
-
-  folder = new PartStack(page, false);
 }
 
-void DetachedWindow::PropertyChange(Object::Pointer /*source*/, int propId)
+void DetachedWindow::PropertyChange(const Object::Pointer& /*source*/, int propId)
 {
   if (propId == IWorkbenchPartConstants::PROP_TITLE)
   {
     this->UpdateTitle();
   }
   else if (propId == PartStack::PROP_SELECTION)
   {
     this->ActivePartChanged(this->GetPartReference(folder->GetSelection()));
   }
 }
 
 Shell::Pointer DetachedWindow::GetShell()
 {
   return windowShell;
 }
 
 void DetachedWindow::Create()
 {
   folder->AddListener(this);
 
   windowShell
       = page->GetWorkbenchWindow().Cast<WorkbenchWindow> () ->GetDetachedWindowPool()->AllocateShell(
-          shellListener);
+          shellListener.data());
   windowShell->SetData(Object::Pointer(this));
-  windowShell->SetText(""); //$NON-NLS-1$
+  windowShell->SetText("");
 
-  DragUtil::AddDragTarget(windowShell->GetControl(),
-      IDragOverListener::Pointer(this));
+  DragUtil::AddDragTarget(windowShell->GetControl(), this);
   hideViewsOnClose = true;
   if (bounds.IsEmpty())
   {
     Rectangle windowRect = page->GetWorkbenchWindow()->GetShell()->GetBounds();
     Point center(windowRect.x + windowRect.width / 2, windowRect.y
         - windowRect.height / 2);
     bounds = Rectangle(center.x - 150, center.y + 100, 300, 200);
   }
 
   // Force the rect into the current display
   Rectangle dispBounds =
       Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetAvailableScreenSize();
   if (bounds.width > dispBounds.width)
     bounds.width = dispBounds.width;
   if (bounds.height > dispBounds.height)
     bounds.height = dispBounds.height;
   if (bounds.x + bounds.width > dispBounds.width)
     bounds.x = dispBounds.width - bounds.width;
   if (bounds.y + bounds.height > dispBounds.height)
     bounds.y = dispBounds.height - bounds.height;
 
   this->GetShell()->SetBounds(bounds);
 
   this->ConfigureShell(windowShell);
 
   this->CreateContents(windowShell->GetControl());
   //windowShell->Layout(true);
   //folder->SetBounds(Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetClientArea(windowShell->GetControl()));
 }
 
 void DetachedWindow::Add(LayoutPart::Pointer part)
 {
 
   Shell::Pointer shell = this->GetShell();
   if (shell != 0)
   {
     part->Reparent(shell->GetControl());
   }
   folder->Add(part);
   this->UpdateMinimumSize();
 }
 
 bool DetachedWindow::BelongsToWorkbenchPage(
     IWorkbenchPage::Pointer workbenchPage)
 {
   return (workbenchPage == this->page);
 }
 
 bool DetachedWindow::Close()
 {
   hideViewsOnClose = false;
   Shell::Pointer shell = this->GetShell();
   if (shell != 0)
   {
     shell->Close();
   }
   return true;
 }
 
 IDropTarget::Pointer DetachedWindow::Drag(void* /*currentControl*/,
-    Object::Pointer draggedObject, const Point& position, const Rectangle& /*dragRectangle*/)
+    const Object::Pointer& draggedObject, const Point& position, const Rectangle& /*dragRectangle*/)
 {
 
   if (draggedObject.Cast<PartPane> () == 0)
   {
     return IDropTarget::Pointer(0);
   }
 
   PartPane::Pointer sourcePart = draggedObject.Cast<PartPane> ();
 
   if (sourcePart->GetWorkbenchWindow() != page->GetWorkbenchWindow())
   {
     return IDropTarget::Pointer(0);
   }
 
   // Only handle the event if the source part is acceptable to the particular PartStack
   IDropTarget::Pointer target;
   if (folder->AllowsDrop(sourcePart))
   {
     target = folder->GetDropTarget(draggedObject, position);
 
     if (target == 0)
     {
       Rectangle displayBounds =
           DragUtil::GetDisplayBounds(folder->GetControl());
       if (displayBounds.Contains(position))
       {
         StackDropResult::Pointer stackDropResult(new StackDropResult(
             displayBounds, Object::Pointer(0)));
         target = folder->CreateDropTarget(sourcePart, stackDropResult);
       }
       else
       {
         return IDropTarget::Pointer(0);
       }
     }
   }
 
   return target;
 }
 
 ILayoutContainer::ChildrenType DetachedWindow::GetChildren() const
 {
   return folder->GetChildren();
 }
 
 WorkbenchPage::Pointer DetachedWindow::GetWorkbenchPage()
 {
   return WorkbenchPage::Pointer(this->page);
 }
 
 void DetachedWindow::RestoreState(IMemento::Pointer memento)
 {
   // Read the bounds.
   int x = 0;
   memento->GetInteger(WorkbenchConstants::TAG_X, x);
   int y = 0;
   memento->GetInteger(WorkbenchConstants::TAG_Y, y);
   int width = 0;
   memento->GetInteger(WorkbenchConstants::TAG_WIDTH, width);
   int height = 0;
   memento->GetInteger(WorkbenchConstants::TAG_HEIGHT, height);
 
   // memento->GetInteger(WorkbenchConstants::TAG_FLOAT);
 
   // Set the bounds.
   bounds = Rectangle(x, y, width, height);
   if (GetShell())
   {
     GetShell()->SetBounds(bounds);
   }
 
   // Create the folder.
   IMemento::Pointer childMem =
       memento->GetChild(WorkbenchConstants::TAG_FOLDER);
   if (childMem)
   {
     folder->RestoreState(childMem);
   }
 }
 
 void DetachedWindow::SaveState(IMemento::Pointer memento)
 {
   if (GetShell())
   {
     bounds = GetShell()->GetBounds();
   }
 
   // Save the bounds.
   memento->PutInteger(WorkbenchConstants::TAG_X, bounds.x);
   memento->PutInteger(WorkbenchConstants::TAG_Y, bounds.y);
   memento->PutInteger(WorkbenchConstants::TAG_WIDTH, bounds.width);
   memento->PutInteger(WorkbenchConstants::TAG_HEIGHT, bounds.height);
 
   // Save the views.
   IMemento::Pointer childMem = memento->CreateChild(
       WorkbenchConstants::TAG_FOLDER);
   folder->SaveState(childMem);
 }
 
 void* DetachedWindow::GetControl()
 {
   return folder->GetControl();
 }
 
 int DetachedWindow::Open()
 {
 
   if (this->GetShell() == 0)
   {
     this->Create();
   }
 
   Rectangle bounds = this->GetShell()->GetBounds();
 
   if (!(bounds == this->GetShell()->GetBounds()))
   {
     this->GetShell()->SetBounds(bounds);
   }
 
   this->GetShell()->SetVisible(true);
 
   folder->SetBounds(Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetClientArea(this->GetShell()->GetControl()));
 
   return 0;
 }
 
 void DetachedWindow::ActivePartChanged(
     IWorkbenchPartReference::Pointer partReference)
 {
   if (activePart == partReference)
   {
     return;
   }
 
   if (activePart != 0)
   {
     activePart->RemovePropertyListener(this);
   }
   activePart = partReference;
   if (partReference != 0)
   {
     partReference->AddPropertyListener(this);
   }
   this->UpdateTitle();
 }
 
 void DetachedWindow::ConfigureShell(Shell::Pointer shell)
 {
   this->UpdateTitle();
 
   Tweaklets::Get(GuiWidgetsTweaklet::KEY)->AddControlListener(
       shell->GetControl(), resizeListener);
   //shell.addListener(SWT.Activate, activationListener);
   //shell.addListener(SWT.Deactivate, activationListener);
 
   //TODO DetachedWindow key bindings
   //  // Register this detached view as a window (for key bindings).
   //  IContextService contextService = (IContextService) getWorkbenchPage()
   //  .getWorkbenchWindow().getWorkbench().getService(IContextService.class);
   //  contextService.registerShell(shell, IContextService.TYPE_WINDOW);
   //
   //  page.getWorkbenchWindow().getWorkbench().getHelpSystem().setHelp(shell,
   //      IWorkbenchHelpContextIds.DETACHED_WINDOW);
 }
 
 void* DetachedWindow::CreateContents(void* parent)
 {
   // Create the tab folder.
   folder->CreateControl(parent);
 
   // Reparent each view in the tab folder.
   QList<PartPane::Pointer> detachedChildren;
   this->CollectViewPanes(detachedChildren, this->GetChildren());
   for (QList<PartPane::Pointer>::iterator itr = detachedChildren.begin(); itr
       != detachedChildren.end(); ++itr)
   {
     PartPane::Pointer part = *itr;
     part->Reparent(parent);
   }
 
   //TODO DetachedWindow listen to folder events (update size?)
   //  if (folder->GetPresentation()
   //    instanceof TabbedStackPresentation)
   //    {
   //      TabbedStackPresentation stack = (TabbedStackPresentation) folder.getPresentation();
   //      AbstractTabFolder tabFolder = stack.getTabFolder();
   //      tabFolder.addListener(new TabFolderListener()
   //      {
   //      public void handleEvent(TabFolderEvent e)
   //        {
   //          switch (e.type)
   //          {
   //            case TabFolderEvent.EVENT_CLOSE:
   //            {
   //              updateMinimumSize();
   //              break;
   //            }
   //            case TabFolderEvent.EVENT_PREFERRED_SIZE:
   //            {
   //              updateMinimumSize();
   //              break;
   //            }
   //          }
   //        }
   //      });
   //    }
 
   // Return tab folder control.
   return folder->GetControl();
 }
 
 void DetachedWindow::UpdateTitle()
 {
   if (activePart != 0)
   {
     // Uncomment to set the shell title to match the title of the active part
     //            String text = activePart.getTitle();
     //
     //            if (!text.equals(s.getText())) {
     //                s.setText(text);
     //            }
   }
 }
 
 void DetachedWindow::UpdateMinimumSize()
 {
   //  // We can only do this for 'Tabbed' stacked presentations.
   //  if (folder.getPresentation().Cast<TabbedStackPresentation>() != 0)
   //  {
   //    TabbedStackPresentation stack = (TabbedStackPresentation) folder.getPresentation();
   //
   //    if (stack->GetPartList().size() == 1)
   //    {
   //      // Get the minimum space required for the part
   //      int width = stack->ComputePreferredSize(true, Constants::INF, Constants::INF, 0);
   //      int height = stack->ComputePreferredSize(false, Constants::INF, Constants::INF, 0);
   //
   //      // Take the current shell 'trim' into account
   //      int shellHeight = windowShell->GetBounds().height - windowShell->GetClientArea().height;
   //      int shellWidth = windowShell->GetBounds().width - windowShell->GetClientArea().width;
   //
   //      windowShell->SetMinimumSize(width + shellWidth, height + shellHeight);
   //    }
   //  }
 }
 
 IWorkbenchPartReference::Pointer DetachedWindow::GetPartReference(
     LayoutPart::Pointer pane)
 {
 
   if (pane == 0 || pane.Cast<PartPane> () == 0)
   {
     return IWorkbenchPartReference::Pointer(0);
   }
 
   return pane.Cast<PartPane> ()->GetPartReference();
 }
 
 bool DetachedWindow::HandleClose()
 {
 
   if (hideViewsOnClose)
   {
     QList<PartPane::Pointer> views;
     this->CollectViewPanes(views, this->GetChildren());
 
     // Save any dirty views
     if (!this->HandleSaves(views))
     {
       return false; // User canceled the save
     }
 
     // OK, go on with the closing
     for (QList<PartPane::Pointer>::iterator itr = views.begin(); itr
         != views.end(); ++itr)
     {
       PartPane::Pointer child = *itr;
 
       // Only close if closable...
       if (child->IsCloseable())
       {
         page->HideView(child->GetPartReference().Cast<IViewReference> ());
 
         // Was the close cancelled?
         if (child->GetContainer() != 0)
           return false;
       }
       else
       {
         page->AttachView(child->GetPartReference().Cast<IViewReference> ());
       }
     }
   }
 
   if (folder != 0)
   {
     folder->Dispose();
   }
 
   if (windowShell != 0)
   {
     Tweaklets::Get(GuiWidgetsTweaklet::KEY)->RemoveControlListener(
         windowShell->GetControl(), resizeListener);
     //    windowShell.removeListener(SWT.Activate, activationListener);
     //    windowShell.removeListener(SWT.Deactivate, activationListener);
 
-    DragUtil::RemoveDragTarget(windowShell->GetControl(),
-        IDragOverListener::Pointer(this));
+    DragUtil::RemoveDragTarget(windowShell->GetControl(), this);
     bounds = windowShell->GetBounds();
 
     //TODO DetachedWindow unregister key bindings
     //    // Unregister this detached view as a window (for key bindings).
     //    final IContextService contextService = (IContextService) getWorkbenchPage().getWorkbenchWindow().getWorkbench().getService(IContextService.class);
     //    contextService.unregisterShell(windowShell);
 
     windowShell->SetData(Object::Pointer(0));
     windowShell = 0;
   }
 
   return true;
 }
 
 bool DetachedWindow::HandleSaves(QList<PartPane::Pointer> views)
 {
   QList<IWorkbenchPart::Pointer> dirtyViews;
   for (QList<PartPane::Pointer>::iterator iterator = views.begin(); iterator
       != views.end(); ++iterator)
   {
     PartPane::Pointer pane = *iterator;
     IViewReference::Pointer ref =
         pane->GetPartReference().Cast<IViewReference> ();
     IViewPart::Pointer part = ref->GetView(false);
     if (part.Cast<ISaveablePart> () != 0)
     {
       ISaveablePart::Pointer saveable = part.Cast<ISaveablePart> ();
       if (saveable->IsDirty() && saveable->IsSaveOnCloseNeeded())
       {
         dirtyViews.push_back(part);
       }
     }
   }
 
   // If there are any prompt to save -before- any closing happens
   // FIXME: This code will result in a double prompt if the user
   // decides not to save a particular view at this stage they'll
   // get a second one from the 'hideView' call...
   if (dirtyViews.size() > 0)
   {
     IWorkbenchWindow::Pointer window = page->GetWorkbenchWindow();
     bool success =
         EditorManager::SaveAll(dirtyViews, true, true, false, window);
     if (!success)
     {
       return false; // the user canceled.
     }
   }
 
   return true;
 }
 
 void DetachedWindow::CollectViewPanes(QList<PartPane::Pointer>& result,
     const QList<LayoutPart::Pointer>& parts)
 {
   for (QList<LayoutPart::Pointer>::const_iterator iter = parts.begin(); iter
       != parts.end(); ++iter)
   {
     LayoutPart::Pointer part = *iter;
     if (part.Cast<PartPane> () != 0)
     {
       result.push_back(part.Cast<PartPane> ());
     }
   }
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDetachedWindow.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDetachedWindow.h
index 15574e42aa..938c7e4357 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDetachedWindow.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDetachedWindow.h
@@ -1,198 +1,197 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYDETACHEDWINDOW_H_
 #define BERRYDETACHEDWINDOW_H_
 
 #include "berryPartStack.h"
 #include "berryWorkbenchPage.h"
 #include "berryLayoutPart.h"
 #include "berryIDragOverListener.h"
 #include "berryIShellListener.h"
 #include "guitk/berryGuiTkIControlListener.h"
 
 #include "berryRectangle.h"
 #include "berryShell.h"
 
 namespace berry
 {
 
 /**
  * TODO: Drag from detached to fast view bar back to detached causes NPE
- *
- * @since 3.1
  */
-class DetachedWindow: public IPropertyChangeListener,
-    public IDragOverListener
+class DetachedWindow: public Object, private IPropertyChangeListener,
+    private IDragOverListener
 {
 
 public:
   berryObjectMacro(DetachedWindow)
 
 private:
   PartStack::Pointer folder;
 
   WorkbenchPage* page;
 
   Rectangle bounds;
 
   Shell::Pointer windowShell;
 
   bool hideViewsOnClose;
 
   struct ShellListener: public IShellListener
   {
     ShellListener(DetachedWindow* wnd);
 
-    void ShellClosed(ShellEvent::Pointer e);
+    void ShellClosed(const ShellEvent::Pointer& e);
 
   private:
     DetachedWindow* window;
   };
 
-  IShellListener::Pointer shellListener;
+  QScopedPointer<IShellListener> shellListener;
 
   struct ShellControlListener: public GuiTk::IControlListener
   {
 
     ShellControlListener(DetachedWindow* wnd);
 
     Events::Types GetEventTypes() const;
 
     void ControlResized(GuiTk::ControlEvent::Pointer e);
 
   private:
     DetachedWindow* window;
   };
 
   GuiTk::IControlListener::Pointer resizeListener;
 
   //      Listener activationListener = new Listener() {
   //          public void handleEvent(Event event) {
   //            switch (event.type) {
   //            case SWT.Activate:
   //              page.window.liftRestrictions();
   //              break;
   //            case SWT.Deactivate:
   //              page.window.imposeRestrictions();
   //              break;
   //            }
   //          }
   //      };
 
   IWorkbenchPartReference::Pointer activePart;
 
 public:
 
   /**
    * Create a new FloatingWindow.
    */
   DetachedWindow(WorkbenchPage* workbenchPage);
+  using IPropertyChangeListener::PropertyChange;
 
-  void PropertyChange(Object::Pointer source, int propId);
+  void PropertyChange(const Object::Pointer& source, int propId);
 
   Shell::Pointer GetShell();
 
   void Create();
 
   /**
    * Adds a visual part to this window.
    * Supports reparenting.
    */
   void Add(LayoutPart::Pointer part);
 
   bool BelongsToWorkbenchPage(IWorkbenchPage::Pointer workbenchPage);
 
   bool Close();
 
   /*
    * @see org.blueberry.ui.internal.IDragOverListener#Drag(void*, Object::Pointer, const Point&, const Rectangle& )
    */
   IDropTarget::Pointer Drag(void* currentControl,
-      Object::Pointer draggedObject, const Point& position,
+      const Object::Pointer& draggedObject, const Point& position,
       const Rectangle& dragRectangle);
 
   ILayoutContainer::ChildrenType GetChildren() const;
 
   WorkbenchPage::Pointer GetWorkbenchPage();
 
   /**
    * @see IPersistablePart
    */
   void RestoreState(IMemento::Pointer memento);
 
   /**
    * @see IPersistablePart
    */
   void SaveState(IMemento::Pointer memento);
 
   void* GetControl();
 
   /**
    * Opens the detached window.
    */
   int Open();
 
 protected:
 
   void ActivePartChanged(IWorkbenchPartReference::Pointer partReference);
 
   /**
    * This method will be called to initialize the given Shell's layout
    */
   void ConfigureShell(Shell::Pointer shell);
 
   /**
    * Override this method to create the widget tree that is used as the window's contents.
    */
   void* CreateContents(void* parent);
 
 private:
 
   void UpdateTitle();
 
   /**
    * Ensure that the shell's minimum size is equal to the minimum size
    * of the first part added to the shell.
    */
   void UpdateMinimumSize();
 
   static IWorkbenchPartReference::Pointer GetPartReference(
       LayoutPart::Pointer pane);
 
   /**
    * Closes this window and disposes its shell.
    */
   bool HandleClose();
 
   /**
    * Prompts for and handles the saving of dirty, saveable views
    * @param views The list of ViewPanes
    * @return <code>true</code> unless the user cancels the save(s)
    */
   bool HandleSaves(QList<PartPane::Pointer> views);
 
   /**
    * Answer a list of the view panes.
    */
   void CollectViewPanes(QList<PartPane::Pointer>& result,
       const QList<LayoutPart::Pointer>& parts);
 
 };
 
 }
 
 #endif /* BERRYDETACHEDWINDOW_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDragUtil.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDragUtil.cpp
index ef9407b1fe..6960e0ec7b 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDragUtil.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDragUtil.cpp
@@ -1,363 +1,362 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "tweaklets/berryGuiWidgetsTweaklet.h"
 
 #include "berryDragUtil.h"
 
 #include "berryGeometry.h"
 #include "tweaklets/berryDnDTweaklet.h"
 #include "tweaklets/berryITracker.h"
 
 namespace berry
 {
 
 const QString DragUtil::DROP_TARGET_ID =
     "org.blueberry.ui.internal.dropTarget";
 
 TestDropLocation::Pointer DragUtil::forcedDropTarget(0);
 
-QList<IDragOverListener::Pointer> DragUtil::defaultTargets = QList<
-    IDragOverListener::Pointer>();
+QList<IDragOverListener*> DragUtil::defaultTargets = QList<IDragOverListener*>();
 
 DragUtil::TrackerMoveListener::TrackerMoveListener(Object::Pointer draggedItem,
     const Rectangle& sourceBounds, const Point& initialLocation,
     bool allowSnapping) :
   allowSnapping(allowSnapping), draggedItem(draggedItem), sourceBounds(
       sourceBounds), initialLocation(initialLocation)
 {
 
 }
 
 GuiTk::IControlListener::Events::Types DragUtil::TrackerMoveListener::GetEventTypes() const
 {
   return Events::MOVED;
 }
 
 void DragUtil::TrackerMoveListener::ControlMoved(
     GuiTk::ControlEvent::Pointer event)
 {
 
   // Get the curslor location as a point
   Point location(event->x, event->y);
 
   // Select a drop target; use the global one by default
   IDropTarget::Pointer target;
 
   void* targetControl =
       Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetCursorControl();
 
   // Get the ITracker which fired the event
   ITracker* tracker = static_cast<ITracker*> (event->item);
 
   // Get the drop target for this location
   target = DragUtil::GetDropTarget(targetControl, draggedItem, location,
       tracker->GetRectangle());
 
   // Set up the tracker feedback based on the target
   Rectangle snapTarget;
   if (target != 0)
   {
     snapTarget = target->GetSnapRectangle();
 
     tracker->SetCursor(target->GetCursor());
   }
   else
   {
     tracker->SetCursor(DnDTweaklet::CURSOR_INVALID);
   }
 
   // If snapping then reset the tracker's rectangle based on the current drop target
   if (allowSnapping)
   {
     if (snapTarget.width == 0 || snapTarget.height == 0)
     {
       snapTarget = Rectangle(sourceBounds.x + location.x - initialLocation.x,
           sourceBounds.y + location.y - initialLocation.y, sourceBounds.width,
           sourceBounds.height);
     }
 
     // Try to prevent flicker: don't change the rectangles if they're already in
     // the right location
     Rectangle currentRectangle = tracker->GetRectangle();
 
     if (!(currentRectangle == snapTarget))
     {
       tracker->SetRectangle(snapTarget);
     }
   }
 
 }
 
 DragUtil::TargetListType::Pointer DragUtil::GetTargetList(void* control)
 {
   Object::Pointer data = Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetData(
       control, DROP_TARGET_ID);
   TargetListType::Pointer list = data.Cast<TargetListType> ();
   return list;
 }
 
-IDropTarget::Pointer DragUtil::GetDropTarget(const QList<
-    IDragOverListener::Pointer>& toSearch, void* mostSpecificControl,
-    Object::Pointer draggedObject, const Point& position,
-    const Rectangle& dragRectangle)
+IDropTarget::Pointer DragUtil::GetDropTarget(const QList<IDragOverListener*>& toSearch,
+                                             void* mostSpecificControl,
+                                             Object::Pointer draggedObject,
+                                             const Point& position,
+                                             const Rectangle& dragRectangle)
 {
 
-  for (QList<IDragOverListener::Pointer>::const_iterator iter =
+  for (QList<IDragOverListener*>::const_iterator iter =
       toSearch.begin(); iter != toSearch.end(); ++iter)
   {
-    IDragOverListener::Pointer next = *iter;
+    IDragOverListener* next = *iter;
 
     IDropTarget::Pointer dropTarget = next->Drag(mostSpecificControl,
         draggedObject, position, dragRectangle);
 
     if (dropTarget != 0)
     {
       return dropTarget;
     }
   }
 
   return IDropTarget::Pointer(0);
 }
 
-void DragUtil::AddDragTarget(void* control, IDragOverListener::Pointer target)
+void DragUtil::AddDragTarget(void* control, IDragOverListener* target)
 {
   if (control == 0)
   {
     defaultTargets.push_back(target);
   }
   else
   {
     TargetListType::Pointer targetList = GetTargetList(control);
 
     if (targetList == 0)
     {
       targetList = new TargetListType();
       Tweaklets::Get(GuiWidgetsTweaklet::KEY)->SetData(control, DROP_TARGET_ID,
           targetList);
     }
     targetList->push_back(target);
   }
 }
 
-void DragUtil::RemoveDragTarget(void* control,
-    IDragOverListener::Pointer target)
+void DragUtil::RemoveDragTarget(void* control, IDragOverListener* target)
 {
   if (control == 0)
   {
     defaultTargets.removeAll(target);
   }
   else
   {
     TargetListType::Pointer targetList = GetTargetList(control);
     if (targetList != 0)
     {
       targetList->removeAll(target);
       if (targetList->empty())
       {
         Tweaklets::Get(GuiWidgetsTweaklet::KEY)->SetData(control,
             DROP_TARGET_ID, Object::Pointer(0));
       }
     }
   }
 }
 
 Rectangle DragUtil::GetDisplayBounds(void* boundsControl)
 {
   void* parent = Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetParent(
       boundsControl);
   if (parent == 0)
   {
     return Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetBounds(boundsControl);
   }
 
   Rectangle rect = Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetBounds(
       boundsControl);
   return Geometry::ToDisplay(parent, rect);
 }
 
 bool DragUtil::PerformDrag(Object::Pointer draggedItem,
     const Rectangle& sourceBounds, const Point& initialLocation,
     bool allowSnapping)
 {
 
   IDropTarget::Pointer target = DragToTarget(draggedItem, sourceBounds,
       initialLocation, allowSnapping);
 
   if (target == 0)
   {
     return false;
   }
 
   target->Drop();
   target->DragFinished(true);
 
   return true;
 }
 
 void DragUtil::ForceDropLocation(TestDropLocation::Pointer forcedLocation)
 {
   forcedDropTarget = forcedLocation;
 }
 
 IDropTarget::Pointer DragUtil::DragToTarget(Object::Pointer draggedItem,
     const Rectangle& sourceBounds, const Point& initialLocation,
     bool allowSnapping)
 {
   //final Display display = Display.getCurrent();
 
   // Testing...immediately 'drop' onto the test target
   if (forcedDropTarget != 0)
   {
     Point location = forcedDropTarget->GetLocation();
 
     void* currentControl =
         Tweaklets::Get(GuiWidgetsTweaklet::KEY)->FindControl(
             forcedDropTarget->GetShells(), location);
     return GetDropTarget(currentControl, draggedItem, location, sourceBounds);
   }
 
   // Create a tracker.  This is just an XOR rect on the screen.
   // As it moves we notify the drag listeners.
   ITracker* tracker = Tweaklets::Get(DnDTweaklet::KEY)->CreateTracker();
   //tracker.setStippled(true);
 
   GuiTk::IControlListener::Pointer trackerListener(new TrackerMoveListener(
       draggedItem, sourceBounds, initialLocation, allowSnapping));
 
   tracker->AddControlListener(trackerListener);
 
   // Setup...when the drag starts we might already be over a valid target, check this...
   // If there is a 'global' target then skip the check
   IDropTarget::Pointer target;
   void* startControl =
       Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetCursorControl();
 
   if (startControl != 0 && allowSnapping)
   {
     target = GetDropTarget(startControl, draggedItem, initialLocation,
         sourceBounds);
   }
 
   // Set up an initial tracker rectangle
   Rectangle startRect = sourceBounds;
   if (target != 0)
   {
     Rectangle rect = target->GetSnapRectangle();
 
     if (rect.width != 0 && rect.height != 0)
     {
       startRect = rect;
     }
 
     tracker->SetCursor(target->GetCursor());
   }
 
   if (startRect.width != 0 && startRect.height != 0)
   {
     tracker->SetRectangle(startRect);
   }
 
   // Tracking Loop...tracking is preformed on the 'SWT.Move' listener registered
   // against the tracker.
 
   //  // HACK:
   //  // Some control needs to capture the mouse during the drag or other
   //  // controls will interfere with the cursor
   //  Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
   //  if (shell != null)
   //  {
   //    shell.setCapture(true);
   //  }
 
   // Run tracker until mouse up occurs or escape key pressed.
   bool trackingOk = tracker->Open();
 
   //  // HACK:
   //  // Release the mouse now
   //  if (shell != null)
   //  {
   //    shell.setCapture(false);
   //  }
 
   // Done tracking...
 
   // Get the current drop target
   IDropTarget::Pointer dropTarget;
   Point finalLocation =
       Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetCursorLocation();
   void* targetControl =
       Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetCursorControl();
   dropTarget = GetDropTarget(targetControl, draggedItem, finalLocation,
       tracker->GetRectangle());
 
   // Cleanup...
   delete tracker;
 
   // if we're going to perform a 'drop' then delay the issuing of the 'finished'
   // callback until after it's done...
   if (trackingOk)
   {
     return dropTarget;
   }
   else if (dropTarget != 0)
   {
     // If the target can handle a 'finished' notification then send one
     dropTarget->DragFinished(false);
   }
 
   return IDropTarget::Pointer(0);
 }
 
 IDropTarget::Pointer DragUtil::GetDropTarget(void* toSearch,
     Object::Pointer draggedObject, const Point& position,
     const Rectangle& dragRectangle)
 {
   // Search for a listener by walking the control's parent hierarchy
   for (void* current = toSearch; current != 0; current = Tweaklets::Get(
       GuiWidgetsTweaklet::KEY)->GetParent(current))
   {
     TargetListType::Pointer targetList = GetTargetList(current);
-    QList<IDragOverListener::Pointer> targets;
+    QList<IDragOverListener*> targets;
     if (targetList != 0)
       targets = *targetList;
 
     IDropTarget::Pointer dropTarget = GetDropTarget(targets, toSearch,
         draggedObject, position, dragRectangle);
 
     if (dropTarget != 0)
     {
       return dropTarget;
     }
 
     //          // Don't look to parent shells for drop targets
     //          if (current instanceof Shell) {
     //              break;
     //          }
   }
 
   // No controls could handle this event -- check for default targets
   return GetDropTarget(defaultTargets, toSearch, draggedObject, position,
       dragRectangle);
 }
 
 //Point DragUtil::GetEventLoc(GuiTk::ControlEvent::Pointer event)
 //{
 //  Control ctrl = (Control) event.widget;
 //  return ctrl.toDisplay(new Point(event.x, event.y));
 //}
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDragUtil.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDragUtil.h
index 51b4e96424..02ae03ceed 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDragUtil.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryDragUtil.h
@@ -1,214 +1,214 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYDRAGUTIL_H_
 #define BERRYDRAGUTIL_H_
 
 #include <org_blueberry_ui_qt_Export.h>
 #include "berryRectangle.h"
 #include "guitk/berryGuiTkIControlListener.h"
 
 #include "berryTestDropLocation.h"
 #include "berryIDragOverListener.h"
 #include "berryIDropTarget.h"
 
 #include <berryObjectList.h>
 #include <list>
 
 namespace berry {
 
 /**
  * Provides the methods for attaching drag-and-drop listeners to SWT controls.
  */
-class BERRY_UI_QT DragUtil {
+class BERRY_UI_QT DragUtil
+{
 
 public:
 
-  typedef ObjectList<IDragOverListener::Pointer> TargetListType;
+  typedef ObjectList<IDragOverListener*> TargetListType;
 
 private:
 
-  static const QString DROP_TARGET_ID; //$NON-NLS-1$
+  static const QString DROP_TARGET_ID;
 
     /**
      * The location where all drags will end. If this is non-null, then
      * all user input is ignored in drag/drop. If null, we use user input
      * to determine where objects should be dropped.
      */
     static TestDropLocation::Pointer forcedDropTarget;
 
     /**
      * List of IDragOverListener
      */
-    static QList<IDragOverListener::Pointer> defaultTargets;
+    static QList<IDragOverListener*> defaultTargets;
 
     /**
      * Return the list of 'IDragOverListener' elements associated with
      * the given control. If there's a 'global' listener then always
      * return it.
      *
      * @param control
      * @return
      */
     static TargetListType::Pointer GetTargetList(void* control);
 
     /**
      * Given a list of IDragOverListeners and a description of what is being dragged, it returns
      * a IDropTarget for the current drop.
      *
      * @param toSearch
      * @param mostSpecificControl
      * @param draggedObject
      * @param position
      * @param dragRectangle
      * @return
      */
-    static IDropTarget::Pointer GetDropTarget(const QList<IDragOverListener::Pointer>& toSearch,
+    static IDropTarget::Pointer GetDropTarget(const QList<IDragOverListener*>& toSearch,
             void* mostSpecificControl, Object::Pointer draggedObject, const Point &position,
             const Rectangle& dragRectangle);
 
 
     struct TrackerMoveListener : public GuiTk::IControlListener {
 
       TrackerMoveListener(Object::Pointer draggedItem, const Rectangle& sourceBounds,
           const Point& initialLocation, bool allowSnapping);
 
       Events::Types GetEventTypes() const;
 
       void ControlMoved(GuiTk::ControlEvent::Pointer event);
 
     private:
 
       bool allowSnapping;
       Object::Pointer draggedItem;
       Rectangle sourceBounds;
       Point initialLocation;
     };
 
 
 public:
 
     /**
      * Sets the drop target for the given control. It is possible to add one or more
      * targets for a "null" control. This becomes a default target that is used if no
      * other targets are found (for example, when dragging objects off the application
      * window).
      *
      * @param control the control that should be treated as a drag target, or null
      * to indicate the default target
      * @param target the drag target to handle the given control
      */
-    static void AddDragTarget(void* control, IDragOverListener::Pointer target);
+    static void AddDragTarget(void* control, IDragOverListener* target);
 
     /**
      * Removes a drop target from the given control.
      *
      * @param control
      * @param target
      */
-    static void RemoveDragTarget(void* control,
-            IDragOverListener::Pointer target);
+    static void RemoveDragTarget(void* control, IDragOverListener* target);
 
     /**
      * Shorthand method. Returns the bounding rectangle for the given control, in
      * display coordinates.
      *
      * @param draggedItem
      * @param boundsControl
      * @return
      */
     static Rectangle GetDisplayBounds(void* boundsControl);
 
   static bool PerformDrag(Object::Pointer draggedItem,
           const Rectangle& sourceBounds, const Point& initialLocation, bool allowSnapping);
 
 //  /**
 //   * Drags the given item to the given location (in display coordinates). This
 //   * method is intended for use by test suites.
 //   *
 //   * @param draggedItem object being dragged
 //   * @param finalLocation location being dragged to
 //   * @return true iff the drop was accepted
 //   */
 //  static bool DragTo(Display display, Object draggedItem,
 //          Point finalLocation, Rectangle dragRectangle) {
 //      Control currentControl = SwtUtil.findControl(display, finalLocation);
 //
 //      IDropTarget target = getDropTarget(currentControl, draggedItem,
 //              finalLocation, dragRectangle);
 //
 //      if (target == null) {
 //          return false;
 //      }
 //
 //      target.drop();
 //
 //      return true;
 //  }
 
   /**
    * Forces all drags to end at the given position (display coordinates). Intended
    * for use by test suites. If this method is called, then all subsequent calls
    * to performDrag will terminate immediately and behave as though the object were
    * dragged to the given location. Calling this method with null cancels this
    * behavior and causes performDrag to behave normally.
    *
    * @param forcedLocation location where objects will be dropped (or null to
    * cause drag/drop to behave normally).
    */
   static void ForceDropLocation(TestDropLocation::Pointer forcedLocation);
 
   /**
    * Drags the given item, given an initial bounding rectangle in display coordinates.
    * Due to a quirk in the Tracker class, changing the tracking rectangle when using the
    * keyboard will also cause the mouse cursor to move. Since "snapping" causes the tracking
    * rectangle to change based on the position of the mouse cursor, it is impossible to do
    * drag-and-drop with the keyboard when snapping is enabled.
    *
    * @param draggedItem object being dragged
    * @param sourceBounds initial bounding rectangle for the dragged item
    * @param initialLocation initial position of the mouse cursor
    * @param allowSnapping true iff the rectangle should snap to the drop location. This must
    * be false if the user might be doing drag-and-drop using the keyboard.
    *
    * @return
    */
   static IDropTarget::Pointer DragToTarget(Object::Pointer draggedItem,
           const Rectangle& sourceBounds, const Point& initialLocation,
           bool allowSnapping);
 
   /**
    * Returns the drag target for the given control or null if none.
    *
    * @param toSearch
    * @param e
    * @return
    */
   static IDropTarget::Pointer GetDropTarget(void* toSearch,
           Object::Pointer draggedObject, const Point& position, const Rectangle& dragRectangle);
 
   /**
    * Returns the location of the given event, in display coordinates
    * @return
    */
   //static Point GetEventLoc(GuiTk::ControlEvent::Pointer event);
 
 };
 
 }
 
 #endif /* BERRYDRAGUTIL_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorManager.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorManager.cpp
index a382aad45e..24a051bc3e 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorManager.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorManager.cpp
@@ -1,1295 +1,1295 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryEditorManager.h"
 
 #include "berryIWorkbenchPart.h"
 #include "berryIWorkbenchWindow.h"
 #include "berryIEditorRegistry.h"
 #include "berryUIException.h"
 
 #include "berryWorkbenchWindow.h"
 #include "berryWorkbenchPage.h"
 #include "berryEditorSite.h"
 #include "berryEditorReference.h"
 #include "berryWorkbenchPlugin.h"
 #include "berryWorkbenchConstants.h"
 #include "berryNullEditorInput.h"
 #include "berryEditorAreaHelper.h"
 #include "berryPartStack.h"
 
 
 #include <Poco/Bugcheck.h>
 
 namespace berry
 {
 
 const QString EditorManager::PIN_EDITOR_KEY = "PIN_EDITOR";
 const QString EditorManager::RESOURCES_TO_SAVE_MESSAGE = "Select resources to save:";
 const QString EditorManager::SAVE_RESOURCES_TITLE = "Save Resources";
 
 EditorManager::EditorManager(WorkbenchWindow::Pointer wind,
     WorkbenchPage::Pointer workbenchPage,
     EditorAreaHelper* pres)
  : editorPresentation(pres), window(wind.GetPointer()), page(workbenchPage.GetPointer()) {
   poco_check_ptr(editorPresentation);
   poco_assert(window != 0);
   poco_assert(page != 0);
 
   //page.getExtensionTracker().registerHandler(this, null);
 }
 
 void EditorManager::CheckDeleteEditorResources()
 {
 //  // get the current number of editors
 //  IEditorReference[] editors = page.getEditorReferences();
 //  // If there are no editors
 //  if (editors.length == 0)
 //  {
 //    if (editorPropChangeListnener != null)
 //    {
 //      // remove property change listener for editors
 //      IPreferenceStore prefStore = WorkbenchPlugin.getDefault()
 //      .getPreferenceStore();
 //      prefStore
 //      .removePropertyChangeListener(editorPropChangeListnener);
 //      editorPropChangeListnener = null;
 //    }
 //    if (pinEditorHandlerActivation != null)
 //    {
 //      // remove pin editor keyboard shortcut handler
 //      final IHandlerService handlerService = (IHandlerService) window.getWorkbench().getService(IHandlerService.class);
 //      handlerService.deactivateHandler(pinEditorHandlerActivation);
 //      pinEditorHandlerActivation = null;
 //    }
 //  }
 }
 
 //void EditorManager::CheckCreateEditorPropListener()
 //{
 //  if (editorPropChangeListnener == null)
 //  {
 //    // Add a property change listener for closing editors automatically
 //    // preference
 //    // Add or remove the pin icon accordingly
 //    editorPropChangeListnener = new IPropertyChangeListener()
 //    {
 //    public void propertyChange(PropertyChangeEvent event)
 //      {
 //        if (event.getProperty().equals(
 //                IPreferenceConstants.REUSE_EDITORS_BOOLEAN))
 //        {
 //          IEditorReference[] editors = getEditors();
 //          for (int i = 0; i < editors.length; i++)
 //          {
 //            ((EditorReference) editors[i]).pinStatusUpdated();
 //          }
 //        }
 //      }
 //    };
 //    WorkbenchPlugin.getDefault().getPreferenceStore()
 //    .addPropertyChangeListener(editorPropChangeListnener);
 //  }
 //}
 
 //void EditorManager::CheckCreatePinEditorShortcutKeyHandler()
 //{
 //  if (pinEditorHandlerActivation == null)
 //  {
 //    final Shell shell = window.getShell();
 //    final IHandler pinEditorHandler = new AbstractHandler()
 //    {
 //    public final Object execute(final ExecutionEvent event)
 //      {
 //        // check if the "Close editors automatically" preference is
 //        // set
 //        IPreferenceStore store = WorkbenchPlugin.getDefault().getPreferenceStore();
 //        if (store
 //            .getBoolean(IPreferenceConstants.REUSE_EDITORS_BOOLEAN)
 //            || ((TabBehaviour)Tweaklets.get(TabBehaviour.KEY)).alwaysShowPinAction())
 //        {
 //
 //          IWorkbenchPartReference ref = editorPresentation
 //          .getVisibleEditor();
 //          if (ref instanceof WorkbenchPartReference)
 //          {
 //            WorkbenchPartReference concreteRef = (WorkbenchPartReference) ref;
 //
 //            concreteRef.setPinned(concreteRef.isPinned());
 //          }
 //        }
 //        return null;
 //      }
 //    };
 //
 //    // Assign the handler for the pin editor keyboard shortcut.
 //    final IHandlerService handlerService = (IHandlerService) window.getWorkbench().getService(IHandlerService.class);
 //    pinEditorHandlerActivation = handlerService.activateHandler(
 //        "org.blueberry.ui.window.pinEditor", pinEditorHandler, //$NON-NLS-1$
 //        new ActiveShellExpression(shell));
 //  }
 //}
 
 QList<IEditorPart::Pointer> EditorManager::CollectDirtyEditors()
 {
   QList<IEditorPart::Pointer> result;
   QList<IEditorReference::Pointer> editors(page->GetEditorReferences());
   for (QList<IEditorReference::Pointer>::iterator i = editors.begin();
        i != editors.end(); ++i)
   {
     IEditorPart::Pointer part = (*i)->GetPart(false).Cast<IEditorPart>();
     if (part.IsNotNull() && part->IsDirty())
     {
       result.push_back(part);
     }
 
   }
   return result;
 }
 
 bool EditorManager::ContainsEditor(IEditorReference::Pointer ref)
 {
   QList<IEditorReference::Pointer> editors(page->GetEditorReferences());
   return std::find(editors.begin(), editors.end(), ref) != editors.end();
 }
 
 //EditorActionBars* EditorManager::CreateEditorActionBars(
 //    EditorDescriptor::Pointer desc, IEditorSite::Pointer site)
 //{
 //  // Get the editor type.
 //  String type = desc.getId();
 //
 //  // If an action bar already exists for this editor type return it.
 //  EditorActionBars actionBars = (EditorActionBars) actionCache.get(type);
 //  if (actionBars != null)
 //  {
 //    actionBars.addRef();
 //    return actionBars;
 //  }
 //
 //  // Create a new action bar set.
 //  actionBars = new EditorActionBars(page, site.getWorkbenchWindow(), type);
 //  actionBars.addRef();
 //  actionCache.put(type, actionBars);
 //
 //  // Read base contributor.
 //  IEditorActionBarContributor contr = desc.createActionBarContributor();
 //  if (contr != null)
 //  {
 //    actionBars.setEditorContributor(contr);
 //    contr.init(actionBars, page);
 //  }
 //
 //  // Read action extensions.
 //  EditorActionBuilder builder = new EditorActionBuilder();
 //  contr = builder.readActionExtensions(desc);
 //  if (contr != null)
 //  {
 //    actionBars.setExtensionContributor(contr);
 //    contr.init(actionBars, page);
 //  }
 //
 //  // Return action bars.
 //  return actionBars;
 //}
 
 //EditorActionBars* EditorManager::CreateEmptyEditorActionBars(
 //    IEditorSite::Pointer site)
 //{
 //  // Get the editor type.
 //  String type = String.valueOf(System.currentTimeMillis());
 //
 //  // Create a new action bar set.
 //  // Note: It is an empty set.
 //  EditorActionBars actionBars = new EditorActionBars(page, site.getWorkbenchWindow(), type);
 //  actionBars.addRef();
 //  actionCache.put(type, actionBars);
 //
 //  // Return action bars.
 //  return actionBars;
 //}
 
 //void EditorManager::DisposeEditorActionBars(EditorActionBars* actionBars)
 //{
 //  actionBars.removeRef();
 //  if (actionBars.getRef() <= 0)
 //  {
 //    String type = actionBars.getEditorType();
 //    actionCache.remove(type);
 //    // refresh the cool bar manager before disposing of a cool item
 //    ICoolBarManager2 coolBar = (ICoolBarManager2) window.getCoolBarManager2();
 //    if (coolBar != null)
 //    {
 //      coolBar.refresh();
 //    }
 //    actionBars.dispose();
 //  }
 //}
 
 IEditorPart::Pointer EditorManager::FindEditor(IEditorInput::Pointer input)
 {
   return this->FindEditor("", input, IWorkbenchPage::MATCH_INPUT);
 }
 
 IEditorPart::Pointer EditorManager::FindEditor(const QString& editorId,
     IEditorInput::Pointer input, int matchFlags)
 {
   QList<IEditorReference::Pointer> refs(this->FindEditors(input, editorId, matchFlags));
   if (refs.size() == 0)
   {
     return IEditorPart::Pointer();
   }
   return refs[0]->GetEditor(true);
 }
 
 QList<IEditorReference::Pointer> EditorManager::FindEditors(
     IEditorInput::Pointer input, const QString& editorId, int matchFlags)
 {
   if (matchFlags == IWorkbenchPage::MATCH_NONE)
   {
     return QList<IEditorReference::Pointer>();
   }
   QList<IEditorReference::Pointer> result;
   QList<IEditorReference::Pointer> othersList(page->GetEditorReferences());
   if (!othersList.empty())
   {
     IEditorReference::Pointer active = page->GetActiveEditorReference();
     if (active.IsNotNull())
     {
       othersList.removeAll(active);
       QList<IEditorReference::Pointer> activeList;
       activeList.push_back(active);
       this->FindEditors(activeList, input, editorId, matchFlags, result);
     }
     this->FindEditors(othersList, input, editorId, matchFlags, result);
   }
   return result;
 }
 
 void EditorManager::FindEditors(
     QList<IEditorReference::Pointer>& editorList,
     IEditorInput::Pointer input, const QString& editorId, int matchFlags,
     QList<IEditorReference::Pointer>& result)
 {
   if (matchFlags == IWorkbenchPage::MATCH_NONE)
   {
     return;
   }
 
   // Phase 0: Remove editors whose ids don't match (if matching by id)
   if (((matchFlags & IWorkbenchPage::MATCH_ID) != 0) && !editorId.isEmpty())
   {
     for (QList<IEditorReference::Pointer>::iterator i = editorList.begin();
       i != editorList.end();)
     {
       if (editorId != (*i)->GetId())
       {
         i = editorList.erase(i);
         continue;
       }
       ++i;
     }
   }
 
   // If not matching on editor input, just return the remaining editors.
   // In practice, this case is never used.
   if ((matchFlags & IWorkbenchPage::MATCH_INPUT) == 0)
   {
     result.append(editorList);
     return;
   }
 
   // Phase 1: check editors that have their own matching strategy
   for (QList<IEditorReference::Pointer>::iterator i = editorList.begin();
        i != editorList.end();)
   {
     EditorReference::Pointer editor = i->Cast<EditorReference>();
     IEditorDescriptor::Pointer desc = editor->GetDescriptor();
     if (desc.IsNotNull())
     {
       IEditorMatchingStrategy::Pointer matchingStrategy = desc
       ->GetEditorMatchingStrategy();
       if (matchingStrategy.IsNotNull())
       {
         i = editorList.erase(i); // We're handling this one here, so remove it
                                  // from the list.
         if (matchingStrategy->Matches(editor, input))
         {
           result.push_back(editor);
         }
         continue;
       }
     }
     ++i;
   }
 
   // Phase 2: check materialized editors (without their own matching
   // strategy)
   for (QList<IEditorReference::Pointer>::iterator i = editorList.begin();
        i != editorList.end();)
   {
     EditorReference::Pointer editor = i->Cast<EditorReference>();
     IEditorPart::Pointer part = editor->GetPart(false).Cast<IEditorPart>();
     if (part.IsNotNull())
     {
       i = editorList.erase(i); // We're handling this one here, so remove it from
       // the list.
       if (part->GetEditorInput().IsNotNull() && part->GetEditorInput() == input)
       {
         result.push_back(editor);
       }
     }
     else ++i;
   }
 
   // Phase 3: check unmaterialized editors for input equality,
   // delaying plug-in activation further by only restoring the editor
   // input
   // if the editor reference's factory id and name match.
 
 //  QString name = input->GetName();
 //  IPersistableElement persistable = input.getPersistable();
 //  if (name == null || persistable == null)
 //  {
 //    return;
 //  }
 //  String id = persistable.getFactoryId();
 //  if (id == null)
 //  {
 //    return;
 //  }
 //  for (Iterator i = editorList.iterator(); i.hasNext();)
 //  {
 //    EditorReference editor = (EditorReference) i.next();
 //    if (name.equals(editor.getName()) && id.equals(editor.getFactoryId()))
 //    {
 //      IEditorInput restoredInput;
 //      try
 //      {
 //        restoredInput = editor.getEditorInput();
 //        if (Util.equals(restoredInput, input))
 //        {
 //          result.add(editor);
 //        }
 //      }
 //      catch (PartInitException e1)
 //      {
 //        WorkbenchPlugin.log(e1);
 //      }
 //    }
 //  }
 }
 
 std::size_t EditorManager::GetEditorCount()
 {
   return page->GetEditorReferences().size();
 }
 
 IEditorRegistry* EditorManager::GetEditorRegistry()
 {
   return WorkbenchPlugin::GetDefault()->GetEditorRegistry();
 }
 
 QList<IEditorPart::Pointer> EditorManager::GetDirtyEditors()
 {
   return this->CollectDirtyEditors();
 }
 
 QList<IEditorReference::Pointer> EditorManager::GetEditors()
 {
   return page->GetEditorReferences();
 }
 
 IEditorPart::Pointer EditorManager::GetVisibleEditor()
 {
   IEditorReference::Pointer ref = editorPresentation->GetVisibleEditor();
   if (ref.IsNull())
   {
     return IEditorPart::Pointer(0);
   }
   return ref->GetPart(true).Cast<IEditorPart>();
 }
 
 bool EditorManager::IsSaveAllNeeded()
 {
   QList<IEditorReference::Pointer> editors(page->GetEditorReferences());
   for (QList<IEditorReference::Pointer>::iterator i = editors.begin();
        i != editors.end(); ++i)
   {
     if ((*i)->IsDirty())
     {
       return true;
     }
   }
   return false;
 }
 
 IEditorReference::Pointer EditorManager::FindReusableEditor(
     EditorDescriptor::Pointer  /*desc*/)
 {
   //return ((TabBehaviour)Tweaklets.get(TabBehaviour.KEY)).findReusableEditor(page);
   return IEditorReference::Pointer(0);
 }
 
 IEditorReference::Pointer EditorManager::OpenEditor(
     const QString& editorId, IEditorInput::Pointer input, bool /*setVisible*/,
     IMemento::Pointer editorState)
 {
   if (input.IsNull())
   {
     throw Poco::InvalidArgumentException();
   }
 
   IEditorRegistry* reg = this->GetEditorRegistry();
   EditorDescriptor::Pointer desc = reg->FindEditor(editorId).Cast<EditorDescriptor>();
   if (desc.IsNull())
   {
     throw PartInitException("Unable to open editor, unknown editor id: " + editorId);
   }
 
   return this->OpenEditorFromDescriptor(desc, input, editorState);
 }
 
 IEditorReference::Pointer EditorManager::OpenEditorFromDescriptor(
     EditorDescriptor::Pointer desc, IEditorInput::Pointer input,
     IMemento::Pointer editorState)
 {
   IEditorReference::Pointer result;
   if (desc->IsInternal())
   {
     result = this->ReuseInternalEditor(desc, input);
     if (result.IsNull())
     {
       result = new EditorReference(this, input, desc, editorState);
     }
   }
 //  else if (desc->GetId() == IEditorRegistry::SYSTEM_INPLACE_EDITOR_ID)
 //  {
 //    if (ComponentSupport.inPlaceEditorSupported())
 //    {
 //      result = new EditorReference(this, input, desc);
 //    }
 //  }
 //  else if (desc->GetId() == IEditorRegistry::SYSTEM_EXTERNAL_EDITOR_ID)
 //  {
 //    IPathEditorInput pathInput = getPathEditorInput(input);
 //    if (pathInput != null)
 //    {
 //      result = openSystemExternalEditor(pathInput.getPath());
 //    }
 //    else
 //    {
 //      throw new PartInitException(
 //          WorkbenchMessages.EditorManager_systemEditorError);
 //    }
 //  }
 //  else if (desc->IsOpenExternal())
 //  {
 //    result = openExternalEditor(desc, input);
 //  }
   else
   {
     // this should never happen
     throw PartInitException("Invalid editor descriptor for id:" + desc->GetId());
   }
 
   if (result.IsNotNull())
   {
     this->CreateEditorTab(result.Cast<EditorReference>(), ""); //$NON-NLS-1$
   }
 
 //  Workbench wb = (Workbench) window.getWorkbench();
 //  wb.getEditorHistory().add(input, desc);
   return result;
 }
 
 //IEditorReference::Pointer EditorManager::OpenExternalEditor(
 //    EditorDescriptor::Pointer desc, IEditorInput::Pointer input)
 //{
 //  final CoreException ex[] = new CoreException[1];
 //
 //  final IPathEditorInput pathInput = getPathEditorInput(input);
 //  if (pathInput != null && pathInput.getPath() != null)
 //  {
 //    BusyIndicator.showWhile(getDisplay(), new Runnable()
 //        {
 //        public void run()
 //          {
 //            try
 //            {
 //              if (desc.getLauncher() != null)
 //              {
 //                // open using launcher
 //                Object launcher = WorkbenchPlugin.createExtension(
 //                    desc.getConfigurationElement(), "launcher"); //$NON-NLS-1$
 //                ((IEditorLauncher) launcher).open(pathInput
 //                    .getPath());
 //              }
 //              else
 //              {
 //                // open using command
 //                ExternalEditor oEditor = new ExternalEditor(
 //                    pathInput.getPath(), desc);
 //                oEditor.open();
 //              }
 //            }
 //            catch (CoreException e)
 //            {
 //              ex[0] = e;
 //            }
 //          }
 //        }
 //        );
 //      }
 //  else
 //  {
 //    throw new PartInitException(NLS.bind(
 //            WorkbenchMessages.EditorManager_errorOpeningExternalEditor,
 //            desc.getFileName(), desc.getId()));
 //  }
 //
 //  if (ex[0] != null)
 //  {
 //    throw new PartInitException(NLS.bind(
 //            WorkbenchMessages.EditorManager_errorOpeningExternalEditor,
 //            desc.getFileName(), desc.getId()), ex[0]);
 //  }
 //
 //  // we do not have an editor part for external editors
 //  return null;
 //}
 
 void EditorManager::CreateEditorTab(EditorReference::Pointer ref, const QString& workbookId)
 {
   editorPresentation->AddEditor(ref, workbookId);
 }
 
 EditorSite::Pointer EditorManager::CreateSite(IEditorReference::Pointer ref,
     IEditorPart::Pointer part, EditorDescriptor::Pointer desc,
     IEditorInput::Pointer input) const
 {
   EditorSite::Pointer site(new EditorSite(ref, part, page, desc));
   if (desc.IsNotNull())
   {
     //site.setActionBars(createEditorActionBars(desc, site));
   }
   else
   {
     //site.setActionBars(createEmptyEditorActionBars(site));
   }
   const QString label = part->GetPartName(); // debugging only
   try
   {
     part->Init(site, input);
 
     // Sanity-check the site
     if (!(part->GetSite() == site) || !(part->GetEditorSite() == site))
     {
       throw PartInitException("Editor initialization failed: " + desc->GetId() + ". Site is incorrect.");
     }
 
   }
   catch (PartInitException e)
   {
     throw e;
   }
   catch (std::exception e)
   {
     throw PartInitException(QString("An exception was thrown during initialization: ") + e.what());
   }
 
   return site;
 }
 
 IEditorReference::Pointer EditorManager::ReuseInternalEditor(
     EditorDescriptor::Pointer  /*desc*/, IEditorInput::Pointer  /*input*/)
 {
 
 //  poco_assert(desc.IsNotNull()); // "descriptor must not be null"); //$NON-NLS-1$
 //  poco_assert(input.IsNotNull()); // "input must not be null"); //$NON-NLS-1$
 //
 //  IEditorReference::Pointer reusableEditorRef = this->FindReusableEditor(desc);
 //  if (reusableEditorRef.IsNotNull())
 //  {
 //    return this->ReuseInternalEditor(page, this, editorPresentation, desc, input,
 //        reusableEditorRef);
 //  }
   return IEditorReference::Pointer(0);
 }
 
 IEditorPart::Pointer EditorManager::CreatePart(EditorDescriptor::Pointer desc) const
 {
 //  try
 //  {
     IEditorPart::Pointer result = desc->CreateEditor();
 //    IConfigurationElement element = desc.getConfigurationElement();
 //    if (element != null)
 //    {
 //      page.getExtensionTracker().registerObject(
 //          element.getDeclaringExtension(), result,
 //          IExtensionTracker.REF_WEAK);
 //    }
     return result;
  // }
 //  catch (CoreException e)
 //  {
 //    throw PartInitException(StatusUtil.newStatus(
 //            desc.getPluginID(),
 //            WorkbenchMessages.EditorManager_instantiationError, e));
 //  }
 }
 
 //IEditorReference::Pointer EditorManager::OpenSystemExternalEditor(
 //    Poco::Path location)
 //{
 //  if (location == null)
 //  {
 //    throw new IllegalArgumentException();
 //  }
 //
 //  final boolean result[] =
 //  { false};
 //  BusyIndicator.showWhile(getDisplay(), new Runnable()
 //      {
 //      public void run()
 //        {
 //          if (location != null)
 //          {
 //            result[0] = Program.launch(location.toOSString());
 //          }
 //        }
 //      }
 //      );
 //
 //      if (!result[0])
 //      {
 //        throw new PartInitException(NLS.bind(
 //                WorkbenchMessages.EditorManager_unableToOpenExternalEditor,
 //                location));
 //      }
 //
 //      // We do not have an editor part for external editors
 //      return null;
 //    }
 
 //    ImageDescriptor EditorManager::FindImage(EditorDescriptor::Pointer desc,
 //        Poco::Path path)
 //    {
 //      if (desc == null)
 //      {
 //        // @issue what should be the default image?
 //        return ImageDescriptor.getMissingImageDescriptor();
 //      }
 //
 //      if (desc.isOpenExternal() && path != null)
 //      {
 //        return PlatformUI.getWorkbench().getEditorRegistry()
 //        .getImageDescriptor(path.toOSString());
 //      }
 //
 //      return desc.getImageDescriptor();
 //    }
 
     bool EditorManager::RestoreState(IMemento::Pointer memento)
     {
       // Restore the editor area workbooks layout/relationship
 //      MultiStatus result = new MultiStatus(PlatformUI.PLUGIN_ID,
 //          IStatus.OK,
 //          WorkbenchMessages.EditorManager_problemsRestoringEditors, null);
       bool result = true;
 
       QString activeWorkbookID;
       QList<IEditorReference::Pointer> visibleEditors;
       QList<IEditorReference::Pointer> activeEditor;
 
       IMemento::Pointer areaMem = memento->GetChild(WorkbenchConstants::TAG_AREA);
       if (areaMem)
       {
         //result.add(editorPresentation.restoreState(areaMem));
         editorPresentation->RestoreState(areaMem);
         areaMem->GetString(WorkbenchConstants::TAG_ACTIVE_WORKBOOK, activeWorkbookID);
       }
 
       // Loop through the editors.
 
       QList<IMemento::Pointer> editorMems(memento->GetChildren(WorkbenchConstants::TAG_EDITOR));
-      for (std::size_t x = 0; x < editorMems.size(); x++)
+      for (int x = 0; x < editorMems.size(); x++)
       {
         // for dynamic UI - call restoreEditorState to replace code which is
         // commented out
         RestoreEditorState(editorMems[x], visibleEditors, activeEditor); //, result);
       }
 
       // restore the presentation
       if (areaMem)
       {
         //result.add(editorPresentation.restorePresentationState(areaMem));
         result &= editorPresentation->RestorePresentationState(areaMem);
       }
       try
       {
 //        StartupThreading.runWithThrowable(new StartupRunnable()
 //            {
 //
 //            public void runWithException() throws Throwable
 //              {
                 // Update each workbook with its visible editor.
-                for (std::size_t i = 0; i < visibleEditors.size(); i++)
+                for (int i = 0; i < visibleEditors.size(); i++)
                 {
                   SetVisibleEditor(visibleEditors[i], false);
                 }
 
                 // Update the active workbook
                 if (!activeWorkbookID.isEmpty())
                 {
                   editorPresentation->SetActiveEditorWorkbookFromID(activeWorkbookID);
                 }
 
                 if (!activeEditor.empty() && activeEditor[0])
                 {
                   IWorkbenchPart::Pointer editor = activeEditor[0]->GetPart(true);
 
                   if (editor)
                   {
                     page->Activate(editor);
                   }
                 }
 //              }});
       }
       catch (...)
       {
         // The exception is already logged.
 //        result
 //        .add(new Status(
 //                IStatus.ERR,
 //                PlatformUI.PLUGIN_ID,
 //                0,
 //                WorkbenchMessages.EditorManager_exceptionRestoringEditor,
 //                t));
         result &= false;
       }
 
       return result;
     }
 
     bool EditorManager::SaveAll(bool confirm, bool closing,
         bool addNonPartSources)
     {
       // Get the list of dirty editors and views. If it is
       // empty just return.
       QList<ISaveablePart::Pointer> parts(page->GetDirtyParts());
       if (parts.empty())
       {
         return true;
       }
 
       QList<IWorkbenchPart::Pointer> wbParts;
       for (QList<ISaveablePart::Pointer>::const_iterator i = parts.begin();
         i != parts.end(); ++i)
       {
         if (IWorkbenchPart::Pointer part = i->Cast<IWorkbenchPart>())
         {
           wbParts.push_back(part);
         }
       }
 
       // If confirmation is required ..
       return this->SaveAll(wbParts, confirm, closing, addNonPartSources, IWorkbenchWindow::Pointer(window));
     }
 
     bool EditorManager::SaveAll(
         const QList<IWorkbenchPart::Pointer>& /*dirtyParts*/, bool /*confirm*/,
         bool /*closing*/, bool /*addNonPartSources*/, SmartPointer<IWorkbenchWindow> /*window*/)
     {
 //      // clone the input list
 //          dirtyParts = new ArrayList(dirtyParts);
 //            List modelsToSave;
 //          if (confirm) {
 //            boolean saveable2Processed = false;
 //            // Process all parts that implement ISaveablePart2.
 //            // These parts are removed from the list after saving
 //            // them. We then need to restore the workbench to
 //            // its previous state, for now this is just last
 //            // active perspective.
 //            // Note that the given parts may come from multiple
 //            // windows, pages and perspectives.
 //            ListIterator listIterator = dirtyParts.listIterator();
 //
 //            WorkbenchPage currentPage = null;
 //            Perspective currentPageOriginalPerspective = null;
 //            while (listIterator.hasNext()) {
 //              IWorkbenchPart part = (IWorkbenchPart) listIterator.next();
 //              if (part instanceof ISaveablePart2) {
 //                WorkbenchPage page = (WorkbenchPage) part.getSite()
 //                    .getPage();
 //                if (!Util.equals(currentPage, page)) {
 //                  if (currentPage != null
 //                      && currentPageOriginalPerspective != null) {
 //                    if (!currentPageOriginalPerspective
 //                        .equals(currentPage.getActivePerspective())) {
 //                      currentPage
 //                          .setPerspective(currentPageOriginalPerspective
 //                              .getDesc());
 //                    }
 //                  }
 //                  currentPage = page;
 //                  currentPageOriginalPerspective = page
 //                      .getActivePerspective();
 //                }
 //                if (confirm) {
 //                  if (part instanceof IViewPart) {
 //                    Perspective perspective = page
 //                        .getFirstPerspectiveWithView((IViewPart) part);
 //                    if (perspective != null) {
 //                      page.setPerspective(perspective.getDesc());
 //                    }
 //                  }
 //                  // show the window containing the page?
 //                  IWorkbenchWindow partsWindow = page
 //                      .getWorkbenchWindow();
 //                  if (partsWindow != partsWindow.getWorkbench()
 //                      .getActiveWorkbenchWindow()) {
 //                    Shell shell = partsWindow.getShell();
 //                    if (shell.getMinimized()) {
 //                      shell.setMinimized(false);
 //                    }
 //                    shell.setActive();
 //                  }
 //                  page.bringToTop(part);
 //                }
 //                // try to save the part
 //                int choice = SaveableHelper.savePart((ISaveablePart2) part,
 //                    page.getWorkbenchWindow(), confirm);
 //                if (choice == ISaveablePart2.CANCEL) {
 //                  // If the user cancels, don't restore the previous
 //                  // workbench state, as that will
 //                  // be an unexpected switch from the current state.
 //                  return false;
 //                } else if (choice != ISaveablePart2.DEFAULT) {
 //                  saveable2Processed = true;
 //                  listIterator.remove();
 //                }
 //              }
 //            }
 //
 //            // try to restore the workbench to its previous state
 //            if (currentPage != null && currentPageOriginalPerspective != null) {
 //              if (!currentPageOriginalPerspective.equals(currentPage
 //                  .getActivePerspective())) {
 //                currentPage.setPerspective(currentPageOriginalPerspective
 //                    .getDesc());
 //              }
 //            }
 //
 //            // if processing a ISaveablePart2 caused other parts to be
 //            // saved, remove them from the list presented to the user.
 //            if (saveable2Processed) {
 //              listIterator = dirtyParts.listIterator();
 //              while (listIterator.hasNext()) {
 //                ISaveablePart part = (ISaveablePart) listIterator.next();
 //                if (!part.isDirty()) {
 //                  listIterator.remove();
 //                }
 //              }
 //            }
 //
 //                  modelsToSave = convertToSaveables(dirtyParts, closing, addNonPartSources);
 //
 //                  // If nothing to save, return.
 //                  if (modelsToSave.isEmpty()) {
 //              return true;
 //            }
 //            boolean canceled = SaveableHelper.waitForBackgroundSaveJobs(modelsToSave);
 //            if (canceled) {
 //              return false;
 //            }
 //                  // Use a simpler dialog if there's only one
 //                  if (modelsToSave.size() == 1) {
 //                    Saveable model = (Saveable) modelsToSave.get(0);
 //              String message = NLS.bind(WorkbenchMessages.EditorManager_saveChangesQuestion, model.getName());
 //              // Show a dialog.
 //              String[] buttons = new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL };
 //              MessageDialog d = new MessageDialog(
 //                shellProvider.getShell(), WorkbenchMessages.Save_Resource,
 //                null, message, MessageDialog.QUESTION, buttons, 0);
 //
 //              int choice = SaveableHelper.testGetAutomatedResponse();
 //              if (SaveableHelper.testGetAutomatedResponse() == SaveableHelper.USER_RESPONSE) {
 //                choice = d.open();
 //              }
 //
 //              // Branch on the user choice.
 //              // The choice id is based on the order of button labels
 //              // above.
 //              switch (choice) {
 //              case ISaveablePart2.YES: // yes
 //                break;
 //              case ISaveablePart2.NO: // no
 //                return true;
 //              default:
 //              case ISaveablePart2.CANCEL: // cancel
 //                return false;
 //              }
 //                  }
 //                  else {
 //                    ListSelectionDialog dlg = new ListSelectionDialog(
 //                            shellProvider.getShell(), modelsToSave,
 //                            new ArrayContentProvider(),
 //                            new WorkbenchPartLabelProvider(), RESOURCES_TO_SAVE_MESSAGE);
 //                    dlg.setInitialSelections(modelsToSave.toArray());
 //                    dlg.setTitle(SAVE_RESOURCES_TITLE);
 //
 //                    // this "if" statement aids in testing.
 //                    if (SaveableHelper.testGetAutomatedResponse()==SaveableHelper.USER_RESPONSE) {
 //                      int result = dlg.open();
 //                        //Just return false to prevent the operation continuing
 //                        if (result == IDialogConstants.CANCEL_ID) {
 //                  return false;
 //                }
 //
 //                        modelsToSave = Arrays.asList(dlg.getResult());
 //                    }
 //                  }
 //              }
 //              else {
 //                modelsToSave = convertToSaveables(dirtyParts, closing, addNonPartSources);
 //          }
 //
 //              // If the editor list is empty return.
 //              if (modelsToSave.isEmpty()) {
 //            return true;
 //          }
 //
 //          // Create save block.
 //              final List finalModels = modelsToSave;
 //          IRunnableWithProgress progressOp = new IRunnableWithProgress() {
 //            public void run(IProgressMonitor monitor) {
 //              IProgressMonitor monitorWrap = new EventLoopProgressMonitor(
 //                  monitor);
 //              monitorWrap.beginTask("", finalModels.size()); //$NON-NLS-1$
 //              for (Iterator i = finalModels.iterator(); i.hasNext();) {
 //                Saveable model = (Saveable) i.next();
 //                // handle case where this model got saved as a result of saving another
 //                if (!model.isDirty()) {
 //                  monitor.worked(1);
 //                  continue;
 //                }
 //                SaveableHelper.doSaveModel(model, new SubProgressMonitor(monitorWrap, 1), shellProvider, closing || confirm);
 //                if (monitorWrap.isCanceled()) {
 //                  break;
 //                }
 //              }
 //              monitorWrap.done();
 //            }
 //          };
 //
 //          // Do the save.
 //          return SaveableHelper.runProgressMonitorOperation(
 //              WorkbenchMessages.Save_All, progressOp, runnableContext, shellProvider);
       return true;
     }
 
     bool EditorManager::SavePart(ISaveablePart::Pointer  /*saveable*/, IWorkbenchPart::Pointer  /*part*/, bool  /*confirm*/)
     {
       //TODO EditorManager save part (SaveableHelper)
       //return SaveableHelper.savePart(saveable, part, window, confirm);
       return true;
     }
 
     bool EditorManager::SaveState(const IMemento::Pointer memento)
     {
 
 //      final MultiStatus result = new MultiStatus(PlatformUI.PLUGIN_ID,
 //          IStatus.OK,
 //          WorkbenchMessages.EditorManager_problemsSavingEditors, null);
       bool result = true;
 
       // Save the editor area workbooks layout/relationship
       IMemento::Pointer editorAreaMem = memento->CreateChild(WorkbenchConstants::TAG_AREA);
       //result.add(editorPresentation.saveState(editorAreaMem));
       result &= editorPresentation->SaveState(editorAreaMem);
 
       // Save the active workbook id
       editorAreaMem->PutString(WorkbenchConstants::TAG_ACTIVE_WORKBOOK,
           editorPresentation->GetActiveEditorWorkbookID());
 
       // Get each workbook
       QList<PartStack::Pointer> workbooks(editorPresentation->GetWorkbooks());
 
       for (QList<PartStack::Pointer>::iterator iter = workbooks.begin();
           iter != workbooks.end(); ++iter)
       {
         PartStack::Pointer workbook = *iter;
 
         // Use the list of editors found in EditorStack; fix for 24091
         QList<LayoutPart::Pointer> editorPanes(workbook->GetChildren());
 
         for (QList<LayoutPart::Pointer>::iterator i = editorPanes.begin();
             i != editorPanes.end(); ++i)
         {
           // Save each open editor.
           EditorReference::Pointer editorReference = i->Cast<PartPane>()->GetPartReference().Cast<EditorReference>();
           IEditorPart::Pointer editor = editorReference->GetEditor(false);
           if (!editor)
           {
             if (editorReference->GetMemento())
             {
               IMemento::Pointer editorMem = memento
               ->CreateChild(WorkbenchConstants::TAG_EDITOR);
               editorMem->PutMemento(editorReference->GetMemento());
             }
             continue;
           }
 
           // for dynamic UI - add the next line to replace the subsequent
           // code which is commented out
           SaveEditorState(memento, editorReference); //, result);
         }
       }
       return result;
     }
 
     bool EditorManager::SetVisibleEditor(IEditorReference::Pointer newEd,
         bool setFocus)
     {
       return editorPresentation->SetVisibleEditor(newEd, setFocus);
     }
 
     IPathEditorInput::Pointer EditorManager::GetPathEditorInput(
         IEditorInput::Pointer input)
     {
       if (input.Cast<IPathEditorInput>().IsNotNull())
       {
         return input.Cast<IPathEditorInput>();
       }
 
 //      return (IPathEditorInput)
 //      Util.getAdapter(input, IPathEditorInput.class);
       return IPathEditorInput::Pointer(0);
     }
 
     void EditorManager::RestoreEditorState(IMemento::Pointer /*editorMem*/,
         QList<IEditorReference::Pointer>& /*visibleEditors*/,
         QList<IEditorReference::Pointer>&  /*activeEditor*/)
     {
       // MultiStatus result) {
 
       //TODO Restore editor state
       // String strFocus = editorMem.getString(IWorkbenchConstants.TAG_FOCUS);
       // boolean visibleEditor = "true".equals(strFocus); //$NON-NLS-1$
 //      EditorReference::Pointer e = new EditorReference(this, editorMem);
 //
 //      try
 //      {
 //        StartupThreading.runWithPartInitExceptions(new StartupRunnable ()
 //            {
 //
 //            public void runWithException() throws Throwable
 //              {
 //                createEditorTab(e, workbookID);
 //              }});
 //
 //      }
 //      catch (PartInitException ex)
 //      {
 //        result.add(ex.getStatus());
 //      }
 //
 //      String strActivePart = editorMem
 //      .getString(IWorkbenchConstants.TAG_ACTIVE_PART);
 //      if ("true".equals(strActivePart))
 //      { //$NON-NLS-1$
 //        activeEditor[0] = e;
 //      }
 //
 //      String strFocus = editorMem.getString(IWorkbenchConstants.TAG_FOCUS);
 //      boolean visibleEditor = "true".equals(strFocus); //$NON-NLS-1$
 //      if (visibleEditor)
 //      {
 //        visibleEditors.add(e);
 //      }
     }
 
     void EditorManager::SaveEditorState(IMemento::Pointer /*mem*/,
         IEditorReference::Pointer  /*ed*/)
     {
       //TODO Save editor state
 //      final EditorReference editorRef = (EditorReference) ed;
 //      final IEditorPart editor = ed.getEditor(false);
 //      final IMemento memento = mem;
 //      final MultiStatus result = res;
 //      if (!(editor.getEditorSite() instanceof EditorSite))
 //      {
 //        return;
 //      }
 //      final EditorSite site = (EditorSite) editor.getEditorSite();
 //      if (site.getPane() instanceof MultiEditorInnerPane)
 //      {
 //        return;
 //      }
 //
 //      SafeRunner.run(new SafeRunnable()
 //          {
 //          public void run()
 //            {
 //              // Get the input.
 //              IEditorInput input = editor.getEditorInput();
 //              if (!input.exists())
 //              {
 //                return;
 //              }
 //              IPersistableElement persistable = input.getPersistable();
 //              if (persistable == null)
 //              {
 //                return;
 //              }
 //
 //              // Save editor.
 //              IMemento editorMem = memento
 //              .createChild(IWorkbenchConstants.TAG_EDITOR);
 //              editorMem.putString(IWorkbenchConstants.TAG_TITLE, editorRef
 //                  .getTitle());
 //              editorMem.putString(IWorkbenchConstants.TAG_NAME, editorRef
 //                  .getName());
 //              editorMem.putString(IWorkbenchConstants.TAG_ID, editorRef
 //                  .getId());
 //              editorMem.putString(IWorkbenchConstants.TAG_TOOLTIP, editorRef
 //                  .getTitleToolTip());
 //
 //              editorMem.putString(IWorkbenchConstants.TAG_PART_NAME,
 //                  editorRef.getPartName());
 //
 //              if (editor instanceof IWorkbenchPart3)
 //              {
 //                Map properties = ((IWorkbenchPart3) editor)
 //                .getPartProperties();
 //                if (!properties.isEmpty())
 //                {
 //                  IMemento propBag = editorMem
 //                  .createChild(IWorkbenchConstants.TAG_PROPERTIES);
 //                  Iterator i = properties.entrySet().iterator();
 //                  while (i.hasNext())
 //                  {
 //                    Map.Entry entry = (Map.Entry) i.next();
 //                    IMemento p = propBag.createChild(
 //                        IWorkbenchConstants.TAG_PROPERTY,
 //                        (String) entry.getKey());
 //                    p.putTextData((String) entry.getValue());
 //                  }
 //                }
 //              }
 //
 //              if (editorRef.isPinned())
 //              {
 //                editorMem.putString(IWorkbenchConstants.TAG_PINNED, "true"); //$NON-NLS-1$
 //              }
 //
 //              EditorPane editorPane = (EditorPane) ((EditorSite) editor
 //                  .getEditorSite()).getPane();
 //              editorMem.putString(IWorkbenchConstants.TAG_WORKBOOK,
 //                  editorPane.getWorkbook().getID());
 //
 //              if (editor == page.getActivePart())
 //              {
 //                editorMem.putString(IWorkbenchConstants.TAG_ACTIVE_PART,
 //                    "true"); //$NON-NLS-1$
 //              }
 //
 //              if (editorPane == editorPane.getWorkbook().getSelection())
 //              {
 //                editorMem.putString(IWorkbenchConstants.TAG_FOCUS, "true"); //$NON-NLS-1$
 //              }
 //
 //              if (input instanceof IPathEditorInput)
 //              {
 //                IPath path = ((IPathEditorInput) input).getPath();
 //                if (path != null)
 //                {
 //                  editorMem.putString(IWorkbenchConstants.TAG_PATH, path
 //                      .toString());
 //                }
 //              }
 //
 //              // Save input.
 //              IMemento inputMem = editorMem
 //              .createChild(IWorkbenchConstants.TAG_INPUT);
 //              inputMem.putString(IWorkbenchConstants.TAG_FACTORY_ID,
 //                  persistable.getFactoryId());
 //              persistable.saveState(inputMem);
 //
 //              // any editors that want to persist state
 //              if (editor instanceof IPersistableEditor)
 //              {
 //                IMemento editorState = editorMem
 //                .createChild(IWorkbenchConstants.TAG_EDITOR_STATE);
 //                ((IPersistableEditor) editor).saveState(editorState);
 //              }
 //            }
 //
 //          public void handleException(Throwable e)
 //            {
 //              result
 //              .add(new Status(
 //                      IStatus.ERR,
 //                      PlatformUI.PLUGIN_ID,
 //                      0,
 //                      NLS
 //                      .bind(
 //                          WorkbenchMessages.EditorManager_unableToSaveEditor,
 //                          editorRef.getTitle()), e));
 //            }
 //          }
 //          );
         }
 
     IMemento::Pointer EditorManager::GetMemento(IEditorReference::Pointer e)
     {
       if (e.Cast<EditorReference>().IsNotNull())
       {
         return e.Cast<EditorReference>()->GetMemento();
       }
       return IMemento::Pointer(0);
     }
 
     IEditorReference::Pointer EditorManager::OpenEmptyTab()
     {
       IEditorInput::Pointer input(new NullEditorInput());
       EditorDescriptor::Pointer desc = (dynamic_cast<EditorRegistry*>(this->GetEditorRegistry()))
       ->FindEditor(EditorRegistry::EMPTY_EDITOR_ID).Cast<EditorDescriptor>();
       EditorReference::Pointer result(new EditorReference(this, input, desc));
       try
       {
         this->CreateEditorTab(result, "");
         return result;
       }
       catch (const PartInitException& e)
       {
 //        StatusManager.getManager().handle(
 //            StatusUtil.newStatus(WorkbenchPlugin.PI_WORKBENCH, e));
         BERRY_ERROR << e.what() << std::endl;
       }
       return IEditorReference::Pointer(0);
     }
 
     bool EditorManager::UseIPersistableEditor()
     {
 //      IPreferenceStore store = WorkbenchPlugin.getDefault()
 //      .getPreferenceStore();
 //      return store.getBoolean(IPreferenceConstants.USE_IPERSISTABLE_EDITORS);
       return false;
     }
 
     }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorReference.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorReference.cpp
index ce01dc44bf..c0f205d6b5 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorReference.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorReference.cpp
@@ -1,573 +1,573 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "tweaklets/berryWorkbenchPageTweaklet.h"
 
 #include "berryEditorReference.h"
 
 #include "berryEditorManager.h"
 #include "berryEditorDescriptor.h"
 #include "berryEditorRegistry.h"
 #include "berryEditorSite.h"
 #include "berryEditorAreaHelper.h"
 #include "berryWorkbenchPlugin.h"
 #include "berryWorkbenchPage.h"
 #include "berryNullEditorInput.h"
 #include "berryPartTester.h"
 
 #include "berryImageDescriptor.h"
 #include "berryPlatformUI.h"
 #include "berryIWorkbenchPartConstants.h"
 
 namespace berry
 {
 
 EditorReference::EditorReference(EditorManager* man,
     IEditorInput::Pointer input, EditorDescriptor::Pointer desc,
     IMemento::Pointer editorState) :
   manager(man), expectingInputChange(false),
       reportedMalfunctioningEditor(false)
 {
   this->InitListenersAndHandlers();
   restoredInput = input;
   this->editorState = editorState;
   this->Init(desc->GetId(), "", desc->GetImageDescriptor(),
              desc->GetLabel(), "");
 }
 
 EditorReference::EditorReference(EditorManager* man, IMemento::Pointer memento) :
   manager(man), expectingInputChange(false),
       reportedMalfunctioningEditor(false)
 {
   this->InitListenersAndHandlers();
   this->editorMemento = memento;
   if (manager->UseIPersistableEditor())
   {
     //editorState = editorMemento->GetChild(WorkbenchConstants::TAG_EDITOR_STATE);
   }
   else
   {
     editorState = 0;
   }
   //  String id = memento.getString(IWorkbenchConstants.TAG_ID);
   //  String title = memento.getString(IWorkbenchConstants.TAG_TITLE);
   //  String tooltip = Util.safeString(memento
   //  .getString(IWorkbenchConstants.TAG_TOOLTIP));
   //  String partName = memento
   //  .getString(IWorkbenchConstants.TAG_PART_NAME);
   //
   //  IMemento propBag = memento.getChild(IWorkbenchConstants.TAG_PROPERTIES);
   //  if (propBag != null)
   //  {
   //    IMemento[] props = propBag
   //    .getChildren(IWorkbenchConstants.TAG_PROPERTY);
   //    for (int i = 0; i < props.length; i++)
   //    {
   //      propertyCache.put(props[i].getID(), props[i].getTextData());
   //    }
   //  }
 
   // For compatibility set the part name to the title if not found
 
   //  if (partName.empty())
   //  {
   //    partName = title;
   //  }
 
   // Get the editor descriptor.
   //  EditorDescriptor::Pointer desc;
   //  if (id != null)
   //  {
   //    desc = getDescriptor(id);
   //  }
   //  // desc may be null if id is null or desc is not found, but findImage below handles this
   //  String location = memento.getString(IWorkbenchConstants.TAG_PATH);
   //  IPath path = location == null ? null : new Path(location);
   //  ImageDescriptor iDesc = this.manager.findImage(desc, path);
   //
   //  this.name = memento.getString(IWorkbenchConstants.TAG_NAME);
   //  if (this.name == null)
   //  {
   //    this.name = title;
   //  }
   //  setPinned("true".equals(memento.getString(IWorkbenchConstants.TAG_PINNED))); //$NON-NLS-1$
   //
   //  IMemento inputMem = memento.getChild(IWorkbenchConstants.TAG_INPUT);
   //  if (inputMem != null)
   //  {
   //    this.factoryId = inputMem
   //    .getString(IWorkbenchConstants.TAG_FACTORY_ID);
   //  }
   //
   //  init(id, title, tooltip, iDesc, partName, ""); //$NON-NLS-1$
 }
 
 EditorDescriptor::Pointer EditorReference::GetDescriptor()
 {
   return this->GetDescriptor(this->GetId());
 }
 
 EditorDescriptor::Pointer EditorReference::GetDescriptor(const QString& id)
 {
   EditorDescriptor::Pointer desc;
   IEditorRegistry* reg = WorkbenchPlugin::GetDefault()->GetEditorRegistry();
   desc = reg->FindEditor(id).Cast<EditorDescriptor> ();
   return desc;
 }
 
 void EditorReference::InitListenersAndHandlers()
 {
   // Create a property change listener to track the "close editors automatically"
   // preference and show/remove the pin icon on editors
   // Only 1 listener will be created in the EditorManager when necessary
   //this->manager->CheckCreateEditorPropListener();
   // Create a keyboard shortcut handler for pinning editors
   // Only 1 handler will be created in the EditorManager when necessary
   //this->manager->CheckCreatePinEditorShortcutKeyHandler();
 }
 
 PartPane::Pointer EditorReference::CreatePane()
 {
   PartPane::Pointer pane(
       new PartPane(IWorkbenchPartReference::Pointer(this), this->manager->page));
   return pane;
   //return Tweaklets::Get(WorkbenchTweaklet::KEY)->CreateEditorPane(this,
   //    this->manager->page);
 }
 
 void EditorReference::PinStatusUpdated()
 {
   //firePropertyChange(IWorkbenchPart.PROP_TITLE);
 }
 
 QString EditorReference::GetFactoryId()
 {
   //  IEditorPart editor = getEditor(false);
   //  if (editor != null)
   //  {
   //    IPersistableElement persistable = editor.getEditorInput()
   //    .getPersistable();
   //    if (persistable != null)
   //    {
   //      return persistable.getFactoryId();
   //    }
   //    return null;
   //  }
   //  return factoryId;
   return "";
 }
 
-QString EditorReference::ComputePartName()
+QString EditorReference::ComputePartName() const
 {
   return WorkbenchPartReference::ComputePartName();
 }
 
 QString EditorReference::GetName()
 {
   if (part.IsNotNull())
   {
     return this->GetEditor(false)->GetEditorInput()->GetName();
   }
   return name;
 }
 
 IEditorPart::Pointer EditorReference::GetEditor(bool restore)
 {
   return this->GetPart(restore).Cast<IEditorPart> ();
 }
 
 void EditorReference::SetName(const QString& name)
 {
   this->name = name;
 }
 
 IMemento::Pointer EditorReference::GetMemento()
 {
   return editorMemento;
 }
 
 IWorkbenchPage::Pointer EditorReference::GetPage() const
 {
   return IWorkbenchPage::Pointer(this->manager->page);
 }
 
 IEditorInput::Pointer EditorReference::GetEditorInput()
 {
   IEditorPart::Pointer part = this->GetEditor(false);
   if (part.IsNotNull())
   {
     return part->GetEditorInput();
   }
   return this->GetRestoredInput();
 }
 
 IEditorInput::Pointer EditorReference::GetRestoredInput()
 {
   if (restoredInput.IsNotNull())
   {
     return restoredInput;
   }
 
   // Get the input factory.
   //    IMemento::Pointer editorMem = this->GetMemento();
   //    if (editorMem == null)
   //    {
   //      throw new PartInitException(NLS.bind(WorkbenchMessages.EditorManager_no_persisted_state, getId(), getName()));
   //    }
   //    IMemento inputMem = editorMem
   //    .getChild(IWorkbenchConstants.TAG_INPUT);
   //    String factoryID = null;
   //    if (inputMem != null)
   //    {
   //      factoryID = inputMem
   //      .getString(IWorkbenchConstants.TAG_FACTORY_ID);
   //    }
   //    if (factoryID == null)
   //    {
   //      throw new PartInitException(NLS.bind(WorkbenchMessages.EditorManager_no_input_factory_ID, getId(), getName()));
   //    }
   //    IAdaptable input = null;
   //    String label = null; // debugging only
   //    if (UIStats.isDebugging(UIStats.CREATE_PART_INPUT))
   //    {
   //      label = getName() != null ? getName() : factoryID;
   //    }
   //    try
   //    {
   //      UIStats.start(UIStats.CREATE_PART_INPUT, label);
   //      IElementFactory factory = PlatformUI.getWorkbench()
   //      .getElementFactory(factoryID);
   //      if (factory == null)
   //      {
   //        throw new PartInitException(NLS.bind(WorkbenchMessages.EditorManager_bad_element_factory, new Object[]
   //                { factoryID, getId(), getName()}));
   //      }
   //
   //      // Get the input element.
   //      input = factory.createElement(inputMem);
   //      if (input == null)
   //      {
   //        throw new PartInitException(NLS.bind(WorkbenchMessages.EditorManager_create_element_returned_null, new Object[]
   //                { factoryID, getId(), getName()}));
   //      }
   //    }finally
   //    {
   //      UIStats.end(UIStats.CREATE_PART_INPUT, input, label);
   //    }
   //    if (!(input instanceof IEditorInput))
   //    {
   //      throw new PartInitException(NLS.bind(WorkbenchMessages.EditorManager_wrong_createElement_result, new Object[]
   //              { factoryID, getId(), getName()}));
   //    }
   //    restoredInput = (IEditorInput) input;
   return restoredInput;
 }
 
 IWorkbenchPart::Pointer EditorReference::CreatePart()
 {
   if (EditorRegistry::EMPTY_EDITOR_ID == this->GetId())
   {
     return this->GetEmptyEditor(this->GetDescriptor());
   }
 
   IWorkbenchPart::Pointer result;
 
   // Try to restore the editor -- this does the real work of restoring the editor
   //
   try
   {
     result = this->CreatePartHelper().Cast<IWorkbenchPart> ();
   } catch (PartInitException e)
   {
     // If unable to create the part, create an error part instead
     // and pass the error to the status handling facility
     //    IStatus originalStatus = exception.getStatus();
     //    IStatus logStatus = StatusUtil.newStatus(originalStatus,
     //        NLS.bind("Unable to create editor ID {0}: {1}", //$NON-NLS-1$
     //            getId(), originalStatus.getMessage()));
     //    IStatus displayStatus = StatusUtil.newStatus(originalStatus,
     //        NLS.bind(WorkbenchMessages.EditorManager_unableToCreateEditor,
     //            originalStatus.getMessage()));
     WorkbenchPlugin::Log(QString("Unable to create editor ID ") + this->GetId() + ": "
                          + e.what());
 
     // Pass the error to the status handling facility
     //StatusManager.getManager().handle(logStatus);
 
     EditorDescriptor::Pointer descr = this->GetDescriptor();
     QString label = this->GetId();
     if (descr.IsNotNull())
       label = descr->GetLabel();
 
     IEditorPart::Pointer part =
         Tweaklets::Get(WorkbenchPageTweaklet::KEY)->CreateErrorEditorPart(label, e.what());
     if (part.IsNotNull())
     {
       IEditorInput::Pointer input;
       try
       {
         input = this->GetEditorInput();
       } catch (PartInitException e1)
       {
         input = new NullEditorInput(EditorReference::Pointer(this));
       }
 
       PartPane::Pointer pane = this->GetPane();
 
       pane->CreateControl(
           manager->page->GetEditorPresentation()->GetLayoutPart()->GetControl());
 
       EditorSite::Pointer site(
           new EditorSite(IEditorReference::Pointer(this), part, manager->page, descr));
 
       //site.setActionBars(new EditorActionBars(manager.page, site.getWorkbenchWindow(), getId()));
 
       part->Init(site, input);
 
       try
       {
         part->CreatePartControl(pane->GetControl());
       } catch (...)
       {
         //content.dispose();
         //StatusUtil.handleStatus(e, StatusManager.SHOW
         //    | StatusManager.LOG);
         WorkbenchPlugin::Log("Error creating editor");
         return IWorkbenchPart::Pointer(0);
       }
 
       result = part.Cast<IWorkbenchPart> ();
     }
   }
 
   return result;
 }
 
 void EditorReference::PropertyChanged(Object::Pointer source, int propId)
 {
   // Detect badly behaved editors that don't fire PROP_INPUT events
   // when they're supposed to. This branch is only needed to handle
   // malfunctioning editors.
   if (propId == IWorkbenchPartConstants::PROP_INPUT)
   {
     expectingInputChange = false;
   }
 
   WorkbenchPartReference::PropertyChanged(source, propId);
 }
 
 bool EditorReference::SetInput(IEditorInput::Pointer input)
 {
 
   if (part.IsNotNull())
   {
     if (part.Cast<IReusableEditor> ().IsNotNull())
     {
       IReusableEditor::Pointer editor = part.Cast<IReusableEditor> ();
 
       expectingInputChange = true;
 
       editor->SetInput(input);
 
       // If the editor never fired a PROP_INPUT event, log the fact that we've discovered
       // a buggy editor and fire the event for free. Firing the event for free isn't required
       // and cannot be relied on (it only works if the input change was triggered by this
       // method, and there are definitely other cases where events will still be lost),
       // but older versions of the workbench did this so we fire it here in the spirit
       // of playing nice.
       if (expectingInputChange)
       {
 
         // Log the fact that this editor is broken
         this->ReportMalfunction(
             "Editor is not firing a PROP_INPUT event in response to IReusableEditor.setInput(...)"); //$NON-NLS-1$
 
         // Fire the property for free (can't be relied on since there are other ways the input
         // can change, but we do it here to be consistent with older versions of the workbench)
         FirePropertyChange(IWorkbenchPartConstants::PROP_INPUT);
       }
 
       return editor->GetEditorInput() == input;
 
     }
     // Can't change the input if the editor already exists and isn't an IReusableEditor
     return false;
   }
 
   // Changing the input is trivial and always succeeds if the editor doesn't exist yet
   if (input != restoredInput)
   {
     restoredInput = input;
 
     //firePropertyChange(IWorkbenchPartConstants.PROP_INPUT);
   }
 
   return true;
 }
 
 void EditorReference::ReportMalfunction(const QString& string)
 {
   if (!reportedMalfunctioningEditor)
   {
     reportedMalfunctioningEditor = true;
 
     QString errorMessage = "Problem detected with part " + this->GetId(); //$NON-NLS-1$
     if (part.IsNotNull())
     {
       errorMessage.append("(class = ").append(part->GetClassName()).append(
           ")"); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     errorMessage += ": " + string; //$NON-NLS-1$
 
     //StatusManager.getManager().handle(StatusUtil.newStatus(getDescriptor().getPluginId(), errorMessage, null));
     BERRY_ERROR << errorMessage << std::endl;
   }
 }
 
 IEditorPart::Pointer EditorReference::CreatePartHelper()
 {
 
   EditorSite::Pointer site;
   IEditorPart::Pointer part;
 
   try
   {
     IEditorInput::Pointer editorInput = this->GetEditorInput();
 
     // Get the editor descriptor.
     QString editorID = this->GetId();
     EditorDescriptor::Pointer desc = this->GetDescriptor();
 
     if (desc.IsNull())
     {
       throw PartInitException("No editor descriptor for id " + editorID);
     }
 
     if (desc->IsInternal())
     {
       // Create an editor instance.
       part = manager->CreatePart(desc);
 
       this->CreatePartProperties(part);
 
     }
     //    else if (desc->GetId() == IEditorRegistry.SYSTEM_INPLACE_EDITOR_ID)
     //    {
     //
     //      part = ComponentSupport.getSystemInPlaceEditor();
     //
     //      if (part == null)
     //      {
     //        throw new PartInitException(WorkbenchMessages.EditorManager_no_in_place_support);
     //      }
     //    }
     else
     {
       throw PartInitException("Invalid editor descriptor for id " + editorID);
     }
     // Create a pane for this part
     PartPane::Pointer pane = this->GetPane();
 
     pane->CreateControl(manager->page->GetEditorPresentation()->GetLayoutPart()->GetControl());
 
 
     // Link everything up to the part reference (the part reference itself should not have
     // been modified until this point)
     site = manager->CreateSite(IEditorReference::Pointer(this), part, desc, editorInput);
 
     // if there is saved state that's appropriate, pass it on
     if (/*part instanceof IPersistableEditor &&*/editorState.IsNotNull())
     {
       //part->RestoreState(editorState);
     }
 
     // Remember the site and the action bars (now that we've created them, we'll need to dispose
     // them if an exception occurs)
     //actionBars = (EditorActionBars) site.getActionBars();
 
     part->CreatePartControl(pane->GetControl());
 
     // The editor should now be fully created. Exercise its public interface, and sanity-check
     // it wherever possible. If it's going to throw exceptions or behave badly, it's much better
     // that it does so now while we can still cancel creation of the part.
     PartTester::TestEditor(part);
 
     return part;
 
   } catch (std::exception e)
   {
     throw PartInitException(e.what());
   }
 
 }
 
 IEditorPart::Pointer EditorReference::GetEmptyEditor(
     EditorDescriptor::Pointer descr)
 {
   IEditorPart::Pointer part =
       Tweaklets::Get(WorkbenchPageTweaklet::KEY)->CreateErrorEditorPart("(Empty)", "");
 
   IEditorInput::Pointer input;
   try
   {
     input = this->GetEditorInput();
   } catch (PartInitException e1)
   {
     input = new NullEditorInput(EditorReference::Pointer(this));
   }
 
   PartPane::Pointer pane = this->GetPane();
 
   pane->CreateControl(
       manager->page->GetEditorPresentation()->GetLayoutPart()->GetControl());
 
   EditorSite::Pointer site(new EditorSite(IEditorReference::Pointer(this),
                                           part, manager->page, descr));
 
   //site.setActionBars(new EditorActionBars(manager.page, site.getWorkbenchWindow(), getId()));
 
   part->Init(site, input);
 
   try
   {
     part->CreatePartControl(pane->GetControl());
   } catch (std::exception e)
   {
     //StatusManager.getManager().handle(
     //    StatusUtil.newStatus(WorkbenchPlugin.PI_WORKBENCH, e));
     BERRY_ERROR << e.what() << std::endl;
     return IEditorPart::Pointer(0);
   }
 
   this->part = part.Cast<IWorkbenchPart> ();
   // Add a dispose listener to the part. This dispose listener does nothing but log an exception
   // if the part's widgets get disposed unexpectedly. The workbench part reference is the only
   // object that should dispose this control, and it will remove the listener before it does so.
 
   this->RefreshFromPart();
   //this->ReleaseReferences();
 
   if (this->GetPage().Cast<WorkbenchPage> ()->GetActiveEditorReference()
       != this)
   {
     //fireInternalPropertyChange(INTERNAL_PROPERTY_OPENED);
   }
 
   return part;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorReference.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorReference.h
index 934b9ccad3..aaa64736e5 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorReference.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorReference.h
@@ -1,235 +1,236 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYEDITORREFERENCE_H_
 #define BERRYEDITORREFERENCE_H_
 
 #include "berryWorkbenchPartReference.h"
 #include "berryIEditorReference.h"
 #include "berryIEditorInput.h"
 #include "berryIMemento.h"
 #include "berryIWorkbenchPart.h"
 #include "berryIEditorPart.h"
 
 namespace berry
 {
 
 class EditorManager;
 class EditorDescriptor;
 class PartPane;
 struct IWorkbenchPage;
 
 /**
  * \ingroup org_blueberry_ui_internal
  *
  */
 class EditorReference : public WorkbenchPartReference, public IEditorReference
 {
 
 private:
   const EditorManager* manager;
 
 private:
   IMemento::Pointer editorMemento;
 
 private:
   IMemento::Pointer editorState;
 
   /**
    * Flag that lets us detect malfunctioning editors that don't fire PROP_INPUT events.
    * It is never needed for a correctly-functioning
    */
 private:
   bool expectingInputChange;
 
   /**
    * Flag that determines whether we've already reported that this editor is malfunctioning.
    * This prevents us from spamming the event log if we repeatedly detect the same error in
    * a particular editor. If we ever detect an editor is violating its public contract in
    * a way we can recover from (such as a missing property change event), we report the error
    * once and then silently ignore errors from the same editor.
    */
 private:
   bool reportedMalfunctioningEditor;
 
   /**
    * User-readable name of the editor's input
    */
   QString name;
 
   QString factoryId;
 
   IEditorInput::Pointer restoredInput;
 
   /**
    * @param manager
    *            The editor manager for this reference
    * @param input
    *            our input
    * @param desc
    *            the descriptor from the declaration
    * @param editorState
    *            propogate state from another editor. Can be <code>null</code>.
    */
 public:
 
   berryObjectMacro(EditorReference);
 
   EditorReference(EditorManager* manager, IEditorInput::Pointer input,
       SmartPointer<EditorDescriptor> desc, IMemento::Pointer editorState = IMemento::Pointer(0));
 
   /**
    * Constructs a new editor reference for use by editors being restored from
    * a memento.
    */
   EditorReference(EditorManager* manager, IMemento::Pointer memento);
 
 public:
   SmartPointer<EditorDescriptor> GetDescriptor();
 
   /**
    * @param id the id
    * @return the editor descriptor
    */
 private:
   SmartPointer<EditorDescriptor> GetDescriptor(const QString& id);
 
   /**
    * Initializes the necessary editor listeners and handlers
    */
 private:
   void InitListenersAndHandlers();
 
 protected:
   SmartPointer<PartPane> CreatePane();
 
   /**
    * This method is called when there should be a change in the editor pin
    * status (added or removed) so that it will ask its presentable part
    * to fire a PROP_TITLE event in order for the presentation to request
    * the new icon for this editor
    */
 public:
   void PinStatusUpdated();
 
 public:
   QString GetFactoryId();
 
 protected:
-  QString ComputePartName();
+  QString ComputePartName() const;
 
 public:
   QString GetName();
 
 public:
   IEditorPart::Pointer GetEditor(bool restore);
 
 public:
   void SetName(const QString& name);
 
 public:
   IMemento::Pointer GetMemento();
 
 public:
   SmartPointer<IWorkbenchPage> GetPage() const;
 
 public:
   IEditorInput::Pointer GetEditorInput();
 
 private:
   IEditorInput::Pointer GetRestoredInput();
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.IWorkbenchPartReference#getTitleImage()
    * This method will append a pin to the icon of the editor
    * if the "automatically close editors" option in the
    * preferences is enabled and the editor has been pinned.
    */
   //public: ImageDescriptor computeImageDescriptor() {
   //        ImageDescriptor descriptor = super.computeImageDescriptor();
   //        if (!isPinned()) {
   //      return descriptor;
   //    }
   //
   //        // Check if the pinned preference is set
   //        IPreferenceStore prefStore = WorkbenchPlugin.getDefault()
   //                .getPreferenceStore();
   //        boolean bUsePin = prefStore
   //        .getBoolean(IPreferenceConstants.REUSE_EDITORS_BOOLEAN)
   //        || ((TabBehaviour)Tweaklets.get(TabBehaviour.KEY)).alwaysShowPinAction();
   //
   //        if (!bUsePin) {
   //      return descriptor;
   //    }
   //
   //        ImageDescriptor pinDesc = this.manager.getEditorPinImageDesc();
   //        if (pinDesc == null) {
   //      return descriptor;
   //    }
   //
   //        return new OverlayIcon(descriptor, pinDesc, new Point(16, 16));
   //    }
 
 protected:
 
   /**
    * Wrapper for restoring the editor. First, this delegates to busyRestoreEditorHelper
    * to do the real work of restoring the view. If unable to restore the editor, this
    * method tries to substitute an error part and return success.
    *
    * @return the created part
    */
   IWorkbenchPart::Pointer CreatePart();
 
+  using WorkbenchPartReference::PropertyChanged;
   void PropertyChanged(Object::Pointer source, int propId);
 
   /**
    * Attempts to set the input of the editor to the given input. Note that the input
    * can't always be changed for an editor. Editors that don't implement IReusableEditor
    * can't have their input changed once they've been materialized.
    *
    * @param input new input
    * @return true iff the input was actually changed
    */
 public:
   bool SetInput(IEditorInput::Pointer input);
 
   /**
    * Reports a recoverable malfunction in the system log. A recoverable malfunction would be
    * something like failure to fire an expected property change. Only the first malfunction is
    *
    * @param string
    */
 private:
   void ReportMalfunction(const QString& string);
 
 private:
   IEditorPart::Pointer CreatePartHelper();
 
   /**
    * Creates and returns an empty editor (<code>ErrorEditorPart</code>).
    *
    * @param descr the editor descriptor
    * @return the empty editor part or <code>null</code> in case of an exception
    */
 public:
   IEditorPart::Pointer GetEmptyEditor(SmartPointer<EditorDescriptor> descr);
 
 };
 
 } // namespace berry
 
 #endif /*BERRYEDITORREFERENCE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorRegistry.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorRegistry.cpp
index 11b9c6236d..cb61d3ab46 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorRegistry.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorRegistry.cpp
@@ -1,1299 +1,1299 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryEditorRegistry.h"
 
 #include "berryWorkbenchPlugin.h"
 #include "berryEditorRegistryReader.h"
 #include "berryWorkbenchRegistryConstants.h"
 
 namespace berry
 {
 
 const QString EditorRegistry::EMPTY_EDITOR_ID =
     "org.blueberry.ui.internal.emptyEditorTab";
 
 QHash<QString, FileEditorMapping::Pointer>
     EditorRegistry::EditorMap::defaultMap;
 
 QHash<QString, FileEditorMapping::Pointer> EditorRegistry::EditorMap::map;
 
 EditorRegistry::RelatedRegistry::RelatedRegistry(EditorRegistry* reg) :
   editorRegistry(reg)
 {
 
 }
 
 QList<IEditorDescriptor::Pointer> EditorRegistry::RelatedRegistry::GetRelatedObjects(
     const QString& fileName)
 {
   IFileEditorMapping::Pointer mapping = editorRegistry->GetMappingFor(fileName);
   if (mapping.IsNull())
   {
     return QList<IEditorDescriptor::Pointer>();
   }
 
   return mapping->GetEditors();
 }
 
 EditorRegistry::EditorRegistry() :
   relatedRegistry(this)
 {
   this->InitialIdToEditorMap(mapIDtoEditor);
   this->InitializeFromStorage();
   //IExtensionTracker tracker = PlatformUI.getWorkbench().getExtensionTracker();
   //tracker.registerHandler(this,
   //    ExtensionTracker.createExtensionPointFilter(getExtensionPointFilter()));
 }
 
 void EditorRegistry::AddEditorFromPlugin(EditorDescriptor::Pointer editor,
     const QList<QString>& extensions,
     const QList<QString>& filenames,
     const QList<QString>&  /*contentTypeVector*/, bool bDefault)
 {
 
   //PlatformUI.getWorkbench().getExtensionTracker().registerObject(editor.getConfigurationElement().getDeclaringExtension(), editor, IExtensionTracker.REF_WEAK);
   // record it in our quick reference list
   sortedEditorsFromPlugins.push_back(editor);
 
   // add it to the table of mappings
   for (QList<QString>::const_iterator itr = extensions.begin(); itr
       != extensions.end(); ++itr)
   {
     QString fileExtension = *itr;
 
     if (!fileExtension.isEmpty())
     {
       FileEditorMapping::Pointer mapping = this->GetMappingFor("*." + fileExtension);
       if (mapping.IsNull())
       { // no mapping for that extension
         mapping = new FileEditorMapping(fileExtension);
         typeEditorMappings.PutDefault(this->MappingKeyFor(mapping), mapping);
       }
       mapping->AddEditor(editor);
       if (bDefault)
       {
         mapping->SetDefaultEditor(editor);
       }
     }
   }
 
   // add it to the table of mappings
   for (QList<QString>::const_iterator itr = filenames.begin(); itr
       != filenames.end(); ++itr)
   {
     QString filename = *itr;
 
     if (!filename.isEmpty())
     {
       FileEditorMapping::Pointer mapping = this->GetMappingFor(filename);
       if (mapping.IsNull())
       { // no mapping for that extension
         QString name;
         QString extension;
         int index = filename.indexOf('.');
         if (index == -1)
         {
           name = filename;
           extension = "";
         }
         else
         {
           name = filename.left(index);
           extension = filename.mid(index + 1);
         }
         mapping = new FileEditorMapping(name, extension);
         typeEditorMappings.PutDefault(this->MappingKeyFor(mapping), mapping);
       }
       mapping->AddEditor(editor);
       if (bDefault)
       {
         mapping->SetDefaultEditor(editor);
       }
     }
   }
 
   //  for (QList<QString>::const_iterator itr = contentTypeVector.begin();
   //         itr != contentTypeVector.end(); ++itr)
   //  {
   //    QString contentTypeId = *itr;
   //    if (!contentTypeId.empty())
   //    {
   //      IContentType contentType = Platform.getContentTypeManager().getContentType(contentTypeId);
   //      if (contentType != null)
   //      {
   //        IEditorDescriptor [] editorArray = (IEditorDescriptor[]) contentTypeToEditorMappings.get(contentType);
   //        if (editorArray == null)
   //        {
   //          editorArray = new IEditorDescriptor[]
   //          { editor};
   //          contentTypeToEditorMappings.put(contentType, editorArray);
   //        }
   //        else
   //        {
   //          IEditorDescriptor [] newArray = new IEditorDescriptor[editorArray.length + 1];
   //          if (bDefault)
   //          { // default editors go to the front of the line
   //            newArray[0] = editor;
   //            System.arraycopy(editorArray, 0, newArray, 1, editorArray.length);
   //          }
   //          else
   //          {
   //            newArray[editorArray.length] = editor;
   //            System.arraycopy(editorArray, 0, newArray, 0, editorArray.length);
   //          }
   //          contentTypeToEditorMappings.put(contentType, newArray);
   //        }
   //      }
   //    }
   //  }
 
   // Update editor map.
   mapIDtoEditor[editor->GetId()] = editor;
 }
 
 void EditorRegistry::AddExternalEditorsToEditorMap()
 {
   // Add registered editors (may include external editors).
   QList<FileEditorMapping::Pointer> maps =
       typeEditorMappings.AllMappings();
-  for (unsigned int i = 0; i < maps.size(); ++i)
+  for (int i = 0; i < maps.size(); ++i)
   {
     FileEditorMapping::Pointer map = maps[i];
     QList<IEditorDescriptor::Pointer> descArray = map->GetEditors();
     for (QList<IEditorDescriptor::Pointer>::iterator itr =
         descArray.begin(); itr != descArray.end(); ++itr)
     {
       mapIDtoEditor[(*itr)->GetId()] = itr->Cast<EditorDescriptor> ();
     }
   }
 }
 
 IEditorDescriptor::Pointer EditorRegistry::FindEditor(const QString& id)
 {
   return mapIDtoEditor[id];
 }
 
 IEditorDescriptor::Pointer EditorRegistry::GetDefaultEditor()
 {
   // the default editor will always be the system external editor
   // this should never return null
   return this->FindEditor(IEditorRegistry::SYSTEM_EXTERNAL_EDITOR_ID);
 }
 
 IEditorDescriptor::Pointer EditorRegistry::GetDefaultEditor(
     const QString& fileName)
 {
   //return this->GetDefaultEditor(filename, guessAtContentType(filename));
   return this->GetEditorForContentType(fileName /*, contentType*/);
 }
 
 IEditorDescriptor::Pointer EditorRegistry::GetEditorForContentType(
     const QString& filename
 /*IContentType contentType*/)
 {
   IEditorDescriptor::Pointer desc;
   ;
   QList<IEditorDescriptor::Pointer> contentTypeResults =
       this->FindRelatedObjects(/*contentType,*/filename, relatedRegistry);
   if (contentTypeResults.size() > 0)
   {
     desc = contentTypeResults.front();
   }
   return desc;
 }
 
 QList<IEditorDescriptor::Pointer> EditorRegistry::FindRelatedObjects(
     /*IContentType type,*/const QString& fileName,
     RelatedRegistry&  /*registry*/)
 {
   QList<IEditorDescriptor::Pointer> allRelated;
   QList<IEditorDescriptor::Pointer> nonDefaultFileEditors;
   QList<IEditorDescriptor::Pointer> related;
 
   if (!fileName.isEmpty())
   {
     FileEditorMapping::Pointer mapping = this->GetMappingFor(fileName);
     if (!mapping.IsNull())
     {
       // backwards compatibility - add editors flagged as "default"
       related = mapping->GetDeclaredDefaultEditors();
       for (QList<IEditorDescriptor::Pointer>::iterator itr =
           related.begin(); itr != related.end(); ++itr)
       {
         // we don't want to return duplicates
         if (std::find(allRelated.begin(), allRelated.end(), *itr)
             == allRelated.end())
         {
           allRelated.push_back(*itr);
         }
       }
 
       // add all filename editors to the nonDefaultList
       // we'll later try to add them all after content types are resolved
       // duplicates (ie: default editors) will be ignored
       QList<IEditorDescriptor::Pointer> tmpList = mapping->GetEditors();
       nonDefaultFileEditors.append(tmpList);
     }
 
     int index = fileName.indexOf('.');
     if (index != -1)
     {
       QString extension = "*" + fileName.mid(index);
       mapping = this->GetMappingFor(extension);
       if (!mapping.IsNull())
       {
         related = mapping->GetDeclaredDefaultEditors();
         for (QList<IEditorDescriptor::Pointer>::iterator itr =
             related.begin(); itr != related.end(); ++itr)
         {
           // we don't want to return duplicates
           if (std::find(allRelated.begin(), allRelated.end(), *itr)
               == allRelated.end())
           {
             allRelated.push_back(*itr);
           }
         }
         QList<IEditorDescriptor::Pointer> tmpList = mapping->GetEditors();
         nonDefaultFileEditors.append(tmpList);
       }
     }
   }
 
   //    if (type != null) {
   //      // now add any objects directly related to the content type
   //      related = registry.getRelatedObjects(type);
   //      for (int i = 0; i < related.length; i++) {
   //        // we don't want to return duplicates
   //        if (!allRelated.contains(related[i])) {
   //          // if it's not filtered, add it to the list
   //          if (!WorkbenchActivityHelper.filterItem(related[i])) {
   //            allRelated.add(related[i]);
   //          }
   //        }
   //      }
   //
   //    }
 
   //    if (type != null) {
   //      // now add any indirectly related objects, walking up the content type hierarchy
   //      while ((type = type.getBaseType()) != null) {
   //        related = registry.getRelatedObjects(type);
   //        for (int i = 0; i < related.length; i++) {
   //          // we don't want to return duplicates
   //          if (!allRelated.contains(related[i])) {
   //            // if it's not filtered, add it to the list
   //            if (!WorkbenchActivityHelper.filterItem(related[i])) {
   //              allRelated.add(related[i]);
   //            }
   //          }
   //        }
   //      }
   //    }
 
   // add all non-default editors to the list
   for (QList<IEditorDescriptor::Pointer>::iterator i =
       nonDefaultFileEditors.begin(); i != nonDefaultFileEditors.end(); ++i)
   {
     IEditorDescriptor::Pointer editor = *i;
     if (std::find(allRelated.begin(), allRelated.end(), editor)
         == allRelated.end())
     {
       allRelated.push_back(editor);
     }
   }
 
   return allRelated;
 }
 
 QList<IEditorDescriptor::Pointer> EditorRegistry::GetEditors(
     const QString& filename)
 {
   //return getEditors(filename, guessAtContentType(filename));
   return this->FindRelatedObjects(/*contentType,*/filename, relatedRegistry);
 }
 
 QList<IFileEditorMapping::Pointer> EditorRegistry::GetFileEditorMappings()
 {
   QList<FileEditorMapping::Pointer>
       array(typeEditorMappings.AllMappings());
   std::sort(array.begin(), array.end(), CmpFileEditorMapping());
 
   QList<IFileEditorMapping::Pointer> result;
   for (QList<FileEditorMapping::Pointer>::iterator itr = array.begin(); itr
       != array.end(); ++itr)
   {
     result.push_back(itr->Cast<IFileEditorMapping> ());
   }
   return result;
 }
 
 FileEditorMapping::Pointer EditorRegistry::GetMappingFor(const QString& ext)
 {
   QString key = this->MappingKeyFor(ext);
   return typeEditorMappings.Get(key);
 }
 
 QList<FileEditorMapping::Pointer> EditorRegistry::GetMappingForFilename(
     const QString& filename)
 {
   QList<FileEditorMapping::Pointer> mapping;
 
   // Lookup on entire filename
   mapping[0] = this->GetMappingFor(filename);
 
   // Lookup on filename's extension
   int index = filename.indexOf('.');
   if (index != -1)
   {
     QString extension = filename.mid(index);
     mapping[1] = this->GetMappingFor("*" + extension);
   }
 
   return mapping;
 }
 
 //    QList<IEditorDescriptor::Pointer> EditorRegistry::GetSortedEditorsFromOS()
 //    {
 //      List externalEditors = new ArrayList();
 //      Program[] programs = Program.getPrograms();
 //
 //      for (int i = 0; i < programs.length; i++)
 //      {
 //        //1FPLRL2: ITPUI:WINNT - NOTEPAD editor cannot be launched
 //        //Some entries start with %SystemRoot%
 //        //For such cases just use the file name as they are generally
 //        //in directories which are on the path
 //        /*
 //         * if (fileName.charAt(0) == '%') { fileName = name + ".exe"; }
 //         */
 //
 //        EditorDescriptor editor = new EditorDescriptor();
 //        editor.setOpenMode(EditorDescriptor.OPEN_EXTERNAL);
 //        editor.setProgram(programs[i]);
 //
 //        // determine the program icon this editor would need (do not let it
 //        // be cached in the workbench registry)
 //        ImageDescriptor desc = new ExternalProgramImageDescriptor(
 //            programs[i]);
 //        editor.setImageDescriptor(desc);
 //        externalEditors.add(editor);
 //      }
 //
 //      Object[] tempArray = sortEditors(externalEditors);
 //      IEditorDescriptor[] array = new IEditorDescriptor[externalEditors
 //      .size()];
 //      for (int i = 0; i < tempArray.length; i++)
 //      {
 //        array[i] = (IEditorDescriptor) tempArray[i];
 //      }
 //      return array;
 //    }
 
 QList<IEditorDescriptor::Pointer> EditorRegistry::GetSortedEditorsFromPlugins()
 {
   QList<IEditorDescriptor::Pointer> result;
   for (QList<EditorDescriptor::Pointer>::iterator itr =
       sortedEditorsFromPlugins.begin(); itr != sortedEditorsFromPlugins.end(); ++itr)
   {
     result.push_back((*itr).Cast<IEditorDescriptor> ());
   }
   return result;
 }
 
 void EditorRegistry::InitialIdToEditorMap(
     QHash<QString, EditorDescriptor::Pointer>& map)
 {
   this->AddSystemEditors(map);
 }
 
 void EditorRegistry::AddSystemEditors(
     QHash<QString, EditorDescriptor::Pointer>& map)
 {
   // there will always be a system external editor descriptor
   EditorDescriptor::Pointer editor(new EditorDescriptor());
   editor->SetID(IEditorRegistry::SYSTEM_EXTERNAL_EDITOR_ID);
   editor->SetName("System Editor");
   editor->SetOpenMode(EditorDescriptor::OPEN_EXTERNAL);
   // @issue we need a real icon for this editor?
   map[IEditorRegistry::SYSTEM_EXTERNAL_EDITOR_ID] = editor;
 
   // there may be a system in-place editor if supported by platform
   //      if (ComponentSupport.inPlaceEditorSupported())
   //      {
   //        editor = new EditorDescriptor();
   //        editor.setID(IEditorRegistry.SYSTEM_INPLACE_EDITOR_ID);
   //        editor.setName(WorkbenchMessages.SystemInPlaceDescription_name);
   //        editor.setOpenMode(EditorDescriptor.OPEN_INPLACE);
   //        // @issue we need a real icon for this editor?
   //        map.put(IEditorRegistry.SYSTEM_INPLACE_EDITOR_ID, editor);
   //      }
 
   EditorDescriptor::Pointer emptyEditorDescriptor(new EditorDescriptor());
   emptyEditorDescriptor->SetID(EMPTY_EDITOR_ID);
   emptyEditorDescriptor->SetName("(Empty)"); //$NON-NLS-1$
   //emptyEditorDescriptor.setImageDescriptor(WorkbenchImages
   //.getImageDescriptor(IWorkbenchGraphicConstants.IMG_OBJ_ELEMENT));
   map[EMPTY_EDITOR_ID] = emptyEditorDescriptor;
 }
 
 void EditorRegistry::InitializeFromStorage()
 {
 
   //Get editors from the registry
   EditorRegistryReader registryReader;
   registryReader.AddEditors(this);
   this->SortInternalEditors();
   this->RebuildInternalEditorMap();
 
   //      IPreferenceStore store = PlatformUI.getPreferenceStore();
   //      String defaultEditors = store
   //      .getString(IPreferenceConstants.DEFAULT_EDITORS);
   //      String chachedDefaultEditors = store
   //      .getString(IPreferenceConstants.DEFAULT_EDITORS_CACHE);
 
   //If defaults has changed load it afterwards so it overrides the users
   // associations.
   //if (defaultEditors == null
   //    || defaultEditors.equals(chachedDefaultEditors))
   //{
   this->SetProductDefaults("");//defaultEditors);
   this->LoadAssociations(); //get saved earlier state
   //      }
   //      else
   //      {
   //        loadAssociations(); //get saved earlier state
   //        setProductDefaults(defaultEditors);
   //        store.putValue(IPreferenceConstants.DEFAULT_EDITORS_CACHE,
   //            defaultEditors);
   //      }
   this->AddExternalEditorsToEditorMap();
 }
 
 void EditorRegistry::SetProductDefaults(const QString& defaultEditors)
 {
   if (defaultEditors.isEmpty())
   {
     return;
   }
 
   //      Poco::StringTokenizer extEditors(defaultEditors,
   //          IPreferenceConstants::SEPARATOR, Poco::StringTokenizer::TOK_TRIM | Poco::StringTokenizer::TOK_IGNORE_EMPTY);
   //      while (extEditors.hasMoreTokens())
   //      {
   //        String extEditor = extEditors.nextToken().trim();
   //        int index = extEditor.indexOf(':');
   //        if (extEditor.length() < 3 || index <= 0 || index
   //            >= (extEditor.length() - 1))
   //        {
   //          //Extension and id must have at least one char.
   //          WorkbenchPlugin
   //          .log("Error setting default editor. Could not parse '" + extEditor
   //              + "'. Default editors should be specified as '*.ext1:editorId1;*.ext2:editorId2'"); //$NON-NLS-1$ //$NON-NLS-2$
   //          return;
   //        }
   //        String ext = extEditor.substring(0, index).trim();
   //        String editorId = extEditor.substring(index + 1).trim();
   //        FileEditorMapping mapping = getMappingFor(ext);
   //        if (mapping == null)
   //        {
   //          WorkbenchPlugin
   //          .log("Error setting default editor. Could not find mapping for '"
   //              + ext + "'."); //$NON-NLS-1$ //$NON-NLS-2$
   //          continue;
   //        }
   //        EditorDescriptor editor = (EditorDescriptor) findEditor(editorId);
   //        if (editor == null)
   //        {
   //          WorkbenchPlugin
   //          .log("Error setting default editor. Could not find editor: '"
   //              + editorId + "'."); //$NON-NLS-1$ //$NON-NLS-2$
   //          continue;
   //        }
   //        mapping.setDefaultEditor(editor);
   //      }
 }
 
 bool EditorRegistry::ReadEditors(
     QHash<QString, EditorDescriptor::Pointer>&  /*editorTable*/)
 {
   //Get the workbench plugin's working directory
   QString workbenchStatePath = WorkbenchPlugin::GetDefault()->GetDataLocation();
   if (workbenchStatePath.isNull())
   {
     return false;
   }
   //      IPreferenceStore store = WorkbenchPlugin.getDefault()
   //      .getPreferenceStore();
   //      Reader reader = null;
   //      try
   //      {
   //        // Get the editors defined in the preferences store
   //        String xmlString = store.getString(IPreferenceConstants.EDITORS);
   //        if (xmlString == null || xmlString.length() == 0)
   //        {
   //          FileInputStream stream = new FileInputStream(workbenchStatePath
   //              .append(IWorkbenchConstants.EDITOR_FILE_NAME)
   //              .toOSString());
   //          reader = new BufferedReader(new InputStreamReader(stream,
   //                  "utf-8")); //$NON-NLS-1$
   //        }
   //        else
   //        {
   //          reader = new StringReader(xmlString);
   //        }
   //        XMLMemento memento = XMLMemento.createReadRoot(reader);
   //        EditorDescriptor editor;
   //        IMemento[] edMementos = memento
   //        .getChildren(IWorkbenchConstants.TAG_DESCRIPTOR);
   //        // Get the editors and validate each one
   //        for (int i = 0; i < edMementos.length; i++)
   //        {
   //          editor = new EditorDescriptor();
   //          boolean valid = editor.loadValues(edMementos[i]);
   //          if (!valid)
   //          {
   //            continue;
   //          }
   //          if (editor.getPluginID() != null)
   //          {
   //            //If the editor is from a plugin we use its ID to look it
   //            // up in the mapping of editors we
   //            //have obtained from plugins. This allows us to verify that
   //            // the editor is still valid
   //            //and allows us to get the editor description from the
   //            // mapping table which has
   //            //a valid config element field.
   //            EditorDescriptor validEditorDescritor = (EditorDescriptor) mapIDtoEditor
   //            .get(editor.getId());
   //            if (validEditorDescritor != null)
   //            {
   //              editorTable.put(validEditorDescritor.getId(),
   //                  validEditorDescritor);
   //            }
   //          }
   //          else
   //          { //This is either from a program or a user defined
   //            // editor
   //            ImageDescriptor descriptor;
   //            if (editor.getProgram() == null)
   //            {
   //              descriptor = new ProgramImageDescriptor(editor
   //                  .getFileName(), 0);
   //            }
   //            else
   //            {
   //              descriptor = new ExternalProgramImageDescriptor(editor
   //                  .getProgram());
   //            }
   //            editor.setImageDescriptor(descriptor);
   //            editorTable.put(editor.getId(), editor);
   //          }
   //        }
   //      }
   //      catch (IOException e)
   //      {
   //        try
   //        {
   //          if (reader != null)
   //          {
   //            reader.close();
   //          }
   //        }
   //        catch (IOException ex)
   //        {
   //          e.printStackTrace();
   //        }
   //        //Ignore this as the workbench may not yet have saved any state
   //        return false;
   //      }
   //      catch (WorkbenchException e)
   //      {
   //        ErrorDialog.openError((Shell) null, WorkbenchMessages.EditorRegistry_errorTitle,
   //            WorkbenchMessages.EditorRegistry_errorMessage,
   //            e.getStatus());
   //        return false;
   //      }
 
   return true;
 }
 
 void EditorRegistry::ReadResources(
     QHash<QString, EditorDescriptor::Pointer>& /*editorTable*/,
     std::ostream&  /*reader*/)
 {
   //      XMLMemento memento = XMLMemento.createReadRoot(reader);
   //      String versionString = memento.getString(IWorkbenchConstants.TAG_VERSION);
   //      boolean versionIs31 = "3.1".equals(versionString); //$NON-NLS-1$
   //
   //      IMemento[] extMementos = memento
   //      .getChildren(IWorkbenchConstants.TAG_INFO);
   //      for (int i = 0; i < extMementos.length; i++)
   //      {
   //        String name = extMementos[i]
   //        .getString(IWorkbenchConstants.TAG_NAME);
   //        if (name == null)
   //        {
   //          name = "*"; //$NON-NLS-1$
   //        }
   //        String extension = extMementos[i]
   //        .getString(IWorkbenchConstants.TAG_EXTENSION);
   //        IMemento[] idMementos = extMementos[i]
   //        .getChildren(IWorkbenchConstants.TAG_EDITOR);
   //        String[] editorIDs = new String[idMementos.length];
   //        for (int j = 0; j < idMementos.length; j++)
   //        {
   //          editorIDs[j] = idMementos[j]
   //          .getString(IWorkbenchConstants.TAG_ID);
   //        }
   //        idMementos = extMementos[i]
   //        .getChildren(IWorkbenchConstants.TAG_DELETED_EDITOR);
   //        String[] deletedEditorIDs = new String[idMementos.length];
   //        for (int j = 0; j < idMementos.length; j++)
   //        {
   //          deletedEditorIDs[j] = idMementos[j]
   //          .getString(IWorkbenchConstants.TAG_ID);
   //        }
   //        FileEditorMapping mapping = getMappingFor(name + "." + extension); //$NON-NLS-1$
   //        if (mapping == null)
   //        {
   //          mapping = new FileEditorMapping(name, extension);
   //        }
   //        List editors = new ArrayList();
   //        for (int j = 0; j < editorIDs.length; j++)
   //        {
   //          if (editorIDs[j] != null)
   //          {
   //            EditorDescriptor editor = (EditorDescriptor) editorTable
   //            .get(editorIDs[j]);
   //            if (editor != null)
   //            {
   //              editors.add(editor);
   //            }
   //          }
   //        }
   //        List deletedEditors = new ArrayList();
   //        for (int j = 0; j < deletedEditorIDs.length; j++)
   //        {
   //          if (deletedEditorIDs[j] != null)
   //          {
   //            EditorDescriptor editor = (EditorDescriptor) editorTable
   //            .get(deletedEditorIDs[j]);
   //            if (editor != null)
   //            {
   //              deletedEditors.add(editor);
   //            }
   //          }
   //        }
   //
   //        List defaultEditors = new ArrayList();
   //
   //        if (versionIs31)
   //        { // parse the new format
   //          idMementos = extMementos[i]
   //          .getChildren(IWorkbenchConstants.TAG_DEFAULT_EDITOR);
   //          String[] defaultEditorIds = new String[idMementos.length];
   //          for (int j = 0; j < idMementos.length; j++)
   //          {
   //            defaultEditorIds[j] = idMementos[j]
   //            .getString(IWorkbenchConstants.TAG_ID);
   //          }
   //          for (int j = 0; j < defaultEditorIds.length; j++)
   //          {
   //            if (defaultEditorIds[j] != null)
   //            {
   //              EditorDescriptor editor = (EditorDescriptor) editorTable
   //              .get(defaultEditorIds[j]);
   //              if (editor != null)
   //              {
   //                defaultEditors.add(editor);
   //              }
   //            }
   //          }
   //        }
   //        else
   //        { // guess at pre 3.1 format defaults
   //          if (!editors.isEmpty())
   //          {
   //            EditorDescriptor editor = (EditorDescriptor) editors.get(0);
   //            if (editor != null)
   //            {
   //              defaultEditors.add(editor);
   //            }
   //          }
   //          defaultEditors.addAll(Arrays.asList(mapping.getDeclaredDefaultEditors()));
   //        }
   //
   //        // Add any new editors that have already been read from the registry
   //        // which were not deleted.
   //        IEditorDescriptor[] editorsArray = mapping.getEditors();
   //        for (int j = 0; j < editorsArray.length; j++)
   //        {
   //          if (!contains(editors, editorsArray[j])
   //              && !deletedEditors.contains(editorsArray[j]))
   //          {
   //            editors.add(editorsArray[j]);
   //          }
   //        }
   //        // Map the editor(s) to the file type
   //        mapping.setEditorsList(editors);
   //        mapping.setDeletedEditorsList(deletedEditors);
   //        mapping.setDefaultEditors(defaultEditors);
   //        typeEditorMappings.put(mappingKeyFor(mapping), mapping);
   //      }
 }
 
 bool EditorRegistry::Contains(
     const QList<IEditorDescriptor::Pointer>& editorsArray,
     IEditorDescriptor::Pointer editorDescriptor)
 {
   IEditorDescriptor::Pointer currentEditorDescriptor;
   for (QList<IEditorDescriptor::Pointer>::const_iterator i =
       editorsArray.begin(); i != editorsArray.end(); ++i)
   {
     currentEditorDescriptor = *i;
     if (currentEditorDescriptor->GetId() == editorDescriptor->GetId())
     {
       return true;
     }
   }
   return false;
 
 }
 
 bool EditorRegistry::ReadResources(
     QHash<QString, EditorDescriptor::Pointer>&  /*editorTable*/)
 {
   //Get the workbench plugin's working directory
   QString workbenchStatePath = WorkbenchPlugin::GetDefault()->GetDataLocation();
   // XXX: nobody cares about this return value
   if (workbenchStatePath.isNull())
   {
     return false;
   }
   //      IPreferenceStore store = WorkbenchPlugin.getDefault()
   //      .getPreferenceStore();
   //      Reader reader = null;
   //      try
   //      {
   //        // Get the resource types
   //        String xmlString = store.getString(IPreferenceConstants.RESOURCES);
   //        if (xmlString == null || xmlString.length() == 0)
   //        {
   //          FileInputStream stream = new FileInputStream(workbenchStatePath
   //              .append(IWorkbenchConstants.RESOURCE_TYPE_FILE_NAME)
   //              .toOSString());
   //          reader = new BufferedReader(new InputStreamReader(stream,
   //                  "utf-8")); //$NON-NLS-1$
   //        }
   //        else
   //        {
   //          reader = new StringReader(xmlString);
   //        }
   //        // Read the defined resources into the table
   //        readResources(editorTable, reader);
   //      }
   //      catch (IOException e)
   //      {
   //        try
   //        {
   //          if (reader != null)
   //          {
   //            reader.close();
   //          }
   //        }
   //        catch (IOException ex)
   //        {
   //          ex.printStackTrace();
   //        }
   //        MessageDialog.openError((Shell) null, WorkbenchMessages.EditorRegistry_errorTitle,
   //            WorkbenchMessages.EditorRegistry_errorMessage);
   //        return false;
   //      }
   //      catch (WorkbenchException e)
   //      {
   //        ErrorDialog.openError((Shell) null, WorkbenchMessages.EditorRegistry_errorTitle,
   //            WorkbenchMessages.EditorRegistry_errorMessage,
   //            e.getStatus());
   //        return false;
   //      }
   return true;
 
 }
 
 bool EditorRegistry::LoadAssociations()
 {
   QHash<QString, EditorDescriptor::Pointer> editorTable;
   if (!this->ReadEditors(editorTable))
   {
     return false;
   }
   return this->ReadResources(editorTable);
 }
 
 QString EditorRegistry::MappingKeyFor(const QString& type)
 {
   // keep everyting lower case for case-sensitive platforms
   return type.toLower();
 }
 
 QString EditorRegistry::MappingKeyFor(FileEditorMapping::Pointer mapping)
 {
   return this->MappingKeyFor(mapping->GetName()
       + (mapping->GetExtension().size() == 0 ? "" : "."
           + mapping->GetExtension())); //$NON-NLS-1$ //$NON-NLS-2$
 }
 
 void EditorRegistry::RebuildEditorMap()
 {
   this->RebuildInternalEditorMap();
   this->AddExternalEditorsToEditorMap();
 }
 
 void EditorRegistry::RebuildInternalEditorMap()
 {
   EditorDescriptor::Pointer desc;
 
   // Allocate a new map.
   mapIDtoEditor.clear();
   this->InitialIdToEditorMap(mapIDtoEditor);
 
   // Add plugin editors.
   for (QList<EditorDescriptor::Pointer>::iterator itr =
       sortedEditorsFromPlugins.begin(); itr != sortedEditorsFromPlugins.end(); ++itr)
   {
     desc = *itr;
     mapIDtoEditor[desc->GetId()] = desc;
   }
 }
 
 void EditorRegistry::SaveAssociations()
 {
   //Save the resource type descriptions
   //      List editors = new ArrayList();
   //      IPreferenceStore store = WorkbenchPlugin.getDefault()
   //      .getPreferenceStore();
   //
   //      XMLMemento memento = XMLMemento
   //      .createWriteRoot(IWorkbenchConstants.TAG_EDITORS);
   //      memento.putString(IWorkbenchConstants.TAG_VERSION, "3.1"); //$NON-NLS-1$
   //      FileEditorMapping maps[] = typeEditorMappings.userMappings();
   //      for (int mapsIndex = 0; mapsIndex < maps.length; mapsIndex++)
   //      {
   //        FileEditorMapping type = maps[mapsIndex];
   //        IMemento editorMemento = memento
   //        .createChild(IWorkbenchConstants.TAG_INFO);
   //        editorMemento.putString(IWorkbenchConstants.TAG_NAME, type
   //        .getName());
   //        editorMemento.putString(IWorkbenchConstants.TAG_EXTENSION, type
   //        .getExtension());
   //        IEditorDescriptor[] editorArray = type.getEditors();
   //        for (int i = 0; i < editorArray.length; i++)
   //        {
   //          EditorDescriptor editor = (EditorDescriptor) editorArray[i];
   //          if (!editors.contains(editor))
   //          {
   //            editors.add(editor);
   //          }
   //          IMemento idMemento = editorMemento
   //          .createChild(IWorkbenchConstants.TAG_EDITOR);
   //          idMemento.putString(IWorkbenchConstants.TAG_ID, editorArray[i]
   //          .getId());
   //        }
   //        editorArray = type.getDeletedEditors();
   //        for (int i = 0; i < editorArray.length; i++)
   //        {
   //          EditorDescriptor editor = (EditorDescriptor) editorArray[i];
   //          if (!editors.contains(editor))
   //          {
   //            editors.add(editor);
   //          }
   //          IMemento idMemento = editorMemento
   //          .createChild(IWorkbenchConstants.TAG_DELETED_EDITOR);
   //          idMemento.putString(IWorkbenchConstants.TAG_ID, editorArray[i]
   //          .getId());
   //        }
   //        editorArray = type.getDeclaredDefaultEditors();
   //        for (int i = 0; i < editorArray.length; i++)
   //        {
   //          EditorDescriptor editor = (EditorDescriptor) editorArray[i];
   //          if (!editors.contains(editor))
   //          {
   //            editors.add(editor);
   //          }
   //          IMemento idMemento = editorMemento
   //          .createChild(IWorkbenchConstants.TAG_DEFAULT_EDITOR);
   //          idMemento.putString(IWorkbenchConstants.TAG_ID, editorArray[i]
   //          .getId());
   //        }
   //      }
   //      Writer writer = null;
   //      try
   //      {
   //        writer = new StringWriter();
   //        memento.save(writer);
   //        writer.close();
   //        store.setValue(IPreferenceConstants.RESOURCES, writer.toString());
   //      }
   //      catch (IOException e)
   //      {
   //        try
   //        {
   //          if (writer != null)
   //          {
   //            writer.close();
   //          }
   //        }
   //        catch (IOException ex)
   //        {
   //          ex.printStackTrace();
   //        }
   //        MessageDialog.openError((Shell) null, "Saving Problems", //$NON-NLS-1$
   //            "Unable to save resource associations."); //$NON-NLS-1$
   //        return;
   //      }
   //
   //      memento = XMLMemento.createWriteRoot(IWorkbenchConstants.TAG_EDITORS);
   //      Iterator itr = editors.iterator();
   //      while (itr.hasNext())
   //      {
   //        EditorDescriptor editor = (EditorDescriptor) itr.next();
   //        IMemento editorMemento = memento
   //        .createChild(IWorkbenchConstants.TAG_DESCRIPTOR);
   //        editor.saveValues(editorMemento);
   //      }
   //      writer = null;
   //      try
   //      {
   //        writer = new StringWriter();
   //        memento.save(writer);
   //        writer.close();
   //        store.setValue(IPreferenceConstants.EDITORS, writer.toString());
   //      }
   //      catch (IOException e)
   //      {
   //        try
   //        {
   //          if (writer != null)
   //          {
   //            writer.close();
   //          }
   //        }
   //        catch (IOException ex)
   //        {
   //          ex.printStackTrace();
   //        }
   //        MessageDialog.openError((Shell) null,
   //            "Error", "Unable to save resource associations."); //$NON-NLS-1$ //$NON-NLS-2$
   //        return;
   //      }
 }
 
 void EditorRegistry::SetFileEditorMappings(
     const QList<FileEditorMapping::Pointer>& newResourceTypes)
 {
   typeEditorMappings.Clear();
-  for (unsigned int i = 0; i < newResourceTypes.size(); i++)
+  for (int i = 0; i < newResourceTypes.size(); i++)
   {
     FileEditorMapping::Pointer mapping = newResourceTypes[i];
     typeEditorMappings.Put(this->MappingKeyFor(mapping), mapping);
   }
   //extensionImages = new HashMap();
   this->RebuildEditorMap();
   //firePropertyChange(PROP_CONTENTS);
 }
 
 void EditorRegistry::SetDefaultEditor(const QString& fileName,
     const QString& editorId)
 {
   EditorDescriptor::Pointer desc = this->FindEditor(editorId).Cast<
       EditorDescriptor> ();
   QList<FileEditorMapping::Pointer> mapping = this->GetMappingForFilename(
       fileName);
   if (!mapping[0].IsNull())
   {
     mapping[0]->SetDefaultEditor(desc);
   }
   if (!mapping[1].IsNull())
   {
     mapping[1]->SetDefaultEditor(desc);
   }
 }
 
 QList<IEditorDescriptor::Pointer> EditorRegistry::SortEditors(
     const QList<IEditorDescriptor::Pointer>& unsortedList)
 {
   QList<IEditorDescriptor::Pointer> result(unsortedList);
   std::sort(result.begin(), result.end(), CmpIEditorDescriptor());
 
   return result;
 }
 
 void EditorRegistry::SortInternalEditors()
 {
   qSort(sortedEditorsFromPlugins.begin(), sortedEditorsFromPlugins.end(), CmpEditorDescriptor());
 }
 
 void EditorRegistry::EditorMap::PutDefault(const QString& key,
     FileEditorMapping::Pointer value)
 {
   defaultMap[key] = value;
 }
 
 void EditorRegistry::EditorMap::Put(const QString& key,
     FileEditorMapping::Pointer value)
 {
   QHash<QString, FileEditorMapping::Pointer>::iterator result =
       defaultMap.find(key);
   if (result != defaultMap.end())
   {
     map[key] = value;
   }
 }
 
 FileEditorMapping::Pointer EditorRegistry::EditorMap::Get(
     const QString& key)
 {
   QHash<QString, FileEditorMapping::Pointer>::const_iterator result =
       map.find(key);
   if (result == map.end())
   {
     return defaultMap[key];
   }
   return result.value();
 }
 
 void EditorRegistry::EditorMap::Clear()
 {
   defaultMap.clear();
   map.clear();
 }
 
 QList<FileEditorMapping::Pointer> EditorRegistry::EditorMap::AllMappings()
 {
   QSet<FileEditorMapping::Pointer> resultSet;
   QHash<QString, FileEditorMapping::Pointer>::const_iterator iter;
   for (iter = defaultMap.begin(); iter != defaultMap.end(); ++iter)
   {
     resultSet.insert(iter.value());
   }
   for (iter = map.begin(); iter != map.end(); ++iter)
   {
     resultSet.insert(iter.value());
   }
 
   return resultSet.toList();
 }
 
 QList<FileEditorMapping::Pointer> EditorRegistry::EditorMap::UserMappings()
 {
   return map.values();
 }
 
 bool EditorRegistry::IsSystemInPlaceEditorAvailable(const QString&  /*filename*/)
 {
   //return ComponentSupport.inPlaceEditorAvailable(filename);
   return false;
 }
 
 bool EditorRegistry::IsSystemExternalEditorAvailable(
     const QString&  /*filename*/)
 {
   //      QString::size_type nDot = filename.find_last_of('.');
   //      if (nDot != QString::npos)
   //      {
   //        QString strName = filename.substr(nDot);
   //        return Program.findProgram(strName) != null;
   //      }
   return false;
 }
 
 void EditorRegistry::RemoveEditorFromMapping(
     QHash<QString, FileEditorMapping::Pointer>& map,
     IEditorDescriptor::Pointer desc)
 {
   FileEditorMapping::Pointer mapping;
   for (QHash<QString, FileEditorMapping::Pointer>::iterator iter =
       map.begin(); iter != map.end(); ++iter)
   {
     mapping = iter.value();
     QList<IEditorDescriptor::Pointer> editors(mapping->GetEditors());
     QList<IEditorDescriptor::Pointer>::iterator result = std::find(
         editors.begin(), editors.end(), desc);
     if (result != editors.end())
     {
       mapping->RemoveEditor(result->Cast<EditorDescriptor> ());
       editors.erase(result);
     }
 
     if (editors.empty())
     {
       map.erase(iter);
       break;
     }
   }
 }
 
 IExtensionPoint::Pointer EditorRegistry::GetExtensionPointFilter()
 {
   return Platform::GetExtensionRegistry()->GetExtensionPoint(
         PlatformUI::PLUGIN_ID(), WorkbenchRegistryConstants::PL_EDITOR);
 }
 
 QList<IFileEditorMapping::Pointer> EditorRegistry::GetUnifiedMappings()
 {
   QList<IFileEditorMapping::Pointer>
       standardMappings(
           dynamic_cast<EditorRegistry*> (PlatformUI::GetWorkbench() ->GetEditorRegistry())->GetFileEditorMappings());
 
   QList<IFileEditorMapping::Pointer> allMappings(standardMappings);
   // mock-up content type extensions into IFileEditorMappings
   //      IContentType [] contentTypes = Platform.getContentTypeManager().getAllContentTypes();
   //      for (int i = 0; i < contentTypes.length; i++)
   //      {
   //        IContentType type = contentTypes[i];
   //        String [] extensions = type.getFileSpecs(IContentType.FILE_EXTENSION_SPEC);
   //        for (int j = 0; j < extensions.length; j++)
   //        {
   //          String extension = extensions[j];
   //          boolean found = false;
   //          for (Iterator k = allMappings.iterator(); k.hasNext();)
   //          {
   //            IFileEditorMapping mapping = (IFileEditorMapping) k.next();
   //            if ("*".equals(mapping.getName())
   //                && extension.equals(mapping.getExtension()))
   //            { //$NON-NLS-1$
   //              found = true;
   //              break;
   //            }
   //          }
   //          if (!found)
   //          {
   //            MockMapping mockMapping = new MockMapping(type, "*", extension); //$NON-NLS-1$
   //            allMappings.add(mockMapping);
   //          }
   //        }
   //
   //        String [] filenames = type.getFileSpecs(IContentType.FILE_NAME_SPEC);
   //        for (int j = 0; j < filenames.length; j++)
   //        {
   //          String wholename = filenames[j];
   //          int idx = wholename.indexOf('.');
   //          String name = idx == -1 ? wholename : wholename.substring(0, idx);
   //          String extension = idx == -1 ? "" : wholename.substring(idx + 1); //$NON-NLS-1$
   //
   //          boolean found = false;
   //          for (Iterator k = allMappings.iterator(); k.hasNext();)
   //          {
   //            IFileEditorMapping mapping = (IFileEditorMapping) k.next();
   //            if (name.equals(mapping.getName())
   //                && extension.equals(mapping.getExtension()))
   //            {
   //              found = true;
   //              break;
   //            }
   //          }
   //          if (!found)
   //          {
   //            MockMapping mockMapping = new MockMapping(type, name, extension);
   //            allMappings.add(mockMapping);
   //          }
   //        }
   //      }
 
   return allMappings;
 }
 
 MockMapping::MockMapping(/*IContentType type,*/const QString& name,
     const QString& ext) :
   extension(ext), filename(name)
 {
   //this.contentType = type;
 }
 
 IEditorDescriptor::Pointer MockMapping::GetDefaultEditor()
 {
   //      QList<IEditorDescriptor::Pointer> candidates = PlatformUI::GetWorkbench()->GetEditorRegistry()
   //      ->GetEditorsForContentType(contentType);
   //      if (candidates.empty())
   //      {
   //        return IEditorDescriptor::Pointer();
   //      }
   //      return candidates[0];
 
   return IEditorDescriptor::Pointer();
 }
 
 QList<IEditorDescriptor::Pointer> MockMapping::GetEditors() const
 {
   //      QList<IEditorDescriptor::Pointer> editorsForContentType = (dynamic_cast<EditorRegistry*>(PlatformUI
   //          ::GetWorkbench()->GetEditorRegistry())
   //      ->GetEditorsForContentType(contentType);
   //      return editorsForContentType;
   return QList<IEditorDescriptor::Pointer>();
 }
 
 QList<IEditorDescriptor::Pointer> MockMapping::GetDeletedEditors() const
 {
   return QList<IEditorDescriptor::Pointer>();
 }
 
-QString MockMapping::GetExtension()
+QString MockMapping::GetExtension() const
 {
   return extension;
 }
 
-QString MockMapping::GetLabel()
+QString MockMapping::GetLabel() const
 {
   return filename + '.' + extension;
 }
 
-QString MockMapping::GetName()
+QString MockMapping::GetName() const
 {
   return filename;
 }
 
 bool MockMapping::operator==(const Object* obj) const
 {
   if (const MockMapping* other = dynamic_cast<const MockMapping*>(obj))
   {
     if (this == other)
     {
       return true;
     }
 
     //MockMapping mapping = (MockMapping) obj;
     if (!(this->filename == other->filename))
     {
       return false;
     }
 
     if (!(this->extension == other->extension))
     {
       return false;
     }
 
     if (!(this->GetEditors() == other->GetEditors()))
     {
       return false;
     }
     return this->GetDeletedEditors() == other->GetDeletedEditors();
   }
 
   return false;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorRegistry.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorRegistry.h
index dc6c63de3a..4247640933 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorRegistry.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorRegistry.h
@@ -1,764 +1,764 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYEDITORREGISTRY_H_
 #define BERRYEDITORREGISTRY_H_
 
 #include <berryIExtensionPoint.h>
 
 #include "berryIEditorRegistry.h"
 #include "berryIFileEditorMapping.h"
 #include "berryEditorDescriptor.h"
 #include "berryFileEditorMapping.h"
 
 namespace berry
 {
 
 /**
  * \ingroup org_blueberry_ui_internal
  *
  * Provides access to the collection of defined editors for resource types.
  */
 class EditorRegistry : public IEditorRegistry
 {
 
   class RelatedRegistry
   {
 
   public: RelatedRegistry(EditorRegistry* editorRegistry);
     /**
      * Return the objects related to the type.
      *
      * @param type
      * @return the objects related to the type
      */
     //  public: QList<IEditorDescriptor::Pointer> GetRelatedObjects(IContentType type) {
     //      IEditorDescriptor[] relatedObjects = (IEditorDescriptor[]) contentTypeToEditorMappings.get(type);
     //      if (relatedObjects == null) {
     //        return EMPTY;
     //      }
     //      return (IEditorDescriptor[]) WorkbenchActivityHelper.restrictArray(relatedObjects);
     //    }
 
     /**
      * Return the objects related to the filename
      * @param fileName
      * @return the objects related to the filename
      */
 public:
     QList<IEditorDescriptor::Pointer> GetRelatedObjects(
         const QString& fileName);
 
 private: EditorRegistry* editorRegistry;
   };
 
   friend class RelatedRegistry;
 
   /**
     * Map of FileEditorMapping (extension to FileEditorMapping) Uses two
     * java.util.HashMap: one keeps the default which are set by the plugins and
     * the other keeps the changes made by the user through the preference page.
     */
  class EditorMap
    {
      static QHash<QString, FileEditorMapping::Pointer> defaultMap;
 
      static QHash<QString, FileEditorMapping::Pointer> map;
 
  public: void Clear();
 
      /**
       * Put a default mapping into the editor map.
       *
       * @param key the key to set
       * @param value the value to associate
       */
    public: static void PutDefault(const QString& key, FileEditorMapping::Pointer value);
 
      /**
       * Put a mapping into the user editor map.
       *
       * @param key the key to set
       * @param value the value to associate
       */
    public: void Put(const QString& key, FileEditorMapping::Pointer value);
 
      /**
       * Return the mapping associated to the key. First searches user
       * map, and then falls back to the default map if there is no match. May
       * return <code>null</code>
       *
       * @param key
       *            the key to search for
       * @return the mapping associated to the key or <code>null</code>
       */
    public: FileEditorMapping::Pointer Get(const QString& key);
 
      /**
       * Return all mappings. This will return default mappings overlayed with
       * user mappings.
       *
       * @return the mappings
       */
    public: QList<FileEditorMapping::Pointer> AllMappings();
 
      /**
       * Return all user mappings.
       *
       * @return the mappings
       */
    public: QList<FileEditorMapping::Pointer> UserMappings();
    };
 
  struct CmpFileEditorMapping : public std::binary_function<FileEditorMapping::Pointer,
                                                      FileEditorMapping::Pointer,
                                                      bool>
  {
    bool operator()(const FileEditorMapping::Pointer& x, const FileEditorMapping::Pointer& y) const
    {
      return x->GetLabel() < y->GetLabel();
    }
  };
 
  struct CmpIEditorDescriptor : public std::binary_function<IEditorDescriptor::Pointer,
                                                       IEditorDescriptor::Pointer,
                                                       bool>
   {
     bool operator()(const IEditorDescriptor::Pointer& x, const IEditorDescriptor::Pointer& y) const
     {
       return x->GetLabel() < y->GetLabel();
     }
   };
 
  struct CmpEditorDescriptor : public std::binary_function<EditorDescriptor::Pointer,
                                                        EditorDescriptor::Pointer,
                                                        bool>
    {
      bool operator()(const EditorDescriptor::Pointer& x, const EditorDescriptor::Pointer& y) const
      {
        return x->GetLabel() < y->GetLabel();
      }
    };
   //private: Map contentTypeToEditorMappings = new HashMap();
 
   /*
    * Cached images - these include images from registered editors (via
    * plugins) and others hence this table is not one to one with the mappings
    * table. It is in fact a superset of the keys one would find in
    * typeEditorMappings
    */
   //private: Map extensionImages = new HashMap();
 
   /**
    * Vector of EditorDescriptor - all the editors loaded from plugin files.
    * The list is kept in order to be able to show in the editor selection
    * dialog of the resource associations page.  This list is sorted based on the
    * human readable label of the editor descriptor.
    *
    * @see #comparer
    */
 private:
   QList<EditorDescriptor::Pointer> sortedEditorsFromPlugins;
 
   // Map of EditorDescriptor - map editor id to editor.
 private:
   QHash<QString, EditorDescriptor::Pointer> mapIDtoEditor;
 
   // Map of FileEditorMapping (extension to FileEditorMapping)
 private:
   EditorMap typeEditorMappings;
 
   /*
    * Compares the labels from two IEditorDescriptor objects
    */
 //private:
 //  static final Comparator comparer = new Comparator()
 //  {
 //  private Collator collator = Collator.getInstance();
 //
 //  public int compare(Object arg0, Object arg1)
 //    {
 //      String s1 = ((IEditorDescriptor) arg0).getLabel();
 //      String s2 = ((IEditorDescriptor) arg1).getLabel();
 //      return collator.compare(s1, s2);
 //    }
 //  };
 
 private: RelatedRegistry relatedRegistry;
 
 public: static const QString EMPTY_EDITOR_ID; // = "org.blueberry.ui.internal.emptyEditorTab"
 
   /**
    * Return an instance of the receiver. Adds listeners into the extension
    * registry for dynamic UI purposes.
    */
 public: EditorRegistry();
 
   /**
    * Add an editor for the given extensions with the specified (possibly null)
    * extended type. The editor is being registered from a plugin
    *
    * @param editor
    *            The description of the editor (as obtained from the plugin
    *            file and built by the registry reader)
    * @param extensions
    *            Collection of file extensions the editor applies to
    * @param filenames
    *            Collection of filenames the editor applies to
    * @param contentTypeVector
    * @param bDefault
    *            Indicates whether the editor should be made the default editor
    *            and hence appear first inside a FileEditorMapping
    *
    * This method is not API and should not be called outside the workbench
    * code.
    */
 public: void AddEditorFromPlugin(EditorDescriptor::Pointer editor, const QList<QString>& extensions,
       const QList<QString>& filenames,
       const QList<QString>& contentTypeVector,
       bool bDefault);
 
   /**
    * Add external editors to the editor mapping.
    */
 private: void AddExternalEditorsToEditorMap();
 
   /*
    * (non-Javadoc) Method declared on IEditorRegistry.
    */
   //public: void AddPropertyListener(IPropertyListener l) {
   //        addListenerObject(l);
   //    }
 
   /*
    * (non-Javadoc) Method declared on IEditorRegistry.
    */
 public: IEditorDescriptor::Pointer FindEditor(const QString& id);
 
   /**
    * Fires a property changed event to all registered listeners.
    *
    * @param type the type of event
    * @see IEditorRegistry#PROP_CONTENTS
    */
   //    private: void FirePropertyChange(final int type) {
   //        Object[] array = getListeners();
   //        for (int nX = 0; nX < array.length; nX++) {
   //            final IPropertyListener l = (IPropertyListener) array[nX];
   //            Platform.run(new SafeRunnable() {
   //                public: void run() {
   //                    l.propertyChanged(EditorRegistry.this, type);
   //                }
   //            });
   //        }
   //    }
 
   /*
    * (non-Javadoc) Method declared on IEditorRegistry.
    *
    * @deprecated
    */
 public: IEditorDescriptor::Pointer GetDefaultEditor();
 
   /*
    * (non-Javadoc) Method declared on IEditorRegistry.
    */
 public: IEditorDescriptor::Pointer GetDefaultEditor(const QString& filename);
 
   /**
    * Return the (approximated) content type for a file with the given name.
    *
    * @param filename the filename
    * @return the content type or <code>null</code> if it could not be determined
    * @since 3.1
    */
   //  private: IContentType::Pointer GuessAtContentType(const QString& filename) {
   //    return Platform.getContentTypeManager().findContentTypeFor(filename);
   //  }
 
   /**
    * Returns the default file image descriptor.
    *
    * @return the image descriptor
    */
   //    private: ImageDescriptor GetDefaultImage() {
   //        // @issue what should be the default image?
   //        return WorkbenchImages.getImageDescriptor(ISharedImages.IMG_OBJ_FILE);
   //    }
 
   /*
    * (non-Javadoc) Method declared on IEditorRegistry.
    */
 public: QList<IEditorDescriptor::Pointer> GetEditors(const QString& filename);
 
   /*
    * (non-Javadoc) Method declared on IEditorRegistry.
    */
 public: QList<IFileEditorMapping::Pointer> GetFileEditorMappings();
 
   /*
    * (non-Javadoc) Method declared on IEditorRegistry.
    */
   //    public: ImageDescriptor GetImageDescriptor(String filename) {
   //    return getImageDescriptor(filename, guessAtContentType(filename));
   //  }
 
   /**
    * Find the file editor mapping for the file extension. Returns
    * <code>null</code> if not found.
    *
    * @param ext
    *            the file extension
    * @return the mapping, or <code>null</code>
    */
 private: FileEditorMapping::Pointer GetMappingFor(const QString& ext);
 
   /**
    * Find the file editor mappings for the given filename.
    * <p>
    * Return an array of two FileEditorMapping items, where the first mapping
    * is for the entire filename, and the second mapping is for the filename's
    * extension only. These items can be null if no mapping exist on the
    * filename and/or filename's extension.</p>
    *
    * @param filename the filename
    * @return the mappings
    */
 private: QList<FileEditorMapping::Pointer> GetMappingForFilename(const QString& filename);
 
   /**
    * Return the editor descriptors pulled from the OS.
    * <p>
    * WARNING! The image described by each editor descriptor is *not* known by
    * the workbench's graphic registry. Therefore clients must take care to
    * ensure that if they access any of the images held by these editors that
    * they also dispose them
    * </p>
    * @return the editor descriptors
    */
 //public: QList<IEditorDescriptor::Pointer> GetSortedEditorsFromOS();
 
   /**
    * Return the editors loaded from plugins.
    *
    * @return the sorted array of editors declared in plugins
    * @see #comparer
    */
 public: QList<IEditorDescriptor::Pointer> GetSortedEditorsFromPlugins();
 
   /**
    * Answer an intial id to editor map. This will create a new map and
    * populate it with the default system editors.
    *
    * @param initialSize
    *            the initial size of the map
    * @return the new map
    */
 private: void InitialIdToEditorMap(QHash<QString, EditorDescriptor::Pointer>& map);
 
   /**
    * Add the system editors to the provided map. This will always add an
    * editor with an id of {@link #SYSTEM_EXTERNAL_EDITOR_ID} and may also add
    * an editor with id of {@link #SYSTEM_INPLACE_EDITOR_ID} if the system
    * configuration supports it.
    *
    * @param map the map to augment
    */
 private: void AddSystemEditors(QHash<QString, EditorDescriptor::Pointer>& map);
 
   /**
    * Initialize the registry state from plugin declarations and preference
    * overrides.
    */
 private: void InitializeFromStorage();
 
   /**
    * Set the default editors according to the preference store which can be
    * overwritten in the file properties.ini.  In the form:
    * <p>
    * <code>ext1:id1;ext2:id2;...</code>
    * </p>
    *
    * @param defaultEditors the default editors to set
    */
 private: void SetProductDefaults(const QString& defaultEditors);
 
   /**
    * Read the editors defined in the preferences store.
    *
    * @param editorTable
    *            Editor table to store the editor definitions.
    * @return true if the table is built succesfully.
    */
 private: bool ReadEditors(QHash<QString, EditorDescriptor::Pointer>& editorTable);
 
   /**
    * Read the file types and associate them to their defined editor(s).
    *
    * @param editorTable
    *            The editor table containing the defined editors.
    * @param reader
    *            Reader containing the preferences content for the resources.
    *
    * @throws WorkbenchException
    */
 public: void ReadResources(QHash<QString, EditorDescriptor::Pointer>& editorTable, std::ostream& reader);
 
   /**
    * Determine if the editors list contains the editor descriptor.
    *
    * @param editorsArray
    *      The list of editors
    * @param editorDescriptor
    *      The editor descriptor
    * @return <code>true</code> if the editors list contains the editor descriptor
    */
 private: bool Contains(const QList<IEditorDescriptor::Pointer>& editorsArray,
       IEditorDescriptor::Pointer editorDescriptor);
 
   /**
    * Creates the reader for the resources preferences defined in the
    * preference store.
    *
    * @param editorTable
    *            The editor table containing the defined editors.
    * @return true if the resources are read succesfully.
    */
 private: bool ReadResources(QHash<QString, EditorDescriptor::Pointer>& editorTable);
 
   /**
    * Load the serialized resource associations Return true if the operation
    * was successful, false otherwise
    */
 private: bool LoadAssociations();
 
   /**
    * Return a friendly version of the given key suitable for use in the editor
    * map.
    */
 private: QString MappingKeyFor(const QString& type);
 
   /**
    * Return a key that combines the file's name and extension of the given
    * mapping
    *
    * @param mapping the mapping to generate a key for
    */
 private: QString MappingKeyFor(FileEditorMapping::Pointer mapping);
 
   /**
    * Rebuild the editor map
    */
 private: void RebuildEditorMap();
 
   /**
    * Rebuild the internal editor mapping.
    */
 private: void RebuildInternalEditorMap();
 
   /*
    * (non-Javadoc) Method declared on IEditorRegistry.
    */
   //    public: void RemovePropertyListener(IPropertyListener l) {
   //        removeListenerObject(l);
   //    }
 
   /**
    * Save the registry to the filesystem by serializing the current resource
    * associations.
    */
 public: void SaveAssociations();
 
   /**
    * Set the collection of FileEditorMappings. The given collection is
    * converted into the internal hash table for faster lookup Each mapping
    * goes from an extension to the collection of editors that work on it. This
    * operation will rebuild the internal editor mappings.
    *
    * @param newResourceTypes
    *            te new file editor mappings.
    */
 public: void SetFileEditorMappings(const QList<FileEditorMapping::Pointer>& newResourceTypes);
 
   /*
    * (non-Javadoc) Method declared on IEditorRegistry.
    */
 public: void SetDefaultEditor(const QString& fileName, const QString& editorId);
 
   /**
    * Alphabetically sort the internal editors.
    *
    * @see #comparer
    */
 private: QList<IEditorDescriptor::Pointer> SortEditors(const QList<IEditorDescriptor::Pointer>& unsortedList);
 
   /**
    * Alphabetically sort the internal editors.
    *
    * @see #comparer
    */
 private: void SortInternalEditors();
 
   /*
    * (non-Javadoc)
    *
    * @see org.blueberry.ui.IEditorRegistry#isSystemInPlaceEditorAvailable(String)
    */
 public: bool IsSystemInPlaceEditorAvailable(const QString& filename);
 
   /*
    * (non-Javadoc)
    *
    * @see org.blueberry.ui.IEditorRegistry#isSystemExternalEditorAvailable(String)
    */
 public: bool IsSystemExternalEditorAvailable(const QString& filename);
 
   /*
    * (non-Javadoc)
    *
    * @see org.blueberry.ui.IEditorRegistry#getSystemExternalEditorImageDescriptor(java.lang.String)
    */
   //    public: ImageDescriptor GetSystemExternalEditorImageDescriptor(
   //            const QString& filename) {
   //        Program externalProgram = null;
   //        int extensionIndex = filename.lastIndexOf('.');
   //        if (extensionIndex >= 0) {
   //            externalProgram = Program.findProgram(filename
   //                    .substring(extensionIndex));
   //        }
   //        if (externalProgram == null) {
   //            return null;
   //        }
   //
   //        return new ExternalProgramImageDescriptor(externalProgram);
   //    }
 
   /**
    * Removes the entry with the value of the editor descriptor from the given
    * map. If the descriptor is the last descriptor in a given
    * FileEditorMapping then the mapping is removed from the map.
    *
    * @param map
    *            the map to search
    * @param desc
    *            the descriptor value to remove
    */
 private: void RemoveEditorFromMapping(QHash<QString, FileEditorMapping::Pointer>& map, IEditorDescriptor::Pointer desc);
 
 private: IExtensionPoint::Pointer GetExtensionPointFilter();
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.IEditorRegistry#getDefaultEditor(java.lang.String, org.blueberry.core.runtime.content.IContentType)
    */
   //  public: IEditorDescriptor::Pointer GetDefaultEditor(const QString& fileName, IContentType contentType) {
   //        return getEditorForContentType(fileName, contentType);
   //  }
 
   /**
    * Return the editor for a file with a given content type.
    *
    * @param filename the file name
    * @param contentType the content type
    * @return the editor for a file with a given content type
    * @since 3.1
    */
     private: IEditorDescriptor::Pointer GetEditorForContentType(const QString& filename
         /*IContentType contentType*/);
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.IEditorRegistry#getEditors(java.lang.String, org.blueberry.core.runtime.content.IContentType)
    */
   //  public: QList<IEditorDescriptor::Pointer> GetEditors(const QString& fileName, IContentType contentType) {
   //    return findRelatedObjects(contentType, fileName, relatedRegistry);
   //  }
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.IEditorRegistry#getImageDescriptor(java.lang.String, org.blueberry.core.runtime.content.IContentType)
    */
   //  public: ImageDescriptor GetImageDescriptor(const QString filename, IContentType contentType) {
   //        if (filename == null) {
   //      return getDefaultImage();
   //    }
   //
   //    if (contentType != null) {
   //      IEditorDescriptor desc = getEditorForContentType(filename, contentType);
   //      if (desc != null) {
   //        ImageDescriptor anImage = (ImageDescriptor) extensionImages.get(desc);
   //        if (anImage != null) {
   //          return anImage;
   //        }
   //        anImage = desc.getImageDescriptor();
   //        extensionImages.put(desc, anImage);
   //        return anImage;
   //      }
   //    }
   //        // Lookup in the cache first...
   //        String key = mappingKeyFor(filename);
   //        ImageDescriptor anImage = (ImageDescriptor) extensionImages.get(key);
   //        if (anImage != null) {
   //      return anImage;
   //    }
   //
   //        // See if we have a mapping for the filename or extension
   //        FileEditorMapping[] mapping = getMappingForFilename(filename);
   //        for (int i = 0; i < 2; i++) {
   //            if (mapping[i] != null) {
   //                // Lookup in the cache first...
   //                String mappingKey = mappingKeyFor(mapping[i]);
   //                ImageDescriptor mappingImage = (ImageDescriptor) extensionImages
   //                        .get(key);
   //                if (mappingImage != null) {
   //          return mappingImage;
   //        }
   //                // Create it and cache it
   //                IEditorDescriptor editor = mapping[i].getDefaultEditor();
   //                if (editor != null) {
   //                    mappingImage = editor.getImageDescriptor();
   //                    extensionImages.put(mappingKey, mappingImage);
   //                    return mappingImage;
   //                }
   //            }
   //        }
   //
   //        // Nothing - time to look externally for the icon
   //        anImage = getSystemExternalEditorImageDescriptor(filename);
   //        if (anImage == null) {
   //      anImage = getDefaultImage();
   //    }
   //        //  for dynamic UI - comment out the next line
   //        //extensionImages.put(key, anImage);
   //        return anImage;
   //
   //  }
 
   /**
    * Find objects related to the content type.
    *
    * This method is temporary and exists only to back us off of the
    * soon-to-be-removed IContentTypeManager.IRelatedRegistry API.
    *
    * @param type
    * @param fileName
    * @param registry
    * @return the related objects
    */
     private: QList<IEditorDescriptor::Pointer> FindRelatedObjects(/*IContentType type,*/ const QString& fileName,
         RelatedRegistry& registry);
 
   /**
    * Return the editors bound to this content type, either directly or indirectly.
    *
    * @param type the content type to check
    * @return the editors
    * @since 3.1
    *
    * TODO: this should be rolled in with the above findRelatedObjects code
    */
   //  public: QList<IEditorDescriptor> GetEditorsForContentType(IContentType type) {
   //    ArrayList allRelated = new ArrayList();
   //    if (type == null) {
   //      return new IEditorDescriptor [0];
   //    }
   //
   //    Object [] related = relatedRegistry.getRelatedObjects(type);
   //    for (int i = 0; i < related.length; i++) {
   //      // we don't want to return duplicates
   //      if (!allRelated.contains(related[i])) {
   //        // if it's not filtered, add it to the list
   //        if (!WorkbenchActivityHelper.filterItem(related[i])) {
   //          allRelated.add(related[i]);
   //        }
   //
   //      }
   //    }
   //
   //    // now add any indirectly related objects, walking up the content type hierarchy
   //    while ((type = type.getBaseType()) != null) {
   //      related = relatedRegistry.getRelatedObjects(type);
   //      for (int i = 0; i < related.length; i++) {
   //        // we don't want to return duplicates
   //        if (!allRelated.contains(related[i])) {
   //          // if it's not filtered, add it to the list
   //          if (!WorkbenchActivityHelper.filterItem(related[i])) {
   //            allRelated.add(related[i]);
   //          }
   //        }
   //      }
   //    }
   //
   //    return (IEditorDescriptor[]) allRelated.toArray(new IEditorDescriptor[allRelated.size()]);
   //  }
 
   /**
    * Get filemappings for all defined filetypes, including those defined by content type.
    *
    * @return the filetypes
    * @since 3.1
    */
 public: QList<IFileEditorMapping::Pointer> GetUnifiedMappings();
 
 };
 
 class MockMapping : public IFileEditorMapping
 {
 
   //private: IContentType contentType;
 private:
   QString extension;
 private:
   QString filename;
 
   MockMapping(/*IContentType type,*/const QString& name,
       const QString& ext);
 
 public:
   IEditorDescriptor::Pointer GetDefaultEditor();
 
 public:
   QList<IEditorDescriptor::Pointer> GetEditors() const;
 
 public:
   QList<IEditorDescriptor::Pointer> GetDeletedEditors() const;
 
 public:
-  QString GetExtension();
+  QString GetExtension() const;
 
   //  public: ImageDescriptor GetImageDescriptor() {
   //    IEditorDescriptor editor = getDefaultEditor();
   //    if (editor == null) {
   //      return WorkbenchImages
   //          .getImageDescriptor(ISharedImages.IMG_OBJ_FILE);
   //    }
   //
   //    return editor.getImageDescriptor();
   //  }
 
 public:
-  QString GetLabel();
+  QString GetLabel() const;
 
 public:
-  QString GetName();
+  QString GetName() const;
 
   /* (non-Javadoc)
    * @see java.lang.Object#equals(java.lang.Object)
    */
 public:
   bool operator==(const Object* obj) const;
 };
 
 }
 
 #endif /*BERRYEDITORREGISTRY_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorRegistryReader.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorRegistryReader.cpp
index 8e3658c7f5..ff960795ea 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorRegistryReader.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorRegistryReader.cpp
@@ -1,115 +1,115 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryEditorRegistryReader.h"
 
 #include "berryEditorRegistry.h"
 #include "berryEditorDescriptor.h"
 #include "berryWorkbenchRegistryConstants.h"
 #include "berryPlatformUI.h"
 
 #include <QStringList>
 
 namespace berry
 {
 
 void EditorRegistryReader::AddEditors(EditorRegistry* registry)
 {
   this->editorRegistry = registry;
   this->ReadRegistry(PlatformUI::PLUGIN_ID(),
                      WorkbenchRegistryConstants::PL_EDITOR);
 }
 
 bool EditorRegistryReader::ReadElement(const IConfigurationElement::Pointer& element)
 {
   if (element->GetName() != WorkbenchRegistryConstants::TAG_EDITOR)
   {
     return false;
   }
 
   QString id = element->GetAttribute(WorkbenchRegistryConstants::ATT_ID);
   if (id.isEmpty())
   {
     this->LogMissingAttribute(element, WorkbenchRegistryConstants::ATT_ID);
     return true;
   }
 
   EditorDescriptor::Pointer editor(new EditorDescriptor(id, element));
 
   QList<QString> extensionsVector;
   QList<QString> filenamesVector;
   QList<QString> contentTypeVector;
   bool defaultEditor = false;
 
   QString value = element->GetAttribute(WorkbenchRegistryConstants::ATT_NAME);
 
   // Get editor name (required field).
   if (value.isEmpty())
   {
     this->LogMissingAttribute(element, WorkbenchRegistryConstants::ATT_NAME);
     return true;
   }
 
   // Get target extensions (optional field)
   QString extensionsString = element->GetAttribute(WorkbenchRegistryConstants::ATT_EXTENSIONS);
   if (!extensionsString.isEmpty())
   {
     QStringList tokens = extensionsString.split(',', QString::SkipEmptyParts);
     foreach(QString token, tokens)
     {
       extensionsVector.push_back(token.trimmed());
     }
   }
   QString filenamesString = element->GetAttribute(WorkbenchRegistryConstants::ATT_FILENAMES);
   if (!filenamesString.isEmpty())
   {
     QStringList tokens = filenamesString.split(',', QString::SkipEmptyParts);
     foreach(QString token, tokens)
     {
       filenamesVector.push_back(token.trimmed());
     }
   }
 
   QList<IConfigurationElement::Pointer> bindings = element->GetChildren(
                                                      WorkbenchRegistryConstants::TAG_CONTENT_TYPE_BINDING);
-  for (unsigned int i = 0; i < bindings.size(); ++i)
+  for (int i = 0; i < bindings.size(); ++i)
   {
     QString contentTypeId = bindings[i]->GetAttribute(
                               WorkbenchRegistryConstants::ATT_CONTENT_TYPE_ID);
     if (contentTypeId.isEmpty())
     {
       continue;
     }
     contentTypeVector.push_back(contentTypeId);
   }
 
   // Is this the default editor?
   defaultEditor = element->GetAttribute(WorkbenchRegistryConstants::ATT_DEFAULT).compare("true", Qt::CaseInsensitive) == 0;
 
   // Add the editor to the manager.
   editorRegistry->AddEditorFromPlugin(editor, extensionsVector,
       filenamesVector, contentTypeVector, defaultEditor);
   return true;
 }
 
 void EditorRegistryReader::ReadElement(EditorRegistry* editorRegistry,
                                        const IConfigurationElement::Pointer& element)
 {
   this->editorRegistry = editorRegistry;
   this->ReadElement(element);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorSashContainer.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorSashContainer.cpp
index a80bd3cefb..132f5ce9a2 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorSashContainer.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEditorSashContainer.cpp
@@ -1,609 +1,609 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryEditorSashContainer.h"
 
 #include "berryPresentationSerializer.h"
 #include "berryWorkbenchConstants.h"
 #include "berryWorkbenchPlugin.h"
 #include "berryLayoutTree.h"
 
 #include "berryWorkbenchWindowConfigurer.h"
 #include "berryWorkbenchWindow.h"
 #include "berryQtDnDControlWidget.h"
 
 #include "tweaklets/berryGuiWidgetsTweaklet.h"
 
 #include <Poco/HashMap.h>
 #include <sstream>
 
 namespace berry
 {
 
 const QString EditorSashContainer::DEFAULT_WORKBOOK_ID =
     "DefaultEditorWorkbook";
 
 void EditorSashContainer::AddChild(const RelationshipInfo& info)
 {
   PartSashContainer::AddChild(info);
 
   this->UpdateStackButtons();
 }
 
 void EditorSashContainer::ChildAdded(LayoutPart::Pointer child)
 {
   PartSashContainer::ChildAdded(child);
 
   if (child.Cast<PartStack> () != 0)
   {
     editorWorkbooks.push_back(child.Cast<PartStack> ());
   }
 }
 
 void EditorSashContainer::ChildRemoved(LayoutPart::Pointer child)
 {
   PartSashContainer::ChildRemoved(child);
 
   if (child.Cast<PartStack> () != 0)
   {
     editorWorkbooks.removeAll(child.Cast<PartStack>());
     if (activeEditorWorkbook == child)
     {
       this->SetActiveWorkbook(PartStack::Pointer(0), false);
     }
 
     this->UpdateStackButtons();
   }
 }
 
 PartStack::Pointer EditorSashContainer::CreateDefaultWorkbook()
 {
   PartStack::Pointer newWorkbook = this->NewEditorWorkbook();
   newWorkbook->SetID(DEFAULT_WORKBOOK_ID);
   this->Add(newWorkbook);
   return newWorkbook;
 }
 
 void EditorSashContainer::AddDropSupport()
 {
   WorkbenchWindowConfigurer::Pointer winConfigurer = page->GetWorkbenchWindow().Cast<WorkbenchWindow>()->GetWindowConfigurer();
 
   QtDnDControlWidget* dropWidget = static_cast<QtDnDControlWidget*>(GetParent());
   dropWidget->SetTransferTypes(winConfigurer->GetTransfers());
-  dropWidget->AddDropListener(winConfigurer->GetDropTargetListener().GetPointer());
+  dropWidget->AddDropListener(winConfigurer->GetDropTargetListener());
 }
 
 PartStack::Pointer EditorSashContainer::NewEditorWorkbook()
 {
   PartStack::Pointer newWorkbook(new PartStack(page, true, PresentationFactoryUtil::ROLE_EDITOR));
   QString str;
   QTextStream buf(&str);
   buf << newWorkbook->GetClassName() << newWorkbook.GetPointer();
   newWorkbook->SetID(str);
 
   return newWorkbook;
 }
 
 void* EditorSashContainer::CreateParent(void* parentWidget)
 {
   //return Tweaklets::Get(GuiWidgetsTweaklet::KEY)->CreateComposite(parentWidget);
   return new QtDnDControlWidget(static_cast<QWidget*>(parentWidget));
 }
 
 void EditorSashContainer::DisposeParent()
 {
   this->parent = 0;
 }
 
 bool EditorSashContainer::IsActiveWorkbook(PartStack::Pointer workbook)
 {
   return activeEditorWorkbook == workbook;
 }
 
 PartStack::Pointer EditorSashContainer::CreateStack()
 {
   return this->NewEditorWorkbook();
 }
 
 void EditorSashContainer::SetVisiblePart(
     ILayoutContainer::Pointer container, PartPane::Pointer visiblePart)
 {
   PartStack::Pointer stack = container.Cast<PartStack>();
   if (stack == 0) return;
 
   stack->GetContainer().Cast<EditorSashContainer>()->SetActiveWorkbook(stack, true);
 
   stack->SetSelection(visiblePart);
 }
 
 LayoutPart::Pointer EditorSashContainer::GetVisiblePart(
     ILayoutContainer::Pointer container)
 {
   PartStack::Pointer refPart = container.Cast<PartStack>();
 
   return refPart->GetSelection();
 }
 
 EditorSashContainer::EditorSashContainer(const QString& editorId,
     WorkbenchPage* page, void* parent)
  : PartSashContainer(editorId, page, parent)
 {
   this->CreateDefaultWorkbook();
 }
 
 bool EditorSashContainer::AllowsAdd(LayoutPart::Pointer layoutPart)
 {
   return LayoutPart::AllowsAdd(layoutPart);
 }
 
 void EditorSashContainer::AddEditor(PartPane::Pointer pane,
     PartStack::Pointer stack)
 {
   //EditorStack workbook = getActiveWorkbook();
   stack->Add(pane);
 }
 
 void EditorSashContainer::UpdateStackButtons()
 {
   //  // This is applicable only when the new
   //  // min/max behaviour is being used
   //  Perspective persp = getPage().getActivePerspective();
   //  if (!Perspective.useNewMinMax(persp))
   //    return;
   //
   //  // Find the upper Right editor stack
   //  LayoutPart[] stacks = getChildren();
   //  EditorStack winner = getUpperRightEditorStack(stacks);
   //
   //  // Now hide the buttons for all but the upper right stack
   //  for (int i = 0; i < stacks.length; i++)
   //  {
   //    if (!(stacks[i] instanceof EditorStack)
   //      )
   //      continue;
   //      ((EditorStack) stacks[i]).showMinMax(stacks[i] == winner);
   //  }
   //
   //  // Force the stack's presentation state to match its perspective
   //  persp.refreshEditorAreaVisibility();
 }
 
 PartStack::Pointer EditorSashContainer::GetUpperRightEditorStack()
 {
   return this->GetUpperRightEditorStack(this->GetChildren());
 }
 
 PartStack::Pointer EditorSashContainer::GetUpperRightEditorStack(
     const ILayoutContainer::ChildrenType& stacks)
 {
 
   // Find the upper Right editor stack
   PartStack::Pointer winner;
   Rectangle winnerRect;
 
   for (ILayoutContainer::ChildrenType::const_iterator iter = stacks.begin();
        iter != stacks.end(); ++iter)
   {
     LayoutPart::Pointer part = *iter;
     if (part.Cast<PartStack>() == 0)
       continue;
 
     PartStack::Pointer stack = part.Cast<PartStack>();
     Rectangle bb = stack->GetBounds();
     if (iter == stacks.begin() || bb.y < winnerRect.y || (bb.y == winnerRect.y && bb.x
         > winnerRect.x))
     {
       winner = stack;
       winnerRect = bb;
     }
   }
 
   return winner;
 }
 
 PartStack::Pointer EditorSashContainer::GetActiveWorkbook()
 {
   if (activeEditorWorkbook == 0)
   {
     if (editorWorkbooks.size() < 1)
     {
       this->SetActiveWorkbook(this->CreateDefaultWorkbook(), false);
     }
     else
     {
       this->SetActiveWorkbook(editorWorkbooks.front(), false);
     }
   }
 
   return activeEditorWorkbook;
 }
 
 QString EditorSashContainer::GetActiveWorkbookID()
 {
   return this->GetActiveWorkbook()->GetID();
 }
 
 QList<PartStack::Pointer> EditorSashContainer::GetEditorWorkbooks()
 {
   return editorWorkbooks;
 }
 
 std::size_t EditorSashContainer::GetEditorWorkbookCount()
 {
   return editorWorkbooks.size();
 }
 
 void EditorSashContainer::FindSashes(LayoutPart::Pointer pane,
     PartPane::Sashes& sashes)
 {
   //Find the sashes around the current editor and
   //then the sashes around the editor area.
   PartSashContainer::FindSashes(pane, sashes);
 
   ILayoutContainer::Pointer container = this->GetContainer();
   if (container != 0)
   {
     container->FindSashes(LayoutPart::Pointer(this), sashes);
   }
 }
 
 void EditorSashContainer::RemoveAllEditors()
 {
   PartStack::Pointer currentWorkbook = this->GetActiveWorkbook();
 
   // Iterate over a copy so the original can be modified.
   QList<PartStack::Pointer> workbooks(editorWorkbooks);
   for (QList<PartStack::Pointer>::iterator iter = workbooks.begin();
        iter != workbooks.end(); ++iter)
   {
     PartStack::Pointer workbook = *iter;
     QList<LayoutPart::Pointer> children = workbook->GetChildren();
     for (QList<LayoutPart::Pointer>::iterator childIter = children.begin();
          childIter != children.end(); ++childIter)
     {
       workbook->Remove(*childIter);
     }
 
     if (workbook != currentWorkbook)
     {
       this->Remove(workbook);
       workbook->Dispose();
     }
   }
 }
 
 void EditorSashContainer::RemoveEditor(PartPane::Pointer pane)
 {
   PartStack::Pointer workbook = pane->GetContainer().Cast<PartStack>();
   if (workbook == 0)
   {
     return;
   }
 
   workbook->Remove(pane);
 
   // remove the editor workbook if empty
   if (workbook->GetItemCount() < 1 /* && editorWorkbooks.size() > 1*/)
   {
     //    // If the user closes the last editor and the editor area
     //    // is maximized, restore it
     //    Perspective persp = getPage().getActivePerspective();
     //    if (Perspective.useNewMinMax(persp))
     //    {
     //      if (persp.getPresentation().getMaximizedStack() instanceof EditorStack)
     //      persp.getPresentation().getMaximizedStack().
     //      setState(IStackPresentationSite.STATE_RESTORED);
     //    }
 
     this->Remove(workbook);
     workbook->Dispose();
   }
 }
 
 bool EditorSashContainer::RestoreState(IMemento::Pointer memento)
 {
   //TODO EditorSashContainer restore state
 //  MultiStatus
 //      result =
 //          new MultiStatus(PlatformUI.PLUGIN_ID, IStatus.OK, WorkbenchMessages.RootLayoutContainer_problemsRestoringPerspective, 0);
   bool result = true;
 
   // Remove the default editor workbook that is
   // initialy created with the editor area.
 
 //    StartupThreading.runWithoutExceptions(new StartupRunnable()
 //        {
 //
 //        public void runWithException() throws Throwable
 //        {
             PartStack::Pointer defaultWorkbook;
             for (ILayoutContainer::ChildrenType::iterator i = children.begin();
                 i != children.end(); ++i)
             {
               LayoutPart::Pointer child = *i;
               if (child->GetID() == DEFAULT_WORKBOOK_ID)
               {
                 defaultWorkbook = child.Cast<PartStack>();
                 if (defaultWorkbook->GetItemCount() > 0)
                 {
                   defaultWorkbook = 0;
                 }
               }
             }
             if (defaultWorkbook)
             {
               Remove(defaultWorkbook);
             }
 //          }}
 //        );
 
 
 
   // Restore the relationship/layout
   QList<IMemento::Pointer> infos(memento->GetChildren(WorkbenchConstants::TAG_INFO));
   QHash<QString, LayoutPart::Pointer> mapIDtoPart;
 
-  for (std::size_t i = 0; i < infos.size(); i++)
+  for (int i = 0; i < infos.size(); i++)
   {
     // Get the info details.
     IMemento::Pointer childMem = infos[i];
     QString partID; childMem->GetString(WorkbenchConstants::TAG_PART, partID);
     QString relativeID; childMem->GetString(WorkbenchConstants::TAG_RELATIVE, relativeID);
     int relationship = 0;
     int left = 0, right = 0;
     if (!relativeID.isEmpty())
     {
       childMem->GetInteger(WorkbenchConstants::TAG_RELATIONSHIP, relationship);
       childMem->GetInteger(WorkbenchConstants::TAG_RATIO_LEFT, left);
       childMem->GetInteger(WorkbenchConstants::TAG_RATIO_RIGHT, right);
     }
 
     PartStack::Pointer workbook;
 //    StartupThreading.runWithoutExceptions(new StartupRunnable()
 //        {
 //
 //        public void runWithException() throws Throwable
 //          {
             // Create the part.
             workbook = NewEditorWorkbook();
             workbook->SetID(partID);
             // 1FUN70C: ITPUI:WIN - Shouldn't set Container when not active
             workbook->SetContainer(ILayoutContainer::Pointer(this));
 //          }}
 //        );
 
         IMemento::Pointer workbookMemento = childMem->GetChild(
             WorkbenchConstants::TAG_FOLDER);
         if (workbookMemento)
         {
           //result.add(workbook[0].restoreState(workbookMemento));
           result &= workbook->RestoreState(workbookMemento);
         }
 
         const int myLeft = left, myRight = right, myRelationship = relationship;
 //        StartupThreading.runWithoutExceptions(new StartupRunnable()
 //            {
 //
 //            public void runWithException() throws Throwable
 //              {
                 // Add the part to the layout
                 if (relativeID.isEmpty())
                 {
                   Add(workbook);
                 }
                 else
                 {
                   LayoutPart::Pointer refPart = mapIDtoPart[relativeID];
                   if (refPart)
                   {
                     Add(workbook, myRelationship, myLeft, myRight, refPart);
                   }
                   else
                   {
                     WorkbenchPlugin::Log("Unable to find part for ID: " + relativeID);
                   }
                 }
 //              }}
 //            );
 
             mapIDtoPart[partID] = workbook;
           }
 
           return result;
 }
 
 bool EditorSashContainer::SaveState(IMemento::Pointer memento)
 {
   QList<RelationshipInfo> relationships(ComputeRelation());
 //  MultiStatus
 //      result =
 //          new MultiStatus(PlatformUI.PLUGIN_ID, IStatus.OK, WorkbenchMessages.RootLayoutContainer_problemsSavingPerspective, 0);
   bool result = true;
 
-  for (std::size_t i = 0; i < relationships.size(); i++)
+  for (int i = 0; i < relationships.size(); i++)
   {
     // Save the relationship info ..
     //    private LayoutPart part;
     //    private int relationship;
     //    private float ratio;
     //    private LayoutPart relative;
     const RelationshipInfo& info = relationships[i];
     IMemento::Pointer childMem = memento->CreateChild(
         WorkbenchConstants::TAG_INFO);
     childMem->PutString(WorkbenchConstants::TAG_PART, info.part->GetID());
 
     PartStack::Pointer stack = info.part.Cast<PartStack>();
     if (stack)
     {
       IMemento::Pointer folderMem = childMem->CreateChild(
           WorkbenchConstants::TAG_FOLDER);
       //result.add(stack.saveState(folderMem));
       result &= stack->SaveState(folderMem);
     }
 
     if (info.relative != 0)
     {
       childMem->PutString(WorkbenchConstants::TAG_RELATIVE, info.relative->GetID());
       childMem->PutInteger(WorkbenchConstants::TAG_RELATIONSHIP, info.relationship);
       childMem->PutInteger(WorkbenchConstants::TAG_RATIO_LEFT, info.left);
       childMem->PutInteger(WorkbenchConstants::TAG_RATIO_RIGHT, info.right);
     }
   }
 
   return result;
 }
 
 void EditorSashContainer::SetActiveWorkbook(PartStack::Pointer newWorkbook,
     bool hasFocus)
 {
   if (newWorkbook != 0)
   {
     if (std::find(editorWorkbooks.begin(), editorWorkbooks.end(), newWorkbook) == editorWorkbooks.end())
     {
       return;
     }
   }
 
   PartStack::Pointer oldWorkbook = activeEditorWorkbook;
   activeEditorWorkbook = newWorkbook;
 
   if (oldWorkbook != 0 && oldWorkbook != newWorkbook)
   {
     oldWorkbook->SetActive(StackPresentation::AS_INACTIVE);
   }
 
   if (newWorkbook != 0)
   {
     if (hasFocus)
     {
       newWorkbook->SetActive(StackPresentation::AS_ACTIVE_FOCUS);
     }
     else
     {
       newWorkbook->SetActive(StackPresentation::AS_ACTIVE_NOFOCUS);
     }
   }
 
   this->UpdateTabList();
 }
 
 void EditorSashContainer::SetActiveWorkbookFromID(const QString& id)
 {
   for (QList<PartStack::Pointer>::iterator iter = editorWorkbooks.begin();
        iter != editorWorkbooks.end(); ++iter)
   {
     PartStack::Pointer workbook = *iter;
     if (workbook->GetID() == id)
     {
       this->SetActiveWorkbook(workbook, false);
     }
   }
 }
 
 PartStack::Pointer EditorSashContainer::GetWorkbookFromID(const QString& id)
 {
   for (QList<PartStack::Pointer>::iterator iter = editorWorkbooks.begin();
        iter != editorWorkbooks.end(); ++iter)
   {
     PartStack::Pointer workbook = *iter;
     if (workbook->GetID() == id)
     {
       return workbook;
     }
   }
 
   return PartStack::Pointer(0);
 }
 
 void EditorSashContainer::UpdateTabList()
 {
   void* parent = this->GetParent();
   if (parent != 0)
   { // parent may be 0 on startup
     PartStack::Pointer wb(this->GetActiveWorkbook());
 //TODO EditorSashContainer update tab list
 //    if (wb == 0)
 //    {
 //      parent.setTabList(new Control[0]);
 //    }
 //    else
 //    {
 //      parent.setTabList(wb.getTabList());
 //    }
   }
 }
 
 void EditorSashContainer::CreateControl(void* parent)
 {
   PartSashContainer::CreateControl(parent);
 
   ///let the user drop files/editor input on the editor area
   this->AddDropSupport();
 }
 
 bool EditorSashContainer::IsCompressible()
 {
   //Added for bug 19524
   return true;
 }
 
 bool EditorSashContainer::IsStackType(ILayoutContainer::Pointer toTest)
 {
   if (toTest.Cast<PartStack>() == 0)
     return false;
 
   return (toTest.Cast<PartStack> ()->GetAppearance()
       == PresentationFactoryUtil::ROLE_EDITOR);
 }
 
 bool EditorSashContainer::IsPaneType(LayoutPart::Pointer toTest)
 {
   if (toTest.Cast<PartPane>() == 0)
     return false;
 
   return (toTest.Cast<PartPane> ()->GetPartReference().Cast<IEditorReference> ()
       != 0);
 }
 
 bool EditorSashContainer::RestorePresentationState(IMemento::Pointer  /*areaMem*/)
 {
   QList<PartStack::Pointer> workbooks = this->GetEditorWorkbooks();
   for (QList<PartStack::Pointer>::iterator iter = workbooks.begin();
        iter != workbooks.end(); ++iter)
   {
     PartStack::Pointer workbook = *iter;
     IMemento::Pointer memento = workbook->GetSavedPresentationState();
     if (memento == 0)
     {
       continue;
     }
     QList<IPresentablePart::Pointer> parts = workbook->GetPresentableParts();
     PresentationSerializer serializer(parts);
     //StartupThreading.runWithoutExceptions(new StartupRunnable()
     //    {
 
     // public void runWithException() throws Throwable
     //   {
     workbook->GetPresentation()->RestoreState(&serializer, memento);
     //   }}
     // );
 
   }
   //return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0, "", 0); //$NON-NLS-1$
   return true;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryElementReference.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryElementReference.cpp
index c21d350e8f..6339b4326e 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryElementReference.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryElementReference.cpp
@@ -1,45 +1,50 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #include "berryElementReference.h"
 
 #include <berryUIElement.h>
 
 namespace berry {
 
 ElementReference::ElementReference(const QString& id, const SmartPointer<UIElement>& adapt,
                  const QHash<QString, Object::Pointer>& parms)
   : commandId(id), element(adapt), parameters(parms)
 {
 }
 
 SmartPointer<UIElement> ElementReference::GetElement() const
 {
   return element;
 }
 
 QString ElementReference::GetCommandId() const
 {
   return commandId;
 }
 
 QHash<QString, Object::Pointer> ElementReference::GetParameters() const
 {
   return parameters;
 }
 
+void ElementReference::AddParameter(const QString &name, const Object::Pointer &value)
+{
+  parameters.insert(name, value);
+}
+
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryElementReference.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryElementReference.h
index bb9bdad509..effd7d51cb 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryElementReference.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryElementReference.h
@@ -1,71 +1,73 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYELEMENTREFERENCE_H
 #define BERRYELEMENTREFERENCE_H
 
 #include <berryIElementReference.h>
 
 namespace berry {
 
 /**
  * Our element reference that is used during element
  * registration/unregistration.
  */
 class ElementReference : public IElementReference
 {
 
 private:
 
   QString commandId;
   SmartPointer<UIElement> element;
   QHash<QString, Object::Pointer> parameters;
 
 public:
 
   /**
    * Construct the reference.
    *
    * @param id
    *            command id. Must not be <code>null</code>.
    * @param adapt
    *            the element. Must not be <code>null</code>.
    * @param parms.
    *            parameters used for filtering. Must not be <code>null</code>.
    */
   ElementReference(const QString& id, const SmartPointer<UIElement>& adapt,
                    const QHash<QString, Object::Pointer>& parms);
 
   /*
    * @see IElementReference#GetElement()
    */
   SmartPointer<UIElement> GetElement() const;
 
   /*
    * @see IElementReference#GetCommandId()
    */
   QString GetCommandId() const;
 
   /*
    * @see IElementReference#GetParameters()
    */
   QHash<QString, Object::Pointer> GetParameters() const;
+
+  void AddParameter(const QString& name, const Object::Pointer& value);
 };
 
 }
 
 #endif // BERRYELEMENTREFERENCE_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEvaluationAuthority.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEvaluationAuthority.cpp
index beada5ae82..24942ac9bb 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEvaluationAuthority.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEvaluationAuthority.cpp
@@ -1,237 +1,237 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #include "berryEvaluationAuthority.h"
 
 #include "berryExpressionInfo.h"
 #include "berryExpression.h"
 #include "berryEvaluationReference.h"
 #include "berryWorkbenchPlugin.h"
 
 #include <berryObjects.h>
 #include <berryISources.h>
 #include <berryIEvaluationService.h>
 
 #include <QStringList>
 #include <QString>
 
 namespace berry {
 
 const QString EvaluationAuthority::COMPONENT = "EVALUATION";
 
 
 QStringList EvaluationAuthority::GetNames(const SmartPointer<IEvaluationReference>& ref) const
 {
   ExpressionInfo info;
   ref->GetExpression()->CollectExpressionInfo(&info);
   QSet<QString> allNames = info.GetAccessedVariableNames();
   if (info.HasDefaultVariableAccess())
   {
     allNames << ISources::ACTIVE_CURRENT_SELECTION_NAME();
   }
 
   allNames.unite(info.GetAccessedPropertyNames());
   return allNames.toList();
 }
 
 void EvaluationAuthority::RefsWithSameExpression(const QList<SmartPointer<EvaluationReference> >& refs)
 {
   int k = 0;
   while (k < refs.size() && !refs[k]->IsPostingChanges())
   {
     k++;
   }
   if (k >= refs.size())
   {
     return;
   }
   EvaluationReference::Pointer ref = refs[k];
   bool oldValue = Evaluate(ref);
   ref->ClearResult();
   const bool newValue = Evaluate(ref);
   if (oldValue != newValue)
   {
     FirePropertyChange(ref, ValueOf(oldValue), ValueOf(newValue));
   }
   for (k++; k < refs.size(); k++)
   {
     ref = refs[k];
     // this is not as expensive as it looks
     if (ref->IsPostingChanges())
     {
       oldValue = Evaluate(ref);
       if (oldValue != newValue)
       {
         ref->SetResult(newValue);
         FirePropertyChange(ref, ValueOf(oldValue),
                            ValueOf(newValue));
       }
     }
   }
 }
 
-void EvaluationAuthority::StartSourceChange(const QStringList& sourceNames)
+void EvaluationAuthority::StartSourceChange(const QStringList& /*sourceNames*/)
 {
   notifying++;
   if (notifying == 1)
   {
     FireServiceChange(IEvaluationService::PROP_NOTIFYING, ValueOf(false),
                       ValueOf(true));
   }
 }
 
-void EvaluationAuthority::EndSourceChange(const QStringList& sourceNames)
+void EvaluationAuthority::EndSourceChange(const QStringList& /*sourceNames*/)
 {
   if (notifying == 1) {
     FireServiceChange(IEvaluationService::PROP_NOTIFYING, ValueOf(true),
                       ValueOf(false));
   }
   notifying--;
 }
 
 void EvaluationAuthority::FirePropertyChange(const SmartPointer<IEvaluationReference>& ref,
                                              Object::Pointer oldValue, Object::Pointer newValue)
 {
   PropertyChangeEvent::Pointer event(new PropertyChangeEvent(ref, ref->GetProperty(), oldValue,
                                                              newValue));
   ref->GetListener()->PropertyChange(event);
 }
 
 void EvaluationAuthority::FireServiceChange(const QString& property, Object::Pointer oldValue,
                                             Object::Pointer newValue)
 {
   PropertyChangeEvent::Pointer event(
         new PropertyChangeEvent(Object::Pointer(this), property, oldValue, newValue));
   serviceListeners.propertyChange(event);
 }
 
 void EvaluationAuthority::ServiceChangeException(const std::exception &exc)
 {
   WorkbenchPlugin::Log(exc.what());
 }
 
 Object::Pointer EvaluationAuthority::ValueOf(bool result)
 {
   return ObjectBool::Pointer(new ObjectBool(result));
 }
 
-void EvaluationAuthority::SourceChanged(int sourcePriority)
+void EvaluationAuthority::SourceChanged(int /*sourcePriority*/)
 {
   // no-op, we want the other one
 }
 
 void EvaluationAuthority::SourceChanged(const QStringList& sourceNames)
 {
   struct SourceChangeScope {
     EvaluationAuthority* const ea;
     const QStringList& sourceNames;
     SourceChangeScope(EvaluationAuthority* ea, const QStringList& sourceNames)
       : ea(ea), sourceNames(sourceNames)
     {
       ea->StartSourceChange(sourceNames);
     }
     ~SourceChangeScope()
     {
       ea->EndSourceChange(sourceNames);
     }
   };
 
   SourceChangeScope(this, sourceNames);
   // evaluations to recompute
   for (int i = 0; i < sourceNames.size(); i++)
   {
     if (cachesBySourceName.contains(sourceNames[i]))
     {
       const ExprToEvalsMapType& cachesByExpression = cachesBySourceName[sourceNames[i]];
       QList<QSet<EvaluationReference::Pointer> > expressionCaches = cachesByExpression.values();
       for (int j = 0; j < expressionCaches.size(); j++)
       {
         if (!(expressionCaches[j].isEmpty()))
         {
           QList<EvaluationReference::Pointer> refs = expressionCaches[j].toList();
           RefsWithSameExpression(refs);
         }
       }
     }
   }
 }
 
 EvaluationAuthority::EvaluationAuthority()
   : serviceExceptionHandler(this, &EvaluationAuthority::ServiceChangeException), notifying(0)
 {
   serviceListeners.propertyChange.SetExceptionHandler(serviceExceptionHandler);
 }
 
-SmartPointer<Shell> EvaluationAuthority::GetActiveShell() const
+SmartPointer<const Shell> EvaluationAuthority::GetActiveShell() const
 {
-  return GetVariable(ISources::ACTIVE_SHELL_NAME()).Cast<Shell>();
+  return GetVariable(ISources::ACTIVE_SHELL_NAME()).Cast<const Shell>();
 }
 
 void EvaluationAuthority::AddEvaluationListener(const SmartPointer<IEvaluationReference>& ref)
 {
   // we update the source priority bucket sort of activations.
   QStringList sourceNames = GetNames(ref);
   for (int i = 0; i < sourceNames.size(); i++)
   {
     ExprToEvalsMapType& cachesByExpression = cachesBySourceName[sourceNames[i]];
     const Expression::Pointer expression = ref->GetExpression();
     cachesByExpression[expression].insert(ref.Cast<EvaluationReference>());
   }
 
   bool result = Evaluate(ref);
   FirePropertyChange(ref, Object::Pointer(0), ValueOf(result));
 }
 
 void EvaluationAuthority::RemoveEvaluationListener(const SmartPointer<IEvaluationReference>& ref)
 {
   // Next we update the source priority bucket sort of activations.
   QStringList sourceNames = GetNames(ref);
   for (int i = 0; i < sourceNames.size(); i++)
   {
     if (cachesBySourceName.contains(sourceNames[i]))
     {
       ExprToEvalsMapType& cachesByExpression = cachesBySourceName[sourceNames[i]];
       if (cachesByExpression.contains(ref->GetExpression()))
       {
         QSet<EvaluationReference::Pointer>& caches = cachesByExpression[ref->GetExpression()];
         caches.remove(ref.Cast<EvaluationReference>());
         if (caches.isEmpty())
         {
           cachesByExpression.remove(ref->GetExpression());
         }
       }
       if (cachesByExpression.isEmpty())
       {
         cachesBySourceName.remove(sourceNames[i]);
       }
     }
   }
   bool result = Evaluate(ref);
   FirePropertyChange(ref, ValueOf(result), Object::Pointer(0));
 }
 
 void EvaluationAuthority::AddServiceListener(IPropertyChangeListener* listener)
 {
   serviceListeners.AddListener(listener);
 }
 
 void EvaluationAuthority::RemoveServiceListener(IPropertyChangeListener* listener)
 {
   serviceListeners.RemoveListener(listener);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEvaluationAuthority.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEvaluationAuthority.h
index e5ca3e8845..eeb0f65190 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEvaluationAuthority.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEvaluationAuthority.h
@@ -1,140 +1,140 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYEVALUATIONAUTHORITY_H
 #define BERRYEVALUATIONAUTHORITY_H
 
 #include "berryExpressionAuthority.h"
 
 #include <berryIPropertyChangeListener.h>
 
 #include <QHash>
 
 namespace berry {
 
 struct IEvaluationReference;
 
 class EvaluationReference;
 class Expression;
 class Shell;
 
 class EvaluationAuthority : public ExpressionAuthority
 {
 
 public:
 
   berryObjectMacro(berry::EvaluationAuthority)
 
 private:
 
   static const QString COMPONENT;
 
   typedef QHash<SmartPointer<Expression>, QSet<SmartPointer<EvaluationReference> > > ExprToEvalsMapType;
 
   /**
    * A bucket sort of the evaluation references based on source priority. Each
    * reference will appear only once per set, but may appear in multiple sets.
    * If no references are defined for a particular priority level, then the
    * array at that index will only contain <code>null</code>.
    */
   QHash<QString,ExprToEvalsMapType> cachesBySourceName;
   IPropertyChangeListener::Events serviceListeners;
   MessageExceptionHandler<EvaluationAuthority> serviceExceptionHandler;
   int notifying;
 
   // private final Map cachesByExpression = new HashMap();
 
   QStringList GetNames(const SmartPointer<IEvaluationReference>& ref) const;
 
   /**
    * This will evaluate all refs with the same expression.
    *
    * @param refs
    */
   void RefsWithSameExpression(const QList<SmartPointer<EvaluationReference> >& refs);
 
   /**
    * @param sourceNames
    */
   void StartSourceChange(const QStringList& sourceNames);
 
   /**
    * @param sourceNames
    */
   void EndSourceChange(const QStringList& sourceNames);
 
   /**
    * @param ref
    * @param oldValue
    * @param newValue
    */
   void FirePropertyChange(const SmartPointer<IEvaluationReference>& ref,
                           Object::Pointer oldValue, Object::Pointer newValue);
 
   void FireServiceChange(const QString& property, Object::Pointer oldValue, Object::Pointer newValue);
 
   void ServiceChangeException(const std::exception& exc);
 
   Object::Pointer ValueOf(bool result);
 
 protected:
 
   /**
    * Returns the currently active shell.
    *
    * @return The currently active shell; may be <code>null</code>.
    */
-  SmartPointer<Shell> GetActiveShell() const;
+  SmartPointer<const Shell> GetActiveShell() const;
 
 public:
 
   EvaluationAuthority();
 
   /*
    * @see ExpressionAuthority#SourceChanged(int)
    */
   void SourceChanged(int sourcePriority);
 
   /*
    * @see ExpressionAuthority#SourceChanged(QString)
    */
   void SourceChanged(const QStringList& sourceNames);
 
   using ExpressionAuthority::SourceChanged;
 
   void AddEvaluationListener(const SmartPointer<IEvaluationReference>& ref);
 
   /**
    * @param ref
    */
   void RemoveEvaluationListener(const SmartPointer<IEvaluationReference>& ref);
 
   /**
    * @param listener
    */
   void AddServiceListener(IPropertyChangeListener* listener);
 
   /**
    * @param listener
    */
   void RemoveServiceListener(IPropertyChangeListener* listener);
 
 };
 
 }
 
 #endif // BERRYEVALUATIONAUTHORITY_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEvaluationResultCache.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEvaluationResultCache.cpp
index 7adc532057..d230e425e2 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEvaluationResultCache.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEvaluationResultCache.cpp
@@ -1,94 +1,94 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #include "berryEvaluationResultCache.h"
 
 #include "berrySourcePriorityNameMapping.h"
 #include "berryEvaluationResult.h"
 
 #include <berryCoreException.h>
 
 namespace berry {
 
 EvaluationResultCache::EvaluationResultCache(const SmartPointer<Expression>& expression)
   : expression(expression),
     sourcePriority(SourcePriorityNameMapping::ComputeSourcePriority(expression))
 {
 }
 
 EvaluationResultCache::~EvaluationResultCache()
 {
 }
 
 void EvaluationResultCache::ClearResult()
 {
   evaluationResult = 0;
 }
 
 bool EvaluationResultCache::Evaluate(IEvaluationContext* context) const
 {
   if (expression.IsNull())
   {
     return true;
   }
 
   if (evaluationResult.IsNull())
   {
     try
     {
       evaluationResult = expression->Evaluate(context);
     }
-    catch (const CoreException& e)
+    catch (const CoreException& /*e*/)
     {
       /*
        * Swallow the exception. It simply means the variable is not
        * valid it some (most frequently, that the value is null). This
        * kind of information is not really useful to us, so we can
        * just treat it as null.
        */
       evaluationResult = EvaluationResult::FALSE_EVAL;
       return false;
     }
   }
 
   // return true if  the result is FALSE or NOT_LOADED
   return evaluationResult != EvaluationResult::FALSE_EVAL;
 }
 
 SmartPointer<Expression> EvaluationResultCache::GetExpression() const
 {
   return expression;
 }
 
 int EvaluationResultCache::GetSourcePriority() const
 {
   return sourcePriority;
 }
 
 void EvaluationResultCache::SetResult(bool result)
 {
   if (result)
   {
     evaluationResult = EvaluationResult::TRUE_EVAL;
   }
   else
   {
     evaluationResult = EvaluationResult::FALSE_EVAL;
   }
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEvaluationService.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEvaluationService.cpp
index d018d4c88a..75cbd780b1 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEvaluationService.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEvaluationService.cpp
@@ -1,105 +1,107 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #include "berryEvaluationService.h"
 
 #include "berryEvaluationReference.h"
 #include "berryEvaluationAuthority.h"
+#include "berryExpression.h"
 
 #include <berryIEvaluationContext.h>
 
 #include <QStringList>
 
 namespace berry {
 
 EvaluationService::EvaluationService()
+  : evaluationAuthority(new EvaluationAuthority())
 {
-  evaluationAuthority = new EvaluationAuthority();
+  evaluationAuthority->Register();
 }
 
 EvaluationService::~EvaluationService()
 {
   this->Dispose();
 }
 
 IEvaluationReference::Pointer EvaluationService::AddEvaluationListener(const SmartPointer<Expression>& expression,
                                                                        IPropertyChangeListener* listener,
                                                                        const QString& property)
 {
   IEvaluationReference::Pointer expressionReference(new EvaluationReference(
                                                       expression, listener, property));
 
   evaluationAuthority->AddEvaluationListener(expressionReference);
   return expressionReference;
 }
 
 void EvaluationService::AddEvaluationReference(const SmartPointer<IEvaluationReference>& ref)
 {
   QString msg("Invalid type: ");
   msg.append(ref->GetClassName());
   Q_ASSERT_X(ref.Cast<EvaluationReference>(), "AddEvaluationReference", qPrintable(msg));
   evaluationAuthority->AddEvaluationListener(ref);
 }
 
 void EvaluationService::RemoveEvaluationListener(const SmartPointer<IEvaluationReference>& ref)
 {
   evaluationAuthority->RemoveEvaluationListener(ref);
 }
 
-void EvaluationService::AddSourceProvider(SmartPointer<ISourceProvider> provider)
+void EvaluationService::AddSourceProvider(const SmartPointer<ISourceProvider>& provider)
 {
   evaluationAuthority->AddSourceProvider(provider);
 }
 
-void EvaluationService::RemoveSourceProvider(SmartPointer<ISourceProvider> provider)
+void EvaluationService::RemoveSourceProvider(const SmartPointer<ISourceProvider>& provider)
 {
   evaluationAuthority->RemoveSourceProvider(provider);
 }
 
 void EvaluationService::Dispose()
 {
   evaluationAuthority->Dispose();
 }
 
 SmartPointer<IEvaluationContext> EvaluationService::GetCurrentState() const
 {
   return evaluationAuthority->GetCurrentState();
 }
 
 void EvaluationService::AddServiceListener(IPropertyChangeListener* listener)
 {
   evaluationAuthority->AddServiceListener(listener);
 }
 
 void EvaluationService::RemoveServiceListener(IPropertyChangeListener* listener)
 {
   evaluationAuthority->RemoveServiceListener(listener);
 }
 
 void EvaluationService::RequestEvaluation(const QString& propertyName)
 {
   QStringList propertyNames;
   propertyNames.push_back(propertyName);
   evaluationAuthority->SourceChanged(propertyNames);
 }
 
 //void EvaluationService::UpdateShellKludge()
 //{
 //  evaluationAuthority->UpdateShellKludge();
 //}
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEvaluationService.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEvaluationService.h
index 1b53c87792..d2b338b2b0 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEvaluationService.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryEvaluationService.h
@@ -1,100 +1,100 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYEVALUATIONSERVICE_H
 #define BERRYEVALUATIONSERVICE_H
 
 #include <berryIEvaluationService.h>
 
 namespace berry {
 
 class EvaluationAuthority;
 
 class EvaluationService : public IEvaluationService
 {
 
 private:
 
-  SmartPointer<EvaluationAuthority> evaluationAuthority;
+  QScopedPointer<EvaluationAuthority, QScopedPointerObjectDeleter> evaluationAuthority;
 
 public:
 
   berryObjectMacro(berry::EvaluationService)
 
   EvaluationService();
 
   ~EvaluationService();
 
   /*
    * @see IEvaluationService#AddEvaluationListener(Expression, IPropertyChangeListener, QString)
    */
   SmartPointer<IEvaluationReference> AddEvaluationListener(const SmartPointer<Expression>& expression,
                                                            IPropertyChangeListener* listener,
                                                            const QString& property);
 
   /*
    * @see IEvaluationService#AddEvaluationReference(IEvaluationReference)
    */
   void AddEvaluationReference(const SmartPointer<IEvaluationReference>& ref);
 
   /*
    * @see IEvaluationService#RemoveEvaluationListener(IEvaluationReference)
    */
   void RemoveEvaluationListener(const SmartPointer<IEvaluationReference>& ref);
 
   /*
    * @see IServiceWithSources#AddSourceProvider(ISourceProvider)
    */
-  void AddSourceProvider(SmartPointer<ISourceProvider> provider);
+  void AddSourceProvider(const SmartPointer<ISourceProvider>& provider);
 
   /*
    * @see IServiceWithSources#RemoveSourceProvider(ISourceProvider)
    */
-  void RemoveSourceProvider(SmartPointer<ISourceProvider> provider);
+  void RemoveSourceProvider(const SmartPointer<ISourceProvider>& provider);
 
   /*
    * @see IDisposable#Dispose()
    */
   void Dispose();
 
   /*
    * @see IEvaluationService#GetCurrentState()
    */
   SmartPointer<IEvaluationContext> GetCurrentState() const;
 
   /*
    * @see IEvaluationService#AddServiceListener(IPropertyChangeListener)
    */
   void AddServiceListener(IPropertyChangeListener *listener);
 
   /*
    * @see IEvaluationService#removeServiceListener(IPropertyChangeListener)
    */
   void RemoveServiceListener(IPropertyChangeListener* listener);
 
   /*
    * @see IEvaluationService#RequestEvaluation(QString)
    */
   void RequestEvaluation(const QString& propertyName);
 
   //void UpdateShellKludge();
 
 };
 
 }
 
 #endif // BERRYEVALUATIONSERVICE_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryExpressionAuthority.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryExpressionAuthority.cpp
index 96a3c37b80..b67f1b5835 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryExpressionAuthority.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryExpressionAuthority.cpp
@@ -1,248 +1,248 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #include "berryExpressionAuthority.h"
 
 #include <berryObjectList.h>
 #include "berryEvaluationContext.h"
 #include "berryIEvaluationResultCache.h"
 
 #include <berryISourceProvider.h>
 #include <berryISources.h>
 #include <berryIStructuredSelection.h>
 
 namespace berry {
 
 void ExpressionAuthority::SourceChanged(int sourcePriority, const QStringList& sourceNames)
 {
   SourceChanged(sourcePriority);
   SourceChanged(sourceNames);
 }
 
 ExpressionAuthority::ExpressionAuthority()
   : context(new EvaluationContext(0, Object::Pointer(this)))
 {
   // break smart-pointer self-cycle
   this->UnRegister(false);
   context->SetAllowPluginActivation(true);
   //context->AddVariable("org.blueberry.core.runtime.Platform", Platform.class);
 }
 
 bool ExpressionAuthority::Evaluate(const QList<SmartPointer<IEvaluationResultCache> >& collection) const
 {
   foreach (IEvaluationResultCache::Pointer cache, collection)
   {
     if (Evaluate(cache))
     {
       return true;
     }
   }
 
   return false;
 }
 
 bool ExpressionAuthority::Evaluate(const SmartPointer<IEvaluationResultCache>& expression) const
 {
   IEvaluationContext::Pointer contextWithDefaultVariable = GetCurrentState();
   return expression->Evaluate(contextWithDefaultVariable.GetPointer());
 }
 
-Object::Pointer ExpressionAuthority::GetVariable(const QString& name) const
+Object::ConstPointer ExpressionAuthority::GetVariable(const QString& name) const
 {
   return context->GetVariable(name);
 }
 
-void ExpressionAuthority::ChangeVariable(const QString& name, const Object::Pointer& value)
+void ExpressionAuthority::ChangeVariable(const QString& name, const Object::ConstPointer& value)
 {
   if (value.IsNull())
   {
     context->RemoveVariable(name);
   }
   else
   {
     context->AddVariable(name, value);
   }
 }
 
-void ExpressionAuthority::SourceChanged(const QStringList& sourceNames)
+void ExpressionAuthority::SourceChanged(const QStringList& /*sourceNames*/)
 {
   // this is a no-op, since we're late in the game
 }
 
 void ExpressionAuthority::UpdateCurrentState()
 {
   foreach (ISourceProvider::Pointer provider, providers)
   {
     ISourceProvider::StateMapType currentState = provider->GetCurrentState();
-    QHashIterator<QString,Object::Pointer> variableItr(currentState);
+    QHashIterator<QString,Object::ConstPointer> variableItr(currentState);
     while (variableItr.hasNext())
     {
       variableItr.next();
       const QString variableName = variableItr.key();
-      const Object::Pointer variableValue = variableItr.value();
+      const Object::ConstPointer variableValue = variableItr.value();
       /*
        * Bug 84056. If we update the active workbench window, then we
        * risk falling back to that shell when the active shell has
        * registered as "none".
        */
       if (!variableName.isNull() &&
           ISources::ACTIVE_WORKBENCH_WINDOW_SHELL_NAME() != variableName)
       {
         ChangeVariable(variableName, variableValue);
       }
     }
   }
 }
 
-void ExpressionAuthority::UpdateEvaluationContext(const QString& name, const Object::Pointer& value)
+void ExpressionAuthority::UpdateEvaluationContext(const QString& name, const Object::ConstPointer& value)
 {
   if (!name.isNull())
   {
     ChangeVariable(name, value);
   }
 }
 
 void ExpressionAuthority::AddSourceProvider(const SmartPointer<ISourceProvider>& provider)
 {
   provider->AddSourceProviderListener(this);
   providers.push_back(provider);
 
   // Update the current state.
   ISourceProvider::StateMapType currentState = provider->GetCurrentState();
-  QHashIterator<QString,Object::Pointer> variableItr(currentState);
+  QHashIterator<QString,Object::ConstPointer> variableItr(currentState);
   while (variableItr.hasNext())
   {
     variableItr.next();
     const QString variableName = variableItr.key();
-    const Object::Pointer variableValue = variableItr.value();
+    const Object::ConstPointer variableValue = variableItr.value();
 
     /*
      * Bug 84056. If we update the active workbench window, then we risk
      * falling back to that shell when the active shell has registered
      * as "none".
      */
     if (!variableName.isNull()
         && ISources::ACTIVE_WORKBENCH_WINDOW_SHELL_NAME() != variableName)
     {
       ChangeVariable(variableName, variableValue);
     }
   }
   SourceChanged(0, currentState);
 }
 
 ExpressionAuthority::~ExpressionAuthority()
 {
   this->Dispose();
 }
 
 void ExpressionAuthority::Dispose()
 {
   foreach (ISourceProvider::Pointer provider, providers)
   {
     provider->RemoveSourceProviderListener(this);
   }
   providers.clear();
 
   if (context.IsNotNull())
   {
     // prevent double delete
     this->Register();
     context = 0;
     //this->UnRegister(false);
   }
 }
 
 SmartPointer<IEvaluationContext> ExpressionAuthority::GetCurrentState() const
 {
   if (currentState.IsNull())
   {
-    const Object::Pointer defaultVariable =
+    const Object::ConstPointer defaultVariable =
         context->GetVariable(ISources::ACTIVE_CURRENT_SELECTION_NAME());
     IEvaluationContext::Pointer contextWithDefaultVariable;
-    if (IStructuredSelection::Pointer selection = defaultVariable.Cast<IStructuredSelection>())
+    if (IStructuredSelection::ConstPointer selection = defaultVariable.Cast<const IStructuredSelection>())
     {
       contextWithDefaultVariable = new EvaluationContext(context.GetPointer(),
                                                          selection->ToVector());
     }
-    else if (defaultVariable.Cast<ISelection>() &&
-             !defaultVariable.Cast<ISelection>()->IsEmpty())
+    else if (defaultVariable.Cast<const ISelection>() &&
+             !defaultVariable.Cast<const ISelection>()->IsEmpty())
     {
-      ObjectList<Object::Pointer>::Pointer defaultObj(new ObjectList<Object::Pointer>());
+      ObjectList<Object::ConstPointer>::Pointer defaultObj(new ObjectList<Object::ConstPointer>());
       defaultObj->push_back(defaultVariable);
       contextWithDefaultVariable = new EvaluationContext(context.GetPointer(),
                                                          defaultObj);
     }
     else
     {
-      ObjectList<Object::Pointer>::Pointer defaultObj(new ObjectList<Object::Pointer>());
+      ObjectList<Object::ConstPointer>::Pointer defaultObj(new ObjectList<Object::ConstPointer>());
       contextWithDefaultVariable = new EvaluationContext(context.GetPointer(), defaultObj);
     }
     currentState = contextWithDefaultVariable;
   }
 
   return currentState;
 }
 
 void ExpressionAuthority::RemoveSourceProvider(const SmartPointer<ISourceProvider>& provider)
 {
   provider->RemoveSourceProviderListener(this);
   providers.removeAll(provider);
 
   ISourceProvider::StateMapType currentState = provider->GetCurrentState();
-  QHashIterator<QString,Object::Pointer> variableItr(currentState);
+  QHashIterator<QString,Object::ConstPointer> variableItr(currentState);
   while (variableItr.hasNext())
   {
     variableItr.next();
     const QString variableName = variableItr.key();
     ChangeVariable(variableName, Object::Pointer(0));
   }
 }
 
 void ExpressionAuthority::SourceChanged(int sourcePriority,
-                                        const QHash<QString, Object::Pointer> &sourceValuesByName)
+                                        const QHash<QString, Object::ConstPointer> &sourceValuesByName)
 {
   // If the selection has changed, invalidate the current state.
   if (sourceValuesByName.contains(ISources::ACTIVE_CURRENT_SELECTION_NAME()))
   {
     currentState = 0;
   }
 
-  QHashIterator<QString, Object::Pointer> entryItr(sourceValuesByName);
+  QHashIterator<QString, Object::ConstPointer> entryItr(sourceValuesByName);
   while (entryItr.hasNext())
   {
     entryItr.next();
     const QString sourceName = entryItr.key();
-    const Object::Pointer sourceValue = entryItr.value();
+    const Object::ConstPointer sourceValue = entryItr.value();
     UpdateEvaluationContext(sourceName, sourceValue);
   }
   SourceChanged(sourcePriority, sourceValuesByName.keys());
 }
 
 void ExpressionAuthority::SourceChanged(int sourcePriority, const QString &sourceName,
-                   Object::Pointer sourceValue)
+                   Object::ConstPointer sourceValue)
 {
   // If the selection has changed, invalidate the current state.
   if (ISources::ACTIVE_CURRENT_SELECTION_NAME() == sourceName)
   {
     currentState = 0;
   }
 
   UpdateEvaluationContext(sourceName, sourceValue);
   SourceChanged(sourcePriority, QStringList(sourceName));
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryExpressionAuthority.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryExpressionAuthority.h
index e3f65eab41..67ff3a76e9 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryExpressionAuthority.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryExpressionAuthority.h
@@ -1,223 +1,223 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYEXPRESSIONAUTHORITY_H
 #define BERRYEXPRESSIONAUTHORITY_H
 
 #include <berryISourceProviderListener.h>
 
 namespace berry {
 
 struct IEvaluationContext;
 struct IEvaluationResultCache;
 struct ISourceProvider;
 
 /**
  * <p>
  * Provides common functionality for evaluating expressions and listening to
  * {@link ISourceProvider} (i.e., the common event framework for commands).
  * </p>
  * <p>
  * This class is not intended for use outside of the
  * <code>org.eclipse.ui.qt</code> plug-in.
  * </p>
  *
  * @see ISourceProvider
  * @see ISources
  * @see Expression
  * @see IEvaluationContext
  */
-class ExpressionAuthority : public ISourceProviderListener
+class ExpressionAuthority : public Object, private ISourceProviderListener
 {
 
 public:
 
   berryObjectMacro(berry::ExpressionAuthority)
 
 private:
 
   /**
    * The evaluation context instance to use when evaluating expression. This
    * context is shared, and so all calls into <code>sourceChanged</code>
    * must happen on the event thread.
    */
   SmartPointer<IEvaluationContext> context;
 
   /**
    * The current state of this authority. This is a child of the
    * {@link #context} that has been given the selection as the default
    * variable. This value is cleared to <code>null</code> whenever the
    * selection changes.
    */
   mutable SmartPointer<IEvaluationContext> currentState;
 
   /**
    * The collection of source providers used by this authority. This
    * collection is consulted whenever a contribution is made. This collection
    * only contains instances of <code>ISourceProvider</code>.
    */
   QList<SmartPointer<ISourceProvider> > providers;
 
 protected:
 
   /**
    * Constructs a new instance of <code>ExpressionAuthority</code>.
    */
   ExpressionAuthority();
 
   /**
    * Returns whether at least one of the <code>IEvaluationResultCache</code>
    * instances in <code>collection</code> evaluates to <code>true</code>.
    *
    * @param collection
    *            The evaluation result caches to check; must not be
    *            <code>null</code>, but may be empty.
    * @return <code>true</code> if there is at least one expression that
    *         evaluates to <code>true</code>; <code>false</code>
    *         otherwise.
    */
   bool Evaluate(const QList<SmartPointer<IEvaluationResultCache> >& collection) const;
 
   /**
    * Returns whether the <code>IEvaluationResultCache</code> evaluates to
    * <code>true</code>.
    *
    * @param expression
    *            The evaluation result cache to check; must not be
    *            <code>null</code>.
    * @return <code>true</code> if the expression evaluates to
    *         <code>true</code>; <code>false</code> otherwise.
    */
   bool Evaluate(const SmartPointer<IEvaluationResultCache>& expression) const;
 
   /**
    * Returns the variable of the given name.
    *
    * @param name
    *            The name of the variable to get; must not be <code>null</code>.
    * @return The variable of the given name; <code>null</code> if none.
    */
-  Object::Pointer GetVariable(const QString& name) const;
+  Object::ConstPointer GetVariable(const QString& name) const;
 
   /**
    * Changes the variable of the given name. If the <code>value</code> is
    * <code>null</code>, then the variable is removed.
    *
    * @param name
    *            The name of the variable to change; must not be
    *            <code>null</code>.
    * @param value
    *            The new value; the variable should be removed if this is
    *            <code>null</code>.
    */
-  void ChangeVariable(const QString& name, const Object::Pointer& value);
+  void ChangeVariable(const QString& name, const Object::ConstPointer& value);
 
   /**
    * Carries out the actual source change notification. It assumed that by the
    * time this method is called, <code>getEvaluationContext()</code> is
    * up-to-date with the current state of the application.
    *
    * @param sourcePriority
    *            A bit mask of all the source priorities that have changed.
    */
   virtual void SourceChanged(int sourcePriority) = 0;
 
   /**
    * Similar to sourceChanged(int) this notifies the subclass about the
    * change, but using the array of source names that changed instead of the
    * priority ... int based.
    * <p>
    * Clients may override this method.
    * </p>
    *
    * @param sourceNames
    *            The array of names that changed.
    */
   virtual void SourceChanged(const QStringList& sourceNames);
 
   /**
    * @param sourcePriority
    * @param strings
    */
   void SourceChanged(int sourcePriority, const QStringList& sourceNames);
 
   /**
    * Updates the evaluation context with the current state from all of the
    * source providers.
    */
   void UpdateCurrentState();
 
   /**
    * Updates this authority's evaluation context.
    *
    * @param name
    *            The name of the variable to update; must not be
    *            <code>null</code>.
    * @param value
    *            The new value of the variable. If this value is
    *            <code>null</code>, then the variable is removed.
    */
-  void UpdateEvaluationContext(const QString& name, const Object::Pointer& value);
+  void UpdateEvaluationContext(const QString& name, const Object::ConstPointer& value);
 
 public:
 
   /**
    * Adds a source provider to a list of providers to check when updating.
    * This also attaches this authority as a listener to the provider.
    *
    * @param provider
    *            The provider to add; must not be <code>null</code>.
    */
   void AddSourceProvider(const SmartPointer<ISourceProvider>& provider);
 
   /**
    * Removes all of the source provider listeners.
    */
   void Dispose();
 
   ~ExpressionAuthority();
 
   /**
    * Creates a new evaluation context based on the current evaluation context
    * (i.e., the current state), and places the current selection as the
    * default variable.
    *
    * @return An evaluation context that can be used for evaluating
    *         expressions; never <code>null</code>.
    */
   SmartPointer<IEvaluationContext> GetCurrentState() const;
 
   /**
    * Removes this source provider from the list, and detaches this authority
    * as a listener.
    *
    * @param provider
    *            The provider to remove; must not be <code>null</code>.
    */
   void RemoveSourceProvider(const SmartPointer<ISourceProvider>& provider);
 
   void SourceChanged(int sourcePriority,
-                     const QHash<QString, Object::Pointer>& sourceValuesByName);
+                     const QHash<QString, Object::ConstPointer>& sourceValuesByName);
 
   void SourceChanged(int sourcePriority, const QString& sourceName,
-                     Object::Pointer sourceValue);
+                     Object::ConstPointer sourceValue);
 
 };
 
 }
 
 #endif // BERRYEXPRESSIONAUTHORITY_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerActivation.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerActivation.cpp
new file mode 100644
index 0000000000..706f4dddce
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerActivation.cpp
@@ -0,0 +1,151 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berryHandlerActivation.h"
+
+#include "berryISources.h"
+#include "berryIHandler.h"
+#include "berryExpression.h"
+
+namespace berry {
+
+HandlerActivation::HandlerActivation(const QString& commandId, const SmartPointer<IHandler>& handler,
+                                     const SmartPointer<Expression>& expression, int depth,
+                                     IHandlerService* handlerService)
+  : EvaluationResultCache(expression)
+  , commandId(commandId)
+  , depth(depth)
+  , handler(handler)
+  , handlerService(handlerService)
+{
+  if (commandId.isNull())
+  {
+    throw ctkInvalidArgumentException(
+        "The command identifier for a handler activation cannot be null");
+  }
+
+  if (handlerService == NULL)
+  {
+    throw ctkInvalidArgumentException("The handler service for an activation cannot be null");
+  }
+}
+
+void HandlerActivation::ClearActive()
+{
+  ClearResult();
+}
+
+bool HandlerActivation::operator<(const Object* object) const
+{
+  const HandlerActivation* activation = dynamic_cast<const HandlerActivation*>(object);
+  return this->CompareTo(activation) < 0;
+}
+
+int berry::HandlerActivation::CompareTo(const HandlerActivation* other) const
+{
+  const IHandlerActivation* const activation = other;
+  int difference = 0;
+
+  // Check the priorities
+  int thisPriority = this->GetSourcePriority();
+  int thatPriority = activation->GetSourcePriority();
+
+  // rogue bit problem - ISources.ACTIVE_MENU
+  int thisLsb = 0;
+  int thatLsb = 0;
+
+  if (((thisPriority & ISources::ACTIVE_MENU()) | (thatPriority & ISources::ACTIVE_MENU())) != 0)
+  {
+    thisLsb = thisPriority & 1;
+    thisPriority = (thisPriority >> 1) & 0x7fffffff;
+    thatLsb = thatPriority & 1;
+    thatPriority = (thatPriority >> 1) & 0x7fffffff;
+  }
+
+  difference = thisPriority - thatPriority;
+  if (difference != 0) {
+    return difference;
+  }
+
+  // if all of the higher bits are the same, check the
+  // difference of the LSB
+  difference = thisLsb - thatLsb;
+  if (difference != 0) {
+    return difference;
+  }
+
+  // Check depth
+  const int thisDepth = this->GetDepth();
+  const int thatDepth = activation->GetDepth();
+  difference = thisDepth - thatDepth;
+  return difference;
+}
+
+QString HandlerActivation::GetCommandId() const
+{
+  return commandId;
+}
+
+int HandlerActivation::GetDepth() const
+{
+  return depth;
+}
+
+SmartPointer<IHandler> HandlerActivation::GetHandler() const
+{
+  return handler;
+}
+
+IHandlerService* HandlerActivation::GetHandlerService() const
+{
+  return handlerService;
+}
+
+QString HandlerActivation::ToString() const
+{
+  QString str;
+  QDebug buffer(&str);
+
+  const Expression::Pointer exp = GetExpression();
+  buffer << "HandlerActivation(commandId=" << commandId << ',';
+  buffer << "\thandler=" << (handler.IsNull() ? QString("") : handler->ToString()) << ',';
+  buffer << "\texpression=" << (exp.IsNull() ? QString("") : exp->ToString())
+         << ",sourcePriority=" << GetSourcePriority() << ')';
+
+  return str;
+}
+
+SmartPointer<IEvaluationReference> HandlerActivation::GetReference()
+{
+  return reference;
+}
+
+void HandlerActivation::SetReference(const SmartPointer<IEvaluationReference>& reference)
+{
+  this->reference = reference;
+}
+
+void HandlerActivation::SetListener(IPropertyChangeListener* listener)
+{
+  this->listener.reset(listener);
+}
+
+IPropertyChangeListener* HandlerActivation::GetListener() const
+{
+  return listener.data();
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerActivation.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerActivation.h
new file mode 100644
index 0000000000..8ad6247ac5
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerActivation.h
@@ -0,0 +1,158 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYHANDLERACTIVATION_H
+#define BERRYHANDLERACTIVATION_H
+
+#include "berryIHandlerActivation.h"
+#include "berryEvaluationResultCache.h"
+#include "berryIEvaluationReference.h"
+#include "berryIPropertyChangeListener.h"
+
+namespace berry {
+
+struct IEvaluationReference;
+struct IPropertyChangeListener;
+
+/**
+ * <p>
+ * A token representing the activation of a handler. This token can later be
+ * used to cancel that activation. Without this token, then handler will only
+ * become inactive if the component in which the handler was activated is
+ * destroyed.
+ * </p>
+ * <p>
+ * This caches the command id and the handler, so that they can later be
+ * identified.
+ * </p>
+ * <p>
+ * <b>Note:</b> this class has a natural ordering that is inconsistent with
+ * equals.
+ * </p>
+ */
+class HandlerActivation : public EvaluationResultCache, public IHandlerActivation
+{
+
+public:
+
+  berryObjectMacro(berry::HandlerActivation)
+
+private:
+
+  /**
+   * The identifier for the command which the activated handler handles. This
+   * value is never <code>null</code>.
+   */
+  const QString commandId;
+
+  /**
+   * The depth of services at which this token was created. This is used as a
+   * final tie-breaker if all other things are equivalent.
+   */
+  const int depth;
+
+  /**
+   * The handler that has been activated. This value may be <code>null</code>.
+   */
+  SmartPointer<IHandler> handler;
+
+  /**
+   * The handler service from which this handler activation was request. This
+   * value is never <code>null</code>.
+   */
+  IHandlerService* handlerService;
+
+  SmartPointer<IEvaluationReference> reference;
+
+  QScopedPointer<IPropertyChangeListener> listener;
+
+public:
+
+  /**
+   * Constructs a new instance of <code>HandlerActivation</code>.
+   *
+   * @param commandId
+   *            The identifier for the command which the activated handler
+   *            handles. This value must not be <code>null</code>.
+   * @param handler `
+   *            The handler that has been activated. This value may be
+   *            <code>null</code>.
+   * @param expression
+   *            The expression that must evaluate to <code>true</code>
+   *            before this handler is active. This value may be
+   *            <code>null</code> if it is always active.</code>.
+   * @param depth
+   *            The depth at which this activation was created within the
+   *            services hierarchy. This is used as the final tie-breaker if
+   *            all other conditions are equal. This should be a positive
+   *            integer.
+   * @param handlerService
+   *            The handler service from which the handler activation was
+   *            requested; must not be <code>null</code>.
+   * @see ISources
+   */
+  HandlerActivation(const QString& commandId, const SmartPointer<IHandler>& handler,
+                    const SmartPointer<Expression>& expression, int depth,
+                    IHandlerService* handlerService);
+
+  void ClearActive();
+
+  /**
+   * Implement {@link Object#operator<(const Object*)}.
+   * <p>
+   * <b>Note:</b> this class has a natural ordering that is inconsistent with
+   * equals.
+   * </p>
+   */
+  bool operator<(const Object* object) const;
+
+  int CompareTo(const HandlerActivation* other) const;
+
+  QString GetCommandId() const;
+
+  int GetDepth() const;
+
+  SmartPointer<IHandler> GetHandler() const;
+
+  IHandlerService* GetHandlerService() const;
+
+  QString ToString() const;
+
+  /**
+   * @return Returns the reference.
+   */
+  SmartPointer<IEvaluationReference> GetReference();
+
+  /**
+   * @param reference
+   *            The reference to set.
+   */
+  void SetReference(const SmartPointer<IEvaluationReference>& reference);
+
+  /**
+   * @param listener The listener to set.
+   */
+  void SetListener(IPropertyChangeListener* listener);
+
+  /**
+   * @return Returns the listener.
+   */
+  IPropertyChangeListener* GetListener() const;
+};
+
+}
+
+#endif // BERRYHANDLERACTIVATION_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerAuthority.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerAuthority.cpp
new file mode 100644
index 0000000000..d6ef1d8b0f
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerAuthority.cpp
@@ -0,0 +1,509 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berryHandlerAuthority.h"
+
+#include "berryISources.h"
+#include "berryIServiceLocator.h"
+#include "berryIEvaluationService.h"
+#include "berryIEvaluationContext.h"
+#include "berryIEvaluationReference.h"
+#include "berryICommandService.h"
+#include "berryIHandler.h"
+#include "berryISourceProvider.h"
+#include "services/berryISourceProviderService.h"
+
+#include "berryObjects.h"
+#include "berryHandlerActivation.h"
+#include "berryMultiStatus.h"
+#include "berryPlatformUI.h"
+#include "berryWorkbenchPlugin.h"
+#include "berryCommandTracing.h"
+#include "berryCommand.h"
+#include "berryEvaluationContext.h"
+#include "berryExpression.h"
+
+#include <QTime>
+
+namespace berry {
+
+const bool HandlerAuthority::DEBUG = false; // = Policy.DEBUG_HANDLERS;
+const bool HandlerAuthority::DEBUG_PERFORMANCE = false; // = Policy.DEBUG_HANDLERS_PERFORMANCE;
+const bool HandlerAuthority::DEBUG_VERBOSE = false; // = Policy.DEBUG_HANDLERS && Policy.DEBUG_HANDLERS_VERBOSE;
+const QString HandlerAuthority::DEBUG_VERBOSE_COMMAND_ID; // = Policy.DEBUG_HANDLERS_VERBOSE_COMMAND_ID;
+const QString HandlerAuthority::TRACING_COMPONENT = "HANDLERS";
+
+const QList<QString> HandlerAuthority::SELECTION_VARIABLES = QList<QString>()
+    << ISources::ACTIVE_CURRENT_SELECTION_NAME()
+    << ISources::ACTIVE_FOCUS_CONTROL_ID_NAME()
+    << ISources::ACTIVE_FOCUS_CONTROL_NAME()
+    << ISources::ACTIVE_MENU_EDITOR_INPUT_NAME()
+    << ISources::ACTIVE_MENU_NAME()
+    << ISources::ACTIVE_MENU_SELECTION_NAME();
+
+class HandlerAuthority::HandlerPropertyListener : public IPropertyChangeListener
+{
+private:
+
+  HandlerAuthority* authority;
+  HandlerActivation::Pointer handler;
+
+public:
+
+  HandlerPropertyListener(HandlerAuthority* authority, const HandlerActivation::Pointer& activation)
+    : authority(authority)
+    , handler(activation)
+  {
+    handler->SetListener(this);
+  }
+
+  using IPropertyChangeListener::PropertyChange;
+
+  void PropertyChange(const PropertyChangeEvent::Pointer& event)
+  {
+    if (handler->GetCommandId() == event->GetProperty())
+    {
+      bool val = false;
+      if (ObjectBool::Pointer boolObj = event->GetNewValue().Cast<ObjectBool>())
+      {
+        val = boolObj->GetValue();
+      }
+      handler->SetResult(val);
+      authority->changedCommandIds.insert(handler->GetCommandId());
+    }
+  }
+};
+
+IEvaluationService* HandlerAuthority::GetEvaluationService() const
+{
+  if (evalService == NULL)
+  {
+    evalService = locator->GetService<IEvaluationService>();
+    evalService->AddServiceListener(GetServiceListener());
+  }
+  return evalService;
+}
+
+IPropertyChangeListener* HandlerAuthority::GetServiceListener() const
+{
+  return const_cast<HandlerAuthority*>(this);
+}
+
+void HandlerAuthority::PropertyChange(const PropertyChangeEvent::Pointer& event)
+{
+  if (IEvaluationService::PROP_NOTIFYING == event->GetProperty())
+  {
+    if (ObjectBool::Pointer boolObj = event->GetNewValue().Cast<ObjectBool>())
+    {
+      bool startNotifying = boolObj->GetValue();
+      if (startNotifying)
+      {
+        changedCommandIds.clear();
+      }
+      else
+      {
+        ProcessChangedCommands();
+      }
+    }
+  }
+}
+
+HandlerAuthority::HandlerAuthority(ICommandService* commandService,
+                 IServiceLocator* locator)
+  : commandService(commandService)
+  , locator(locator)
+  , evalService(NULL)
+{
+  if (commandService == NULL)
+  {
+    throw ctkInvalidArgumentException("The handler authority needs a command service");
+  }
+}
+
+HandlerAuthority::~HandlerAuthority()
+{
+  GetEvaluationService()->RemoveServiceListener(GetServiceListener());
+}
+
+void HandlerAuthority::ActivateHandler(const SmartPointer<IHandlerActivation>& activation)
+{
+  const HandlerActivation::Pointer handler = activation.Cast<HandlerActivation>();
+
+  // First we update the handlerActivationsByCommandId map.
+  const QString commandId = handler->GetCommandId();
+  MultiStatus::Pointer conflicts(
+        new MultiStatus(PlatformUI::PLUGIN_ID(), 0,
+                        "A handler conflict occurred. This may disable some commands.",
+                        BERRY_STATUS_LOC)
+        );
+  IdToHandlerActivationMap::mapped_type& handlerActivations = handlerActivationsByCommandId[commandId];
+  handlerActivations.insert(handler, Empty());
+  if (handler->GetExpression().IsNotNull())
+  {
+    HandlerPropertyListener* l = new HandlerPropertyListener(this, handler);
+    handler->SetReference(GetEvaluationService()->AddEvaluationListener(
+                            handler->GetExpression(), l,
+                            handler->GetCommandId()));
+  }
+  if (handlerActivations.size() > 1)
+  {
+    UpdateCommand(commandId, ResolveConflicts(commandId, handlerActivations, conflicts));
+  }
+  else
+  {
+    UpdateCommand(commandId, (Evaluate(handler) ? handler : HandlerActivation::Pointer(0)));
+  }
+
+  if (conflicts->GetSeverity() != IStatus::OK_TYPE)
+  {
+    WorkbenchPlugin::Log(conflicts);
+  }
+}
+
+void HandlerAuthority::DeactivateHandler(const SmartPointer<IHandlerActivation>& activation)
+{
+  const HandlerActivation::Pointer handler = activation.Cast<HandlerActivation>();
+
+  // First we update the handlerActivationsByCommandId map.
+  const QString commandId = handler->GetCommandId();
+  MultiStatus::Pointer conflicts(
+        new MultiStatus("org.blueberry.ui", 0, "A handler conflict occurred.  This may disable some commands.", BERRY_STATUS_LOC));
+  IdToHandlerActivationMap::iterator value = handlerActivationsByCommandId.find(commandId);
+  if (value != handlerActivationsByCommandId.end())
+  {
+    IdToHandlerActivationMap::mapped_type& handlerActivations = value.value();
+    if (handlerActivations.remove(handler) > 0)
+    {
+      if (handler->GetReference().IsNotNull())
+      {
+        GetEvaluationService()->RemoveEvaluationListener(handler->GetReference());
+        handler->SetReference(IEvaluationReference::Pointer(0));
+        handler->SetListener(NULL);
+      }
+      if (handlerActivations.isEmpty())
+      {
+        handlerActivationsByCommandId.remove(commandId);
+        UpdateCommand(commandId, IHandlerActivation::Pointer(0));
+      }
+      else if (handlerActivations.size() == 1)
+      {
+        IHandlerActivation::Pointer remainingActivation = handlerActivations.begin().key();
+        UpdateCommand(commandId, (Evaluate(remainingActivation) ? remainingActivation : IHandlerActivation::Pointer(0)));
+      }
+      else
+      {
+        UpdateCommand(commandId, ResolveConflicts(commandId, handlerActivations, conflicts));
+      }
+    }
+  }
+
+  if (conflicts->GetSeverity() != IStatus::OK_TYPE)
+  {
+    WorkbenchPlugin::Log(conflicts);
+  }
+}
+
+SmartPointer<IHandlerActivation> HandlerAuthority::ResolveConflicts(
+    const QString& commandId,
+    const QMap<SmartPointer<HandlerActivation>,Empty>& activations,
+    SmartPointer<MultiStatus> conflicts)
+{
+  // If we don't have any, then there is no match.
+  if (activations.isEmpty())
+  {
+    return IHandlerActivation::Pointer(0);
+  }
+
+  // Cycle over the activations, remembered the current best.
+  QMapIterator<HandlerActivation::Pointer,Empty> activationItr(activations);
+  HandlerActivation::Pointer bestActivation;
+  HandlerActivation::Pointer currentActivation;
+  bool conflict = false;
+  while (activationItr.hasNext())
+  {
+    currentActivation = activationItr.next().key();
+    if (!Evaluate(currentActivation))
+    {
+      continue; // only consider potentially active handlers
+    }
+
+    // Check to see if we haven't found a potentially active handler yet
+    if ((DEBUG_VERBOSE) && ((DEBUG_VERBOSE_COMMAND_ID.isNull()) ||
+                            (DEBUG_VERBOSE_COMMAND_ID == commandId)))
+    {
+      CommandTracing::PrintTrace(TRACING_COMPONENT,
+                                 "    resolveConflicts: eval: " + currentActivation->ToString());
+    }
+    if (bestActivation.IsNull())
+    {
+      bestActivation = currentActivation;
+      conflict = false;
+      continue;
+    }
+
+    // Compare the two handlers.
+    int comparison = bestActivation->CompareTo(currentActivation.GetPointer());
+    if (comparison < 0)
+    {
+      bestActivation = currentActivation;
+      conflict = false;
+    }
+    else if (comparison == 0)
+    {
+      if (currentActivation->GetHandler() != bestActivation->GetHandler())
+      {
+        conflict = true;
+        break;
+      }
+    }
+    else
+    {
+      break;
+    }
+  }
+
+  // If we are logging information, now is the time to do it.
+  if (DEBUG)
+  {
+    if (conflict)
+    {
+      CommandTracing::PrintTrace(TRACING_COMPONENT,
+                                 "Unresolved conflict detected for '" + commandId + '\'');
+    }
+    else if ((bestActivation.IsNotNull()) && (DEBUG_VERBOSE) &&
+             ((DEBUG_VERBOSE_COMMAND_ID.isNull()) || (DEBUG_VERBOSE_COMMAND_ID == commandId)))
+    {
+      CommandTracing::PrintTrace(TRACING_COMPONENT,
+                                 "Resolved conflict detected.  The following activation won: ");
+      CommandTracing::PrintTrace(TRACING_COMPONENT, "    " + bestActivation->ToString());
+    }
+  }
+
+  // Return the current best.
+  if (conflict)
+  {
+    if (!previousLogs.contains(commandId))
+    {
+      previousLogs.insert(commandId);
+      QString str;
+      QDebug dbg(&str);
+      dbg << "Conflict for" << commandId << ":";
+      dbg << bestActivation->ToString();
+      dbg << currentActivation->ToString();
+
+      IStatus::Pointer s(new Status(IStatus::WARNING_TYPE, "org.blueberry.ui", str, BERRY_STATUS_LOC));
+      conflicts->Add(s);
+    }
+    return IHandlerActivation::Pointer(0);
+  }
+  return bestActivation;
+}
+
+void HandlerAuthority::UpdateCommand(const QString& commandId,
+                   const SmartPointer<IHandlerActivation>& activation)
+{
+  const Command::Pointer command = commandService->GetCommand(commandId);
+  if (activation.IsNull())
+  {
+    command->SetHandler(IHandler::Pointer(0));
+  }
+  else
+  {
+    command->SetHandler(activation->GetHandler());
+    commandService->RefreshElements(commandId,  QHash<QString, Object::Pointer>());
+  }
+}
+
+SmartPointer<IHandler> HandlerAuthority::FindHandler(const QString& commandId,
+                                                     IEvaluationContext* context)
+{
+  IdToHandlerActivationMap::mapped_type activations = handlerActivationsByCommandId.value(commandId);
+
+  IHandlerActivation::Pointer lastActivation;
+  IHandlerActivation::Pointer currentActivation;
+  QMapIterator<HandlerActivation::Pointer,Empty> i(activations);
+  while (i.hasNext() && lastActivation.IsNull())
+  {
+    HandlerActivation::Pointer activation = i.next().key();
+    try
+    {
+      if (Eval(context, activation))
+      {
+        lastActivation = currentActivation;
+        currentActivation = activation;
+      }
+    }
+    catch (const CoreException&)
+    {
+      // OK, this one is out of the running
+    }
+  }
+  if (currentActivation.IsNotNull())
+  {
+    if (lastActivation.IsNull())
+    {
+      return currentActivation->GetHandler();
+    }
+    if (lastActivation->GetSourcePriority() != currentActivation->GetSourcePriority())
+    {
+      return lastActivation->GetHandler();
+    }
+  }
+
+  return IHandler::Pointer(0);
+}
+
+IEvaluationContext::Pointer HandlerAuthority::CreateContextSnapshot(bool includeSelection)
+{
+  IEvaluationContext::Pointer tmpContext = GetCurrentState();
+
+  EvaluationContext::Pointer context;
+  if (includeSelection)
+  {
+    context = new EvaluationContext(NULL, tmpContext->GetDefaultVariable());
+    for (int i = 0; i < SELECTION_VARIABLES.size(); i++)
+    {
+      CopyVariable(context.GetPointer(), tmpContext.GetPointer(), SELECTION_VARIABLES[i]);
+    }
+  }
+  else
+  {
+    context = new EvaluationContext(NULL, Object::Pointer(0));
+  }
+
+  ISourceProviderService* sp = locator->GetService<ISourceProviderService>();
+  QList<ISourceProvider::Pointer> providers = sp->GetSourceProviders();
+  for (int i = 0; i < providers.size(); i++)
+  {
+    QList<QString> names = providers[i]->GetProvidedSourceNames();
+    for (int j = 0; j < names.size(); j++)
+    {
+      if (!IsSelectionVariable(names[j]))
+      {
+        CopyVariable(context.GetPointer(), tmpContext.GetPointer(), names[j]);
+      }
+    }
+  }
+
+  return context;
+}
+
+bool HandlerAuthority::Eval(IEvaluationContext* context,
+                            const SmartPointer<IHandlerActivation>& activation)
+{
+  Expression::Pointer expression = activation->GetExpression();
+  if (expression.IsNull())
+  {
+    return true;
+  }
+  return expression->Evaluate(context) == EvaluationResult::TRUE_EVAL;
+}
+
+bool HandlerAuthority::IsSelectionVariable(const QString& name)
+{
+  for (int i = 0; i < SELECTION_VARIABLES.size(); i++)
+  {
+    if (SELECTION_VARIABLES[i] == name)
+    {
+      return true;
+    }
+  }
+  return false;
+}
+
+void HandlerAuthority::CopyVariable(IEvaluationContext* context,
+                  IEvaluationContext* tmpContext, const QString& var)
+{
+  Object::ConstPointer o = tmpContext->GetVariable(var);
+  if (o.IsNotNull())
+  {
+    context->AddVariable(var, o);
+  }
+}
+
+void HandlerAuthority::ProcessChangedCommands()
+{
+  // If tracing, then track how long it takes to process the activations.
+  QTime startTime;
+  if (DEBUG_PERFORMANCE)
+  {
+    startTime.start();
+  }
+
+  MultiStatus::Pointer conflicts(
+        new MultiStatus("org.blueberry.ui", 0,
+                        "A handler conflict occurred.  This may disable some commands.", BERRY_STATUS_LOC));
+
+  /*
+   * For every command identifier with a changed activation, we resolve
+   * conflicts and trigger an update.
+   */
+  const QSet<QString> changedIds = changedCommandIds;
+  changedCommandIds.clear();
+  foreach(const QString& commandId, changedIds)
+  {
+    IdToHandlerActivationMap::mapped_type activations = handlerActivationsByCommandId.value(commandId);
+    if (activations.size() == 1)
+    {
+      const IHandlerActivation::Pointer activation = activations.begin().key();
+      UpdateCommand(commandId, (Evaluate(activation) ? activation : IHandlerActivation::Pointer(0)));
+    }
+    else
+    {
+      const IHandlerActivation::Pointer activation = ResolveConflicts(
+            commandId, activations, conflicts);
+      UpdateCommand(commandId, activation);
+    }
+  }
+  if (conflicts->GetSeverity() != IStatus::OK_TYPE)
+  {
+    WorkbenchPlugin::Log(conflicts);
+  }
+
+  // If tracing performance, then print the results.
+  if (DEBUG_PERFORMANCE)
+  {
+    const int elapsedTime = startTime.elapsed();
+    const int size = changedCommandIds.size();
+    if (size > 0)
+    {
+      CommandTracing::PrintTrace(TRACING_COMPONENT, QString::number(size) + " command ids changed in " + elapsedTime + "ms");
+    }
+  }
+}
+
+bool HandlerAuthority::Evaluate(const SmartPointer<IEvaluationResultCache>& expression)
+{
+  IEvaluationContext::Pointer contextWithDefaultVariable = GetCurrentState();
+  return expression->Evaluate(contextWithDefaultVariable.GetPointer());
+}
+
+SmartPointer<IEvaluationContext> HandlerAuthority::GetCurrentState() const
+{
+  return GetEvaluationService()->GetCurrentState();
+}
+
+//void HandlerAuthority::UpdateShellKludge()
+//{
+//  ((EvaluationService) getEvaluationService()).updateShellKludge();
+//}
+
+//void HandlerAuthority::UpdateShellKludge(const SmartPointer<Shell>& shell)
+//{
+//  ((EvaluationService) getEvaluationService()).updateShellKludge(shell);
+//}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerAuthority.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerAuthority.h
new file mode 100644
index 0000000000..a9adfa245e
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerAuthority.h
@@ -0,0 +1,254 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYHANDLERAUTHORITY_H
+#define BERRYHANDLERAUTHORITY_H
+
+#include "berryIPropertyChangeListener.h"
+
+#include <QMap>
+#include <QHash>
+
+namespace berry {
+
+template<class T> class SmartPointer;
+
+struct ICommandService;
+struct IEvaluationContext;
+struct IEvaluationResultCache;
+struct IEvaluationService;
+struct IHandler;
+struct IHandlerActivation;
+struct IServiceLocator;
+
+class HandlerActivation;
+class MultiStatus;
+class Shell;
+
+/**
+ * <p>
+ * A central authority for resolving conflicts between handlers. This authority
+ * listens to a variety of incoming sources, and updates the underlying commands
+ * if changes in the active handlers occur.
+ * </p>
+ * <p>
+ * This authority encapsulates all of the handler conflict resolution mechanisms
+ * for the workbench. A conflict occurs if two or more handlers are assigned to
+ * the same command identifier. To resolve this conflict, the authority
+ * considers which source the handler came from.
+ * </p>
+ */
+class HandlerAuthority : private IPropertyChangeListener
+{
+
+private:
+
+  /**
+   * Whether the workbench command support should kick into debugging mode.
+   * This causes the unresolvable handler conflicts to be printed to the
+   * console.
+   */
+  static const bool DEBUG; // = Policy.DEBUG_HANDLERS;
+
+  /**
+   * Whether the performance information should be printed about the
+   * performance of the handler authority.
+   */
+  static const bool DEBUG_PERFORMANCE; // = Policy.DEBUG_HANDLERS_PERFORMANCE;
+
+  /**
+   * Whether the workbench command support should kick into verbose debugging
+   * mode. This causes the resolvable handler conflicts to be printed to the
+   * console.
+   */
+  static const bool DEBUG_VERBOSE; // = Policy.DEBUG_HANDLERS && Policy.DEBUG_HANDLERS_VERBOSE;
+
+  /**
+   * The command identifier to which the verbose output should be restricted.
+   */
+  static const QString DEBUG_VERBOSE_COMMAND_ID; // = Policy.DEBUG_HANDLERS_VERBOSE_COMMAND_ID;
+
+  /**
+   * The component name to print when displaying tracing information.
+   */
+  static const QString TRACING_COMPONENT; // = "HANDLERS";
+
+  static const QList<QString> SELECTION_VARIABLES;
+
+  /**
+   * The command service that should be updated when the handlers are
+   * changing. This value is never <code>null</code>.
+   */
+  ICommandService* const commandService;
+
+  struct Empty {};
+  typedef QHash<QString, QMap<SmartPointer<HandlerActivation>, Empty> > IdToHandlerActivationMap;
+  /**
+   * This is a map of handler activations (<code>SortedSet</code> of
+   * <code>IHandlerActivation</code>) sorted by command identifier (<code>String</code>).
+   * If there is only one handler activation for a command, then the
+   * <code>SortedSet</code> is replaced by a <code>IHandlerActivation</code>.
+   * If there is no activation, the entry should be removed entirely.
+   */
+  IdToHandlerActivationMap handlerActivationsByCommandId;
+
+  QSet<QString> previousLogs;
+
+  IServiceLocator* locator;
+
+  QSet<QString> changedCommandIds;
+
+  mutable IEvaluationService* evalService;
+
+  IEvaluationService* GetEvaluationService() const;
+
+  IPropertyChangeListener* GetServiceListener() const;
+
+public:
+
+  /**
+   * Constructs a new instance of <code>HandlerAuthority</code>.
+   *
+   * @param commandService
+   *            The command service from which commands can be retrieved (to
+   *            update their handlers); must not be <code>null</code>.
+   * @param locator
+   *            the appropriate service locator
+   */
+  HandlerAuthority(ICommandService* commandService,
+                   IServiceLocator* locator);
+
+  ~HandlerAuthority();
+
+  /**
+   * Activates a handler on the workbench. This will add it to a master list.
+   * If conflicts exist, they will be resolved based on the source priority.
+   * If conflicts still exist, then no handler becomes active.
+   *
+   * @param activation
+   *            The activation; must not be <code>null</code>.
+   */
+  void ActivateHandler(const SmartPointer<IHandlerActivation>& activation);
+
+  /**
+   * Removes an activation for a handler on the workbench. This will remove it
+   * from the master list, and update the appropriate command, if necessary.
+   *
+   * @param activation
+   *            The activation; must not be <code>null</code>.
+   */
+  void DeactivateHandler(const SmartPointer<IHandlerActivation>& activation);
+
+private:
+
+  /**
+   * Resolves conflicts between multiple handlers for the same command
+   * identifier. This tries to select the best activation based on the source
+   * priority. For the sake of comparison, activations with the same handler
+   * are considered equivalent (i.e., non-conflicting).
+   *
+   * @param commandId
+   *            The identifier of the command for which the conflicts should
+   *            be detected; must not be <code>null</code>. This is only
+   *            used for debugging purposes.
+   * @param activations
+   *            All of the possible handler activations for the given command
+   *            identifier; must not be <code>null</code>.
+   * @return The best matching handler activation. If none can be found (e.g.,
+   *         because of unresolvable conflicts), then this returns
+   *         <code>null</code>.
+   */
+  SmartPointer<IHandlerActivation> ResolveConflicts(
+      const QString& commandId,
+      const QMap<SmartPointer<HandlerActivation>,Empty>& activations,
+      SmartPointer<MultiStatus> conflicts);
+
+  /**
+   * Updates the command with the given handler activation.
+   *
+   * @param commandId
+   *            The identifier of the command which should be updated; must
+   *            not be <code>null</code>.
+   * @param activation
+   *            The activation to use; may be <code>null</code> if the
+   *            command should have a <code>null</code> handler.
+   */
+  void UpdateCommand(const QString& commandId,
+                     const SmartPointer<IHandlerActivation>& activation);
+
+public:
+
+  /**
+   * Currently this is a an internal method to help locate a handler.
+   * <p>
+   * DO NOT CALL THIS METHOD.
+   * </p>
+   *
+   * @param commandId
+   *            the command id to check
+   * @param context
+   *            the context to use for activations
+   */
+  SmartPointer<IHandler> FindHandler(const QString& commandId,
+                                     IEvaluationContext* context);
+
+  SmartPointer<IEvaluationContext> CreateContextSnapshot(bool includeSelection);
+
+private:
+
+  using IPropertyChangeListener::PropertyChange;
+  void PropertyChange(const SmartPointer<PropertyChangeEvent>& event);
+
+  /**
+   * Evaluate the expression for the handler and bypass the result cache.
+   * <p>
+   * DO NOT CALL THIS METHOD.
+   * </p>
+   *
+   * @param context
+   * @param activation
+   * @return <code>true</code> if the handler expression can evaluate to
+   *         true.
+   * @throws CoreException
+   */
+  bool Eval(IEvaluationContext* context,
+            const SmartPointer<IHandlerActivation>& activation);
+
+  bool IsSelectionVariable(const QString& name);
+
+  void CopyVariable(IEvaluationContext* context,
+                    IEvaluationContext* tmpContext, const QString& var);
+
+  class HandlerPropertyListener;
+
+  void ProcessChangedCommands();
+
+protected:
+
+  bool Evaluate(const SmartPointer<IEvaluationResultCache>& expression);
+
+public:
+
+  SmartPointer<IEvaluationContext> GetCurrentState() const;
+
+//  void UpdateShellKludge();
+
+//  void UpdateShellKludge(const SmartPointer<Shell>& shell);
+};
+
+}
+
+#endif // BERRYHANDLERAUTHORITY_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerPersistence.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerPersistence.cpp
new file mode 100644
index 0000000000..52cd7d25b4
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerPersistence.cpp
@@ -0,0 +1,240 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berryHandlerPersistence.h"
+
+#include "berryIExtension.h"
+#include "berryIExtensionRegistry.h"
+#include "berryIConfigurationElement.h"
+#include "berryIHandler.h"
+#include "berryIHandlerService.h"
+#include "berryIHandlerActivation.h"
+
+#include "berryHandlerProxy.h"
+#include "berryPlatform.h"
+#include "berryWorkbenchPlugin.h"
+#include "berryExpression.h"
+
+namespace berry {
+
+const int HandlerPersistence::INDEX_COMMAND_DEFINITIONS = 0;
+const int HandlerPersistence::INDEX_HANDLER_DEFINITIONS = 1;
+//const int HandlerPersistence::INDEX_HANDLER_SUBMISSIONS = 2;
+const int HandlerPersistence::INDEX_SIZE = 2;
+
+
+HandlerPersistence::HandlerPersistence(IHandlerService* handlerService,
+                                       IEvaluationService* evaluationService)
+  : handlerService(handlerService)
+  , evaluationService(evaluationService)
+{
+}
+
+HandlerPersistence::~HandlerPersistence()
+{
+  ClearActivations(handlerService);
+}
+
+bool HandlerPersistence::HandlersNeedUpdating(const QList<SmartPointer<IExtension> >& extensions)
+{
+  /*
+   * Handlers will need to be re-read (i.e., re-verified) if any of the
+   * handler extensions change (i.e., handlers, commands), or if any of
+   * the command extensions change (i.e., action definitions).
+   */
+  foreach(const IExtension::Pointer& extension, extensions)
+  {
+    QString xpId = extension->GetExtensionPointUniqueIdentifier();
+    if (xpId == EXTENSION_HANDLERS ||
+        xpId == EXTENSION_COMMANDS ||
+        xpId == EXTENSION_ACTION_DEFINITIONS)
+    {
+      return true;
+    }
+  }
+  return false;
+}
+
+void HandlerPersistence::ReRead()
+{
+  // Create the extension registry mementos.
+  IExtensionRegistry* const registry = Platform::GetExtensionRegistry();
+  QList<QList<IConfigurationElement::Pointer> > indexedConfigurationElements;
+  for (int i = 0; i < INDEX_SIZE; ++i)
+  {
+    indexedConfigurationElements.push_back(QList<IConfigurationElement::Pointer>());
+  }
+
+  // Sort the commands extension point based on element name.
+  QList<IConfigurationElement::Pointer> commandsExtensionPoint = registry
+      ->GetConfigurationElementsFor(EXTENSION_COMMANDS);
+  foreach (const IConfigurationElement::Pointer& configurationElement, commandsExtensionPoint)
+  {
+    const QString name = configurationElement->GetName();
+
+    /*// Check if it is a handler submission or a command definition.
+    if (TAG_HANDLER_SUBMISSION == name)
+    {
+      indexedConfigurationElements[INDEX_HANDLER_SUBMISSIONS].push_back(configurationElement);
+    }
+    else*/
+    if (TAG_COMMAND == name)
+    {
+      indexedConfigurationElements[INDEX_COMMAND_DEFINITIONS].push_back(configurationElement);
+    }
+  }
+
+  // Sort the handler extension point based on element name.
+  QList<IConfigurationElement::Pointer> handlersExtensionPoint = registry
+      ->GetConfigurationElementsFor(EXTENSION_HANDLERS);
+  foreach (const IConfigurationElement::Pointer& configurationElement, handlersExtensionPoint)
+  {
+    const QString name = configurationElement->GetName();
+
+    // Check if it is a handler submission or a command definition.
+    if (TAG_HANDLER == name)
+    {
+      indexedConfigurationElements[INDEX_HANDLER_DEFINITIONS].push_back(configurationElement);
+    }
+  }
+
+  ClearActivations(handlerService);
+  ReadDefaultHandlersFromRegistry(indexedConfigurationElements[INDEX_COMMAND_DEFINITIONS]);
+  //ReadHandlerSubmissionsFromRegistry(indexedConfigurationElements[INDEX_HANDLER_SUBMISSIONS]);
+  ReadHandlersFromRegistry(indexedConfigurationElements[INDEX_HANDLER_DEFINITIONS]);
+}
+
+bool HandlerPersistence::IsChangeImportant(const QList<SmartPointer<IExtension> >& /*extensions*/,
+                                           RegistryChangeType /*changeType*/)
+{
+  return false;
+}
+
+bool HandlerPersistence::IsChangeImportant(const QList<SmartPointer<IExtensionPoint> >& /*extensionPoints*/,
+                                           RegistryChangeType /*changeType*/)
+{
+  return false;
+}
+
+void HandlerPersistence::Read()
+{
+  RegistryPersistence::Read();
+  ReRead();
+}
+
+void HandlerPersistence::ClearActivations(IHandlerService* handlerService)
+{
+  handlerService->DeactivateHandlers(handlerActivations);
+  foreach (const IHandlerActivation::Pointer& activation, handlerActivations)
+  {
+    if (activation->GetHandler().IsNotNull())
+    {
+      try
+      {
+        activation->GetHandler()->Dispose();
+      }
+      catch (const ctkException& e)
+      {
+        WorkbenchPlugin::Log("Failed to dispose handler for " + activation->GetCommandId(), e);
+      }
+      catch (...)
+      {
+        WorkbenchPlugin::Log("Failed to dispose handler for " + activation->GetCommandId());
+      }
+    }
+  }
+  handlerActivations.clear();
+}
+
+void HandlerPersistence::ReadDefaultHandlersFromRegistry(
+    const QList<SmartPointer<IConfigurationElement> >& configurationElements)
+{
+  foreach (const IConfigurationElement::Pointer& configurationElement, configurationElements)
+  {
+    /*
+     * Read out the command identifier. This was already checked by
+     * <code>CommandPersistence</code>, so we'll just ignore any
+     * problems here.
+     */
+    const QString commandId = ReadOptional(configurationElement, ATT_ID);
+    if (commandId.isNull())
+    {
+      continue;
+    }
+
+    // Check to see if we have a default handler of any kind.
+    if (configurationElement->GetAttribute(ATT_DEFAULT_HANDLER).isNull() &&
+        configurationElement->GetChildren(TAG_DEFAULT_HANDLER).isEmpty())
+    {
+      continue;
+    }
+
+    IHandler::Pointer handler(new HandlerProxy(commandId, configurationElement, ATT_DEFAULT_HANDLER));
+    handlerActivations.push_back(handlerService->ActivateHandler(commandId, handler));
+  }
+}
+
+void HandlerPersistence::ReadHandlersFromRegistry(
+    const QList<SmartPointer<IConfigurationElement> >& configurationElements)
+{
+  QList<IStatus::Pointer> warningsToLog;
+
+  foreach (const IConfigurationElement::Pointer& configurationElement, configurationElements)
+  {
+    // Read out the command identifier.
+    const QString commandId = ReadRequired(configurationElement,
+                                           ATT_COMMAND_ID, warningsToLog, "Handlers need a command id");
+    if (commandId.isNull())
+    {
+      continue;
+    }
+
+    // Check to see if we have a handler class.
+    if (!CheckClass(configurationElement, warningsToLog,
+                    "Handlers need a class", commandId))
+    {
+      continue;
+    }
+
+    // Get the activeWhen and enabledWhen expressions.
+    const Expression::Pointer activeWhenExpression = ReadWhenElement(
+          configurationElement, TAG_ACTIVE_WHEN, commandId, warningsToLog);
+    if (activeWhenExpression == ERROR_EXPRESSION)
+    {
+      continue;
+    }
+    const Expression::Pointer enabledWhenExpression = ReadWhenElement(
+          configurationElement, TAG_ENABLED_WHEN, commandId, warningsToLog);
+    if (enabledWhenExpression == ERROR_EXPRESSION)
+    {
+      continue;
+    }
+
+    const IHandler::Pointer proxy(new HandlerProxy(commandId, configurationElement,
+                                                   ATT_CLASS, enabledWhenExpression, evaluationService));
+    handlerActivations.push_back(handlerService->ActivateHandler(commandId,
+                                                                 proxy, activeWhenExpression));
+
+    // Read out the help context identifier.
+    const QString helpContextId = ReadOptional(configurationElement, ATT_HELP_CONTEXT_ID);
+    handlerService->SetHelpContextId(proxy, helpContextId);
+  }
+
+  LogWarnings(warningsToLog,
+              "Warnings while parsing the handlers from the 'org.blueberry.ui.handlers' extension point.");
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerPersistence.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerPersistence.h
new file mode 100644
index 0000000000..3a5042e54f
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerPersistence.h
@@ -0,0 +1,162 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYHANDLERPERSISTENCE_H
+#define BERRYHANDLERPERSISTENCE_H
+
+#include "berryRegistryPersistence.h"
+
+namespace berry {
+
+struct IEvaluationService;
+struct IHandlerActivation;
+struct IHandlerService;
+
+/**
+ * <p>
+ * A static class for accessing the registry.
+ * </p>
+ */
+class HandlerPersistence : public RegistryPersistence
+{
+
+private:
+
+  /**
+   * The index of the command elements in the indexed array.
+   *
+   * @see HandlerPersistence#read()
+   */
+  static const int INDEX_COMMAND_DEFINITIONS; // = 0;
+
+  /**
+   * The index of the command elements in the indexed array.
+   *
+   * @see HandlerPersistence#read()
+   */
+  static const int INDEX_HANDLER_DEFINITIONS; // = 1;
+
+  /**
+   * The index of the handler submissions in the indexed array.
+   *
+   * @see HandlerPersistence#read()
+   */
+  //static const int INDEX_HANDLER_SUBMISSIONS; // = 2;
+
+  static const int INDEX_SIZE;
+
+  /**
+   * The handler activations that have come from the registry. This is used to
+   * flush the activations when the registry is re-read. This value is never
+   * <code>null</code>
+   */
+  QList<SmartPointer<IHandlerActivation> > handlerActivations;
+
+  /**
+   * The handler service with which this persistence class is associated. This
+   * value must not be <code>null</code>.
+   */
+  IHandlerService* const handlerService;
+
+  IEvaluationService* const evaluationService;
+
+public:
+
+  /**
+   * Constructs a new instance of <code>HandlerPersistence</code>.
+   *
+   * @param handlerService
+   *            The handler service with which the handlers should be
+   *            registered; must not be <code>null</code>.
+   * @param evaluationService
+   *            The evaluation service used by handler proxies with enabled
+   *            when expressions
+   */
+  HandlerPersistence(IHandlerService* handlerService,
+                     IEvaluationService* evaluationService);
+
+  ~HandlerPersistence();
+
+  bool HandlersNeedUpdating(const QList<SmartPointer<IExtension> >& extensions);
+
+  void ReRead();
+
+protected:
+
+  friend class HandlerService;
+
+  bool IsChangeImportant(const QList<SmartPointer<IExtension> >& extensions,
+                         RegistryChangeType changeType);
+
+  bool IsChangeImportant(const QList<SmartPointer<IExtensionPoint> >& extensionPoints,
+                         RegistryChangeType changeType);
+
+  /**
+   * Reads all of the handlers from the registry
+   *
+   * @param handlerService
+   *            The handler service which should be populated with the values
+   *            from the registry; must not be <code>null</code>.
+   */
+  void Read();
+
+private:
+
+  /**
+   * Deactivates all of the activations made by this class, and then clears
+   * the collection. This should be called before every read.
+   *
+   * @param handlerService
+   *            The service handling the activations; must not be
+   *            <code>null</code>.
+   */
+  void ClearActivations(IHandlerService* handlerService);
+
+  /**
+   * Reads the default handlers from an array of command elements from the
+   * commands extension point.
+   *
+   * @param configurationElements
+   *            The configuration elements in the commands extension point;
+   *            must not be <code>null</code>, but may be empty.
+   * @param configurationElementCount
+   *            The number of configuration elements that are really in the
+   *            array.
+   */
+  void ReadDefaultHandlersFromRegistry(
+      const QList<SmartPointer<IConfigurationElement> >& configurationElements);
+
+  /**
+   * Reads all of the handlers from the handlers extension point.
+   *
+   * @param configurationElements
+   *            The configuration elements in the commands extension point;
+   *            must not be <code>null</code>, but may be empty.
+   * @param configurationElementCount
+   *            The number of configuration elements that are really in the
+   *            array.
+   * @param handlerService
+   *            The handler service to which the handlers should be added;
+   *            must not be <code>null</code>.
+   */
+  void ReadHandlersFromRegistry(
+      const QList<SmartPointer<IConfigurationElement> >& configurationElements);
+
+};
+
+}
+
+#endif // BERRYHANDLERPERSISTENCE_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerProxy.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerProxy.cpp
new file mode 100644
index 0000000000..803238c9ab
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerProxy.cpp
@@ -0,0 +1,417 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berryHandlerProxy.h"
+
+#include "berryIConfigurationElement.h"
+#include "berryIEvaluationContext.h"
+#include "berryIEvaluationService.h"
+#include "berryICommandService.h"
+#include "berryIContributor.h"
+#include "berryIEvaluationReference.h"
+
+#include "berryEvaluationResult.h"
+#include "berryExpression.h"
+#include "berryCoreException.h"
+#include "berryCommandExceptions.h"
+#include "berryUtil.h"
+#include "berryShell.h"
+#include "berryObjects.h"
+#include "berryObjectString.h"
+#include "berryUIElement.h"
+#include "berryRadioState.h"
+#include "berryRegistryToggleState.h"
+#include "berryHandlerEvent.h"
+#include "berryPlatformUI.h"
+#include "berryBundleUtility.h"
+#include "berryWorkbenchRegistryConstants.h"
+#include "berryStatus.h"
+#include "berryWorkbenchPlugin.h"
+
+#include <QMessageBox>
+
+namespace berry {
+
+QHash<SmartPointer<IConfigurationElement>, HandlerProxy*> HandlerProxy::CEToProxyMap =
+    QHash<IConfigurationElement::Pointer, HandlerProxy*>();
+const QString HandlerProxy::PROP_ENABLED = "enabled";
+
+
+HandlerProxy::HandlerProxy(const QString commandId,
+                           const SmartPointer<IConfigurationElement>& configurationElement,
+                           const QString handlerAttributeName,
+                           const SmartPointer<Expression> enabledWhenExpression,
+                           IEvaluationService* evaluationService)
+  : configurationElement(configurationElement)
+  , enabledWhenExpression(enabledWhenExpression)
+  , handlerAttributeName(handlerAttributeName)
+  , evaluationService(evaluationService)
+  , proxyEnabled(false)
+  , commandId(commandId)
+  , loadException(NULL)
+{
+  if (configurationElement.IsNull())
+  {
+    throw ctkInvalidArgumentException(
+        "The configuration element backing a handler proxy cannot be null");
+  }
+
+  if (handlerAttributeName.isNull())
+  {
+    throw ctkInvalidArgumentException(
+        "The attribute containing the handler class must be known");
+  }
+
+  if (enabledWhenExpression.IsNotNull() && evaluationService == NULL)
+  {
+    throw ctkInvalidArgumentException(
+        "We must have a handler service and evaluation service to support the enabledWhen expression");
+  }
+
+  if (enabledWhenExpression.IsNotNull())
+  {
+    SetProxyEnabled(false);
+    RegisterEnablement();
+  }
+  else
+  {
+    SetProxyEnabled(true);
+  }
+
+  CEToProxyMap.insert(configurationElement, this);
+}
+
+void HandlerProxy::UpdateStaleCEs(const QList<SmartPointer<IConfigurationElement> >& replacements)
+{
+  foreach (const IConfigurationElement::Pointer& ce, replacements)
+  {
+    QHash<IConfigurationElement::Pointer, HandlerProxy*>::const_iterator i = CEToProxyMap.find(ce);
+    if (i != CEToProxyMap.end())
+    {
+      (*i)->configurationElement = ce;
+    }
+  }
+}
+
+void HandlerProxy::SetEnabled(const Object::Pointer& evaluationContext)
+{
+  IEvaluationContext* const context = dynamic_cast<IEvaluationContext*>(evaluationContext.GetPointer());
+  if (context == NULL)
+  {
+    return;
+  }
+  if (enabledWhenExpression.IsNotNull())
+  {
+    try
+    {
+      SetProxyEnabled(enabledWhenExpression->Evaluate(context) == EvaluationResult::TRUE_EVAL);
+    }
+    catch (const CoreException& /*e*/)
+    {
+      // TODO should we log this exception, or just treat it as
+      // a failure
+    }
+  }
+  if (IsOkToLoad() && LoadHandler())
+  {
+    handler->SetEnabled(evaluationContext);
+  }
+}
+
+void HandlerProxy::Dispose()
+{
+  if (handler.IsNotNull())
+  {
+    handler->RemoveHandlerListener(GetHandlerListener());
+    handler->Dispose();
+    handler = 0;
+  }
+  if (evaluationService)
+  {
+    evaluationService->RemoveEvaluationListener(enablementRef);
+  }
+  enablementRef = 0;
+  delete loadException;
+  loadException = NULL;
+}
+
+Object::Pointer HandlerProxy::Execute(const SmartPointer<const ExecutionEvent>& event)
+{
+  if (LoadHandler())
+  {
+    if (!IsEnabled())
+    {
+      Shell::Pointer shell = Util::GetShellToParentOn();
+      QWidget* parent = NULL;
+      if (shell.IsNotNull()) parent = shell->GetControl();
+      QMessageBox::information(parent, "Information", "The chosen operation is not enabled.");
+      return Object::Pointer(0);
+    }
+    return handler->Execute(event);
+  }
+
+  if(loadException != NULL)
+    throw ExecutionException("Exception occured when loading the handler", *loadException);
+
+  return Object::Pointer(0);
+}
+
+bool HandlerProxy::IsEnabled() const
+{
+  if (enabledWhenExpression.IsNotNull())
+  {
+    // proxyEnabled reflects the enabledWhen clause
+    if (!GetProxyEnabled())
+    {
+      return false;
+    }
+    if (IsOkToLoad() && LoadHandler())
+    {
+      return handler->IsEnabled();
+    }
+
+    return true;
+  }
+
+  /*
+   * There is no enabled when expression, so we just need to consult the
+   * handler.
+   */
+  if (IsOkToLoad() && LoadHandler())
+  {
+    return handler->IsEnabled();
+  }
+  return true;
+}
+
+bool HandlerProxy::IsHandled() const
+{
+  if (configurationElement.IsNotNull() && handler.IsNull())
+  {
+    return true;
+  }
+
+  if (IsOkToLoad() && LoadHandler())
+  {
+    return handler->IsHandled();
+  }
+
+  return false;
+}
+
+QString HandlerProxy::ToString() const
+{
+  if (handler.IsNull())
+  {
+    if (configurationElement.IsNotNull())
+    {
+      const QString configurationElementAttribute = GetConfigurationElementAttribute();
+      if (!configurationElementAttribute.isEmpty())
+      {
+        return configurationElementAttribute;
+      }
+    }
+    return "HandlerProxy()";
+  }
+
+  return handler->ToString();
+}
+
+void HandlerProxy::UpdateElement(UIElement* element, const QHash<QString, Object::Pointer>& parameters)
+{
+  if (checkedState.IsNotNull())
+  {
+    ObjectBool::Pointer value = checkedState->GetValue().Cast<ObjectBool>();
+    element->SetChecked(value->GetValue());
+  }
+  else if (radioState.IsNotNull())
+  {
+    ObjectString::Pointer value = radioState->GetValue().Cast<ObjectString>();
+    Object::Pointer parameter = parameters[RadioState::PARAMETER_ID];
+    element->SetChecked(value.IsNotNull() && parameter == value);
+  }
+  if (handler.IsNotNull())
+  {
+    if (IElementUpdater::Pointer updater = handler.Cast<IElementUpdater>())
+    {
+      updater->UpdateElement(element, parameters);
+    }
+  }
+}
+
+void HandlerProxy::HandleStateChange(const SmartPointer<State>& state, const Object::Pointer& oldValue)
+{
+  if (state->GetId() == RegistryToggleState::STATE_ID)
+  {
+    checkedState = state;
+    RefreshElements();
+  }
+  else if (state->GetId() == RadioState::STATE_ID)
+  {
+    radioState = state;
+    RefreshElements();
+  }
+  if (IStateListener* stateListener = dynamic_cast<IStateListener*>(handler.GetPointer()))
+  {
+    stateListener->HandleStateChange(state, oldValue);
+  }
+}
+
+SmartPointer<IConfigurationElement> HandlerProxy::GetConfigurationElement() const
+{
+  return configurationElement;
+}
+
+QString HandlerProxy::GetAttributeName() const
+{
+  return handlerAttributeName;
+}
+
+SmartPointer<IHandler> HandlerProxy::GetHandler() const
+{
+  return handler;
+}
+
+void HandlerProxy::RegisterEnablement()
+{
+  enablementRef = evaluationService->AddEvaluationListener(
+        enabledWhenExpression, GetEnablementListener(), PROP_ENABLED);
+}
+
+void HandlerProxy::SetProxyEnabled(bool enabled)
+{
+  proxyEnabled = enabled;
+}
+
+bool HandlerProxy::GetProxyEnabled() const
+{
+  return proxyEnabled;
+}
+
+IPropertyChangeListener* HandlerProxy::GetEnablementListener() const
+{
+  return const_cast<HandlerProxy*>(this);
+}
+
+void HandlerProxy::PropertyChange(const SmartPointer<PropertyChangeEvent>& event)
+{
+  if (event->GetProperty() == PROP_ENABLED)
+  {
+    SetProxyEnabled(event->GetNewValue().IsNull() ?
+                      false : event->GetNewValue().Cast<ObjectBool>()->GetValue());
+    HandlerEvent::Pointer event(new HandlerEvent(IHandler::Pointer(this), true, false));
+    FireHandlerChanged(event);
+  }
+}
+
+bool HandlerProxy::LoadHandler() const
+{
+  if (handler.IsNull())
+  {
+    HandlerProxy* self = const_cast<HandlerProxy*>(this);
+    // Load the handler.
+    try
+    {
+      if (configurationElement.IsNotNull())
+      {
+        handler = configurationElement->CreateExecutableExtension<IHandler>(handlerAttributeName);
+        if (handler.IsNotNull())
+        {
+          handler->AddHandlerListener(GetHandlerListener());
+          self->SetEnabled(evaluationService == NULL ? IEvaluationContext::Pointer(0) : evaluationService->GetCurrentState());
+          self->RefreshElements();
+          return true;
+        }
+        else
+        {
+          const QString message = "The proxied handler was the wrong class";
+          IStatus::Pointer status(
+                new Status(IStatus::ERROR_TYPE, PlatformUI::PLUGIN_ID(), 0, message, BERRY_STATUS_LOC));
+          WorkbenchPlugin::Log(message, status);
+          configurationElement = 0;
+          loadException = new ctkException("Class cast exception");
+        }
+      }
+    }
+    catch (const CoreException& e)
+    {
+      const QString message = "The proxied handler for '" + configurationElement->GetAttribute(handlerAttributeName)
+          + "' could not be loaded";
+      IStatus::Pointer status(
+            new Status(IStatus::ERROR_TYPE, PlatformUI::PLUGIN_ID(), 0, message, e, BERRY_STATUS_LOC));
+      WorkbenchPlugin::Log(message, status);
+      configurationElement = 0;
+      loadException = e.clone();
+    }
+    return false;
+  }
+
+  return true;
+}
+
+IHandlerListener* HandlerProxy::GetHandlerListener() const
+{
+  return const_cast<HandlerProxy*>(this);
+}
+
+void HandlerProxy::HandlerChanged(const SmartPointer<HandlerEvent>& handlerEvent)
+{
+  HandlerEvent::Pointer event(new HandlerEvent(IHandler::Pointer(this),
+                                               handlerEvent->IsEnabledChanged(),
+                                               handlerEvent->IsHandledChanged()));
+  FireHandlerChanged(event);
+}
+
+QString HandlerProxy::GetConfigurationElementAttribute() const
+{
+  const QString attribute = configurationElement->GetAttribute(handlerAttributeName);
+  if (attribute.isNull())
+  {
+    QList<IConfigurationElement::Pointer> children = configurationElement->GetChildren(handlerAttributeName);
+    foreach (const IConfigurationElement::Pointer& child, children)
+    {
+      const QString childAttribute = child->GetAttribute(WorkbenchRegistryConstants::ATT_CLASS);
+      if (!childAttribute.isNull())
+      {
+        return childAttribute;
+      }
+    }
+  }
+  return attribute;
+}
+
+bool HandlerProxy::IsOkToLoad() const
+{
+  if (configurationElement.IsNotNull() && handler.IsNull())
+  {
+    const QString bundleId = configurationElement->GetContributor()->GetName();
+    return BundleUtility::IsActive(bundleId);
+  }
+  return true;
+}
+
+void HandlerProxy::RefreshElements()
+{
+  if (commandId.isNull() || (!(handler.Cast<IElementUpdater>())
+      && (checkedState.IsNull() && radioState.IsNull())))
+  {
+    return;
+  }
+  ICommandService* cs = PlatformUI::GetWorkbench()->GetService<ICommandService>();
+  cs->RefreshElements(commandId, QHash<QString, Object::Pointer>());
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerProxy.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerProxy.h
new file mode 100644
index 0000000000..c7d1ed08ff
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerProxy.h
@@ -0,0 +1,231 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYHANDLERPROXY_H
+#define BERRYHANDLERPROXY_H
+
+#include "berryAbstractHandlerWithState.h"
+#include "berryIElementUpdater.h"
+#include "berryIHandlerListener.h"
+#include "berryIPropertyChangeListener.h"
+
+namespace berry {
+
+struct IConfigurationElement;
+struct IEvaluationReference;
+struct IEvaluationService;
+
+class Expression;
+
+/**
+ * <p>
+ * A proxy for a handler that has been defined in XML. This delays the class
+ * loading until the handler is really asked for information (besides the
+ * priority or the command identifier). Asking a proxy for anything but the
+ * attributes defined publicly in this class will cause the proxy to instantiate
+ * the proxied handler.
+ * </p>
+ */
+class HandlerProxy : public AbstractHandlerWithState, public IElementUpdater,
+    private IHandlerListener, private IPropertyChangeListener
+{
+
+public:
+
+  berryObjectMacro(berry::HandlerProxy)
+
+private:
+
+  static QHash<SmartPointer<IConfigurationElement>, HandlerProxy*> CEToProxyMap;
+
+  /**
+   *
+   */
+  static const QString PROP_ENABLED; // = "enabled";
+
+  /**
+   * The configuration element from which the handler can be created. This
+   * value will exist until the element is converted into a real class -- at
+   * which point this value will be set to <code>null</code>.
+   */
+  mutable SmartPointer<IConfigurationElement> configurationElement;
+
+  /**
+   * The <code>enabledWhen</code> expression for the handler. Only if this
+   * expression evaluates to <code>true</code> (or the value is
+   * <code>null</code>) should we consult the handler.
+   */
+  const SmartPointer<Expression> enabledWhenExpression;
+
+  /**
+   * The real handler. This value is <code>null</code> until the proxy is
+   * forced to load the real handler. At this point, the configuration element
+   * is converted, nulled out, and this handler gains a reference.
+   */
+  mutable SmartPointer<IHandler> handler;
+
+  /**
+   * The name of the configuration element attribute which contains the
+   * information necessary to instantiate the real handler.
+   */
+  const QString handlerAttributeName;
+
+  /**
+   * The evaluation service to use when evaluating
+   * <code>enabledWhenExpression</code>. This value may be
+   * <code>null</code> only if the <code>enabledWhenExpression</code> is
+   * <code>null</code>.
+   */
+  IEvaluationService* evaluationService;
+
+  SmartPointer<IEvaluationReference> enablementRef;
+
+  bool proxyEnabled;
+
+  QString commandId;
+
+  //
+  // state to support checked or radio commands.
+  SmartPointer<State> checkedState;
+
+  SmartPointer<State> radioState;
+
+  // Exception that occurs while loading the proxied handler class
+  mutable ctkException* loadException;
+
+public:
+
+  /**
+   * Constructs a new instance of <code>HandlerProxy</code> with all the
+   * information it needs to try to avoid loading until it is needed.
+   *
+   * @param commandId the id for this handler
+   * @param configurationElement
+   *            The configuration element from which the real class can be
+   *            loaded at run-time; must not be <code>null</code>.
+   * @param handlerAttributeName
+   *            The name of the attribute or element containing the handler
+   *            executable extension; must not be <code>null</code>.
+   * @param enabledWhenExpression
+   *            The name of the element containing the enabledWhen expression.
+   *            This should be a child of the
+   *            <code>configurationElement</code>. If this value is
+   *            <code>null</code>, then there is no enablement expression
+   *            (i.e., enablement will be delegated to the handler when
+   *            possible).
+   * @param evaluationService
+   *            The evaluation service to manage enabledWhen expressions
+   *            trying to evaluate the <code>enabledWhenExpression</code>.
+   *            This value may be <code>null</code> only if the
+   *            <code>enabledWhenExpression</code> is <code>null</code>.
+   */
+  HandlerProxy(const QString commandId,
+               const SmartPointer<IConfigurationElement>& configurationElement,
+               const QString handlerAttributeName,
+               const SmartPointer<Expression> enabledWhenExpression = SmartPointer<Expression>(),
+               IEvaluationService* evaluationService = NULL);
+
+  static void UpdateStaleCEs(const QList<SmartPointer<IConfigurationElement> >& replacements);
+
+  void SetEnabled(const Object::Pointer& evaluationContext);
+
+  /**
+   * Passes the dipose on to the proxied handler, if it has been loaded.
+   */
+  void Dispose();
+
+  Object::Pointer Execute(const SmartPointer<const ExecutionEvent>& event);
+
+  bool IsEnabled() const;
+
+  bool IsHandled() const;
+
+  QString ToString() const;
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see org.eclipse.ui.commands.IElementUpdater#updateElement(org.eclipse.ui.menus.UIElement,
+   *      java.util.Map)
+   */
+  void UpdateElement(UIElement* element, const QHash<QString, Object::Pointer>& parameters);
+
+  /* (non-Javadoc)
+   * @see org.eclipse.core.commands.IStateListener#handleStateChange(org.eclipse.core.commands.State, java.lang.Object)
+   */
+  void HandleStateChange(const SmartPointer<State>& state, const Object::Pointer& oldValue);
+
+  /**
+   * @return the config element for use with the PDE framework.
+   */
+  SmartPointer<IConfigurationElement> GetConfigurationElement() const;
+
+  QString GetAttributeName() const;
+
+  /**
+   * @return Returns the handler.
+   */
+  SmartPointer<IHandler> GetHandler() const;
+
+private:
+
+  /**
+   *
+   */
+  void RegisterEnablement();
+
+  void SetProxyEnabled(bool enabled);
+
+  bool GetProxyEnabled() const;
+
+  /**
+   * @return
+   */
+  IPropertyChangeListener* GetEnablementListener() const;
+
+  using IPropertyChangeListener::PropertyChange;
+  void PropertyChange(const SmartPointer<PropertyChangeEvent>& event);
+
+  /**
+   * Loads the handler, if possible. If the handler is loaded, then the member
+   * variables are updated accordingly.
+   *
+   * @return <code>true</code> if the handler is now non-null;
+   *         <code>false</code> otherwise.
+   */
+  bool LoadHandler() const;
+
+  IHandlerListener* GetHandlerListener() const;
+
+  void HandlerChanged(const SmartPointer<HandlerEvent>& handlerEvent);
+
+  /**
+   * Retrives the ConfigurationElement attribute according to the
+   * <code>handlerAttributeName</code>.
+   *
+   * @return the handlerAttributeName value, may be <code>null</code>.
+   */
+  QString GetConfigurationElementAttribute() const;
+
+  bool IsOkToLoad() const;
+
+  void RefreshElements();
+
+};
+
+}
+
+#endif // BERRYHANDLERPROXY_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerService.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerService.cpp
new file mode 100644
index 0000000000..8f114d12ba
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerService.cpp
@@ -0,0 +1,278 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berryHandlerService.h"
+
+#include "berryHandlerAuthority.h"
+#include "berryHandlerPersistence.h"
+#include "berryIHandler.h"
+#include "berryHandlerActivation.h"
+#include "berryExpression.h"
+#include "berryExecutionEvent.h"
+#include "berryParameterizedCommand.h"
+#include "berryICommandService.h"
+#include "berryUIElement.h"
+
+namespace berry {
+
+HandlerService::HandlerService(ICommandService* commandService,
+                               IEvaluationService* evaluationService,
+                               IServiceLocator* locator)
+  : commandService(commandService)
+  , handlerAuthority(new HandlerAuthority(commandService, locator))
+  , handlerPersistence(new HandlerPersistence(this, evaluationService))
+{
+  if (commandService == NULL)
+  {
+    throw ctkInvalidArgumentException("A handler service requires a command service");
+  }
+}
+
+SmartPointer<IHandlerActivation> HandlerService::ActivateHandler(
+    const SmartPointer<IHandlerActivation>& childActivation)
+{
+  const QString commandId = childActivation->GetCommandId();
+  const IHandler::Pointer handler = childActivation->GetHandler();
+  const Expression::Pointer expression = childActivation->GetExpression();
+  const int depth = childActivation->GetDepth() + 1;
+  const IHandlerActivation::Pointer localActivation(
+        new HandlerActivation(commandId, handler, expression, depth, this));
+  handlerAuthority->ActivateHandler(localActivation);
+  return localActivation;
+}
+
+SmartPointer<IHandlerActivation> HandlerService::ActivateHandler(const QString& commandId,
+                                                 const SmartPointer<IHandler>& handler)
+{
+  return ActivateHandler(commandId, handler, Expression::Pointer(0));
+}
+
+SmartPointer<IHandlerActivation> HandlerService::ActivateHandler(const QString& commandId,
+                                                 const SmartPointer<IHandler>& handler,
+                                                 const SmartPointer<Expression>& expression)
+{
+  return ActivateHandler(commandId, handler, expression, false);
+}
+
+SmartPointer<IHandlerActivation> HandlerService::ActivateHandler(const QString& commandId,
+                                                 const SmartPointer<IHandler>& handler,
+                                                 const SmartPointer<Expression>& expression,
+                                                 bool /*global*/)
+{
+  const IHandlerActivation::Pointer activation(
+        new HandlerActivation(commandId, handler, expression, IHandlerActivation::ROOT_DEPTH, this));
+  handlerAuthority->ActivateHandler(activation);
+  return activation;
+}
+
+void HandlerService::AddSourceProvider(const SmartPointer<ISourceProvider>& /*provider*/)
+{
+  // no-op
+}
+
+SmartPointer<const ExecutionEvent> HandlerService::CreateExecutionEvent(const SmartPointer<const Command>& command,
+                                                                  const SmartPointer<const UIElement>& trigger)
+{
+  ExecutionEvent::Pointer event(new ExecutionEvent(command, ExecutionEvent::ParameterMap(), trigger,
+                                                   Object::Pointer(GetCurrentState())));
+  return event;
+}
+
+SmartPointer<const ExecutionEvent> HandlerService::CreateExecutionEvent(
+    const SmartPointer<const ParameterizedCommand>& command,
+    const SmartPointer<const UIElement>& trigger)
+{
+  ExecutionEvent::Pointer event(
+        new ExecutionEvent(command->GetCommand(), command->GetParameterMap(), trigger,
+                           Object::Pointer(GetCurrentState())));
+  return event;
+}
+
+void HandlerService::DeactivateHandler(const SmartPointer<IHandlerActivation>& activation)
+{
+  if (activation->GetHandlerService() == this)
+  {
+    handlerAuthority->DeactivateHandler(activation);
+  }
+}
+
+void HandlerService::DeactivateHandlers(const QList<SmartPointer<IHandlerActivation> >& activations)
+{
+  foreach (const IHandlerActivation::Pointer activation, activations)
+  {
+    DeactivateHandler(activation);
+  }
+}
+
+void HandlerService::Dispose()
+{
+  handlerPersistence.reset();
+  handlerAuthority.reset();
+}
+
+Object::Pointer HandlerService::ExecuteCommand(const SmartPointer<ParameterizedCommand>& command,
+                                               const SmartPointer<const UIElement>& trigger)
+{
+  return command->ExecuteWithChecks(trigger, Object::Pointer(GetCurrentState()));
+}
+
+Object::Pointer HandlerService::ExecuteCommand(const QString& commandId,
+                                               const SmartPointer<const UIElement>& trigger)
+{
+  const Command::Pointer command = commandService->GetCommand(commandId);
+  const ExecutionEvent::Pointer event(
+        new ExecutionEvent(command, ExecutionEvent::ParameterMap(), trigger,
+                           Object::Pointer(GetCurrentState())));
+  return command->ExecuteWithChecks(event);
+}
+
+Object::Pointer HandlerService::ExecuteCommandInContext(const SmartPointer<ParameterizedCommand>& command,
+                                                        const SmartPointer<const UIElement>& trigger,
+                                                        const SmartPointer<IEvaluationContext>& context)
+{
+  IHandler::Pointer oldHandler = command->GetCommand()->GetHandler();
+
+  IHandler::Pointer handler = FindHandler(command->GetId(), context.GetPointer());
+  handler->SetEnabled(context);
+
+  struct RestoreHandlerState {
+    RestoreHandlerState(HandlerService* hs, ParameterizedCommand* cmd, IHandler* handler, IHandler* oldHandler)
+      : hs(hs), cmd(cmd), handler(handler), oldHandler(oldHandler) {}
+    ~RestoreHandlerState() {
+      cmd->GetCommand()->SetHandler(IHandler::Pointer(oldHandler));
+      handler->SetEnabled(hs->GetCurrentState());
+    }
+  private:
+    HandlerService* hs;
+    ParameterizedCommand* cmd;
+    IHandler* handler;
+    IHandler* oldHandler;
+  };
+
+  RestoreHandlerState restorer(this, command.GetPointer(), handler.GetPointer(), oldHandler.GetPointer());
+  command->GetCommand()->SetHandler(handler);
+  return command->ExecuteWithChecks(trigger, context);
+ }
+
+SmartPointer<IEvaluationContext> HandlerService::GetCurrentState() const
+{
+  return handlerAuthority->GetCurrentState();
+}
+
+void HandlerService::ReadRegistry()
+{
+  handlerPersistence->Read();
+}
+
+void HandlerService::RemoveSourceProvider(const SmartPointer<ISourceProvider>& /*provider*/)
+{
+  // this is a no-op
+}
+
+void HandlerService::SetHelpContextId(const SmartPointer<IHandler>& handler,
+                      const QString& helpContextId)
+{
+  commandService->SetHelpContextId(handler, helpContextId);
+}
+
+/*
+ * <p>
+ * Bug 95792. A mechanism by which the key binding architecture can force an
+ * update of the handlers (based on the active shell) before trying to
+ * execute a command. This mechanism is required for GTK+ only.
+ * </p>
+ * <p>
+ * DO NOT CALL THIS METHOD.
+ * </p>
+ */
+//  void UpdateShellKludge() {
+//    handlerAuthority.updateShellKludge();
+//  }
+
+/*
+ * <p>
+ * Bug 95792. A mechanism by which the key binding architecture can force an
+ * update of the handlers (based on the active shell) before trying to
+ * execute a command. This mechanism is required for GTK+ only.
+ * </p>
+ * <p>
+ * DO NOT CALL THIS METHOD.
+ * </p>
+ *
+ * @param shell
+ *            The shell that should be considered active; must not be
+ *            <code>null</code>.
+ */
+//  void UpdateShellKludge(const SmartPointer<Shell>& shell)
+//  {
+//    handlerAuthority.updateShellKludge(shell);
+//  }
+
+SmartPointer<IHandler> HandlerService::FindHandler(const QString& commandId,
+                                   IEvaluationContext* context)
+{
+  return handlerAuthority->FindHandler(commandId, context);
+}
+
+/*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.ui.handlers.IHandlerService#createContextSnapshot(boolean)
+ */
+SmartPointer<IEvaluationContext> HandlerService::CreateContextSnapshot(bool includeSelection)
+{
+  return handlerAuthority->CreateContextSnapshot(includeSelection);
+}
+
+Object::Pointer HandlerService::ExecuteCommandInContext(
+    const SmartPointer<ParameterizedCommand>& command,
+    const SmartPointer<const UIElement>& trigger,
+    IEvaluationContext* context)
+{
+  IHandler::Pointer oldHandler = command->GetCommand()->GetHandler();
+
+  IHandler::Pointer handler = FindHandler(command->GetId(), context);
+  handler->SetEnabled(Object::Pointer(context));
+
+  struct RestoreHandler {
+    RestoreHandler(HandlerService* hs, ParameterizedCommand* cmd, IHandler* handler, IHandler* oldHandler)
+      : hs(hs), cmd(cmd), handler(handler), oldHandler(oldHandler)
+    {}
+
+    ~RestoreHandler()
+    {
+      cmd->GetCommand()->SetHandler(IHandler::Pointer(oldHandler));
+      handler->SetEnabled(Object::Pointer(hs->GetCurrentState()));
+    }
+
+    HandlerService* const hs;
+    ParameterizedCommand* const cmd;
+    IHandler* const handler;
+    IHandler* const oldHandler;
+  };
+
+  RestoreHandler restorer(this, command.GetPointer(), handler.GetPointer(), oldHandler.GetPointer());
+  command->GetCommand()->SetHandler(handler);
+
+  return command->ExecuteWithChecks(trigger, Object::Pointer(context));
+}
+
+HandlerPersistence* HandlerService::GetHandlerPersistence()
+{
+  return handlerPersistence.data();
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerService.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerService.h
new file mode 100644
index 0000000000..41ed303673
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerService.h
@@ -0,0 +1,193 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYHANDLERSERVICE_H
+#define BERRYHANDLERSERVICE_H
+
+#include "berryIHandlerService.h"
+
+namespace berry {
+
+struct ICommandService;
+struct IEvaluationService;
+struct IServiceLocator;
+
+class HandlerAuthority;
+class HandlerPersistence;
+
+/**
+ * <p>
+ * Provides services related to activating and deactivating handlers within the
+ * workbench.
+ * </p>
+ */
+class HandlerService : public IHandlerService
+{
+
+private:
+
+  /**
+   * The command service for this handler service. This value is never
+   * <code>null</code>.
+   */
+  ICommandService* const commandService;
+
+  /**
+   * The central authority for determining which handler we should use.
+   */
+  QScopedPointer<HandlerAuthority> handlerAuthority;
+
+  /**
+   * The class providing persistence for this service.
+   */
+  QScopedPointer<HandlerPersistence> handlerPersistence;
+
+public:
+
+  /**
+   * Constructs a new instance of <code>CommandService</code> using a
+   * command manager.
+   *
+   * @param commandService
+   *            The command service to use; must not be <code>null</code>.
+   * @param evaluationService
+   *            The evaluation service to use; must not be <code>null</code>.
+   * @param locator
+   *            an appropriate service locator
+   */
+  HandlerService(ICommandService* commandService,
+                 IEvaluationService* evaluationService,
+                 IServiceLocator* locator);
+
+  SmartPointer<IHandlerActivation> ActivateHandler(
+      const SmartPointer<IHandlerActivation>& childActivation);
+
+  SmartPointer<IHandlerActivation> ActivateHandler(const QString& commandId,
+                                                   const SmartPointer<IHandler>& handler);
+
+  SmartPointer<IHandlerActivation> ActivateHandler(const QString& commandId,
+                                                   const SmartPointer<IHandler>& handler,
+                                                   const SmartPointer<Expression>& expression);
+
+  SmartPointer<IHandlerActivation> ActivateHandler(const QString& commandId,
+                                                   const SmartPointer<IHandler>& handler,
+                                                   const SmartPointer<Expression>& expression,
+                                                   bool global);
+
+  void AddSourceProvider(const SmartPointer<ISourceProvider>& provider);
+
+  SmartPointer<const ExecutionEvent> CreateExecutionEvent(const SmartPointer<const Command>& command,
+                                                    const SmartPointer<const UIElement>& trigger);
+
+  SmartPointer<const ExecutionEvent> CreateExecutionEvent(
+      const SmartPointer<const ParameterizedCommand>& command,
+      const SmartPointer<const UIElement>& trigger);
+
+  void DeactivateHandler(const SmartPointer<IHandlerActivation>& activation);
+
+  void DeactivateHandlers(const QList<SmartPointer<IHandlerActivation> >& activations);
+
+  void Dispose();
+
+  Object::Pointer ExecuteCommand(const SmartPointer<ParameterizedCommand>& command,
+                                 const SmartPointer<const UIElement>& trigger);
+
+  Object::Pointer ExecuteCommand(const QString& commandId,
+                                 const SmartPointer<const UIElement>& trigger);
+
+  Object::Pointer ExecuteCommandInContext(const SmartPointer<ParameterizedCommand>& command,
+                                          const SmartPointer<const UIElement>& trigger,
+                                          const SmartPointer<IEvaluationContext>& context);
+
+  SmartPointer<IEvaluationContext> GetCurrentState() const;
+
+  void ReadRegistry();
+
+  void RemoveSourceProvider(const SmartPointer<ISourceProvider>& provider);
+
+  void SetHelpContextId(const SmartPointer<IHandler>& handler,
+                        const QString& helpContextId);
+
+  /*
+   * <p>
+   * Bug 95792. A mechanism by which the key binding architecture can force an
+   * update of the handlers (based on the active shell) before trying to
+   * execute a command. This mechanism is required for GTK+ only.
+   * </p>
+   * <p>
+   * DO NOT CALL THIS METHOD.
+   * </p>
+   */
+//  void UpdateShellKludge() {
+//    handlerAuthority.updateShellKludge();
+//  }
+
+  /*
+   * <p>
+   * Bug 95792. A mechanism by which the key binding architecture can force an
+   * update of the handlers (based on the active shell) before trying to
+   * execute a command. This mechanism is required for GTK+ only.
+   * </p>
+   * <p>
+   * DO NOT CALL THIS METHOD.
+   * </p>
+   *
+   * @param shell
+   *            The shell that should be considered active; must not be
+   *            <code>null</code>.
+   */
+//  void UpdateShellKludge(const SmartPointer<Shell>& shell)
+//  {
+//    handlerAuthority.updateShellKludge(shell);
+//  }
+
+  /**
+   * Currently this is a an internal method to help locate a handler.
+   * <p>
+   * DO NOT CALL THIS METHOD.
+   * </p>
+   *
+   * @param commandId
+   *            the command id to check
+   * @param context
+   *            the context to use for activations
+   * @return the correct IHandler or <code>null</code>
+   * @since 3.3
+   */
+  SmartPointer<IHandler> FindHandler(const QString& commandId,
+                                     IEvaluationContext* context);
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see org.eclipse.ui.handlers.IHandlerService#createContextSnapshot(boolean)
+   */
+  SmartPointer<IEvaluationContext> CreateContextSnapshot(bool includeSelection);
+
+  Object::Pointer ExecuteCommandInContext(
+      const SmartPointer<ParameterizedCommand>& command,
+      const SmartPointer<const UIElement>& trigger,
+      IEvaluationContext* context);
+
+  /**
+   * @return Returns the handlerPersistence.
+   */
+  HandlerPersistence* GetHandlerPersistence();
+};
+
+}
+
+#endif // BERRYHANDLERSERVICE_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerServiceFactory.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerServiceFactory.cpp
new file mode 100644
index 0000000000..fb3b8eaa81
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerServiceFactory.cpp
@@ -0,0 +1,85 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berryHandlerServiceFactory.h"
+
+#include "berryIHandlerService.h"
+#include "berryIWorkbenchLocationService.h"
+#include "berryIWorkbench.h"
+#include "berryIWorkbenchWindow.h"
+#include "berryIWorkbenchPartSite.h"
+#include "berryICommandService.h"
+#include "berryIEvaluationService.h"
+
+#include "berryExpression.h"
+#include "berryHandlerService.h"
+#include "berryActivePartExpression.h"
+#include "berryWorkbenchWindowExpression.h"
+#include "berrySlaveHandlerService.h"
+#include "berryNestableHandlerService.h"
+
+namespace berry {
+
+Object* HandlerServiceFactory::Create(
+    const QString& serviceInterface, IServiceLocator* parentLocator,
+    IServiceLocator* locator) const
+{
+  if (serviceInterface != qobject_interface_iid<IHandlerService*>())
+  {
+    return NULL;
+  }
+
+  IWorkbenchLocationService* wls = locator->GetService<IWorkbenchLocationService>();
+  IWorkbench* const wb = wls->GetWorkbench();
+  if (wb == NULL)
+  {
+    return NULL;
+  }
+
+  Object* parent = parentLocator->GetService(serviceInterface);
+  if (parent == NULL)
+  {
+    ICommandService* commands = locator->GetService<ICommandService>();
+    IEvaluationService* evals = locator->GetService<IEvaluationService>();
+    HandlerService* handlerService = new HandlerService(commands, evals, locator);
+    handlerService->ReadRegistry();
+    return handlerService;
+  }
+
+  return NULL;
+
+  IWorkbenchWindow* const window = wls->GetWorkbenchWindow();
+  IWorkbenchPartSite* const site = wls->GetPartSite();
+  if (site == NULL)
+  {
+    Expression::Pointer exp(new WorkbenchWindowExpression(window));
+    return new SlaveHandlerService(dynamic_cast<IHandlerService*>(parent), exp);
+  }
+
+  if (SlaveHandlerService* slaveParent = dynamic_cast<SlaveHandlerService*>(parent))
+  {
+    Expression::Pointer parentExp = slaveParent->GetDefaultExpression();
+    if (parentExp.Cast<ActivePartExpression>())
+    {
+      return new NestableHandlerService(dynamic_cast<IHandlerService*>(parent), parentExp);
+    }
+  }
+
+  Expression::Pointer exp(new ActivePartExpression(site->GetPart().GetPointer()));
+  return new SlaveHandlerService(dynamic_cast<IHandlerService*>(parent), exp);
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtDnDTweaklet.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerServiceFactory.h
old mode 100755
new mode 100644
similarity index 57%
copy from BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtDnDTweaklet.h
copy to BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerServiceFactory.h
index 57589ad2f8..af96be2213
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtDnDTweaklet.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryHandlerServiceFactory.h
@@ -1,40 +1,37 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
+#ifndef BERRYHANDLERSERVICEFACTORY_H
+#define BERRYHANDLERSERVICEFACTORY_H
 
-#ifndef BERRYQTDNDTWEAKLET_H_
-#define BERRYQTDNDTWEAKLET_H_
-
-#include <berryDnDTweaklet.h>
+#include "berryIServiceFactory.h"
 
 namespace berry {
 
-class QtDnDTweaklet : public QObject, public DnDTweaklet
+class HandlerServiceFactory : public QObject, public IServiceFactory
 {
   Q_OBJECT
-  Q_INTERFACES(berry::DnDTweaklet)
+  Q_INTERFACES(berry::IServiceFactory)
 
 public:
 
-  QtDnDTweaklet();
-  QtDnDTweaklet(const QtDnDTweaklet& other);
-
-  ITracker* CreateTracker();
+  Object* Create(const QString& serviceInterface, IServiceLocator* parentLocator,
+                 IServiceLocator* locator) const;
 };
 
 }
 
-#endif /* BERRYQTDNDTWEAKLET_H_ */
+#endif // BERRYHANDLERSERVICEFACTORY_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryIDragOverListener.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryIDragOverListener.cpp
index a811c62bbd..2e79884de5 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryIDragOverListener.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryIDragOverListener.cpp
@@ -1,41 +1,41 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryIDragOverListener.h"
 
 namespace berry {
 
-void
-IDragOverListener::Events
-::AddListener(IDragOverListener::Pointer l)
+void IDragOverListener::Events::AddListener(IDragOverListener* l)
 {
-  if (l.IsNull()) return;
+  if (l == NULL) return;
 
-  drag += DragDelegate(l.GetPointer(), &IDragOverListener::Drag);
+  drag += DragDelegate(l, &IDragOverListener::Drag);
 
 }
 
-void
-IDragOverListener::Events
-::RemoveListener(IDragOverListener::Pointer l)
+void IDragOverListener::Events::RemoveListener(IDragOverListener* l)
 {
-  if (l.IsNull()) return;
+  if (l == NULL) return;
 
-  drag -= DragDelegate(l.GetPointer(), &IDragOverListener::Drag);
+  drag -= DragDelegate(l, &IDragOverListener::Drag);
 
 }
 
+IDragOverListener::~IDragOverListener()
+{
+}
+
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryIDragOverListener.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryIDragOverListener.h
index 9210699901..8ecc015846 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryIDragOverListener.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryIDragOverListener.h
@@ -1,67 +1,67 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIDRAGOVERLISTENER_H_
 #define BERRYIDRAGOVERLISTENER_H_
 
-#include <berryMacros.h>
 #include <berryMessage.h>
 
 #include "berryPoint.h"
 #include "berryRectangle.h"
 
 #include "berryIDropTarget.h"
 
 namespace berry {
 
 /**
  * Implementers of this interface will receive notifications when objects are dragged over
  * a particular control.
  */
-struct IDragOverListener : public virtual Object {
-
-  berryObjectMacro(IDragOverListener);
+struct IDragOverListener
+{
 
   struct Events {
 
-    typedef Message4<void*, Object::Pointer, const Point&, const Rectangle&, IDropTarget::Pointer> DragEventType;
-    typedef MessageDelegate4<IDragOverListener, void*, Object::Pointer, const Point&, const Rectangle&, IDropTarget::Pointer> DragDelegate;
+    typedef Message4<void*, const Object::Pointer&, const Point&, const Rectangle&, IDropTarget::Pointer> DragEventType;
+    typedef MessageDelegate4<IDragOverListener, void*, const Object::Pointer&, const Point&, const Rectangle&, IDropTarget::Pointer> DragDelegate;
 
     DragEventType drag;
 
-    void AddListener(IDragOverListener::Pointer listener);
-    void RemoveListener(IDragOverListener::Pointer listener);
+    void AddListener(IDragOverListener* listener);
+    void RemoveListener(IDragOverListener* listener);
 
   };
 
+  virtual ~IDragOverListener();
+
   /**
    * Notifies the receiver that the given object has been dragged over
    * the given position. Returns a drop target if the object may be
    * dropped in this position. Returns null otherwise.
    *
    * @param draggedObject object being dragged over this location
    * @param position location of the cursor
    * @param dragRectangle current drag rectangle (may be an empty rectangle if none)
    * @return a valid drop target or null if none
    */
-  virtual IDropTarget::Pointer Drag(void* currentControl, Object::Pointer draggedObject,
+  virtual IDropTarget::Pointer Drag(void* currentControl, const Object::Pointer& draggedObject,
           const Point& position, const Rectangle& dragRectangle) = 0;
 };
 
 }
 
 #endif /* BERRYIDRAGOVERLISTENER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryIEvaluationResultCache.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryIEvaluationResultCache.h
index 092513c78a..5f49986a7b 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryIEvaluationResultCache.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryIEvaluationResultCache.h
@@ -1,100 +1,100 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIEVALUATIONRESULTCACHE_H_
 #define BERRYIEVALUATIONRESULTCACHE_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 
 namespace berry {
 
 struct IEvaluationContext;
 class Expression;
 
 /**
  * <p>
  * A cache of the result of an expression. This also provides the source
  * priority for the expression.
  * </p>
  * <p>
  * This interface is not intended to be implemented or extended by clients.
  * </p>
  *
  * @see ISources
  * @see ISourceProvider
  */
-struct BERRY_UI_QT IEvaluationResultCache : public Object
+struct BERRY_UI_QT IEvaluationResultCache : public virtual Object
 {
 
-  berryInterfaceMacro(IEvaluationResultCache, berry);
+  berryObjectMacro(berry::IEvaluationResultCache)
 
   ~IEvaluationResultCache();
 
   /**
    * Clears the cached computation of the <code>evaluate</code> method, if
    * any. This method is only intended for internal use. It provides a
    * mechanism by which <code>ISourceProvider</code> events can invalidate
    * state on a <code>IEvaluationResultCache</code> instance.
    */
   virtual void ClearResult() = 0;
 
   /**
    * Returns the expression controlling the activation or visibility of this
    * item.
    *
    * @return The expression associated with this item; may be
    *         <code>null</code>.
    */
   virtual SmartPointer<Expression> GetExpression() const = 0;
 
   /**
    * Returns the priority that has been given to this expression.
    *
    * @return The priority.
    * @see ISources
    */
   virtual int GetSourcePriority() const = 0;
 
   /**
    * Evaluates the expression -- given the current state of the workbench.
    * This method should cache its computation. The cache will be cleared by a
    * call to <code>clearResult</code>.
    *
    * @param context
    *            The context in which this state should be evaluated; must not
    *            be <code>null</code>.
    * @return <code>true</code> if the expression currently evaluates to
    *         <code>true</code>; <code>false</code> otherwise.
    */
   virtual bool Evaluate(IEvaluationContext* context) const = 0;
 
   /**
    * Forces the cached result to be a particular value. This will <b>not</b>
    * notify any users of the cache that it has changed.
    *
    * @param result
    *            The cached result to use.
    */
   virtual void SetResult(bool result) = 0;
 };
 
 }
 
 #endif /* BERRYIEVALUATIONRESULTCACHE_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryIServiceLocatorCreator.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryIServiceLocatorCreator.h
index e5513f6d97..bd56143831 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryIServiceLocatorCreator.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryIServiceLocatorCreator.h
@@ -1,92 +1,92 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYISERVICELOCATORCREATOR_H_
 #define BERRYISERVICELOCATORCREATOR_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 
 
 namespace berry {
 
 struct IServiceLocator;
 struct IServiceFactory;
 struct IDisposable;
 
 /**
  * When creating components this service can be used to create the appropriate
  * service locator for the new component. For use with the component framework.
  * <p>
  * <b>Note:</b> Must not be implemented or extended by clients.
  * <p>
  * <p>
  * <strong>PROVISIONAL</strong>. This class or interface has been added as part
  * of a work in progress. There is a guarantee neither that this API will work
  * nor that it will remain the same. Please do not use this API without
  * consulting with the Platform/UI team.  This might disappear in 3.4 M5.
  * </p>
  *
  *
  * @since 3.4
  */
 struct BERRY_UI_QT IServiceLocatorCreator : public virtual Object
 {
 
-  berryInterfaceMacro(IServiceLocatorCreator, berry)
+  berryObjectMacro(berry::IServiceLocatorCreator)
 
   ~IServiceLocatorCreator();
 
   /**
    * Creates a service locator that can be used for hosting a new service
    * context. It will have the appropriate child services created as needed,
    * and can be used with the Dependency Injection framework to reuse
    * components (by simply providing your own implementation for certain
    * services).
    *
    * @param parent
    *            the parent locator
    * @param factory
    *            a factory that can lazily provide services if requested. This
    *            may be <code>null</code>
    * @param owner
    *            an object whose {@link IDisposable#dispose()} method will be
    *            called on the UI thread if the created service locator needs
    *            to be disposed (typically, because a plug-in contributing
    *            services to the service locator via an
    *            {@link AbstractServiceFactory} is no longer available). The
    *            owner can be any object that implements {@link IDisposable}.
    *            The recommended implementation of the owner's dispose method
    *            is to do whatever is necessary to stop using the created
    *            service locator, and then to call
    *            {@link IDisposable#dispose()} on the service locator.
    * @return the created service locator. The returned service locator will be
    *         an instance of {@link IDisposable}.
    */
   virtual SmartPointer<IServiceLocator> CreateServiceLocator(
       IServiceLocator* parent,
-      const SmartPointer<const IServiceFactory> factory,
+      const IServiceFactory* factory,
       WeakPointer<IDisposable> owner) = 0;
 };
 
 }
 
-Q_DECLARE_INTERFACE(berry::IServiceLocatorCreator, "org.blueberry.ui.qt.IServiceLocatorCreator")
+Q_DECLARE_INTERFACE(berry::IServiceLocatorCreator, "org.blueberry.ui.IServiceLocatorCreator")
 
 #endif /* BERRYISERVICELOCATORCREATOR_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryIStickyViewManager.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryIStickyViewManager.h
index ec9a1203a9..722d66ac2e 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryIStickyViewManager.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryIStickyViewManager.h
@@ -1,54 +1,55 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYISTICKYVIEWMANAGER_H_
 #define BERRYISTICKYVIEWMANAGER_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
 
 #include <berryIMemento.h>
 
 #include <set>
 
 namespace berry {
 
 class Perspective;
 
-struct BERRY_UI_QT IStickyViewManager : public Object {
+struct BERRY_UI_QT IStickyViewManager : public Object
+{
 
-  berryInterfaceMacro(IStickyViewManager, berry);
+  berryObjectMacro(berry::IStickyViewManager)
 
   ~IStickyViewManager();
 
   virtual void Remove(const QString& perspectiveId) = 0;
 
   virtual void Add(const QString& perspectiveId, const std::set<QString>& stickyViewSet) = 0;
 
   virtual void Clear() = 0;
 
   virtual void Update(SmartPointer<Perspective> oldPersp, SmartPointer<Perspective> newPersp) = 0;
 
   virtual void Save(IMemento::Pointer memento) = 0;
 
   virtual void Restore(IMemento::Pointer memento) = 0;
 
 };
 
 }
 
 #endif /* BERRYISTICKYVIEWMANAGER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryIWorkbenchLocationService.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryIWorkbenchLocationService.h
index de6bb1059a..ffcb45ff6f 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryIWorkbenchLocationService.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryIWorkbenchLocationService.h
@@ -1,86 +1,86 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIWORKBENCHLOCATIONSERVICE_H_
 #define BERRYIWORKBENCHLOCATIONSERVICE_H_
 
 #include <berryObject.h>
-#include <berryMacros.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 
 namespace berry {
 
 struct IWorkbench;
 struct IWorkbenchWindow;
 struct IWorkbenchPartSite;
 struct IPageSite;
 
 /**
  * Query where you are in the workbench hierarchy.
  *
  */
-struct BERRY_UI_QT IWorkbenchLocationService : public Object
+struct BERRY_UI_QT IWorkbenchLocationService : public virtual Object
 {
 
-  berryInterfaceMacro(IWorkbenchLocationService, berry);
+  berryObjectMacro(berry::IWorkbenchLocationService)
 
   ~IWorkbenchLocationService();
 
   /**
    * Get the service scope.
    *
    * @return the service scope. May return <code>null</code>.
    * @see IServiceScopes#PARTSITE_SCOPE
    */
   virtual QString GetServiceScope() const = 0;
 
   /**
    * A more numeric representation of the service level.
    *
    * @return the level - 0==workbench, 1==workbench window, etc
    */
   virtual int GetServiceLevel() const = 0;
 
   /**
    * @return the workbench. May return <code>null</code>.
    */
   virtual IWorkbench* GetWorkbench() const = 0;
 
   /**
    * @return the workbench window in this service locator hierarchy. May
    *  return <code>null</code>.
    */
-  virtual SmartPointer<IWorkbenchWindow> GetWorkbenchWindow() const = 0;
+  virtual IWorkbenchWindow* GetWorkbenchWindow() const = 0;
 
   /**
    * @return the part site in this service locator hierarchy. May return
    *  <code>null</code>.
    */
-  virtual SmartPointer<IWorkbenchPartSite> GetPartSite() const = 0;
+  virtual IWorkbenchPartSite* GetPartSite() const = 0;
 
   /**
    * @return the inner page site for a page based view in this service locator
    *  hierarchy. May return <code>null</code>.
    * @see PageBookView
    */
-  virtual SmartPointer<IPageSite> GetPageSite() const = 0;
+  //virtual SmartPointer<IPageSite> GetPageSite() const = 0;
 };
 
 }
+Q_DECLARE_INTERFACE(berry::IWorkbenchLocationService, "org.blueberry.ui.IWorkbenchLocationService")
 
 #endif /* BERRYIWORKBENCHLOCATIONSERVICE_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryInternalMenuService.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryInternalMenuService.h
index 36979b4c64..2386d0e003 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryInternalMenuService.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryInternalMenuService.h
@@ -1,91 +1,91 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYINTERNALMENUSERVICE_H
 #define BERRYINTERNALMENUSERVICE_H
 
 #include <berryIMenuService.h>
 
 #include <QUrl>
 
 namespace berry {
 
 struct IContributionItem;
 struct IEvaluationReference;
 struct IServiceLocator;
 
 class Expression;
 class MenuAdditionCacheEntry;
 
 /**
  * Internal baseclass for Workbench and Window menu service implementations.
  * Methods in this class might some day make sense to live in IMenuService.
  */
 struct InternalMenuService : public IMenuService
 {
 
   /**
    * Ties an expression to {@link IContributionItem#SetVisible(bool)}.
    *
    * @param item
    *            the item
    * @param visibleWhen
    *            the expression
    * @param restriction
    *            the restriction expression
    * @param identifierId
    *         the activity identifier id
    */
   virtual void RegisterVisibleWhen(const SmartPointer<IContributionItem>& item,
                                    const SmartPointer<Expression>& visibleWhen,
-                                   const QSet<SmartPointer<IEvaluationReference> >& restriction,
+                                   QSet<SmartPointer<IEvaluationReference> >& restriction,
                                    const QString& identifierID) = 0;
 
   /**
    * Removes any expressions bound to
    * {@link IContributionItem#SetVisible(bool)} of the given item
    *
    * @param item
    *            the item to unbind
    */
   virtual void UnregisterVisibleWhen(const SmartPointer<IContributionItem>& item,
-                                     const QSet<SmartPointer<IEvaluationReference> >& restriction) = 0;
+                                     QSet<SmartPointer<IEvaluationReference> >& restriction) = 0;
 
   /**
    * Return a list of {@link MenuAdditionCacheEntry} objects that are
    * contributed at the given uri.
    *
    * @param uri
    *            the uri to search on
    * @return the list of items
    */
   virtual QList<SmartPointer<AbstractContributionFactory> > GetAdditionsForURI(const QUrl& uri) = 0;
 
   virtual void PopulateContributionManager(IServiceLocator* serviceLocatorToUse,
                                            const QSet<SmartPointer<IEvaluationReference> >& restriction,
                                            ContributionManager* mgr,
                                            const QString& uri, bool recurse) = 0;
 
   virtual void PopulateContributionManager(ContributionManager* mgr,
                                            const QString& uri, bool recurse) = 0;
 
   using IMenuService::PopulateContributionManager;
 };
 
 }
 
 #endif // BERRYINTERNALMENUSERVICE_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryLayoutPart.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryLayoutPart.cpp
index ed929a1e63..00fc90488c 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryLayoutPart.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryLayoutPart.cpp
@@ -1,347 +1,347 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "tweaklets/berryGuiWidgetsTweaklet.h"
 
 #include "berryLayoutPart.h"
 
 #include "berryILayoutContainer.h"
 #include "berryDetachedWindow.h"
 
 #include "berryIWorkbenchWindow.h"
 #include "berryConstants.h"
 
 
 namespace berry
 {
 
 const QString LayoutPart::PROP_VISIBILITY = "PROP_VISIBILITY";
 
 
 LayoutPart::LayoutPart(const QString& id_)
   : container(0), id(id_), deferCount(0)
 {
 
 }
 
 LayoutPart::~LayoutPart()
 {
 }
 
 bool LayoutPart::AllowsAutoFocus()
 {
   if (container != 0)
   {
     return container->AllowsAutoFocus();
   }
   return true;
 }
 
 void LayoutPart::Dispose()
 {
 
 }
 
 Rectangle LayoutPart::GetBounds()
 {
   if (this->GetControl() == 0)
     return Rectangle();
 
   return Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetBounds(this->GetControl());
 }
 
 ILayoutContainer::Pointer LayoutPart::GetContainer()
 {
   return ILayoutContainer::Pointer(container);
 }
 
 bool LayoutPart::IsPlaceHolder() const
 {
   return false;
 }
 
 QString LayoutPart::GetID() const
 {
   return id;
 }
 
 bool LayoutPart::IsCompressible()
 {
   return false;
 }
 
 Point LayoutPart::GetSize()
 {
   Rectangle r = this->GetBounds();
   Point ptSize(r.width, r.height);
   return ptSize;
 }
 
 int LayoutPart::GetSizeFlags(bool  /*horizontal*/)
 {
   return Constants::MIN;
 }
 
 int LayoutPart::ComputePreferredSize(bool /*width*/, int /*availableParallel*/,
     int  /*availablePerpendicular*/, int preferredParallel)
 {
   return preferredParallel;
 }
 
 IDropTarget::Pointer LayoutPart::GetDropTarget(Object::Pointer  /*draggedObject*/, const Point&  /*displayCoordinates*/)
 {
   return IDropTarget::Pointer(0);
 }
 
 bool LayoutPart::IsDocked()
 {
   Shell::Pointer s = this->GetShell();
   if (s == 0) {
       return false;
   }
 
   return s->GetData().Cast<IWorkbenchWindow>() != 0;
 }
 
 Shell::Pointer LayoutPart::GetShell()
 {
   void* ctrl = this->GetControl();
   if (ctrl)
   {
     return Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetShell(ctrl);
   }
   return Shell::Pointer(0);
 }
 
 IWorkbenchWindow::Pointer LayoutPart::GetWorkbenchWindow()
 {
   Shell::Pointer s = this->GetShell();
   if (s == 0)
   {
     return IWorkbenchWindow::Pointer(0);
   }
   Object::Pointer data = s->GetData();
   if (data.Cast<IWorkbenchWindow>() != 0)
   {
     return data.Cast<IWorkbenchWindow>();
   }
   else if (data.Cast<DetachedWindow>() != 0)
   {
     return data.Cast<DetachedWindow>()->GetWorkbenchPage()->GetWorkbenchWindow();
   }
 
   return IWorkbenchWindow::Pointer(0);
 
 }
 
 void LayoutPart::MoveAbove(void*  /*refControl*/)
 {
 }
 
 void LayoutPart::Reparent(void* newParent)
 {
   void* control = this->GetControl();
 
   GuiWidgetsTweaklet* guiTweaklet = Tweaklets::Get(GuiWidgetsTweaklet::KEY);
   if ((control == 0) || (guiTweaklet->GetParent(control) == newParent))
   {
     return;
   }
 
   if (guiTweaklet->IsReparentable(control))
   {
     // make control small in case it is not resized with other controls
     //control.setBounds(0, 0, 0, 0);
     // By setting the control to disabled before moving it,
     // we ensure that the focus goes away from the control and its children
     // and moves somewhere else
     bool enabled = guiTweaklet->GetEnabled(control);
     guiTweaklet->SetEnabled(control, false);
     guiTweaklet->SetParent(control, newParent);
     guiTweaklet->SetEnabled(control, enabled);
     guiTweaklet->MoveAbove(control, 0);
   }
 }
 
 bool LayoutPart::GetVisible()
 {
   void* ctrl = this->GetControl();
   if (ctrl)
   {
     return Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetVisible(ctrl);
   }
 
   return false;
 }
 
 bool LayoutPart::IsVisible()
 {
   void* ctrl = this->GetControl();
   if (ctrl)
   {
     return Tweaklets::Get(GuiWidgetsTweaklet::KEY)->IsVisible(ctrl);
   }
 
   return false;
 }
 
 void LayoutPart::SetVisible(bool makeVisible)
 {
   void* ctrl = this->GetControl();
   if (ctrl != 0)
   {
     if (makeVisible == Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetVisible(ctrl))
     {
       return;
     }
 
 //    if (!makeVisible && this->IsFocusAncestor(ctrl))
 //    {
 //      // Workaround for Bug 60970 [EditorMgmt] setActive() called on an editor when it does not have focus.
 //      // Force focus on the shell so that when ctrl is hidden,
 //      // SWT does not try to send focus elsewhere, which may cause
 //      // some other part to be activated, which affects the part
 //      // activation order and can cause flicker.
 //      ctrl.getShell().forceFocus();
 //    }
 
     Tweaklets::Get(GuiWidgetsTweaklet::KEY)->SetVisible(ctrl, makeVisible);
 }
 }
 
 bool LayoutPart::IsFocusAncestor(void*  /*ctrl*/)
 {
 //  Control f = ctrl.getDisplay().getFocusControl();
 //  while (f != null && f != ctrl)
 //  {
 //    f = f.getParent();
 //  }
 //  return f == ctrl;
   return false;
 }
 
 void LayoutPart::SetBounds(const Rectangle& r)
 {
   void* ctrl = this->GetControl();
   if (ctrl)
   {
     return Tweaklets::Get(GuiWidgetsTweaklet::KEY)->SetBounds(ctrl, r);
   }
 }
 
 void LayoutPart::SetContainer(ILayoutContainer::Pointer container)
 {
 
   this->container = container.GetPointer();
 
   //TODO Zoom
 //  if (container != 0)
 //  {
 //    setZoomed(container.childIsZoomed(this));
   //  }
 }
 
 void LayoutPart::SetFocus()
 {
 }
 
 void LayoutPart::SetID(const QString& str)
 {
   id = str;
 }
 
 LayoutPart::Pointer LayoutPart::GetPart()
 {
   return LayoutPart::Pointer(this);
 }
 
 void LayoutPart::DeferUpdates(bool shouldDefer)
 {
   if (shouldDefer)
   {
     if (deferCount == 0)
     {
       this->StartDeferringEvents();
     }
     deferCount++;
   }
   else
   {
     if (deferCount> 0)
     {
       deferCount--;
       if (deferCount == 0)
       {
         this->HandleDeferredEvents();
       }
     }
   }
 }
 
 void LayoutPart::StartDeferringEvents()
 {
 
 }
 
 void LayoutPart::HandleDeferredEvents()
 {
 
 }
 
 bool LayoutPart::IsDeferred()
 {
   return deferCount> 0;
 }
 
 void LayoutPart::DescribeLayout(QString&  /*buf*/) const
 {
 
 }
 
 QString LayoutPart::GetPlaceHolderId()
 {
   return this->GetID();
 }
 
 void LayoutPart::ResizeChild(LayoutPart::Pointer  /*childThatChanged*/)
 {
 
 }
 
 void LayoutPart::FlushLayout()
 {
   ILayoutContainer::Pointer container = this->GetContainer();
   if (container != 0)
   {
     container->ResizeChild(LayoutPart::Pointer(this));
   }
 }
 
 bool LayoutPart::AllowsAdd(LayoutPart::Pointer  /*toAdd*/)
 {
   return false;
 }
 
-QString LayoutPart::ToString()
+QString LayoutPart::ToString() const
 {
   return "";
 }
 
 void LayoutPart::TestInvariants()
 {
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryLayoutPart.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryLayoutPart.h
index 70b2588d4f..182d188152 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryLayoutPart.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryLayoutPart.h
@@ -1,305 +1,305 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYLAYOUTPART_H_
 #define BERRYLAYOUTPART_H_
 
 #include <berryMacros.h>
 
 #include "berryIDropTarget.h"
 
 #include "berryISizeProvider.h"
 #include "berryRectangle.h"
 #include "berryPoint.h"
 #include "berryShell.h"
 
 namespace berry {
 
 struct ILayoutContainer;
 struct IWorkbenchWindow;
 
 /**
  * \ingroup org_blueberry_ui_internal
  *
  * A presentation part is used to build the presentation for the
  * workbench.  Common subclasses are pane and folder.
  */
 class LayoutPart : virtual public Object, public virtual ISizeProvider
 {
 
 public:
 
   berryObjectMacro(LayoutPart)
 
 protected: ILayoutContainer* container;
 
     protected: QString id;
 
     public: static const QString PROP_VISIBILITY;// = "PROP_VISIBILITY";
 
     /**
      * Number of times deferUpdates(true) has been called without a corresponding
      * deferUpdates(false)
      */
   private: int deferCount;
 
     /**
      * PresentationPart constructor comment.
      */
     public: LayoutPart(const QString& id);
 
     public: virtual ~LayoutPart();
 
     /**
      * When a layout part closes, focus will return to a previously active part.
      * This method determines whether this part should be considered for activation
      * when another part closes. If a group of parts are all closing at the same time,
      * they will all return false from this method while closing to ensure that the
      * parent does not activate a part that is in the process of closing. Parts will
      * also return false from this method if they are minimized, closed fast views,
      * obscured by zoom, etc.
      *
      * @return true iff the parts in this container may be given focus when the active
      * part is closed
      */
     public: virtual bool AllowsAutoFocus();
 
 
     /**
      * Creates the GUI control
      */
     public: virtual void CreateControl(void* parent) = 0;
 
     /**
      * Disposes the GUI control
      *
      * This can be used to execute cleanup code or notify listeners
      * when a LayoutPart is no longer used, but is still referenced
      * by a SmartPointer (instead of putting the code in the LayoutPart
      * destructor).
      */
     public: virtual void Dispose();
 
     /**
      * Gets the presentation bounds.
      */
     public: Rectangle GetBounds();
 
 
     /**
      * Gets the parent for this part.
      * <p>
      * In general, this is non-null if the object has been added to a container and the
      * container's widgetry exists. The exception to this rule is PartPlaceholders
      * created when restoring a ViewStack using restoreState, which point to the
      * ViewStack even if its widgetry doesn't exist yet. Returns null in the remaining
      * cases.
      * </p>
      * <p>
      * TODO: change the semantics of this method to always point to the parent container,
      * regardless of whether its widgetry exists. Locate and refactor code that is currently
      * depending on the special cases.
      * </p>
      */
     public: virtual SmartPointer<ILayoutContainer> GetContainer();
 
     /**
      * Get the part control.  This method may return null.
      */
     public: virtual void* GetControl() = 0;
 
     public: virtual bool IsPlaceHolder() const;
 
     /**
      * Gets the ID for this part.
      */
     public: virtual QString GetID() const;
 
     public: virtual bool IsCompressible();
 
     /**
      * Gets the presentation size.
      */
     public: virtual Point GetSize();
 
     /**
      * @see org.blueberry.ui.presentations.StackPresentation#getSizeFlags(boolean)
      *
      * @since 3.1
      */
     public: virtual int GetSizeFlags(bool horizontal);
 
     /**
      * @see org.blueberry.ui.presentations.StackPresentation#computePreferredSize(boolean, int, int, int)
      *
      * @since 3.1
      */
     public: virtual int ComputePreferredSize(bool width, int availableParallel, int availablePerpendicular, int preferredParallel);
 
     public: virtual IDropTarget::Pointer GetDropTarget(Object::Pointer draggedObject, const Point& displayCoordinates);
 
     public: bool IsDocked();
 
     public: virtual Shell::Pointer GetShell();
 
     /**
    * Returns the workbench window window for a part.
    *
    * @return the workbench window, or <code>null</code> if there's no window
    *         associated with this part.
    */
     public: virtual SmartPointer<IWorkbenchWindow> GetWorkbenchWindow();
 
     /**
      * Move the control over another one.
      */
     public: virtual void MoveAbove(void* refControl);
 
     /**
      * Reparent a part.
      */
     public: virtual void Reparent(void* newParent);
 
     /**
      * Returns true if this part was set visible. This returns whatever was last passed into
      * setVisible, but does not necessarily indicate that the part can be seen (ie: one of its
      * ancestors may be invisible)
      */
     public: virtual bool GetVisible();
 
     /**
      * Returns true if this part can be seen. Returns false if the part or any of its ancestors
      * are invisible.
      */
     public: virtual bool IsVisible();
 
     /**
      * Shows the receiver if <code>visible</code> is true otherwise hide it.
      */
     public: virtual void SetVisible(bool makeVisible);
 
     /**
      * Returns <code>true</code> if the given control or any of its descendents has focus.
      */
     private: virtual bool IsFocusAncestor(void* ctrl);
 
     /**
      * Sets the presentation bounds.
      */
     public: virtual void SetBounds(const Rectangle& r);
 
     /**
      * Sets the parent for this part.
      */
     public: virtual void SetContainer(SmartPointer<ILayoutContainer> container);
 
     /**
      * Sets focus to this part.
      */
     public: virtual void SetFocus();
 
     /**
      * Sets the part ID.
      */
     public: virtual void SetID(const QString& str);
 
     /* (non-Javadoc)
      * @see org.blueberry.ui.internal.IWorkbenchDragDropPart#getPart()
      */
     public: virtual LayoutPart::Pointer GetPart();
 
 
     /**
      * deferUpdates(true) disables widget updates until a corresponding call to
      * deferUpdates(false). Exactly what gets deferred is the decision
      * of each LayoutPart, however the part may only defer operations in a manner
      * that does not affect the final result.
      * That is, the state of the receiver after the final call to deferUpdates(false)
      * must be exactly the same as it would have been if nothing had been deferred.
      *
      * @param shouldDefer true iff events should be deferred
      */
     public: void DeferUpdates(bool shouldDefer);
 
     /**
      * This is called when deferUpdates(true) causes UI events for this
      * part to be deferred. Subclasses can overload to initialize any data
      * structures that they will use to collect deferred events.
      */
     protected: virtual void StartDeferringEvents();
 
     /**
      * Immediately processes all UI events which were deferred due to a call to
      * deferUpdates(true). This is called when the last call is made to
      * deferUpdates(false). Subclasses should overload this method if they
      * defer some or all UI processing during deferUpdates.
      */
     protected: virtual void HandleDeferredEvents();
 
     /**
      * Subclasses can call this method to determine whether UI updates should
      * be deferred. Returns true iff there have been any calls to deferUpdates(true)
      * without a corresponding call to deferUpdates(false). Any operation which is
      * deferred based on the result of this method should be performed later within
      * handleDeferredEvents().
      *
      * @return true iff updates should be deferred.
      */
     protected: bool IsDeferred();
 
     /**
      * Writes a description of the layout to the given string buffer.
      * This is used for drag-drop test suites to determine if two layouts are the
      * same. Like a hash code, the description should compare as equal iff the
      * layouts are the same. However, it should be user-readable in order to
      * help debug failed tests. Although these are english readable strings,
      * they do not need to be translated.
      *
      * @param buf
      */
     public: virtual void DescribeLayout(QString& buf) const;
 
     /**
      * Returns an id representing this part, suitable for use in a placeholder.
      *
      * @since 3.0
      */
     public: virtual QString GetPlaceHolderId();
 
     public: virtual void ResizeChild(LayoutPart::Pointer childThatChanged);
 
     public: void FlushLayout();
 
     /**
      * Returns true iff the given part can be added to this ILayoutContainer
      * @param toAdd
      * @return
      * @since 3.1
      */
     public: virtual bool AllowsAdd(LayoutPart::Pointer toAdd);
 
     /**
      * Tests the integrity of this object. Throws an exception if the object's state
      * is not internally consistent. For use in test suites.
      */
     public: virtual void TestInvariants();
 
-    public: virtual QString ToString();
+    public: virtual QString ToString() const;
 };
 
 }
 
 #endif /*BERRYLAYOUTPART_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryLayoutPartSash.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryLayoutPartSash.cpp
index f44e1ce87c..2d8dff9339 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryLayoutPartSash.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryLayoutPartSash.cpp
@@ -1,306 +1,306 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "tweaklets/berryGuiWidgetsTweaklet.h"
 
 #include "berryLayoutPartSash.h"
 
 #include "berryLayoutTree.h"
 #include "berryLayoutTreeNode.h"
 #include "berryWorkbenchPlugin.h"
 
 #include "berryConstants.h"
 
 namespace berry
 {
 
 LayoutPartSash::SelectionListener::SelectionListener(LayoutPartSash* lp)
  : layoutPartSash(lp)
 {
 
 }
 
 void LayoutPartSash::SelectionListener::WidgetSelected(GuiTk::SelectionEvent::Pointer e)
 {
   layoutPartSash->CheckDragLimit(e);
 
   if (e->detail != Constants::DRAG)
         {
           layoutPartSash->WidgetSelected(e->x, e->y, e->width,
               e->height);
         }
 }
 
 LayoutPartSash::LayoutPartSash(PartSashContainer* rootContainer, int style)
  : LayoutPart(""), sash(0), enabled(false), rootContainer(rootContainer),
    style(style), left(300), right(300), presFactory(0), isVisible(false)
 {
   selectionListener = new SelectionListener(this);
 }
 
 LayoutPartSash::~LayoutPartSash()
 {
   this->Dispose();
 }
 
 void LayoutPartSash::CheckDragLimit(GuiTk::SelectionEvent::Pointer event)
 {
   LayoutTree::Pointer root = rootContainer->GetLayoutTree();
   LayoutTreeNode::Pointer node = root->FindSash(LayoutPartSash::Pointer(this));
   Rectangle nodeBounds = node->GetBounds();
   Rectangle eventRect(event->x, event->y, event->width, event->height);
 
   bool vertical = (style == Constants::VERTICAL);
 
   // If a horizontal sash, flip the coordinate system so that we
   // can handle horizontal and vertical sashes without special cases
   if (!vertical)
   {
     nodeBounds.FlipXY();
     eventRect.FlipXY();
   }
 
   int eventX = eventRect.x;
   int left = std::max<int>(0, eventX - nodeBounds.x);
   left = std::min<int>(left, nodeBounds.width - this->GetSashSize());
   int right = nodeBounds.width - left - this->GetSashSize();
 
   LayoutTreeNode::ChildSizes sizes = node->ComputeChildSizes(nodeBounds.width, nodeBounds.height, left, right, nodeBounds.width);
 
   eventRect.x = nodeBounds.x + sizes.left;
 
   // If it's a horizontal sash, restore eventRect to its original coordinate system
   if (!vertical)
   {
     eventRect.FlipXY();
   }
 
   event->x = eventRect.x;
   event->y = eventRect.y;
 }
 
 void LayoutPartSash::CreateControl(void* /*parent*/)
 {
   // Defer creation of the control until it becomes visible
   if (isVisible)
   {
     this->DoCreateControl();
   }
 }
 
 void LayoutPartSash::DoCreateControl()
 {
   if (sash == 0)
   {
     // ask the presentation factory to create the sash
     IPresentationFactory* factory = WorkbenchPlugin::GetDefault()->GetPresentationFactory();
 
     int sashStyle = IPresentationFactory::SASHTYPE_NORMAL | style;
     sash = factory->CreateSash(this->rootContainer->GetParent(), sashStyle);
 
     Tweaklets::Get(GuiWidgetsTweaklet::KEY)->AddSelectionListener(sash, selectionListener);
     Tweaklets::Get(GuiWidgetsTweaklet::KEY)->SetEnabled(sash, enabled);
     Tweaklets::Get(GuiWidgetsTweaklet::KEY)->SetBounds(sash, bounds);
     Tweaklets::Get(GuiWidgetsTweaklet::KEY)->SetVisible(sash, isVisible);
   }
 }
 
 void LayoutPartSash::SetBounds(const Rectangle& r)
 {
   LayoutPart::SetBounds(r);
 
   bounds = r;
 }
 
 void LayoutPartSash::SetVisible(bool visible)
 {
   if (visible == isVisible)
   {
     return;
   }
 
   if (visible)
   {
     this->DoCreateControl();
   }
   else
   {
     this->Dispose();
   }
 
   LayoutPart::SetVisible(visible);
 
   isVisible = visible;
 }
 
 bool LayoutPartSash::IsVisible()
 {
   return isVisible;
 }
 
 void LayoutPartSash::Dispose()
 {
 
   if (sash != 0)
   {
     bounds = Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetBounds(sash);
     Tweaklets::Get(GuiWidgetsTweaklet::KEY)->Dispose(sash);
   }
   sash = 0;
 }
 
 Rectangle LayoutPartSash::GetBounds()
 {
   if (sash == 0)
   {
     return bounds;
   }
 
   return Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetBounds(sash);
 }
 
 void* LayoutPartSash::GetControl()
 {
   return sash;
 }
 
-QString LayoutPartSash::GetID()
+QString LayoutPartSash::GetID() const
 {
   return "";
 }
 
 LayoutPartSash::Pointer LayoutPartSash::GetPostLimit()
 {
   return postLimit;
 }
 
 LayoutPartSash::Pointer LayoutPartSash::GetPreLimit()
 {
   return preLimit;
 }
 
 int LayoutPartSash::GetLeft()
 {
   return left;
 }
 
 int LayoutPartSash::GetRight()
 {
   return right;
 }
 
 bool LayoutPartSash::IsHorizontal()
 {
   return ((style & Constants::HORIZONTAL) == Constants::HORIZONTAL);
 }
 
 bool LayoutPartSash::IsVertical()
 {
   return ((style & Constants::VERTICAL) == Constants::VERTICAL);
 }
 
 void LayoutPartSash::SetPostLimit(LayoutPartSash::Pointer newPostLimit)
 {
   postLimit = newPostLimit;
 }
 
 void LayoutPartSash::SetPreLimit(LayoutPartSash::Pointer newPreLimit)
 {
   preLimit = newPreLimit;
 }
 
 void LayoutPartSash::SetRatio(float newRatio)
 {
   int total = left + right;
   int newLeft = (int) (total * newRatio);
   this->SetSizes(newLeft, total - newLeft);
 }
 
 void LayoutPartSash::SetSizes(int left, int right)
 {
   if (left < 0 || right < 0)
   {
     return;
   }
 
   if (left == this->left && right == this->right)
   {
     return;
   }
 
   this->left = left;
   this->right = right;
 
   this->FlushCache();
 }
 
 void LayoutPartSash::FlushCache()
 {
   LayoutTree::Pointer root = rootContainer->GetLayoutTree();
 
   if (root != 0)
   {
     LayoutTreeNode::Pointer node = root->FindSash(LayoutPartSash::Pointer(this));
     if (node != 0)
     {
       node->FlushCache();
     }
   }
 }
 
 void LayoutPartSash::WidgetSelected(int x, int y, int  /*width*/, int  /*height*/)
 {
   if (!enabled)
   {
     return;
   }
 
   LayoutTree::Pointer root = rootContainer->GetLayoutTree();
   LayoutTreeNode::Pointer node = root->FindSash(LayoutPartSash::Pointer(this));
   Rectangle nodeBounds = node->GetBounds();
   //Recompute ratio
   x -= nodeBounds.x;
   y -= nodeBounds.y;
   if (style == Constants::VERTICAL)
   {
     this->SetSizes(x, nodeBounds.width - x - this->GetSashSize());
   }
   else
   {
     this->SetSizes(y, nodeBounds.height - y - this->GetSashSize());
   }
 
   node->SetBounds(nodeBounds);
 }
 
 void LayoutPartSash::SetEnabled(bool resizable)
 {
   this->enabled = resizable;
   if (sash != 0)
   {
     Tweaklets::Get(GuiWidgetsTweaklet::KEY)->SetEnabled(sash, enabled);
   }
 }
 
 int LayoutPartSash::GetSashSize() const
 {
   IPresentationFactory* factory = WorkbenchPlugin::GetDefault()->GetPresentationFactory();
   int sashStyle = IPresentationFactory::SASHTYPE_NORMAL | style;
   int size = factory->GetSashSize(sashStyle);
   return size;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryLayoutPartSash.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryLayoutPartSash.h
index 53b87e91da..268407b6a1 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryLayoutPartSash.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryLayoutPartSash.h
@@ -1,182 +1,182 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYLAYOUTPARTSASH_H_
 #define BERRYLAYOUTPARTSASH_H_
 
 #include "berryLayoutPart.h"
 
 #include "berryPartSashContainer.h"
 
 #include "guitk/berryGuiTkISelectionListener.h"
 #include "presentations/berryIPresentationFactory.h"
 
 namespace berry
 {
 
 
 class LayoutPartSash: public LayoutPart
 {
 
   friend class WorkbenchPage;
   friend class PartSashContainer;
   friend class LayoutTreeNode;
 
 public:
 
   berryObjectMacro(LayoutPartSash);
 
   LayoutPartSash(PartSashContainer* rootContainer, int style);
   ~LayoutPartSash();
 
 private:
 
   void* sash;
   bool enabled;
 
   PartSashContainer* rootContainer;
 
   int style;
 
   LayoutPartSash::Pointer preLimit;
 
   LayoutPartSash::Pointer postLimit;
 
   int left;
   int right;
 
   Rectangle bounds;
 
   IPresentationFactory* presFactory;
 
   /**
    * Stores whether or not the sash is visible. (This is expected to have a meaningful
    * value even if the underlying control doesn't exist).
    */
   bool isVisible;
 
   struct SelectionListener : public GuiTk::ISelectionListener
   {
     SelectionListener(LayoutPartSash* layoutPartSash);
 
     void WidgetSelected(GuiTk::SelectionEvent::Pointer e);
 
   private: LayoutPartSash* layoutPartSash;
   };
 
   GuiTk::ISelectionListener::Pointer selectionListener;
 
 
   // checkDragLimit contains changes by cagatayk@acm.org
   void CheckDragLimit(GuiTk::SelectionEvent::Pointer event);
 
   /**
    * Creates the control. As an optimization, creation of the control is deferred if
    * the control is invisible.
    */
 public:
   void CreateControl(void* parent);
 
   /**
    * Creates the underlying SWT control.
    *
    * @since 3.1
    */
 private:
   void DoCreateControl();
 
 public:
   void SetBounds(const Rectangle& r);
 
   /**
    * Makes the sash visible or invisible. Note: as an optimization, the actual widget is destroyed when the
    * sash is invisible.
    */
 public:
   void SetVisible(bool visible);
 
 public:
   bool IsVisible();
 
   /**
    * See LayoutPart#dispose
    */
 public:
   void Dispose();
 
   /**
    * Gets the presentation bounds.
    */
 public:
   Rectangle GetBounds();
 
   /**
    * Returns the part control.
    */
 public:
   void* GetControl();
 
   /**
    *
    */
 public:
-  QString GetID();
+  QString GetID() const;
 
 protected:
 
   LayoutPartSash::Pointer GetPostLimit();
 
   LayoutPartSash::Pointer GetPreLimit();
 
   int GetLeft();
 
   int GetRight();
 
   bool IsHorizontal();
 
   bool IsVertical();
 
   void SetPostLimit(LayoutPartSash::Pointer newPostLimit);
 
   void SetPreLimit(LayoutPartSash::Pointer newPreLimit);
 
   void SetRatio(float newRatio);
 
   void SetSizes(int left, int right);
 
 private:
   void FlushCache();
 
 private:
   void WidgetSelected(int x, int y, int width, int height);
 
   /**
    * @param resizable
    * @since 3.1
    */
 public:
   void SetEnabled(bool resizable);
 
 protected:
 
   /* package */int GetSashSize() const;
 
 
 };
 
 }
 
 #endif /* BERRYLAYOUTPARTSASH_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryLayoutTreeNode.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryLayoutTreeNode.cpp
index 54f3f65e48..fa15915437 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryLayoutTreeNode.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryLayoutTreeNode.cpp
@@ -1,719 +1,719 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryLayoutTreeNode.h"
 
 #include "berryConstants.h"
 #include "berryIPageLayout.h"
 
 #include <sstream>
 
 namespace berry
 {
 
 LayoutTreeNode::ChildSizes::ChildSizes (int l, int r, bool resize)
 {
   left = l;
   right = r;
   resizable = resize;
 }
 
 LayoutTreeNode::LayoutTreeNode(LayoutPartSash::Pointer sash)
  : LayoutTree(sash)
 {
   children[0] = 0;
   children[1] = 0;
 }
 
 LayoutTreeNode::~LayoutTreeNode()
 {
 
 }
 
 void LayoutTreeNode::FlushChildren()
 {
   LayoutTree::FlushChildren();
 
   children[0]->FlushChildren();
   children[1]->FlushChildren();
 }
 
 LayoutPart::Pointer LayoutTreeNode::FindPart(const Point& toFind)
 {
   if (!children[0]->IsVisible())
   {
     if (!children[1]->IsVisible())
     {
       return LayoutPart::Pointer(0);
     }
 
     return children[1]->FindPart(toFind);
   }
   else
   {
     if (!children[1]->IsVisible())
     {
       return children[0]->FindPart(toFind);
     }
   }
 
   LayoutPartSash::Pointer sash = this->GetSash();
 
   Rectangle bounds = sash->GetBounds();
 
   if (sash->IsVertical())
   {
     if (toFind.x < bounds.x + (bounds.width / 2))
     {
       return children[0]->FindPart(toFind);
     }
     return children[1]->FindPart(toFind);
   }
   else
   {
     if (toFind.y < bounds.y + (bounds.height / 2))
     {
       return children[0]->FindPart(toFind);
     }
     return children[1]->FindPart(toFind);
   }
 }
 
 LayoutPart::Pointer LayoutTreeNode::ComputeRelation(
     QList<PartSashContainer::RelationshipInfo>& relations)
 {
   PartSashContainer::RelationshipInfo r =
       PartSashContainer::RelationshipInfo();
   r.relative = children[0]->ComputeRelation(relations);
   r.part = children[1]->ComputeRelation(relations);
   r.left = this->GetSash()->GetLeft();
   r.right = this->GetSash()->GetRight();
   r.relationship = this->GetSash()->IsVertical() ? IPageLayout::RIGHT : IPageLayout::BOTTOM;
   relations.push_front(r);
   return r.relative;
 }
 
 void LayoutTreeNode::DisposeSashes()
 {
   children[0]->DisposeSashes();
   children[1]->DisposeSashes();
   this->GetSash()->Dispose();
 }
 
 LayoutTree::Pointer LayoutTreeNode::Find(LayoutPart::Pointer child)
 {
   LayoutTree::Pointer node = children[0]->Find(child);
   if (node != 0)
   {
     return node;
   }
   node = children[1]->Find(child);
   return node;
 }
 
 LayoutPart::Pointer LayoutTreeNode::FindBottomRight()
 {
   if (children[1]->IsVisible())
   {
     return children[1]->FindBottomRight();
   }
   return children[0]->FindBottomRight();
 }
 
 LayoutTreeNode* LayoutTreeNode::FindCommonParent(LayoutPart::Pointer child1,
     LayoutPart::Pointer child2, bool foundChild1,
     bool foundChild2)
 {
   if (!foundChild1)
   {
     foundChild1 = this->Find(child1) != 0;
   }
   if (!foundChild2)
   {
     foundChild2 = this->Find(child2) != 0;
   }
   if (foundChild1 && foundChild2)
   {
     return this;
   }
   if (parent == 0)
   {
     return 0;
   }
   return parent
   ->FindCommonParent(child1, child2, foundChild1, foundChild2);
 }
 
 LayoutTreeNode::Pointer LayoutTreeNode::FindSash(LayoutPartSash::Pointer sash)
 {
   if (this->GetSash() == sash)
   {
     return LayoutTreeNode::Pointer(this);
   }
   LayoutTreeNode::Pointer node = children[0]->FindSash(sash);
   if (node != 0)
   {
     return node;
   }
   node = children[1]->FindSash(sash);
   if (node != 0)
   {
     return node;
   }
   return LayoutTreeNode::Pointer(0);
 }
 
 void LayoutTreeNode::FindSashes(LayoutTree::Pointer child, PartPane::Sashes sashes)
 {
   void* sash = this->GetSash()->GetControl();
   bool leftOrTop = children[0] == child;
   if (sash != 0)
   {
     LayoutPartSash::Pointer partSash = this->GetSash();
     //If the child is in the left, the sash
     //is in the rigth and so on.
     if (leftOrTop)
     {
       if (partSash->IsVertical())
       {
         if (sashes.right == 0)
         {
           sashes.right = sash;
         }
       }
       else
       {
         if (sashes.bottom == 0)
         {
           sashes.bottom = sash;
         }
       }
     }
     else
     {
       if (partSash->IsVertical())
       {
         if (sashes.left == 0)
         {
           sashes.left = sash;
         }
       }
       else
       {
         if (sashes.top == 0)
         {
           sashes.top = sash;
         }
       }
     }
   }
   if (this->GetParent() != 0)
   {
     this->GetParent()->FindSashes(LayoutTree::Pointer(this), sashes);
   }
 }
 
 LayoutPartSash::Pointer LayoutTreeNode::GetSash() const
 {
   return part.Cast<LayoutPartSash>();
 }
 
 int LayoutTreeNode::GetSashSize() const
 {
   return this->GetSash()->GetSashSize();
 }
 
 bool LayoutTreeNode::IsVisible()
 {
   return children[0]->IsVisible() || children[1]->IsVisible();
 }
 
 LayoutTree::Pointer LayoutTreeNode::Remove(LayoutTree::Pointer child)
 {
   this->GetSash()->Dispose();
   if (parent == 0)
   {
     //This is the root. Return the other child to be the new root.
     if (children[0] == child)
     {
       children[1]->SetParent(0);
       return children[1];
     }
     children[0]->SetParent(0);
     return children[0];
   }
 
   LayoutTreeNode::Pointer oldParent(parent);
   if (children[0] == child)
   {
     oldParent->ReplaceChild(LayoutTree::Pointer(this), children[1]);
   }
   else
   {
     oldParent->ReplaceChild(LayoutTree::Pointer(this), children[0]);
   }
   return oldParent;
 }
 
 void LayoutTreeNode::ReplaceChild(LayoutTree::Pointer oldChild, LayoutTree::Pointer newChild)
 {
   if (children[0] == oldChild)
   {
     children[0] = newChild;
   }
   else if (children[1] == oldChild)
   {
     children[1] = newChild;
   }
   newChild->SetParent(this);
   if (!children[0]->IsVisible() || !children[0]->IsVisible())
   {
     this->GetSash()->Dispose();
   }
 
   this->FlushCache();
 }
 
 bool LayoutTreeNode::SameDirection(bool isVertical, LayoutTreeNode::Pointer subTree)
 {
   bool treeVertical = this->GetSash()->IsVertical();
   if (treeVertical != isVertical)
   {
     return false;
   }
   while (subTree != 0)
   {
     if (this == subTree.GetPointer())
     {
       return true;
     }
     if (subTree->children[0]->IsVisible() && subTree->children[1]->IsVisible())
     {
       if (subTree->GetSash()->IsVertical() != isVertical)
       {
         return false;
       }
     }
     subTree = subTree->GetParent();
   }
   return true;
 }
 
 int LayoutTreeNode::DoComputePreferredSize(bool width, int availableParallel,
     int availablePerpendicular, int preferredParallel)
 {
   this->AssertValidSize(availablePerpendicular);
   this->AssertValidSize(availableParallel);
   this->AssertValidSize(preferredParallel);
 
   // If one child is invisible, defer to the other child
   if (!children[0]->IsVisible())
   {
     return children[1]->ComputePreferredSize(width, availableParallel,
         availablePerpendicular, preferredParallel);
   }
 
   if (!children[1]->IsVisible())
   {
     return children[0]->ComputePreferredSize(width, availableParallel,
         availablePerpendicular, preferredParallel);
   }
 
   if (availableParallel == 0)
   {
     return 0;
   }
 
   // If computing the dimension perpendicular to our sash
   if (width == this->GetSash()->IsVertical())
   {
     // Compute the child sizes
     ChildSizes sizes = this->ComputeChildSizes(availableParallel,
         availablePerpendicular,
         GetSash()->GetLeft(), GetSash()->GetRight(), preferredParallel);
 
     // Return the sum of the child sizes plus the sash size
     return this->Add(sizes.left, this->Add(sizes.right, this->GetSashSize()));
   }
   else
   {
     // Computing the dimension parallel to the sash. We will compute and return the preferred size
     // of whichever child is closest to the ideal size.
 
     // First compute the dimension of the child sizes perpendicular to the sash
     ChildSizes sizes = this->ComputeChildSizes(availablePerpendicular, availableParallel,
         GetSash()->GetLeft(), GetSash()->GetRight(), availablePerpendicular);
 
     // Use this information to compute the dimension of the child sizes parallel to the sash.
     // Return the preferred size of whichever child is largest
     int leftSize = children[0]->ComputePreferredSize(width, availableParallel,
         sizes.left, preferredParallel);
 
     // Compute the preferred size of the right child
     int rightSize = children[1]->ComputePreferredSize(width, availableParallel,
         sizes.right, preferredParallel);
 
     // Return leftSize or rightSize: whichever one is largest
     int result = rightSize;
     if (leftSize > rightSize)
     {
       result = leftSize;
     }
 
     this->AssertValidSize(result);
 
     return result;
   }
 }
 
 LayoutTreeNode::ChildSizes LayoutTreeNode::ComputeChildSizes(int width, int height, int left,
     int right, int preferredWidth)
 {
   poco_assert(children[0]->IsVisible());
   poco_assert(children[1]->IsVisible());
   this->AssertValidSize(width);
   this->AssertValidSize(height);
   this->AssertValidSize(preferredWidth);
   poco_assert(left >= 0);
   poco_assert(right >= 0);
   poco_assert(preferredWidth >= 0);
   poco_assert(preferredWidth <= width);
   bool vertical = this->GetSash()->IsVertical();
 
   if (width <= this->GetSashSize())
   {
     return ChildSizes(0,0, false);
   }
 
   if (width == INF)
   {
     if (preferredWidth == INF)
     {
       return ChildSizes(children[0]->ComputeMaximumSize(vertical, height),
           children[1]->ComputeMaximumSize(vertical, height), false);
     }
 
     if (preferredWidth == 0)
     {
       return ChildSizes(children[0]->ComputeMinimumSize(vertical, height),
           children[1]->ComputeMinimumSize(vertical, height), false);
     }
   }
 
   int total = left + right;
 
   // Use all-or-none weighting
   double wLeft = left, wRight = right;
   switch (this->GetCompressionBias())
   {
   case -1:
     wLeft = 0.0;
     break;
   case 1:
     wRight = 0.0;
     break;
   default:
     break;
   }
   double wTotal = wLeft + wRight;
 
   // Subtract the SASH_WIDTH from preferredWidth and width. From here on, we'll deal with the
   // width available to the controls and neglect the space used by the sash.
   preferredWidth = std::max<int>(0, this->Subtract(preferredWidth, this->GetSashSize()));
   width = std::max<int>(0, this->Subtract(width, this->GetSashSize()));
 
   int redistribute = this->Subtract(preferredWidth, total);
 
   // Compute the minimum and maximum sizes for each child
   int leftMinimum = children[0]->ComputeMinimumSize(vertical, height);
   int rightMinimum = children[1]->ComputeMinimumSize(vertical, height);
   int leftMaximum = children[0]->ComputeMaximumSize(vertical, height);
   int rightMaximum = children[1]->ComputeMaximumSize(vertical, height);
 
   int idealLeft = 0;
   int idealRight = 0;
   if (PartSashContainer::leftToRight)
   {
     // Keep track of the available space for each child, given the minimum size of the other child
     int leftAvailable = std::min<int>(leftMaximum, std::max<int>(0, this->Subtract(width,
         rightMinimum)));
     int rightAvailable = std::min<int>(rightMaximum, std::max<int>(0, this->Subtract(width,
         leftMinimum)));
 
     // Figure out the ideal size of the left child
     idealLeft = std::max<int>(leftMinimum, std::min<int>(preferredWidth, left
         + (int)(redistribute * wLeft / wTotal)));
 
     // If the right child can't use all its available space, let the left child fill it in
     idealLeft = std::max<int>(idealLeft, preferredWidth - rightAvailable);
     // Ensure the left child doesn't get larger than its available space
     idealLeft = std::min<int>(idealLeft, leftAvailable);
 
     // Check if the left child would prefer to be a different size
     idealLeft = children[0]->ComputePreferredSize(vertical, leftAvailable, height,
         idealLeft);
 
     // Ensure that the left child is larger than its minimum size
     idealLeft = std::max<int>(idealLeft, leftMinimum);
     idealLeft = std::min<int>(idealLeft, leftAvailable);
 
     // Compute the right child width
     idealRight = std::max<int>(rightMinimum, preferredWidth - idealLeft);
 
     rightAvailable = std::max<int>(0, std::min<int>(rightAvailable, this->Subtract(width,
         idealLeft)));
     idealRight = std::min<int>(idealRight, rightAvailable);
     idealRight = children[1]->ComputePreferredSize(vertical, rightAvailable,
         height, idealRight);
     idealRight = std::max<int>(idealRight, rightMinimum);
   }
   else
   {
     // Keep track of the available space for each child, given the minimum size of the other child
     int rightAvailable = std::min<int>(rightMaximum, std::max<int>(0, this->Subtract(width,
         leftMinimum)));
     int leftAvailable = std::min<int>(leftMaximum, std::max<int>(0, this->Subtract(width,
         rightMinimum)));
 
     // Figure out the ideal size of the right child
     idealRight = std::max<int>(rightMinimum, std::min<int>(preferredWidth, right
         + (int)(redistribute * wRight / wTotal)));
 
     // If the left child can't use all its available space, let the right child fill it in
     idealRight = std::max<int>(idealRight, preferredWidth - leftAvailable);
     // Ensure the right child doesn't get larger than its available space
     idealRight = std::min<int>(idealRight, rightAvailable);
 
     // Check if the right child would prefer to be a different size
     idealRight = children[1]->ComputePreferredSize(vertical, rightAvailable, height,
         idealRight);
 
     // Ensure that the right child is larger than its minimum size
     idealRight = std::max<int>(idealRight, rightMinimum);
     idealRight = std::min<int>(idealRight, rightAvailable);
 
     // Compute the left child width
     idealLeft = std::max<int>(leftMinimum, preferredWidth - idealRight);
 
     leftAvailable = std::max<int>(0, std::min<int>(leftAvailable, this->Subtract(width,
         idealRight)));
     idealLeft = std::min<int>(idealLeft, leftAvailable);
     idealLeft = children[0]->ComputePreferredSize(vertical, leftAvailable,
         height, idealLeft);
     idealLeft = std::max<int>(idealLeft, leftMinimum);
   }
 
   return ChildSizes(idealLeft, idealRight, leftMaximum> leftMinimum
       && rightMaximum> rightMinimum
       && leftMinimum + rightMinimum < width);
 }
 
 int LayoutTreeNode::DoGetSizeFlags(bool width)
 {
   if (!children[0]->IsVisible())
   {
     return children[1]->GetSizeFlags(width);
   }
 
   if (!children[1]->IsVisible())
   {
     return children[0]->GetSizeFlags(width);
   }
 
   int leftFlags = children[0]->GetSizeFlags(width);
   int rightFlags = children[1]->GetSizeFlags(width);
 
   return ((leftFlags | rightFlags) & ~Constants::MAX) | (leftFlags & rightFlags
       & Constants::MAX);
 }
 
 void LayoutTreeNode::DoSetBounds(const Rectangle& b)
 {
   if (!children[0]->IsVisible())
   {
     children[1]->SetBounds(b);
     this->GetSash()->SetVisible(false);
     return;
   }
   if (!children[1]->IsVisible())
   {
     children[0]->SetBounds(b);
     this->GetSash()->SetVisible(false);
     return;
   }
 
   Rectangle bounds = b;
 
   bool vertical = this->GetSash()->IsVertical();
 
   // If this is a horizontal sash, flip coordinate systems so
   // that we can eliminate special cases
   if (!vertical)
   {
     bounds.FlipXY();
   }
 
   ChildSizes childSizes = this->ComputeChildSizes(bounds.width, bounds.height,
       this->GetSash()->GetLeft(), this->GetSash()->GetRight(), bounds.width);
 
   this->GetSash()->SetVisible(true);
   this->GetSash()->SetEnabled(childSizes.resizable);
 
   Rectangle leftBounds = Rectangle(bounds.x, bounds.y, childSizes.left, bounds.height);
   Rectangle sashBounds = Rectangle(leftBounds.x + leftBounds.width, bounds.y, this->GetSashSize(), bounds.height);
   Rectangle
       rightBounds =
           Rectangle(sashBounds.x + sashBounds.width, bounds.y, childSizes.right, bounds.height);
 
   if (!vertical)
   {
     leftBounds.FlipXY();
     sashBounds.FlipXY();
     rightBounds.FlipXY();
   }
 
   this->GetSash()->SetBounds(sashBounds);
   children[0]->SetBounds(leftBounds);
   children[1]->SetBounds(rightBounds);
 }
 
 void LayoutTreeNode::CreateControl(void* parent)
 {
   children[0]->CreateControl(parent);
   children[1]->CreateControl(parent);
   this->GetSash()->CreateControl(parent);
 
   LayoutTree::CreateControl(parent);
 }
 
 bool LayoutTreeNode::IsCompressible()
 {
   return children[0]->IsCompressible() || children[1]->IsCompressible();
 }
 
 int LayoutTreeNode::GetCompressionBias()
 {
   bool left = children[0]->IsCompressible();
   bool right = children[1]->IsCompressible();
   if (left == right)
   {
     return 0;
   }
   if (right)
   {
     return -1;
   }
   return 1;
 }
 
 bool LayoutTreeNode::IsLeftChild(LayoutTree::ConstPointer toTest)
 {
   return children[0] == toTest;
 }
 
 LayoutTree::Pointer LayoutTreeNode::GetChild(bool left)
 {
   int index = left ? 0 : 1;
   return (children[index]);
 }
 
 void LayoutTreeNode::SetChild(bool left, LayoutPart::Pointer part)
 {
   LayoutTree::Pointer child(new LayoutTree(part));
   this->SetChild(left, child);
   this->FlushCache();
 }
 
 void LayoutTreeNode::SetChild(bool left, LayoutTree::Pointer child)
 {
   int index = left ? 0 : 1;
   children[index] = child;
   child->SetParent(this);
   this->FlushCache();
 }
 
-QString LayoutTreeNode::ToString()
+QString LayoutTreeNode::ToString() const
 {
   QString str;
   QTextStream s(&str);
   s << "<null>\n";
   if (part->GetControl() != 0)
   {
     s << "<@" << part->GetControl() << ">\n";
   }
   QString str2;
   QTextStream result(&str2);
   result << "[";
   if (children[0]->GetParent() != this)
   {
     result << str2 << "{" << children[0] << "}" << str;
   }
   else
   {
     result << str2 << children[0] << str;
   }
 
   if (children[1]->GetParent() != this)
   {
     result << str2 << "{" << children[1] << "}]";
   }
   else
   {
     result << str2 << children[1] << "]";
   }
   return str2;
 }
 
 //void LayoutTreeNode::UpdateSashes(void* parent) {
 //        if (parent == 0)
 //            return;
 //        children[0]->UpdateSashes(parent);
 //        children[1]->UpdateSashes(parent);
 //        if (children[0]->IsVisible() && children[1]->IsVisible())
 //            this->GetSash()->CreateControl(parent);
 //        else
 //            this->GetSash()->Dispose();
 //    }
 
 void LayoutTreeNode::DescribeLayout(QString& buf) const
 {
   if (!(children[0]->IsVisible()))
   {
     if (!children[1]->IsVisible())
     {
       return;
     }
 
     children[1]->DescribeLayout(buf);
     return;
   }
 
   if (!children[1]->IsVisible())
   {
     children[0]->DescribeLayout(buf);
     return;
   }
 
   buf.append("("); //$NON-NLS-1$
   children[0]->DescribeLayout(buf);
 
   buf.append(this->GetSash()->IsVertical() ? "|" : "-");
 
   children[1]->DescribeLayout(buf);
   buf.append(")");
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryLayoutTreeNode.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryLayoutTreeNode.h
index e466c70309..2f2dc90cd3 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryLayoutTreeNode.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryLayoutTreeNode.h
@@ -1,222 +1,226 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYLAYOUTTREENODE_H_
 #define BERRYLAYOUTTREENODE_H_
 
 #include "berryLayoutTree.h"
 
 #include "berryLayoutPartSash.h"
 
 namespace berry {
 
 /**
  * \ingroup org_blueberry_ui_internal
  *
  * Implementation of a tree node. The node represents a
  * sash and it allways has two children.
  */
 class LayoutTreeNode : public LayoutTree {
 
 public:
 
   berryObjectMacro(LayoutTreeNode)
 
   struct ChildSizes {
     int left;
     int right;
     bool resizable;
 
   ChildSizes (int l, int r, bool resize);
   };
 
     /* The node children witch may be another node or a leaf */
     private: LayoutTree::Pointer children[2];
 
     /**
      * Initialize this tree with its sash.
      */
     public: LayoutTreeNode(LayoutPartSash::Pointer sash);
 
     public: ~LayoutTreeNode();
 
     /* (non-Javadoc)
      * @see org.blueberry.ui.internal.LayoutTree#flushChildren()
      */
     public: void FlushChildren();
 
     /**
      * Traverses the tree to find the part that intersects the given point
      *
      * @param toFind
      * @return the part that intersects the given point
      */
     public: LayoutPart::Pointer FindPart(const Point& toFind);
 
     /**
      * Add the relation ship between the children in the list
      * and returns the left children.
      */
     public: LayoutPart::Pointer ComputeRelation(QList<PartSashContainer::RelationshipInfo>& relations);
 
     /**
      * Dispose all Sashs in this tree
      */
     public: void DisposeSashes();
 
     /**
      * Find a LayoutPart in the tree and return its sub-tree. Returns
      * null if the child is not found.
      */
     public: SmartPointer<LayoutTree> Find(LayoutPart::Pointer child);
 
     /**
      * Find the part that is in the bottom right position.
      */
     public: LayoutPart::Pointer FindBottomRight();
 
     /**
      * Go up in the tree finding a parent that is common of both children.
      * Return the subtree.
      */
     LayoutTreeNode* FindCommonParent(LayoutPart::Pointer child1, LayoutPart::Pointer child2,
             bool foundChild1 = false, bool foundChild2 = false);
 
     /**
      * Find a sash in the tree and return its sub-tree. Returns
      * null if the sash is not found.
      */
     public: SmartPointer<LayoutTreeNode> FindSash(LayoutPartSash::Pointer sash);
 
+    using LayoutTree::FindSashes;
+
     /**
      * Sets the elements in the array of sashes with the
      * Left,Rigth,Top and Botton sashes. The elements
      * may be null depending whether there is a shash
      * beside the <code>part</code>
      */
     void FindSashes(SmartPointer<LayoutTree> child, PartPane::Sashes sashes);
 
     /**
      * Returns the sash of this node.
      */
     public: LayoutPartSash::Pointer GetSash() const;
 
     private: int GetSashSize() const;
 
     /**
      * Returns true if this tree has visible parts otherwise returns false.
      */
     public: bool IsVisible();
 
+    using LayoutTree::Remove;
+
     /**
      * Remove the child and this node from the tree
      */
     SmartPointer<LayoutTree> Remove(SmartPointer<LayoutTree> child);
 
     /**
      * Replace a child with a new child and sets the new child's parent.
      */
     void ReplaceChild(SmartPointer<LayoutTree> oldChild, SmartPointer<LayoutTree> newChild);
 
     /**
      * Go up from the subtree and return true if all the sash are
      * in the direction specified by <code>isVertical</code>
      */
     public: bool SameDirection(bool isVertical, SmartPointer<LayoutTreeNode> subTree);
 
     public: int DoComputePreferredSize(bool width, int availableParallel, int availablePerpendicular, int preferredParallel);
 
     /**
      * Computes the pixel sizes of this node's children, given the available
      * space for this node. Note that "width" and "height" actually refer
      * to the distance perpendicular and parallel to the sash respectively.
      * That is, their meaning is reversed when computing a horizontal sash.
      *
      * @param width the pixel width of a vertical node, or the pixel height
      * of a horizontal node (INF if unbounded)
      * @param height the pixel height of a vertical node, or the pixel width
      * of a horizontal node (INF if unbounded)
      * @return a struct describing the pixel sizes of the left and right children
      * (this is a width for horizontal nodes and a height for vertical nodes)
      */
     ChildSizes ComputeChildSizes(int width, int height, int left, int right, int preferredWidth);
 
     protected: int DoGetSizeFlags(bool width);
 
     /**
      * Resize the parts on this tree to fit in <code>bounds</code>.
      */
     public: void DoSetBounds(const Rectangle& bounds);
 
     /* (non-Javadoc)
      * @see org.blueberry.ui.internal.LayoutTree#createControl(org.blueberry.swt.widgets.Composite)
      */
     public: void CreateControl(void* parent);
 
     //Added by hudsonr@us.ibm.com - bug 19524
 
     public: bool IsCompressible();
 
     /**
      * Returns 0 if there is no bias. Returns -1 if the first child should be of
      * fixed size, and the second child should be compressed. Returns 1 if the
      * second child should be of fixed size.
      * @return the bias
      */
     public: int GetCompressionBias();
 
     bool IsLeftChild(SmartPointer<const LayoutTree> toTest);
 
     SmartPointer<LayoutTree> GetChild(bool left);
 
     /**
      * Sets a child in this node
      */
     void SetChild(bool left, LayoutPart::Pointer part);
 
     /**
      * Sets a child in this node
      */
     void SetChild(bool left, SmartPointer<LayoutTree> child);
 
     /**
      * Returns a string representation of this object.
      */
-    public: QString ToString();
+    public: QString ToString() const;
 
     /**
      * Create the sashes if the children are visible
      * and dispose it if they are not.
      */
     //public: void UpdateSashes(void* parent);
 
     /**
      * Writes a description of the layout to the given string buffer.
      * This is used for drag-drop test suites to determine if two layouts are the
      * same. Like a hash code, the description should compare as equal iff the
      * layouts are the same. However, it should be user-readable in order to
      * help debug failed tests. Although these are english readable strings,
      * they should not be translated or equality tests will fail.
      *
      * @param buf
      */
     public: void DescribeLayout(QString& buf) const;
 
 };
 
 }
 
 #endif /*BERRYLAYOUTTREENODE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryMMMenuListener.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryMMMenuListener.h
index 628477146b..1fd4128836 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryMMMenuListener.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryMMMenuListener.h
@@ -1,45 +1,45 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYMMMENULISTENER_H
 #define BERRYMMMENULISTENER_H
 
 #include <QObject>
 
 namespace berry
 {
 
-struct MenuManager;
+class MenuManager;
 
 class MMMenuListener : public QObject
 {
   Q_OBJECT
 
   berry::MenuManager* mm;
 
 public:
 
   MMMenuListener(berry::MenuManager* mm);
 
 private:
 
   Q_SLOT void HandleAboutToShow();
 };
 
 }
 
 #endif // BERRYMMMENULISTENER_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryMenuServiceFactory.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryMenuServiceFactory.cpp
new file mode 100644
index 0000000000..03c58a5dab
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryMenuServiceFactory.cpp
@@ -0,0 +1,54 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berryMenuServiceFactory.h"
+
+#include "berryIEvaluationReference.h"
+#include "berryIWorkbenchLocationService.h"
+#include "berryIWorkbenchWindow.h"
+
+#include "berrySlaveMenuService.h"
+#include "berryWorkbenchWindow.h"
+
+namespace berry {
+
+Object* MenuServiceFactory::Create(const QString& serviceInterface, IServiceLocator* parentLocator,
+                                   IServiceLocator* locator) const
+{
+  if (serviceInterface != qobject_interface_iid<IMenuService*>())
+  {
+    return NULL;
+  }
+
+  IWorkbenchLocationService* wls = locator->GetService<IWorkbenchLocationService>();
+  IWorkbench* const wb = wls->GetWorkbench();
+  if (wb == NULL)
+  {
+    return NULL;
+  }
+
+  Object* parent = parentLocator->GetService(serviceInterface);
+  if (parent == NULL)
+  {
+    // we are registering the global services in the Workbench
+    return NULL;
+  }
+  IWorkbenchWindow* const window = wls->GetWorkbenchWindow();
+  return new SlaveMenuService(dynamic_cast<InternalMenuService*>(parent), locator,
+                              dynamic_cast<WorkbenchWindow*>(window)->GetMenuRestrictions());
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtDnDTweaklet.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryMenuServiceFactory.h
old mode 100755
new mode 100644
similarity index 58%
copy from BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtDnDTweaklet.h
copy to BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryMenuServiceFactory.h
index 57589ad2f8..c5d4a1ee51
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtDnDTweaklet.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryMenuServiceFactory.h
@@ -1,40 +1,38 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
+#ifndef BERRYMENUSERVICEFACTORY_H
+#define BERRYMENUSERVICEFACTORY_H
 
-#ifndef BERRYQTDNDTWEAKLET_H_
-#define BERRYQTDNDTWEAKLET_H_
-
-#include <berryDnDTweaklet.h>
+#include "berryIServiceFactory.h"
 
 namespace berry {
 
-class QtDnDTweaklet : public QObject, public DnDTweaklet
+class MenuServiceFactory : public QObject, public IServiceFactory
 {
   Q_OBJECT
-  Q_INTERFACES(berry::DnDTweaklet)
+  Q_INTERFACES(berry::IServiceFactory)
 
 public:
 
-  QtDnDTweaklet();
-  QtDnDTweaklet(const QtDnDTweaklet& other);
+  Object* Create(const QString& serviceInterface, IServiceLocator* parentLocator,
+                 IServiceLocator* locator) const;
 
-  ITracker* CreateTracker();
 };
 
 }
 
-#endif /* BERRYQTDNDTWEAKLET_H_ */
+#endif // BERRYMENUSERVICEFACTORY_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryNestableHandlerService.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryNestableHandlerService.cpp
new file mode 100644
index 0000000000..9bace18147
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryNestableHandlerService.cpp
@@ -0,0 +1,85 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berryNestableHandlerService.h"
+
+#include "berryExpression.h"
+#include "berryIHandlerActivation.h"
+#include "berryISourceProvider.h"
+
+namespace berry {
+
+NestableHandlerService::NestableHandlerService(IHandlerService* parentHandlerService,
+                       const SmartPointer<Expression>& defaultExpression)
+  : SlaveHandlerService(parentHandlerService, defaultExpression)
+  , active(false)
+{
+}
+
+void NestableHandlerService::Activate()
+{
+  if (active)
+  {
+    return;
+  }
+
+  QList<IHandlerActivation::Pointer> localActivations = localActivationsToParentActivations.keys();
+  for (int i = 0; i < localActivations.size(); i++)
+  {
+    // Ignore activations that have been cleared since the copy
+    // was made.
+    if (localActivationsToParentActivations.contains(localActivations[i]))
+    {
+      SlaveHandlerService::DoActivation(localActivations[i]);
+    }
+  }
+  active = true;
+}
+
+void NestableHandlerService::Deactivate()
+{
+  if (!active)
+  {
+    return;
+  }
+
+  DeactivateHandlers(parentActivations.toList());
+  parentActivations.clear();
+
+  QList<IHandlerActivation::Pointer> localActivations = localActivationsToParentActivations.keys();
+  for (int i = 0; i < localActivations.size(); i++)
+  {
+    if (localActivationsToParentActivations.contains(localActivations[i]))
+    {
+      localActivationsToParentActivations.insert(localActivations[i], NULL);
+    }
+  }
+
+  active = false;
+}
+
+SmartPointer<IHandlerActivation> NestableHandlerService::DoActivation(
+    const SmartPointer<IHandlerActivation>& localActivation)
+{
+  if (active)
+  {
+    return SlaveHandlerService::DoActivation(localActivation);
+  }
+  localActivationsToParentActivations.insert(localActivation, NULL);
+  return localActivation;
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryNestableHandlerService.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryNestableHandlerService.h
new file mode 100644
index 0000000000..eaa99afebe
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryNestableHandlerService.h
@@ -0,0 +1,78 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYNESTABLEHANDLERSERVICE_H
+#define BERRYNESTABLEHANDLERSERVICE_H
+
+#include "berrySlaveHandlerService.h"
+#include "berryINestable.h"
+
+namespace berry {
+
+/**
+ * <p>
+ * A handler service which delegates almost all responsibility to the parent
+ * service. It is capable of being nested inside a component that is not
+ * recognizable by the "sources" event mechanism. This means that the handlers
+ * must be activated and deactivated manually.
+ * </p>
+ * <p>
+ * This class is not intended for use outside of the
+ * <code>org.eclipse.ui.workbench</code> plug-in.
+ * </p>
+ */
+class NestableHandlerService : public SlaveHandlerService, public INestable
+{
+
+private:
+
+  /**
+   * Whether the component with which this service is associated is active.
+   */
+  bool active;
+
+public:
+
+  berryObjectMacro(berry::NestableHandlerService)
+
+  /**
+   * Constructs a new instance.
+   *
+   * @param parentHandlerService
+   *            The parent handler service for this slave; must not be
+   *            <code>null</code>.
+   * @param defaultExpression
+   *            The default expression to use if none is provided. This is
+   *            primarily used for conflict resolution. This value may be
+   *            <code>null</code>.
+   */
+  NestableHandlerService(IHandlerService* parentHandlerService,
+                         const SmartPointer<Expression>& defaultExpression);
+
+  void Activate();
+
+  void Deactivate();
+
+protected:
+
+  SmartPointer<IHandlerActivation> DoActivation(
+      const SmartPointer<IHandlerActivation>& localActivation);
+
+};
+
+}
+
+#endif // BERRYNESTABLEHANDLERSERVICE_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPagePartSelectionTracker.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPagePartSelectionTracker.cpp
index 88a04f68d8..2797bd470b 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPagePartSelectionTracker.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPagePartSelectionTracker.cpp
@@ -1,275 +1,275 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryPagePartSelectionTracker.h"
 
 #include "berryIPostSelectionProvider.h"
 
 namespace berry
 {
 
 class SelTrackerPartListener: public IPartListener
 {
 
 public:
 
   SelTrackerPartListener(PagePartSelectionTracker* tracker)
   : tracker(tracker)
   {}
 
   Events::Types GetPartEventTypes() const
   {
     return Events::CLOSED | Events::OPENED;
   }
 
-  void PartClosed(IWorkbenchPartReference::Pointer partRef)
+  void PartClosed(const IWorkbenchPartReference::Pointer& partRef)
   {
     if (tracker->GetPartId(partRef->GetPart(false))
         == tracker->AbstractPartSelectionTracker::GetPartId())
     {
       tracker->SetPart(IWorkbenchPart::Pointer(0), true);
     }
   }
 
-  void PartOpened(IWorkbenchPartReference::Pointer partRef)
+  void PartOpened(const IWorkbenchPartReference::Pointer& partRef)
   {
     if (tracker->GetPartId(partRef->GetPart(false))
         == tracker->AbstractPartSelectionTracker::GetPartId())
     {
       tracker->SetPart(partRef->GetPart(false), true);
     }
   }
 
 private:
 
   PagePartSelectionTracker* tracker;
 
 };
 
 class SelTrackerPerspectiveListener: public IPerspectiveListener
 {
 public:
 
   SelTrackerPerspectiveListener(PagePartSelectionTracker* tracker)
   : tracker(tracker)
   {}
 
   IPerspectiveListener::Events::Types GetPerspectiveEventTypes() const
   {
     return IPerspectiveListener::Events::PART_CHANGED;
   }
 
-  void PerspectiveChanged(IWorkbenchPage::Pointer,
-      IPerspectiveDescriptor::Pointer,
-      IWorkbenchPartReference::Pointer partRef, const QString& changeId)
+  using IPerspectiveListener::PerspectiveChanged;
+  void PerspectiveChanged(const IWorkbenchPage::Pointer&,
+                          const IPerspectiveDescriptor::Pointer&,
+                          const IWorkbenchPartReference::Pointer& partRef,
+                          const QString& changeId)
   {
     if (!partRef)
       return;
     IWorkbenchPart::Pointer part = partRef->GetPart(false);
     if (!part)
       return;
 
     if (IWorkbenchPage::CHANGE_VIEW_SHOW == changeId)
     {
       if (tracker->GetPart()) // quick check first, plus avoids double setting
         return;
       if (tracker->GetPartId(part) == tracker->AbstractPartSelectionTracker::GetPartId())
         tracker->SetPart(part, true);
     }
   }
 
 private:
 
   PagePartSelectionTracker* tracker;
 };
 
 class SelTrackerSelectionChangedListener: public ISelectionChangedListener
 {
 public:
 
   SelTrackerSelectionChangedListener(PagePartSelectionTracker* tracker)
   : tracker(tracker)
   {}
 
-  void SelectionChanged(SelectionChangedEvent::Pointer event)
+  void SelectionChanged(const SelectionChangedEvent::Pointer& event)
   {
     tracker->FireSelection(tracker->GetPart(), event->GetSelection());
   }
 
 private:
 
   PagePartSelectionTracker* tracker;
 
 };
 
 PagePartSelectionTracker::PostSelectionListener::PostSelectionListener(
     PagePartSelectionTracker* tracker) :
   m_Tracker(tracker)
 {
 }
 
 void PagePartSelectionTracker::PostSelectionListener::SelectionChanged(
-    SelectionChangedEvent::Pointer event)
+    const SelectionChangedEvent::Pointer& event)
 {
   m_Tracker->FirePostSelection(m_Tracker->GetPart(), event->GetSelection());
 }
 
 PagePartSelectionTracker::PagePartSelectionTracker(
     IWorkbenchPage* page, const QString& partId) :
   AbstractPartSelectionTracker(partId)
 {
-  postSelectionListener = new PostSelectionListener(this);
-  perspListener = new SelTrackerPerspectiveListener(this);
-  selChangedListener = new SelTrackerSelectionChangedListener(this);
-  partListener = new SelTrackerPartListener(this);
+  postSelectionListener.reset(new PostSelectionListener(this));
+  perspListener.reset(new SelTrackerPerspectiveListener(this));
+  selChangedListener.reset(new SelTrackerSelectionChangedListener(this));
+  partListener.reset(new SelTrackerPartListener(this));
 
   this->SetPage(page);
-  page->AddPartListener(partListener);
-  page->GetWorkbenchWindow()->AddPerspectiveListener(
-      perspListener);
+  page->AddPartListener(partListener.data());
+  page->GetWorkbenchWindow()->AddPerspectiveListener(perspListener.data());
   QString secondaryId;
   QString primaryId = partId;
   int indexOfColon;
   if ((indexOfColon = partId.indexOf(':')) != -1)
   {
     secondaryId = partId.mid(indexOfColon + 1);
     primaryId = partId.left(indexOfColon);
   }
   IViewReference::Pointer part =
       page->FindViewReference(primaryId, secondaryId);
   if (part.IsNotNull() && part->GetView(false).IsNotNull())
   {
     this->SetPart(part->GetView(false), false);
   }
 }
 
 ISelection::ConstPointer PagePartSelectionTracker::GetSelection()
 {
   IWorkbenchPart::Pointer part = this->GetPart();
   if (part.IsNotNull())
   {
     ISelectionProvider::Pointer sp = part->GetSite()->GetSelectionProvider();
     if (sp.IsNotNull())
     {
       return sp->GetSelection();
     }
   }
   return ISelection::Pointer(0);
 }
 
 PagePartSelectionTracker::~PagePartSelectionTracker()
 {
   IWorkbenchPage::Pointer page = GetPage();
-  page->GetWorkbenchWindow()->RemovePerspectiveListener(
-      perspListener);
-  page->RemovePartListener(partListener);
+  page->GetWorkbenchWindow()->RemovePerspectiveListener(perspListener.data());
+  page->RemovePartListener(partListener.data());
   this->SetPart(IWorkbenchPart::Pointer(0), false);
   this->SetPage(0);
 }
 
 IWorkbenchPart::Pointer PagePartSelectionTracker::GetPart()
 {
   return fPart;
 }
 
 IWorkbenchPage::Pointer PagePartSelectionTracker::GetPage()
 {
   return IWorkbenchPage::Pointer(fPage);
 }
 
 ISelectionProvider::Pointer PagePartSelectionTracker::GetSelectionProvider()
 {
   IWorkbenchPart::Pointer part = this->GetPart();
   if (part.IsNotNull())
   {
     return part->GetSite()->GetSelectionProvider();
   }
   return ISelectionProvider::Pointer(0);
 }
 
 QString PagePartSelectionTracker::GetPartId(IWorkbenchPart::Pointer part)
 {
   QString id = part->GetSite()->GetId();
   if (part.Cast<IViewPart> ().IsNotNull())
   {
     QString secondaryId =
         part.Cast<IViewPart> ()->GetViewSite() ->GetSecondaryId();
     if (secondaryId != "")
     {
       id = id + ':' + secondaryId;
     }
   }
   return id;
 }
 
 void PagePartSelectionTracker::SetPage(IWorkbenchPage* page)
 {
   fPage = page;
 }
 
 void PagePartSelectionTracker::SetPart(IWorkbenchPart::Pointer part,
     bool notify)
 {
   if (fPart.IsNotNull())
   {
     // remove myself as a listener from the existing part
     ISelectionProvider::Pointer sp = fPart->GetSite()->GetSelectionProvider();
     if (sp.IsNotNull())
     {
-      sp->RemoveSelectionChangedListener(selChangedListener);
+      sp->RemoveSelectionChangedListener(selChangedListener.data());
       if (sp.Cast<IPostSelectionProvider> ().IsNotNull())
       {
         sp.Cast<IPostSelectionProvider> () ->RemovePostSelectionChangedListener(
-            postSelectionListener);
+            postSelectionListener.data());
       }
       else
       {
-        sp->RemoveSelectionChangedListener(postSelectionListener);
+        sp->RemoveSelectionChangedListener(postSelectionListener.data());
       }
     }
   }
   fPart = part;
   ISelection::ConstPointer sel;
   if (part.IsNotNull())
   {
     ISelectionProvider::Pointer sp = part->GetSite()->GetSelectionProvider();
     if (sp.IsNotNull())
     {
-      sp->AddSelectionChangedListener(selChangedListener);
+      sp->AddSelectionChangedListener(selChangedListener.data());
       if (sp.Cast<IPostSelectionProvider> ().IsNotNull())
       {
         sp.Cast<IPostSelectionProvider> () ->AddPostSelectionChangedListener(
-            postSelectionListener);
+            postSelectionListener.data());
       }
       else
       {
-        sp->AddSelectionChangedListener(postSelectionListener);
+        sp->AddSelectionChangedListener(postSelectionListener.data());
       }
       if (notify)
       {
         // get the selection to send below
         sel = sp->GetSelection();
       }
     }
   }
   if (notify)
   {
     this->FireSelection(part, sel);
     this->FirePostSelection(part, sel);
   }
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPagePartSelectionTracker.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPagePartSelectionTracker.h
index aa4bd8e286..66130219b0 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPagePartSelectionTracker.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPagePartSelectionTracker.h
@@ -1,143 +1,143 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYPAGEPARTSELECTIONTRACKER_H_
 #define BERRYPAGEPARTSELECTIONTRACKER_H_
 
 #include "berryIPartListener.h"
 #include "berryISelectionChangedListener.h"
 #include "berryISelectionService.h"
 #include "berryISelectionProvider.h"
 #include "berrySelectionChangedEvent.h"
 #include "berryIWorkbenchPage.h"
 
 #include "berryAbstractPartSelectionTracker.h"
 
 namespace berry
 {
 
 /**
  * \ingroup org_blueberry_ui_internal
  *
  * Provides per-part selection tracking for the selection service.
  */
 class PagePartSelectionTracker : public AbstractPartSelectionTracker
 {
 
 public:
   berryObjectMacro(PagePartSelectionTracker)
 
 private:
 
   /**
    * The workbench page for which this is tracking selection.
    */
   IWorkbenchPage* fPage;
 
   /**
    * The part in this tracker's page, or <code>null</code> if one is not open.
    */
   IWorkbenchPart::Pointer fPart;
 
   struct PostSelectionListener : public ISelectionChangedListener
   {
     PostSelectionListener(PagePartSelectionTracker* tracker);
 
-    void SelectionChanged(SelectionChangedEvent::Pointer event);
+    void SelectionChanged(const SelectionChangedEvent::Pointer& event);
 
     PagePartSelectionTracker* m_Tracker;
   };
 
   friend struct PostSelectionListener;
   friend class SelTrackerPartListener;
   friend class SelTrackerPerspectiveListener;
   friend class SelTrackerSelectionChangedListener;
 
-  ISelectionChangedListener::Pointer postSelectionListener;
-  IPerspectiveListener::Pointer perspListener;
-  ISelectionChangedListener::Pointer selChangedListener;
-  IPartListener::Pointer partListener;
+  QScopedPointer<ISelectionChangedListener> postSelectionListener;
+  QScopedPointer<IPerspectiveListener> perspListener;
+  QScopedPointer<ISelectionChangedListener> selChangedListener;
+  QScopedPointer<IPartListener> partListener;
 
 public:
 
   /**
    * Constructs a part selection tracker for the part with the given id.
    *
    * @param id part identifier
    */
   PagePartSelectionTracker(IWorkbenchPage* page,
       const QString& partId);
 
 
   /**
    * Returns the selection from the part being tracked,
    * or <code>null</code> if the part is closed or has no selection.
    */
   ISelection::ConstPointer GetSelection();
 
   /**
    * Disposes this selection tracker.  This removes all listeners currently registered.
    */
   ~PagePartSelectionTracker();
 
 protected:
 
   /**
    * Returns the part this is tracking,
    * or <code>null</code> if it is not open
    *
    * @return part., or <code>null</code>
    */
   IWorkbenchPart::Pointer GetPart();
 
   /**
    * Returns the page this selection provider works for
    *
    * @return workbench page
    */
   IWorkbenchPage::Pointer GetPage();
 
   ISelectionProvider::Pointer GetSelectionProvider();
 
 private:
 
   /**
    * Returns the id for the given part, taking into account
    * multi-view instances which may have a secondary id.
    *
    */
   QString GetPartId(IWorkbenchPart::Pointer part);
 
   /**
    * Sets the page this selection provider works for
    *
    * @param page workbench page
    */
   void SetPage(IWorkbenchPage* page);
 
   /**
    * Sets the part for this selection tracker.
    *
    * @param part the part
    * @param notify whether to send notification that the selection has changed.
    */
   void SetPart(IWorkbenchPart::Pointer part, bool notify);
 
 };
 
 }
 
 #endif /*BERRYPAGEPARTSELECTIONTRACKER_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryParameterValueConverterProxy.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryParameterValueConverterProxy.cpp
new file mode 100644
index 0000000000..a008a56801
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryParameterValueConverterProxy.cpp
@@ -0,0 +1,72 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berryParameterValueConverterProxy.h"
+
+#include "berryWorkbenchRegistryConstants.h"
+#include "berryCommandExceptions.h"
+#include "berryIConfigurationElement.h"
+#include "berryCoreException.h"
+
+namespace berry {
+
+IParameterValueConverter* ParameterValueConverterProxy::GetConverter() const
+{
+  if (parameterValueConverter.isNull())
+  {
+    try
+    {
+      parameterValueConverter = QSharedPointer<IParameterValueConverter>(
+            converterConfigurationElement->CreateExecutableExtension<IParameterValueConverter>(WorkbenchRegistryConstants::ATT_CONVERTER)
+            );
+    }
+    catch (const CoreException& e)
+    {
+      throw ParameterValueConversionException(
+          "Problem creating parameter value converter", e);
+    }
+
+    if (parameterValueConverter.isNull())
+    {
+      throw ParameterValueConversionException(
+          "Parameter value converter was not a subclass of AbstractParameterValueConverter");
+    }
+  }
+  return parameterValueConverter.data();
+}
+
+ParameterValueConverterProxy::ParameterValueConverterProxy(
+    const SmartPointer<IConfigurationElement>& converterConfigurationElement)
+  : converterConfigurationElement(converterConfigurationElement)
+{
+  if (converterConfigurationElement.IsNull())
+  {
+    throw ctkInvalidArgumentException(
+        "converterConfigurationElement must not be null");
+  }
+}
+
+Object::Pointer ParameterValueConverterProxy::ConvertToObject(const QString& parameterValue)
+{
+  return GetConverter()->ConvertToObject(parameterValue);
+}
+
+QString ParameterValueConverterProxy::ConvertToString(const Object::Pointer& parameterValue)
+{
+  return GetConverter()->ConvertToString(parameterValue);
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryParameterValueConverterProxy.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryParameterValueConverterProxy.h
new file mode 100644
index 0000000000..11da0641d6
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryParameterValueConverterProxy.h
@@ -0,0 +1,82 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYPARAMETERVALUECONVERTERPROXY_H
+#define BERRYPARAMETERVALUECONVERTERPROXY_H
+
+#include "berryIParameterValueConverter.h"
+
+#include <QSharedPointer>
+
+namespace berry {
+
+struct IConfigurationElement;
+
+/**
+ * A proxy for a parameter value converter that has been defined in the regisry.
+ * This delays the class loading until the converter is really asked to do
+ * string/object conversions.
+ */
+class ParameterValueConverterProxy : public IParameterValueConverter
+{
+
+private:
+
+  /**
+   * The configuration element providing the executable extension that will
+   * extend <code>AbstractParameterValueConverter</code>. This value will
+   * not be <code>null</code>.
+   */
+  const SmartPointer<IConfigurationElement> converterConfigurationElement;
+
+  /**
+   * The real parameter value converter instance. This will be
+   * <code>null</code> until one of the conversion methods are used.
+   */
+  mutable QSharedPointer<IParameterValueConverter> parameterValueConverter;
+
+  /**
+   * Returns the real parameter value converter for this proxy or throws an
+   * exception indicating the converter could not be obtained.
+   *
+   * @return the real converter for this proxy; never <code>null</code>.
+   * @throws ParameterValueConversionException
+   *             if the converter could not be obtained
+   */
+  IParameterValueConverter* GetConverter() const;
+
+public:
+
+  /**
+   * Constructs a <code>ParameterValueConverterProxy</code> to represent the
+   * real converter until it is needed.
+   *
+   * @param converterConfigurationElement
+   *            The configuration element from which the real converter can be
+   *            loaded.
+   */
+  ParameterValueConverterProxy(
+      const SmartPointer<IConfigurationElement>& converterConfigurationElement);
+
+  Object::Pointer ConvertToObject(const QString& parameterValue);
+
+  QString ConvertToString(const Object::Pointer& parameterValue);
+
+};
+
+}
+
+#endif // BERRYPARAMETERVALUECONVERTERPROXY_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartList.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartList.cpp
index ebb3af2294..532a16014c 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartList.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartList.cpp
@@ -1,367 +1,367 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 #include "berryPartList.h"
 
 #include "berrySaveablesList.h"
 
 #include "berryPartPane.h"
 #include "berryIWorkbenchPartConstants.h"
 #include "berryIWorkbenchPartSite.h"
 
 #include <berryObjects.h>
 
 namespace berry
 {
 
-void PartList::PropertyChange(Object::Pointer source, int propId)
+void PartList::PropertyChange(const Object::Pointer& source, int propId)
 {
   WorkbenchPartReference::Pointer ref = source.Cast<
       WorkbenchPartReference> ();
 
   if (propId == IWorkbenchPartConstants::PROP_OPENED)
   {
     this->PartOpened(ref);
   }
   else if (propId == IWorkbenchPartConstants::PROP_CLOSED)
   {
     this->PartClosed(ref);
   }
   else if (propId == IWorkbenchPartConstants::PROP_VISIBLE)
   {
     if (ref->GetVisible())
     {
       this->PartVisible(ref);
     }
     else
     {
       this->PartHidden(ref);
     }
   }
   else if (propId == IWorkbenchPartConstants::PROP_INPUT)
   {
     this->PartInputChanged(ref);
   }
 }
 
 IWorkbenchPartReference::Pointer PartList::GetActivePartReference()
 {
   return activePartReference.Lock();
 }
 
 IEditorReference::Pointer PartList::GetActiveEditorReference()
 {
   return activeEditorReference.Lock();
 }
 
 IEditorPart::Pointer PartList::GetActiveEditor()
 {
   return activeEditorReference.Expired() ? IEditorPart::Pointer(0) : activeEditorReference.Lock()->GetEditor(
       false);
 }
 
 IWorkbenchPart::Pointer PartList::GetActivePart()
 {
   return activePartReference.Expired() ? IWorkbenchPart::Pointer(0) : activePartReference.Lock()->GetPart(false);
 }
 
 //QList<IEditorReference::Pointer> PartList::GetEditors()
 //{
 //  QList<IEditorReference::Pointer> result;
 //  for (std::deque<IWorkbenchPartReference::Pointer>::iterator iter =
 //      parts.begin(); iter != parts.end(); ++iter)
 //  {
 //    if (iter->Cast<IEditorReference> () != 0)
 //      result.push_back(iter->Cast<IEditorReference> ());
 //  }
 //
 //  return result;
 //}
 
 void PartList::AddPart(WorkbenchPartReference::Pointer ref)
 {
   poco_assert(ref.IsNotNull());
 
   ref->AddPropertyListener(this);
 
 //  if (!this->Contains(ref))
 //  {
 //    parts.push_back(ref);
 //  }
 
   // parts.add(ref);
   this->FirePartAdded(ref);
 
   // If this part is already open, fire the "part opened" event
   // immediately
   if (ref->GetPart(false).IsNotNull())
   {
     this->PartOpened(ref);
   }
 
   // If this part is already visible, fire the visibility event
   // immediately
   if (ref->GetVisible())
   {
     this->PartVisible(ref);
   }
 }
 
 void PartList::SetActivePart(IWorkbenchPartReference::Pointer ref)
 {
   if (activePartReference.Lock() == ref)
   {
     return;
   }
 
   IWorkbenchPartReference::Pointer oldPart = activePartReference.Lock();
 
   // A part can't be activated until it is added
   //poco_assert(ref == 0 || this->Contains(ref));
 
   //std::remove(parts.begin(), parts.end(), ref);
   //parts.push_front(ref);
 
   activePartReference = ref;
 
   this->FireActivePartChanged(oldPart, ref);
 }
 
 void PartList::SetActiveEditor(IEditorReference::Pointer ref)
 {
   if (activeEditorReference.Lock() == ref)
   {
     return;
   }
 
   // A part can't be activated until it is added
   //poco_assert(ref == 0 || this->Contains(ref));
 
   activeEditorReference = ref;
   //std::remove(parts.begin(), parts.end(), ref);
   //parts.push_front(ref);
 
   this->FireActiveEditorChanged(ref);
 }
 
 void PartList::RemovePart(WorkbenchPartReference::Pointer ref)
 {
   poco_assert(ref.IsNotNull());
   // It is an error to remove a part that isn't in the list
   //poco_assert(this->Contains(ref));
   // We're not allowed to remove the active part. We must deactivate it
   // first.
   poco_assert(activePartReference.Lock() != ref);
   // We're not allowed to remove the active editor. We must deactivate it
   // first.
   if (ref.Cast<IEditorReference>())
   {
     poco_assert(activeEditorReference.Lock() != ref.Cast<IEditorReference>());
   }
 
   if (ref->GetVisible())
   {
     ref->SetVisible(false);
   }
 
   // If this part is currently open, fire the "part closed" event before
   // removal
   if (ref->GetPart(false).IsNotNull())
   {
     this->PartClosed(ref);
   }
 
   //std::remove(parts.begin(), parts.end(), ref);
   ref->RemovePropertyListener(this);
 
   this->FirePartRemoved(ref);
 }
 
 //int PartList::IndexOf(const IWorkbenchPartReference::Pointer ref) const
 //{
 //  std::deque<IWorkbenchPartReference::Pointer>::const_iterator result = std::find(parts.begin(), parts.end(), ref);
 //  if (result == parts.end()) return -1;
 //  else return result - parts.begin();
 //}
 
 //void PartList::BringToTop(IWorkbenchPartReference::Pointer ref)
 //{
 //  ILayoutContainer::Pointer targetContainer;
 //  if (ref != 0)
 //  {
 //    PartPane::Pointer pane = ref.Cast<WorkbenchPartReference>()->GetPane();
 //    if (pane != 0)
 //    {
 //      targetContainer = pane->GetContainer();
 //    }
 //  }
 //
 //  std::deque<IWorkbenchPartReference::Pointer>::iterator newIndex = this->LastIndexOfContainer(targetContainer);
 //
 //  // //New index can be -1 if there is no last index
 //  // if (newIndex >= 0 && ref == parts.get(newIndex))
 //  //  return;
 //
 //  std::remove(parts.begin(), parts.end(), ref);
 //  if(newIndex != parts.end())
 //  {
 //    parts.insert(newIndex, ref);
 //  }
 //  else
 //  parts.push_front(ref);
 //}
 
 //QList<IWorkbenchPartReference::Pointer>
 //PartList::GetParts(const QList<IViewReference::Pointer>& views)
 //{
 //  QList<IWorkbenchPartReference::Pointer> resultList;
 //  for (std::deque<IWorkbenchPartReference::Pointer>::iterator partIter = parts.begin();
 //      partIter != parts.end(); ++partIter)
 //  {
 //    IWorkbenchPartReference::Pointer ref = *partIter;
 //    if (ref.Cast<IViewReference>() != 0)
 //    {
 //      //Filter views from other perspectives
 //      for (unsigned int i = 0; i < views.size(); i++)
 //      {
 //        if (ref == views[i])
 //        {
 //          resultList.push_back(ref);
 //          break;
 //        }
 //      }
 //    }
 //    else
 //    {
 //      resultList.push_back(ref);
 //    }
 //  }
 //  return resultList;
 //}
 
 //std::deque<IWorkbenchPartReference::Pointer>::iterator
 //PartList::LastIndexOfContainer(ILayoutContainer::Pointer container)
 //{
 //  for (std::deque<IWorkbenchPartReference::Pointer>::iterator iter = parts.begin();
 //      iter != parts.end(); ++iter)
 //  {
 //    IWorkbenchPartReference::Pointer ref = *iter;
 //
 //    ILayoutContainer::Pointer cnt;
 //    PartPane::Pointer pane = ref.Cast<WorkbenchPartReference>()->GetPane();
 //    if (pane != 0)
 //    {
 //      cnt = pane->GetContainer();
 //    }
 //    if (cnt == container)
 //    {
 //      return iter;
 //    }
 //  }
 //
 //  return parts.end();
 //}
 
 //bool PartList::Contains(IWorkbenchPartReference::Pointer ref)
 //{
 //  return std::find(parts.begin(), parts.end(), ref) != parts.end();
 //}
 
 void PartList::PartInputChanged(WorkbenchPartReference::Pointer ref)
 {
   this->FirePartInputChanged(ref);
 }
 
 void PartList::PartHidden(WorkbenchPartReference::Pointer ref)
 {
   // Part should not be null
   poco_assert(ref.IsNotNull());
   // This event should only be fired if the part is actually visible
   poco_assert(!ref->GetVisible());
   // We shouldn't be receiving events from parts until they are in the
   // list
   //poco_assert(this->Contains(ref));
 
   this->FirePartHidden(ref);
 }
 
 void PartList::PartOpened(WorkbenchPartReference::Pointer ref)
 {
   poco_assert(ref.IsNotNull());
 
   IWorkbenchPart::Pointer actualPart = ref->GetPart(false);
   // We're firing the event that says "the part was just created"... so
   // there better be a part there.
   poco_assert(actualPart.IsNotNull());
   // Must be called after the part is inserted into the part list
   //poco_assert(this->Contains(ref));
   // The active part must be opened before it is activated, so we should
   // never get an open event for a part that is already active.
   // (This either indicates that a redundant
   // open event was fired or that a closed part was somehow activated)
   poco_assert(activePartReference.Lock() != ref);
   // The active editor must be opened before it is activated, so we should
   // never get an open event for an editor that is already active.
   // (This either indicates that a redundant
   // open event was fired or that a closed editor was somehow activated)
   poco_assert((void*)activeEditorReference.Lock().GetPointer() != (void*)ref.GetPointer());
 
   SaveablesList* modelManager = dynamic_cast<SaveablesList*>(
         actualPart->GetSite()->GetService<ISaveablesLifecycleListener>());
   modelManager->PostOpen(actualPart);
 
   // Fire the "part opened" event
   this->FirePartOpened(ref);
 }
 
 void PartList::PartClosed(WorkbenchPartReference::Pointer ref)
 {
   poco_assert(ref.IsNotNull());
 
   IWorkbenchPart::Pointer actualPart = ref->GetPart(false);
   // Called before the part is disposed, so the part should still be
   // there.
   poco_assert(actualPart.IsNotNull());
   // Must be called before the part is actually removed from the part list
   // poco_assert(this->Contains(ref));
   // Not allowed to close the active part. The part must be deactivated
   // before it may be closed.
   poco_assert(activePartReference.Lock() != ref);
   // Not allowed to close the active editor. The editor must be
   // deactivated before it may be closed.
   if (ref.Cast<IEditorReference>())
   {
     poco_assert(activeEditorReference.Lock() != ref.Cast<IEditorReference>());
   }
 
   this->FirePartClosed(ref);
 }
 
 void PartList::PartVisible(WorkbenchPartReference::Pointer ref)
 {
   // Part should not be null
   poco_assert(ref.IsNotNull());
   // This event should only be fired if the part is actually visible
   poco_assert(ref->GetVisible());
   // We shouldn't be receiving events from parts until they are in the
   // list
   //poco_assert(this->Contains(ref));
   // Part must be open before it can be made visible
   poco_assert(ref->GetPart(false).IsNotNull());
 
   this->FirePartVisible(ref);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartList.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartList.h
index 209e5b5d64..a4f7dc9d09 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartList.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartList.h
@@ -1,189 +1,190 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 #ifndef BERRYPARTLIST_H_
 #define BERRYPARTLIST_H_
 
 #include "berryWorkbenchPartReference.h"
 #include "berryILayoutContainer.h"
 
 #include "berryIEditorReference.h"
 #include "berryIViewReference.h"
 
 #include <deque>
 
 namespace berry
 {
 
 class PartList : public IPropertyChangeListener {
 
 private:
 
   // list of parts in the activation order (oldest last)
   //std::deque<IWorkbenchPartReference::Pointer> parts;
 
   IWorkbenchPartReference::WeakPtr activePartReference;
   IEditorReference::WeakPtr activeEditorReference;
 
 public:
 
-  void PropertyChange(Object::Pointer source, int propId);
+  using IPropertyChangeListener::PropertyChange;
+  void PropertyChange(const Object::Pointer& source, int propId);
 
   IWorkbenchPartReference::Pointer GetActivePartReference();
 
   IEditorReference::Pointer GetActiveEditorReference();
 
   IEditorPart::Pointer GetActiveEditor();
 
   IWorkbenchPart::Pointer GetActivePart();
 
   //QList<IEditorReference::Pointer> GetEditors();
 
   void AddPart(WorkbenchPartReference::Pointer ref);
 
   /**
    * Sets the active part.
    *
    * @param ref
    */
   void SetActivePart(IWorkbenchPartReference::Pointer ref);
 
   void SetActiveEditor(IEditorReference::Pointer ref);
 
   /**
    * In order to remove a part, it must first be deactivated.
    */
   void RemovePart(WorkbenchPartReference::Pointer ref);
 
   //int IndexOf(const IWorkbenchPartReference::Pointer ref) const;
 
   /*
    * Ensures that the given part appears AFTER any other part in the same
    * container.
    */
   //void BringToTop(IWorkbenchPartReference::Pointer ref);
 
   /*
    * Return a list with all parts (editors and views).
    */
   //QList<IWorkbenchPartReference::Pointer> GetParts(const QList<IViewReference::Pointer>& views);
 
 
 private:
 
   /*
    * Returns the last (most recent) index of the given container in the activation list, or returns
    * -1 if the given container does not appear in the activation list.
    */
   //std::deque<IWorkbenchPartReference::Pointer>::iterator
   //  LastIndexOfContainer(ILayoutContainer::Pointer container);
 
   void PartInputChanged(WorkbenchPartReference::Pointer ref);
 
   void PartHidden(WorkbenchPartReference::Pointer ref);
 
   void PartOpened(WorkbenchPartReference::Pointer ref);
 
   /**
    * Called when a concrete part is about to be destroyed. This is called
    * BEFORE disposal happens, so the part should still be accessable from the
    * part reference.
    *
    * @param ref
    */
   void PartClosed(WorkbenchPartReference::Pointer ref);
 
   void PartVisible(WorkbenchPartReference::Pointer ref);
 
   //bool Contains(IWorkbenchPartReference::Pointer ref);
 
 protected:
 
   /**
    * Fire the event indicating that a part reference was just realized. That
    * is, the concrete IWorkbenchPart has been attached to the part reference.
    *
    * @param part
    *            the reference that was create
    */
   virtual void FirePartOpened(IWorkbenchPartReference::Pointer part) = 0;
 
   /**
    * Fire the event indicating that a part reference was just realized. That
    * is, the concrete IWorkbenchPart has been attached to the part reference.
    *
    * @param part
    *            the reference that was create
    */
   virtual void FirePartClosed(IWorkbenchPartReference::Pointer part) = 0;
 
   /**
    * Indicates that a new part reference was added to the list.
    *
    * @param part
    */
   virtual void FirePartAdded(IWorkbenchPartReference::Pointer part) = 0;
 
   /**
    * Indicates that a part reference was removed from the list
    *
    * @param part
    */
   virtual void FirePartRemoved(IWorkbenchPartReference::Pointer part) = 0;
 
   /**
    * Indicates that the active editor changed
    *
    * @param part
    *            active part reference or null if none
    */
   virtual void FireActiveEditorChanged(IWorkbenchPartReference::Pointer ref) = 0;
 
   /**
    * Indicates that the active part has changed
    *
    * @param part
    *            active part reference or null if none
    */
   virtual void FireActivePartChanged(
       IWorkbenchPartReference::Pointer oldPart, IWorkbenchPartReference::Pointer newPart) = 0;
 
   /**
    * Indicates that the part has been made visible
    *
    * @param ref
    */
   virtual void FirePartVisible(IWorkbenchPartReference::Pointer ref) = 0;
 
   /**
    * Indicates that the part has been hidden
    *
    * @param ref
    */
   virtual void FirePartHidden(IWorkbenchPartReference::Pointer ref) = 0;
 
   /**
    * Indicates that the part input has changed
    *
    * @param ref
    */
   virtual void FirePartInputChanged(IWorkbenchPartReference::Pointer ref) = 0;
 
   virtual void FirePartBroughtToTop(IWorkbenchPartReference::Pointer ref) = 0;
 };
 
 }
 
 #endif /*BERRYPARTLIST_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartPane.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartPane.cpp
index 973ea5fbbd..4528612f65 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartPane.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartPane.cpp
@@ -1,464 +1,464 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "tweaklets/berryGuiWidgetsTweaklet.h"
 
 #include "berryPartPane.h"
 
 #include "tweaklets/berryWorkbenchPageTweaklet.h"
 
 #include "berryWorkbenchPage.h"
 #include "berryPartStack.h"
 #include "berryEditorAreaHelper.h"
 #include "berryPerspective.h"
 #include "berryPartStack.h"
 #include "berryDragUtil.h"
 
 namespace berry
 {
 
 PartPane::Sashes::Sashes() :
   left(0), right(0), top(0), bottom(0)
 {
 }
 
 PartPane::PartPane(IWorkbenchPartReference::Pointer partReference,
     WorkbenchPage* workbenchPage)
  : LayoutPart(partReference->GetId()),
    control(0), inLayout(true), busy(false), hasFocus(false)
 {
   //super(partReference.getId());
   this->partReference = partReference;
   this->page = workbenchPage;
 }
 
 void PartPane::CreateControl(void* parent) {
   if (this->GetControl() != 0)
   {
     return;
   }
 
   partReference.Lock()->AddPropertyListener(this);
 
   // Create view form.
   control = Tweaklets::Get(WorkbenchPageTweaklet::KEY)->CreatePaneControl(parent);
 
   // the part should never be visible by default.  It will be made visible
   // by activation.  This allows us to have views appear in tabs without
   // becoming active by default.
   Tweaklets::Get(GuiWidgetsTweaklet::KEY)->SetVisible(control, false);
   Tweaklets::Get(GuiWidgetsTweaklet::KEY)->MoveAbove(control, 0);
 
   // Create a title bar.
   //this->CreateTitleBar();
 
 
   // When the pane or any child gains focus, notify the workbench.
   Tweaklets::Get(GuiWidgetsTweaklet::KEY)->AddControlListener(control, GuiTk::IControlListener::Pointer(this));
 
   //control.addTraverseListener(traverseListener);
 }
 
 PartPane::~PartPane()
 {
 //  super.dispose();
 //
   this->Register();
 
   if (control != 0)
   {
     BERRY_DEBUG << "Deleting PartPane control";
     Tweaklets::Get(GuiWidgetsTweaklet::KEY)->RemoveControlListener(control, GuiTk::IControlListener::Pointer(this));
 //    control.removeTraverseListener(traverseListener);
     Tweaklets::Get(GuiWidgetsTweaklet::KEY)->Dispose(control);
     control = 0;
   }
 //  if ((paneMenuManager != null))
 //  {
 //    paneMenuManager.dispose();
 //    paneMenuManager = null;
 //  }
 //
   if (!partReference.Expired())
   {
     partReference.Lock()->RemovePropertyListener(this);
   }
 //  partReference.removePartPropertyListener(this);
 
   this->UnRegister(false);
 }
 
 void PartPane::DoHide()
 {
   if (partReference.Lock().Cast<IViewReference>() != 0)
   {
     this->GetPage()->HideView(partReference.Lock().Cast<IViewReference>());
   }
   else if (partReference.Lock().Cast<IEditorReference>() != 0)
   {
     this->GetPage()->CloseEditor(partReference.Lock().Cast<IEditorReference>(), true);
   }
 }
 
 Rectangle PartPane::GetParentBounds()
 {
   void* ctrl = this->GetControl();
 
   if (this->GetContainer() != 0 && this->GetContainer().Cast<LayoutPart>() != 0)
   {
     LayoutPart::Pointer part = this->GetContainer().Cast<LayoutPart>();
 
     if (part->GetControl() != 0)
     {
       ctrl = part->GetControl();
     }
   }
 
   return DragUtil::GetDisplayBounds(ctrl);
 }
 
 void* PartPane::GetControl()
 {
   return control;
 }
 
 IWorkbenchPartReference::Pointer PartPane::GetPartReference() const
 {
   return partReference.Lock();
 }
 
 void PartPane::ControlActivated(GuiTk::ControlEvent::Pointer /*e*/)
 {
   if (inLayout)
   {
     this->RequestActivation();
   }
 }
 
 GuiTk::IControlListener::Events::Types PartPane::GetEventTypes() const
 {
   return GuiTk::IControlListener::Events::ACTIVATED;
 }
 
 void PartPane::MoveAbove(void* refControl)
 {
   if (this->GetControl() != 0)
   {
     Tweaklets::Get(GuiWidgetsTweaklet::KEY)->MoveAbove(this->GetControl(), refControl);
   }
 }
 
 void PartPane::RequestActivation()
 {
   IWorkbenchPart::Pointer part = partReference.Lock()->GetPart(true);
 
   this->page->RequestActivation(part);
 }
 
 //PartStack::Pointer PartPane::GetStack()
 //{
 //  return partStack;
 //}
 
 PartPane::Sashes PartPane::FindSashes()
 {
   Sashes result;
 
   ILayoutContainer::Pointer container = this->GetContainer();
 
   if (container == 0) {
       return result;
   }
 
   container->FindSashes(LayoutPart::Pointer(this), result);
   return result;
 }
 
 WorkbenchPage::Pointer PartPane::GetPage()
 {
   return WorkbenchPage::Pointer(page);
 }
 
 void PartPane::SetContainer(ILayoutContainer::Pointer container)
 {
 
   if (hasFocus)
   {
     ILayoutContainer::Pointer oldContainer = this->GetContainer();
     if (PartStack::Pointer oldStack = oldContainer.Cast<PartStack>())
     {
       oldStack->SetActive(StackPresentation::AS_INACTIVE);
     }
     if (PartStack::Pointer newContainer = container.Cast<PartStack>())
     {
       newContainer->SetActive(StackPresentation::AS_ACTIVE_FOCUS);
     }
   }
 
   void* containerControl = container == 0 ? 0 : container.Cast<LayoutPart>()->GetControl();
 
   if (containerControl != 0)
   {
     void* control = this->GetControl();
     void* newParent = Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetParent(containerControl);
     if (control != 0 && newParent != Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetParent(control))
     {
       this->Reparent(newParent);
     }
   }
 
   LayoutPart::SetContainer(container);
 }
 
 void PartPane::Reparent(void* newParent)
 {
   void* control = this->GetControl();
 
   GuiWidgetsTweaklet* guiTweaklet = Tweaklets::Get(GuiWidgetsTweaklet::KEY);
   if ((control == 0) || (guiTweaklet->GetParent(control) == newParent))
   {
     return;
   }
 
   if (guiTweaklet->IsReparentable(control))
   {
     // make control small in case it is not resized with other controls
     //control.setBounds(0, 0, 0, 0);
     // By setting the control to disabled before moving it,
     // we ensure that the focus goes away from the control and its children
     // and moves somewhere else
     bool enabled = guiTweaklet->GetEnabled(control);
     guiTweaklet->SetEnabled(control, false);
     guiTweaklet->SetParent(control, newParent);
     guiTweaklet->SetEnabled(control, enabled);
     guiTweaklet->MoveAbove(control, 0);
   }
 }
 
 void PartPane::ShowFocus(bool inFocus)
 {
   if (partReference.Lock().Cast<IViewReference>() != 0)
   {
     hasFocus = inFocus;
   }
 
   if (PartStack::Pointer stack = this->GetContainer().Cast<PartStack>())
   {
     if (partReference.Lock().Cast<IViewReference>() != 0)
     {
       stack->SetActive(inFocus ? StackPresentation::AS_ACTIVE_FOCUS
                               : StackPresentation::AS_INACTIVE);
     }
     else if (partReference.Lock().Cast<IEditorReference>() != 0)
     {
       if (inFocus)
       {
         page->GetEditorPresentation()->SetActiveWorkbook(stack, true);
       }
       else
       {
         stack->SetActive(page->GetEditorPresentation()->GetActiveWorkbook() == stack ?
             StackPresentation::AS_ACTIVE_NOFOCUS : StackPresentation::AS_INACTIVE);
       }
     }
   }
 }
 
 PartStack::Pointer PartPane::GetStack()
 {
   ILayoutContainer::Pointer container = this->GetContainer();
   return container.Cast<PartStack>();
 }
 
 void PartPane::SetVisible(bool makeVisible)
 {
   // Avoid redundant visibility changes
   if (makeVisible == this->GetVisible())
   {
     return;
   }
 
   if (makeVisible)
   {
     partReference.Lock()->GetPart(true);
   }
 
   if (this->GetControl() != 0)
     Tweaklets::Get(GuiWidgetsTweaklet::KEY)->SetVisible(this->GetControl(), makeVisible);
 
   partReference.Lock().Cast<WorkbenchPartReference>()->FireVisibilityChange();
 }
 
 bool PartPane::GetVisible()
 {
   if (this->GetControl() != 0)
     return Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetVisible(this->GetControl());
   return false;
 }
 
 void PartPane::SetFocus()
 {
   this->RequestActivation();
 
   IWorkbenchPart::Pointer part = partReference.Lock()->GetPart(true);
   if (part.IsNotNull())
   {
 //    Control control = getControl();
 //    if (!SwtUtil.isFocusAncestor(control))
 //    {
       // First try to call part.setFocus
       part->SetFocus();
     //}
   }
 }
 
 void PartPane::SetWorkbenchPage(WorkbenchPage::Pointer workbenchPage)
 {
   this->page = workbenchPage.GetPointer();
 }
 
 void PartPane::DoDock()
 {
   // do nothing
 }
 
 void PartPane::SetBusy(bool isBusy)
 {
   if (isBusy != busy)
   {
     busy = isBusy;
     //firePropertyChange(IPresentablePart.PROP_BUSY);
   }
 }
 
 void PartPane::ShowHighlight()
 {
   //No nothing by default
 }
 
 void* PartPane::GetToolBar()
 {
   return 0;
 }
 
 bool PartPane::HasViewMenu()
 {
   return false;
 }
 
 bool PartPane::IsBusy()
 {
   return busy;
 }
 
 void PartPane::DescribeLayout(QString& buf) const
 {
 
   IWorkbenchPartReference::Pointer part = this->GetPartReference();
 
   if (part.IsNotNull())
   {
     buf.append(part->GetPartName());
     return;
   }
 }
 
 bool PartPane::IsCloseable()
 {
   if (partReference.Lock().Cast<IViewReference>() != 0)
   {
     Perspective::Pointer perspective = page->GetActivePerspective();
     if (perspective == 0) {
         // Shouldn't happen -- can't have a ViewStack without a
         // perspective
         return true;
     }
     return perspective->IsCloseable(partReference.Lock().Cast<IViewReference>());
   }
 
   return true;
 }
 
 void PartPane::SetInLayout(bool inLayout)
 {
   this->inLayout = inLayout;
 }
 
 bool PartPane::GetInLayout()
 {
   return inLayout;
 }
 
 bool PartPane::AllowsAutoFocus()
 {
   if (!inLayout)
   {
     return false;
   }
 
   //return super.allowsAutoFocus();
   return true;
 }
 
 void PartPane::RemoveContributions()
 {
 
 }
 
 void PartPane::AddPropertyListener(IPropertyChangeListener *listener)
 {
   propertyChangeEvents.AddListener(listener);
 }
 
 void PartPane::RemovePropertyListener(IPropertyChangeListener *listener)
 {
   propertyChangeEvents.RemoveListener(listener);
 }
 
-void PartPane::FirePropertyChange(PropertyChangeEvent::Pointer event)
+void PartPane::FirePropertyChange(const PropertyChangeEvent::Pointer& event)
 {
   propertyChangeEvents.propertyChange(event);
 }
 
-void PartPane::PropertyChange(PropertyChangeEvent::Pointer event)
+void PartPane::PropertyChange(const PropertyChangeEvent::Pointer& event)
 {
   this->FirePropertyChange(event);
 }
 
 int PartPane::ComputePreferredSize(bool width, int availableParallel,
     int availablePerpendicular, int preferredParallel)
 {
 
   return partReference.Lock().Cast<WorkbenchPartReference>()->ComputePreferredSize(width,
       availableParallel, availablePerpendicular, preferredParallel);
 }
 
 int PartPane::GetSizeFlags(bool horizontal)
 {
   return partReference.Lock().Cast<WorkbenchPartReference>()->GetSizeFlags(horizontal);
 }
 
 void PartPane::ShellActivated()
 {
 
 }
 
 void PartPane::ShellDeactivated()
 {
 
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartPane.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartPane.h
index f27e55e8f2..0dcb80ac98 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartPane.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartPane.h
@@ -1,434 +1,437 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYPARTPANE_H_
 #define BERRYPARTPANE_H_
 
 #include "berryWorkbenchPartReference.h"
 #include "berryLayoutPart.h"
 
 #include "berryRectangle.h"
 #include "berryIPropertyChangeListener.h"
 
 #include "guitk/berryGuiTkIControlListener.h"
 
 namespace berry {
 
 class WorkbenchPage;
 class PartStack;
 struct ILayoutContainer;
 
 /**
  * Provides the common behavior for both views
  * and editor panes.
  *
  */
 class PartPane : public LayoutPart,
                  public IPropertyChangeListener,
                  public GuiTk::IControlListener
 {
 
 public:
   berryObjectMacro(PartPane)
 
   friend class PartSashContainer;
   friend class EditorSashContainer;
   friend class WorkbenchPage;
   friend struct ILayoutContainer;
   friend class PartStack;
   friend class ContainerPlaceholder;
   friend class LayoutTree;
   friend class LayoutTreeNode;
   friend class DetachedPlaceHolder;
   friend class PerspectiveHelper;
 
 //    private: MenuManager paneMenuManager;
 //    private: ListenerList listeners = new ListenerList();
 //    private: ListenerList partListeners = new ListenerList();
   private: IPropertyChangeListener::Events propertyChangeEvents;
 
     protected: IWorkbenchPartReference::WeakPtr partReference;
 
     protected: WorkbenchPage* page;
 
     protected: void* control;
 
     private: bool inLayout;
 
 //    private: TraverseListener traverseListener = new TraverseListener() {
 //        /* (non-Javadoc)
 //         * @see org.blueberry.swt.events.TraverseListener#keyTraversed(org.blueberry.swt.events.TraverseEvent)
 //         */
 //        public: void keyTraversed(TraverseEvent e) {
 //            // Hack: Currently, SWT sets focus whenever we call Control.traverse. This doesn't
 //            // cause too much of a problem for ctrl-pgup and ctrl-pgdn, but it is seriously unexpected
 //            // for other traversal events. When (and if) it becomes possible to call traverse() without
 //            // forcing a focus change, this if statement should be removed and ALL events should be
 //            // forwarded to the container.
 //            if (e.detail == SWT.TRAVERSE_PAGE_NEXT
 //                    || e.detail == SWT.TRAVERSE_PAGE_PREVIOUS) {
 //                ILayoutContainer container = getContainer();
 //                if (container != null && container instanceof LayoutPart) {
 //                    LayoutPart parent = (LayoutPart) container;
 //                    Control parentControl = parent.getControl();
 //                    if (parentControl != null && !parentControl.isDisposed()) {
 //                        e.doit = parentControl.traverse(e.detail);
 //                        if (e.doit) {
 //              e.detail = SWT.TRAVERSE_NONE;
 //            }
 //                    }
 //                }
 //            }
 //        }
 //
 //    };
 
   private: bool busy;
 
   private: bool hasFocus;
 
   //private: SmartPointer<PartStack> partStack;
 
   protected:
    /*static*/ class Sashes {
         public:
           Sashes();
 
           /*Sash*/ void* left;
           /*Sash*/ void* right;
           /*Sash*/ void* top;
           /*Sash*/ void* bottom;
     };
 
     /**
      * Construct a pane for a part.
      */
     public: PartPane(IWorkbenchPartReference::Pointer partReference,
             WorkbenchPage* workbenchPage);
 
 //    public: void addSizeMenuItem(Menu menu, int index) {
 //        //Add size menu
 //        MenuItem item = new MenuItem(menu, SWT.CASCADE, index);
 //        item.setText(WorkbenchMessages.PartPane_size);
 //        Menu sizeMenu = new Menu(menu);
 //        item.setMenu(sizeMenu);
 //        addSizeItems(sizeMenu);
 //    }
 
     /**
      *
      * Creates the GUI-dependent container control
      * for the part widgets. This is passed to
      * IWorkbenchPart::CreatePartControl(void*)
      */
     public: virtual void CreateControl(void* parent);
 
     //public: virtual void SetControlEnabled(bool enabled) = 0;
 
     /**
      * Create a title bar for the pane if required.
      */
    // protected: virtual void CreateTitleBar() = 0;
 
     /**
      * @private:
      */
     public: virtual ~PartPane();
 
     /**
      * User has requested to close the pane.
      * Take appropriate action depending on type.
      */
     public: void DoHide();
 
     protected: Rectangle GetParentBounds();
 
     /**
      * Get the control.
      */
     public: void* GetControl();
 
     /**
      * Answer the part child.
      */
     public: IWorkbenchPartReference::Pointer GetPartReference() const;
 
     /**
      * @see GuiTk::IControlListener
      */
     public: void ControlActivated(GuiTk::ControlEvent::Pointer e);
 
     /**
      * @see GuiTk::IControlListener
      */
     public: GuiTk::IControlListener::Events::Types GetEventTypes() const;
 
     /**
      * Move the control over another one.
      */
     public: void MoveAbove(void* refControl);
 
     /**
      * Notify the workbook page that the part pane has
      * been activated by the user.
      */
     public: void RequestActivation();
 
     /**
      * Shows the receiver if <code>visible</code> is true otherwise hide it.
      */
     public: void SetVisible(bool makeVisible);
     public: virtual bool GetVisible();
 
     /**
      * Sets focus to this part.
      */
     public: void SetFocus();
 
     /**
      * Sets the workbench page of the view.
      */
     public: void SetWorkbenchPage(SmartPointer<WorkbenchPage> workbenchPage);
 
     public: void Reparent(void* newParent);
 
     /**
      * Indicate focus in part.
      */
     public: void ShowFocus(bool inFocus);
 
     /**
      * @see IPartDropTarget::targetPartFor
      */
 //    public: LayoutPart targetPartFor(LayoutPart dragSource) {
 //        return this;
 //    }
 
     /**
      * Returns the PartStack that contains this PartPane, or null if none.
      *
      * @return
      */
     public: SmartPointer<PartStack> GetStack();
 
     public: void SetContainer(SmartPointer<ILayoutContainer> stack);
 
     /**
      * Show a title label menu for this pane.
      */
 //    public: void ShowPaneMenu() {
 //        PartStack folder = getStack();
 //
 //        if (folder != null) {
 //            folder.showPaneMenu();
 //        }
 //    }
 
     /**
      * Show the context menu for this part.
      */
 //    public: void showSystemMenu() {
 //        PartStack folder = getStack();
 //
 //        if (folder != null) {
 //            folder.showSystemMenu();
 //        }
 //    }
 
     /**
      * Finds and return the sashes around this part.
      */
     protected: Sashes FindSashes();
 
     /**
      * Enable the user to resize this part using
      * the keyboard to move the specified sash
      */
 //    protected: void moveSash(final Sash sash) {
 //        moveSash(sash, this);
 //    }
 
 //    public: static void moveSash(final Sash sash,
 //            final LayoutPart toGetFocusWhenDone) {
 //        final KeyListener listener = new KeyAdapter() {
 //            public: void keyPressed(KeyEvent e) {
 //                if (e.character == SWT.ESC || e.character == '\r') {
 //                    if (toGetFocusWhenDone != null) {
 //            toGetFocusWhenDone.setFocus();
 //          }
 //                }
 //            }
 //        };
 //        sash.addFocusListener(new FocusAdapter() {
 //            public: void focusGained(FocusEvent e) {
 //                sash.setBackground(sash.getDisplay().getSystemColor(
 //                        SWT.COLOR_LIST_SELECTION));
 //                sash.addKeyListener(listener);
 //            }
 //
 //            public: void focusLost(FocusEvent e) {
 //                sash.setBackground(null);
 //                sash.removeKeyListener(listener);
 //            }
 //        });
 //        sash.setFocus();
 //
 //    }
 
     /**
      * Add a menu item to the Size Menu
      */
 //    protected: void addSizeItem(Menu sizeMenu, String labelMessage,
 //            final Sash sash) {
 //        MenuItem item = new MenuItem(sizeMenu, SWT.NONE);
 //        item.setText(labelMessage);
 //        item.addSelectionListener(new SelectionAdapter() {
 //            public: void widgetSelected(SelectionEvent e) {
 //                moveSash(sash);
 //            }
 //        });
 //        item.setEnabled(!isZoomed() && sash != null);
 //    }
 
     /**
      * Returns the workbench page of this pane.
      */
     public: SmartPointer<WorkbenchPage> GetPage();
 
     /**
      * Add the Left,Right,Up,Botton menu items to the Size menu.
      */
 //    protected: void addSizeItems(Menu sizeMenu) {
 //        Sashes sashes = findSashes();
 //        addSizeItem(sizeMenu,
 //                WorkbenchMessages.PartPane_sizeLeft, sashes.left);
 //        addSizeItem(sizeMenu,
 //                WorkbenchMessages.PartPane_sizeRight, sashes.right);
 //        addSizeItem(sizeMenu,
 //                WorkbenchMessages.PartPane_sizeTop, sashes.top);
 //        addSizeItem(sizeMenu, WorkbenchMessages.PartPane_sizeBottom, sashes.bottom);
 //    }
 
     /**
      * Pin this part.
      */
     protected: virtual void DoDock();
 
     /**
      * Set the busy state of the pane.
      */
     public: virtual void SetBusy(bool isBusy);
 
     /**
      * Show a highlight for the receiver if it is
      * not currently the part in the front of its
      * presentation.
      *
      */
     public: virtual void ShowHighlight();
 
     /**
      * @return
      */
     public: virtual void* GetToolBar();
 
     /**
      * @return
      */
     public: bool HasViewMenu();
 
     /**
      * @param location
      */
 //    public: void ShowViewMenu(Point location) {
 //
 //    }
 
     public: bool IsBusy();
 
     /**
      * Writes a description of the layout to the given string buffer.
      * This is used for drag-drop test suites to determine if two layouts are the
      * same. Like a hash code, the description should compare as equal iff the
      * layouts are the same. However, it should be user-readable in order to
      * help debug failed tests. Although these are english readable strings,
      * they do not need to be translated.
      *
      * @param buf
      */
     public: void DescribeLayout(QString& buf) const;
 
     /**
      * @return
      * @since 3.1
      */
     public: bool IsCloseable();
 
     public: void SetInLayout(bool inLayout);
 
     public: bool GetInLayout();
 
     public: bool AllowsAutoFocus();
 
     /**
      * Clears all contribution items from the contribution managers (this is done separately
      * from dispose() since it is done after the part is disposed). This is a bit of a hack.
      * Really, the contribution managers should be part of the site, not the PartPane. If these
      * were moved elsewhere, then disposal of the PartPane would be atomic and this method could
      * be removed.
      */
   public: virtual void RemoveContributions();
 
   public: void AddPropertyListener(IPropertyChangeListener* listener);
 
   public: void RemovePropertyListener(IPropertyChangeListener* listener);
 
-  public: void FirePropertyChange(PropertyChangeEvent::Pointer event);
+  public: void FirePropertyChange(const PropertyChangeEvent::Pointer& event);
 
 
   /* (non-Javadoc)
    * @see IPropertyChangeListener#PropertyChange(PropertyChangeEvent::Pointer)
    */
-  public: void PropertyChange(PropertyChangeEvent::Pointer event);
+  public:
+
+  using IPropertyChangeListener::PropertyChange;
+  void PropertyChange(const PropertyChangeEvent::Pointer& event);
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.LayoutPart#computePreferredSize(boolean, int, int, int)
    */
   public: int ComputePreferredSize(bool width, int availableParallel,
           int availablePerpendicular, int preferredParallel);
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.LayoutPart#getSizeFlags(boolean)
    */
   public: int GetSizeFlags(bool horizontal);
 
   /**
    * Informs the pane that it's window shell has
    * been activated.
    */
   public: virtual void ShellActivated();
 
   /**
    * Informs the pane that it's window shell has
    * been deactivated.
    */
   public: virtual void ShellDeactivated();
 
 };
 
 }
 
 #endif /*BERRYPARTPANE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartSashContainer.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartSashContainer.cpp
index 0a1472c229..6bf4bd7481 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartSashContainer.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartSashContainer.cpp
@@ -1,1272 +1,1272 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "tweaklets/berryGuiWidgetsTweaklet.h"
 
 #include "berryPartSashContainer.h"
 
 #include "berryLayoutTree.h"
 #include "berryLayoutTreeNode.h"
 #include "berryPartStack.h"
 #include "berryPageLayout.h"
 #include "berryPerspective.h"
 #include "berryPerspectiveHelper.h"
 #include "berryDragUtil.h"
 #include "berryWorkbenchPlugin.h"
 #include "berryIPreferencesService.h"
 #include "berryIPreferences.h"
 
 #include "berryWorkbenchPreferenceConstants.h"
 #include "berryGeometry.h"
 #include "berryPartPane.h"
 
 #include "berryConstants.h"
 
 
 namespace berry
 {
 
 bool PartSashContainer::leftToRight = true;
 
 PartSashContainer::ControlListener::ControlListener(
     PartSashContainer* container) :
   partSashContainer(container)
 {
 
 }
 
 GuiTk::IControlListener::Events::Types PartSashContainer::ControlListener::GetEventTypes() const
 {
   return Events::RESIZED;
 }
 
 void PartSashContainer::ControlListener::ControlResized(
     GuiTk::ControlEvent::Pointer /*e*/)
 {
   partSashContainer->ResizeSashes();
 }
 
 PartSashContainer::SashContainerDropTarget::SashContainerDropTarget(
     PartSashContainer* partSashContainer, Object::Pointer sourcePart, int side,
     int cursor, Object::Pointer targetPart) :
   partSashContainer(partSashContainer)
 {
   this->SetTarget(sourcePart, side, cursor, targetPart);
 }
 
 void PartSashContainer::SashContainerDropTarget::SetTarget(
     Object::Pointer sourcePart, int side, int cursor,
     Object::Pointer targetPart)
 {
   this->side = side;
   this->targetPart = targetPart;
   this->sourcePart = sourcePart;
   this->cursor = cursor;
 }
 
 void PartSashContainer::SashContainerDropTarget::Drop()
 {
   if (side != Constants::NONE)
   {
     LayoutPart::Pointer visiblePart = sourcePart.Cast<LayoutPart> ();
 
     if (sourcePart.Cast<ILayoutContainer> () != 0)
     {
       visiblePart = partSashContainer->GetVisiblePart(sourcePart.Cast<
           ILayoutContainer> ());
     }
 
     partSashContainer->DropObject(
         partSashContainer->GetVisibleParts(sourcePart), visiblePart,
         targetPart, side);
   }
 }
 
 void PartSashContainer::DropObject(const QList<PartPane::Pointer>& toDrop,
     LayoutPart::Pointer visiblePart, Object::Pointer targetPart, int side)
 {
   //getControl().setRedraw(false);
 
   // Targetpart is null if there isn't a part under the cursor (all the parts are
   // hidden or the container is empty). In this case, the actual side doesn't really
   // since we'll be the only visible container and will fill the entire space. However,
   // we can't leave it as Constants::CENTER since we can't stack if we don't have something
   // to stack on. In this case, we pick Constants::BOTTOM -- this will insert the new pane
   // below any currently-hidden parts.
   if (targetPart == 0 && side == Constants::CENTER)
   {
     side = Constants::BOTTOM;
   }
 
   PartStack::Pointer targetStack = targetPart.Cast<PartStack> ();
   if (targetStack == 0 && targetPart.Cast<PartPane>() != 0)
   {
     targetStack = targetPart.Cast<PartPane> ()->GetStack();
   }
   LayoutPart::Pointer targetLayoutPart = targetStack;
 
   // if targetLayoutPart == 0 then we normally got a EditorSashContainer
   if (targetLayoutPart == 0)
     targetLayoutPart = targetPart.Cast<LayoutPart>();
 
   if (side == Constants::CENTER)
   {
 
     if (this->IsStackType(targetStack))
     {
 
-      for (unsigned int idx = 0; idx < toDrop.size(); idx++)
+      for (int idx = 0; idx < toDrop.size(); idx++)
       {
         LayoutPart::Pointer next = toDrop[idx];
         this->Stack(next, targetStack);
       }
     }
   }
   else
   {
     PartStack::Pointer newPart = this->CreateStack();
 
     // if the toDrop array has 1 item propagate the stack
     // appearance
     if (toDrop.size() == 1 && toDrop[0]->GetStack() != 0)
     {
       toDrop[0]->GetStack()->CopyAppearanceProperties(newPart);
     }
 
-    for (unsigned int idx = 0; idx < toDrop.size(); idx++)
+    for (int idx = 0; idx < toDrop.size(); idx++)
     {
       LayoutPart::Pointer next = toDrop[idx];
       this->Stack(next, newPart);
     }
 
     this->AddEnhanced(newPart, side, this->GetDockingRatio(newPart, targetStack),
         targetLayoutPart);
   }
 
   if (visiblePart != 0)
   {
     this->SetVisiblePart(visiblePart->GetContainer(),
         visiblePart.Cast<PartPane> ());
   }
 
   //getControl().setRedraw(true);
 
   if (visiblePart != 0)
   {
     visiblePart->SetFocus();
   }
 }
 
 DnDTweaklet::CursorType PartSashContainer::SashContainerDropTarget::GetCursor()
 {
   return DnDTweaklet::PositionToCursorType(cursor);
 }
 
 Rectangle PartSashContainer::SashContainerDropTarget::GetSnapRectangle()
 {
   Rectangle targetBounds;
 
   if (targetPart.Cast<LayoutPart> () != 0)
   {
     targetBounds = DragUtil::GetDisplayBounds(
         targetPart.Cast<LayoutPart> ()->GetControl());
   }
   else if (targetPart.Cast<LayoutPart> () != 0)
   {
     targetBounds = DragUtil::GetDisplayBounds(
         targetPart.Cast<LayoutPart> ()->GetControl());
   }
   else
   {
     targetBounds = DragUtil::GetDisplayBounds(partSashContainer->GetParent());
   }
 
   if (side == Constants::CENTER || side == Constants::NONE)
   {
     return targetBounds;
   }
 
   int distance = Geometry::GetDimension(targetBounds, !Geometry::IsHorizontal(
       side));
 
   ILayoutContainer::Pointer stack = targetPart.Cast<ILayoutContainer> ();
   if (stack == 0 && targetPart.Cast<LayoutPart> () != 0)
   {
     stack = targetPart.Cast<LayoutPart> ()->GetContainer();
   }
 
   return Geometry::GetExtrudedEdge(targetBounds, (int) (distance
       * partSashContainer->GetDockingRatio(sourcePart, stack)), side);
 }
 
 PartSashContainer::PartSashContainer(const QString& id,
     WorkbenchPage* _page, void* _parentWidget) :
   LayoutPart(id), parentWidget(_parentWidget), parent(0), page(_page), active(
       false), layoutDirty(false)
 {
   resizeListener = new ControlListener(this);
 
   QString layout = WorkbenchPlugin::GetDefault()->GetPreferencesService()->
       GetSystemPreferences()->Get(WorkbenchPreferenceConstants::PREFERRED_SASH_LAYOUT,
           WorkbenchPreferenceConstants::LEFT);
   if (layout == WorkbenchPreferenceConstants::RIGHT)
   {
     leftToRight = false;
   }
 }
 
 QList<PartPane::Pointer> PartSashContainer::GetVisibleParts(
     Object::Pointer pane)
 {
   QList<PartPane::Pointer> parts;
   if (pane.Cast<PartPane> ().IsNotNull())
   {
     parts.push_back(pane.Cast<PartPane> ());
   }
   else if (pane.Cast<PartStack> ().IsNotNull())
   {
     PartStack::Pointer stack = pane.Cast<PartStack> ();
     QList<LayoutPart::Pointer> children = stack->GetChildren();
     for (QList<LayoutPart::Pointer>::iterator iter = children.begin(); iter
         != children.end(); ++iter)
     {
       if (iter->Cast<PartPane> () != 0)
       {
         parts.push_back(iter->Cast<PartPane> ());
       }
     }
   }
 
   return parts;
 }
 
 PartSashContainer::~PartSashContainer()
 {
 
 }
 
 void PartSashContainer::FindSashes(LayoutPart::Pointer pane,
     PartPane::Sashes& sashes)
 {
   if (root == 0)
   {
     return;
   }
   LayoutTree::Pointer part = root->Find(pane);
   if (part == 0)
   {
     return;
   }
   part->FindSashes(sashes);
 }
 
 void PartSashContainer::Add(LayoutPart::Pointer child)
 {
   if (child.IsNull())
   {
     return;
   }
 
   this->AddEnhanced(child, Constants::RIGHT, 0.5f, this->FindBottomRight());
 }
 
 void PartSashContainer::AddPart(LayoutPart::Pointer child)
 {
   if (child.IsNull())
   {
     return;
   }
 
   PartStack::Pointer newFolder = this->CreateStack();
   newFolder->Add(child);
   this->AddEnhanced(newFolder, Constants::RIGHT, 0.5f, this->FindBottomRight());
 }
 
 void PartSashContainer::AddEnhanced(LayoutPart::Pointer child,
     int directionConstant, float ratioForNewPart, LayoutPart::Pointer relative)
 {
   int relativePosition =
       PageLayout::ConstantToLayoutPosition(directionConstant);
 
   float ratioForUpperLeftPart;
 
   if (relativePosition == IPageLayout::RIGHT || relativePosition
       == IPageLayout::BOTTOM)
   {
     ratioForUpperLeftPart = 1.0f - ratioForNewPart;
   }
   else
   {
     ratioForUpperLeftPart = ratioForNewPart;
   }
 
   this->Add(child, relativePosition, ratioForUpperLeftPart, relative);
 }
 
 void PartSashContainer::Add(LayoutPart::Pointer child, int relationship,
     float ratio, LayoutPart::Pointer relative)
 {
   bool isHorizontal = (relationship == IPageLayout::LEFT || relationship
       == IPageLayout::RIGHT);
 
   LayoutTree::Pointer node;
   if (root != 0 && relative != 0)
   {
     node = root->Find(relative);
   }
 
   Rectangle bounds;
   if (this->GetParent() == 0)
   {
     void* control = this->GetPage()->GetClientComposite();
     if (control != 0)
     {
       bounds = Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetBounds(control);
     }
     else
     {
       bounds = Rectangle(0, 0, 800, 600);
     }
     bounds.x = 0;
     bounds.y = 0;
   }
   else
   {
     bounds = this->GetBounds();
   }
 
   int totalSize = this->MeasureTree(bounds, node, isHorizontal);
 
   int left = (int) (totalSize * ratio);
   int right = totalSize - left;
 
   this->Add(child, relationship, left, right, relative);
 }
 
 int PartSashContainer::MeasureTree(const Rectangle& outerBounds,
     LayoutTree::ConstPointer toMeasure, bool horizontal)
 {
   if (toMeasure == 0)
   {
     return outerBounds.GetDimension(horizontal);
   }
 
   LayoutTreeNode* parent = toMeasure->GetParent();
   if (parent == 0)
   {
     return outerBounds.GetDimension(horizontal);
   }
 
   if (parent->GetSash()->IsHorizontal() == horizontal)
   {
     return MeasureTree(outerBounds, LayoutTree::ConstPointer(parent), horizontal);
   }
 
   bool isLeft = parent->IsLeftChild(toMeasure);
 
   LayoutTree::Pointer otherChild = parent->GetChild(!isLeft);
   if (otherChild->IsVisible())
   {
     int left = parent->GetSash()->GetLeft();
     int right = parent->GetSash()->GetRight();
     int childSize = isLeft ? left : right;
 
     int bias = parent->GetCompressionBias();
 
     // Normalize bias: 1 = we're fixed, -1 = other child is fixed
     if (isLeft)
     {
       bias = -bias;
     }
 
     if (bias == 1)
     {
       // If we're fixed, return the fixed size
       return childSize;
     }
     else if (bias == -1)
     {
 
       // If the other child is fixed, return the size of the parent minus the fixed size of the
       // other child
       return MeasureTree(outerBounds, LayoutTree::ConstPointer(parent), horizontal) - (left + right
           - childSize);
     }
 
     // Else return the size of the parent, scaled appropriately
     return MeasureTree(outerBounds, LayoutTree::ConstPointer(parent), horizontal) * childSize / (left
         + right);
   }
 
   return MeasureTree(outerBounds, LayoutTree::ConstPointer(parent), horizontal);
 }
 
 void PartSashContainer::AddChild(const RelationshipInfo& info)
 {
   LayoutPart::Pointer child = info.part;
 
   children.push_back(child);
 
   if (root == 0)
   {
     root = new LayoutTree(child);
   }
   else
   {
     //Add the part to the tree.
     int vertical = (info.relationship == IPageLayout::LEFT || info.relationship
         == IPageLayout::RIGHT) ? Constants::VERTICAL : Constants::HORIZONTAL;
     bool left = info.relationship == IPageLayout::LEFT || info.relationship
         == IPageLayout::TOP;
     LayoutPartSash::Pointer sash(new LayoutPartSash(this, vertical));
     sash->SetSizes(info.left, info.right);
     if ((parent != 0) && child.Cast<PartPlaceholder> ().IsNull())
     {
       sash->CreateControl(parent);
     }
     LayoutTree::Pointer newroot =
         root->Insert(child, left, sash, info.relative);
     root = newroot;
   }
 
   this->ChildAdded(child);
 
   if (active)
   {
     child->CreateControl(parent);
     child->SetVisible(true);
     child->SetContainer(ILayoutContainer::Pointer(this));
     this->ResizeChild(child);
   }
 
 }
 
 void PartSashContainer::AddChildForPlaceholder(LayoutPart::Pointer child,
     LayoutPart::Pointer placeholder)
 {
   RelationshipInfo newRelationshipInfo;
   newRelationshipInfo.part = child;
   if (root != 0)
   {
     newRelationshipInfo.relationship = IPageLayout::RIGHT;
     newRelationshipInfo.relative = root->FindBottomRight();
     newRelationshipInfo.left = 200;
     newRelationshipInfo.right = 200;
   }
 
   // find the relationship info for the placeholder
   QList<RelationshipInfo> relationships = this->ComputeRelation();
-  for (unsigned int i = 0; i < relationships.size(); i++)
+  for (int i = 0; i < relationships.size(); i++)
   {
     RelationshipInfo info = relationships[i];
     if (info.part == placeholder)
     {
       newRelationshipInfo.left = info.left;
       newRelationshipInfo.right = info.right;
       newRelationshipInfo.relationship = info.relationship;
       newRelationshipInfo.relative = info.relative;
     }
   }
 
   this->AddChild(newRelationshipInfo);
   this->FlushLayout();
 }
 
 bool PartSashContainer::AllowsBorder()
 {
   return true;
 }
 
 void PartSashContainer::ChildAdded(LayoutPart::Pointer child)
 {
   if (this->IsDeferred())
   {
     child->DeferUpdates(true);
   }
 }
 
 void PartSashContainer::ChildRemoved(LayoutPart::Pointer child)
 {
   if (this->IsDeferred())
   {
     child->DeferUpdates(false);
   }
 }
 
 QList<PartSashContainer::RelationshipInfo> PartSashContainer::ComputeRelation()
 {
   LayoutTree::Pointer treeRoot = root;
   QList<RelationshipInfo> list;
   if (treeRoot == 0)
   {
     return QList<RelationshipInfo>();
   }
   RelationshipInfo r;
   r.part = treeRoot->ComputeRelation(list);
   list.push_front(r);
   return list;
 }
 
 void PartSashContainer::SetActive(bool isActive)
 {
   if (isActive == active)
   {
     return;
   }
 
   active = isActive;
 
   ILayoutContainer::ChildrenType children = this->children;
   for (ILayoutContainer::ChildrenType::iterator childIter = children.begin(); childIter
       != children.end(); ++childIter)
   {
     if (childIter->Cast<PartStack> ().IsNotNull())
     {
       PartStack::Pointer stack = childIter->Cast<PartStack> ();
       stack->SetActive(isActive);
     }
   }
 
   if (isActive)
   {
 
     this->CreateControl(parentWidget);
 
     Tweaklets::Get(GuiWidgetsTweaklet::KEY)->AddControlListener(parent,
         resizeListener);
 
-    DragUtil::AddDragTarget(parent, IDragOverListener::Pointer(this));
-    DragUtil::AddDragTarget(Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetShell(parent)->GetControl(), IDragOverListener::Pointer(this));
+    DragUtil::AddDragTarget(parent, this);
+    DragUtil::AddDragTarget(Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetShell(parent)->GetControl(), this);
 
     ILayoutContainer::ChildrenType children = this->children;
     for (ILayoutContainer::ChildrenType::iterator childIter = children.begin(); childIter
         != children.end(); ++childIter)
     {
       LayoutPart::Pointer child = *childIter;
       child->SetContainer(ILayoutContainer::Pointer(this));
       child->SetVisible(true); //zoomedPart == null || child == zoomedPart);
       if (child.Cast<PartStack> ().IsNull())
       {
         if (root != 0)
         {
           LayoutTree::Pointer node = root->Find(child);
           if (node != 0)
           {
             node->FlushCache();
           }
         }
       }
     }
 
     if (root != 0)
     {
       //root.flushChildren();
       //if (!isZoomed())
       {
         root->CreateControl(parent);
       }
     }
 
     this->ResizeSashes();
   }
   else
   {
-    DragUtil::RemoveDragTarget(parent, IDragOverListener::Pointer(this));
-    DragUtil::RemoveDragTarget(Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetShell(parent)->GetControl(), IDragOverListener::Pointer(this));
+    DragUtil::RemoveDragTarget(parent, this);
+    DragUtil::RemoveDragTarget(Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetShell(parent)->GetControl(), this);
 
     // remove all Listeners
     if (resizeListener != 0 && parent != 0)
     {
       Tweaklets::Get(GuiWidgetsTweaklet::KEY)->RemoveControlListener(parent,
           resizeListener);
     }
 
     for (ILayoutContainer::ChildrenType::iterator iter = children.begin(); iter
         != children.end(); ++iter)
     {
       LayoutPart::Pointer child = *iter;
       child->SetContainer(ILayoutContainer::Pointer(0));
       if (child.Cast<PartStack> ().IsNotNull())
       {
         child->SetVisible(false);
       }
     }
 
     this->DisposeSashes();
 
     //dispose();
   }
 }
 
 void PartSashContainer::CreateControl(void* parentWidget)
 {
   if (this->parent != 0)
   {
     return;
   }
 
   parent = this->CreateParent(parentWidget);
 
   ILayoutContainer::ChildrenType children = this->children;
   for (ILayoutContainer::ChildrenType::iterator childIter = children.begin(); childIter
       != children.end(); ++childIter)
   {
     (*childIter)->CreateControl(parent);
   }
 
 }
 
 void PartSashContainer::Dispose()
 {
   if (parent == 0)
   {
     return;
   }
 
   for (ILayoutContainer::ChildrenType::iterator iter = children.begin();
        iter != children.end(); ++iter)
   {
     // In PartSashContainer dispose really means deactivate, so we
     // only dispose PartTabFolders.
     if (iter->Cast<PartStack>() != 0)
     {
       (*iter)->Dispose();
     }
   }
 
   this->DisposeParent();
   this->parent = 0;
 }
 
 void PartSashContainer::DisposeSashes()
 {
   if (root != 0)
   {
     root->DisposeSashes();
   }
 }
 
 void PartSashContainer::SetVisible(bool makeVisible)
 {
 
   if (makeVisible == this->GetVisible())
   {
     return;
   }
 
   //if (!SwtUtil.isDisposed(this.parent))
   //{
   Tweaklets::Get(GuiWidgetsTweaklet::KEY)->SetEnabled(this->parent, makeVisible);
   //}
   LayoutPart::SetVisible(makeVisible);
 
   ILayoutContainer::ChildrenType children = this->children;
   for (ILayoutContainer::ChildrenType::iterator childIter = children.begin(); childIter
       != children.end(); ++childIter)
   {
     (*childIter)->SetVisible(makeVisible); // && (zoomedPart == null || child == zoomedPart));
   }
 }
 
 LayoutPart::Pointer PartSashContainer::FindBottomRight()
 {
   if (root == 0)
   {
     return LayoutPart::Pointer(0);
   }
   return root->FindBottomRight();
 }
 
 Rectangle PartSashContainer::GetBounds()
 {
   return Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetBounds(this->parent);
 }
 
 ILayoutContainer::ChildrenType PartSashContainer::GetChildren() const
 {
   return children;
 }
 
 void* PartSashContainer::GetControl()
 {
   return this->parent;
 }
 
 LayoutTree::Pointer PartSashContainer::GetLayoutTree()
 {
   return root;
 }
 
 WorkbenchPage::Pointer PartSashContainer::GetPage()
 {
   return WorkbenchPage::Pointer(page);
 }
 
 void* PartSashContainer::GetParent()
 {
   return parent;
 }
 
 bool PartSashContainer::IsChild(LayoutPart::Pointer part)
 {
   return std::find(children.begin(), children.end(), part) != children.end();
 }
 
 void PartSashContainer::ResizeChild(LayoutPart::Pointer childThatChanged)
 {
   if (root != 0)
   {
     LayoutTree::Pointer tree = root->Find(childThatChanged);
 
     if (tree != 0)
     {
       tree->FlushCache();
     }
   }
 
   this->FlushLayout();
 }
 
 void PartSashContainer::Remove(LayoutPart::Pointer child)
 {
   //  if (child == getZoomedPart())
   //  {
   //    childRequestZoomOut();
   //  }
 
   if (!this->IsChild(child))
   {
     return;
   }
 
   children.removeAll(child);
   if (root != 0)
   {
     root = root->Remove(child);
   }
   this->ChildRemoved(child);
 
   if (active)
   {
     child->SetVisible(false);
     child->SetContainer(ILayoutContainer::Pointer(0));
     this->FlushLayout();
   }
 }
 
 void PartSashContainer::FlushLayout()
 {
   layoutDirty = true;
   LayoutPart::FlushLayout();
 
   if (layoutDirty)
   {
     this->ResizeSashes();
   }
 }
 
 void PartSashContainer::Replace(LayoutPart::Pointer oldChild,
                                 LayoutPart::Pointer newChild)
 {
 
   if (!this->IsChild(oldChild))
   {
     return;
   }
 
   //  if (oldChild == getZoomedPart())
   //  {
   //    if (newChild.Cast<PartPlaceholder> ().IsNotNull())
   //    {
   //      childRequestZoomOut();
   //    }
   //    else
   //    {
   //      zoomedPart.setZoomed(false);
   //      zoomedPart = newChild;
   //      zoomedPart.setZoomed(true);
   //    }
   //  }
 
   children.erase(std::find(children.begin(), children.end(), oldChild));
   children.push_back(newChild);
 
   this->ChildAdded(newChild);
 
   if (root != 0)
   {
     LayoutTree::Pointer leaf;
 
     leaf = root->Find(oldChild);
     if (leaf != 0)
     {
       leaf->SetPart(newChild);
     }
   }
 
   this->ChildRemoved(oldChild);
   if (active)
   {
     oldChild->SetVisible(false);
     oldChild->SetContainer(ILayoutContainer::Pointer(0));
     newChild->CreateControl(parent);
     newChild->SetContainer(ILayoutContainer::Pointer(this));
     newChild->SetVisible(true); //zoomedPart == null || zoomedPart == newChild);
     this->ResizeChild(newChild);
   }
 }
 
 void PartSashContainer::ResizeSashes()
 {
   layoutDirty = false;
   if (!active)
   {
     return;
   }
 
   //  if (isZoomed())
   //  {
   //    getZoomedPart().setBounds(parent.getClientArea());
   //  }
   //  else
   {
     if (root != 0)
     {
       root->SetBounds(Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetClientArea(
           parent));
     }
   }
 }
 
 int PartSashContainer::ComputePreferredSize(bool width, int availableParallel,
     int availablePerpendicular, int preferredParallel)
 {
   //  if (isZoomed())
   //  {
   //    return getZoomedPart().computePreferredSize(width, availableParallel,
   //        availablePerpendicular, preferredParallel);
   //  }
 
   if (root != 0)
   {
     return root->ComputePreferredSize(width, availableParallel,
         availablePerpendicular, preferredParallel);
   }
 
   return preferredParallel;
 }
 
 int PartSashContainer::GetSizeFlags(bool width)
 {
   //  if (isZoomed())
   //  {
   //    return getZoomedPart().getSizeFlags(width);
   //  }
 
   if (root != 0)
   {
     return root->GetSizeFlags(width);
   }
 
   return 0;
 }
 
 void PartSashContainer::SetBounds(const Rectangle& r)
 {
   Tweaklets::Get(GuiWidgetsTweaklet::KEY)->SetBounds(this->parent, r);
 }
 
 IDropTarget::Pointer PartSashContainer::Drag(void* /*currentControl*/,
-    Object::Pointer draggedObject, const Point& position,
+    const Object::Pointer& draggedObject, const Point& position,
     const Rectangle&  /*dragRectangle*/)
 {
   if (!(draggedObject.Cast<PartStack> () != 0
       || draggedObject.Cast<PartPane> () != 0))
   {
     return IDropTarget::Pointer(0);
   }
 
   PartPane::Pointer sourcePart = draggedObject.Cast<PartPane> ();
   PartStack::Pointer sourceContainer = draggedObject.Cast<PartStack> ();
   if (sourceContainer == 0)
   {
     sourceContainer = sourcePart->GetStack();
   }
 
   if (!this->IsStackType(sourceContainer) && !this->IsPaneType(sourcePart))
   {
     return IDropTarget::Pointer(0);
   }
 
   IWorkbenchWindow::Pointer window = sourcePart ? sourcePart->GetWorkbenchWindow() : sourceContainer->GetWorkbenchWindow();
   bool differentWindows = window
       != this->GetWorkbenchWindow();
   bool editorDropOK = ((sourceContainer->GetAppearance()
       == PresentationFactoryUtil::ROLE_EDITOR)
       && window->GetWorkbench()
           == this->GetWorkbenchWindow()->GetWorkbench());
   if (differentWindows && !editorDropOK)
   {
     return IDropTarget::Pointer(0);
   }
 
   Rectangle containerBounds = DragUtil::GetDisplayBounds(parent);
   LayoutPart::Pointer targetPart;
 
   // If this container has no visible children
   if (this->GetVisibleChildrenCount(ILayoutContainer::Pointer(this)) == 0)
   {
     return this->CreateDropTarget(draggedObject, Constants::CENTER,
         Constants::CENTER, Object::Pointer(0));
   }
 
   if (containerBounds.Contains(position))
   {
 
     if (root != 0)
     {
       targetPart = root->FindPart(
           Tweaklets::Get(GuiWidgetsTweaklet::KEY)->ToControl(parent, position));
     }
 
     if (targetPart != 0)
     {
       void* targetControl = targetPart->GetControl();
 
       Rectangle targetBounds = DragUtil::GetDisplayBounds(targetControl);
 
       int side = Geometry::GetClosestSide(targetBounds, position);
       int distance =
           Geometry::GetDistanceFromEdge(targetBounds, position, side);
 
       // is the source coming from a standalone part
       bool standalone = (this->IsStackType(sourceContainer)
           && sourceContainer->IsStandalone()) || (this->IsPaneType(sourcePart)
           && sourcePart->GetStack()->IsStandalone());
 
       // Only allow dropping onto an existing stack from different windows
       if (differentWindows && targetPart.Cast<PartStack> () != 0
           && targetPart.Cast<PartStack> ()->GetAppearance()
               == PresentationFactoryUtil::ROLE_EDITOR)
       {
         IDropTarget::Pointer target = targetPart->GetDropTarget(draggedObject,
             position);
         return target;
       }
 
       // Reserve the 5 pixels around the edge of the part for the drop-on-edge cursor
       if (distance >= 5 && !standalone)
       {
         // Otherwise, ask the part if it has any special meaning for this drop location
         IDropTarget::Pointer target = targetPart->GetDropTarget(draggedObject,
             position);
         if (target != 0)
         {
           return target;
         }
       }
 
       if (distance > 30 && this->IsStackType(targetPart.Cast<PartStack> ())
           && !standalone)
       {
         PartStack::Pointer targetContainer = targetPart.Cast<PartStack> ();
         if (targetContainer->AllowsAdd(sourcePart))
         {
           side = Constants::CENTER;
         }
       }
 
       // If the part doesn't want to override this drop location then drop on the edge
 
       // A "pointless drop" would be one that will put the dragged object back where it started.
       // Note that it should be perfectly valid to drag an object back to where it came from -- however,
       // the drop should be ignored.
 
       bool pointlessDrop = false; // = isZoomed();
 
       if (!sourcePart && sourceContainer == targetPart)
       {
         pointlessDrop = true;
       }
 
       if ((sourceContainer != 0) && (sourceContainer == targetPart)
           && this->GetVisibleChildrenCount(sourceContainer.Cast<ILayoutContainer>()) <= 1)
       {
         pointlessDrop = true;
       }
 
       if (side == Constants::CENTER && sourceContainer == targetPart)
       {
         pointlessDrop = true;
       }
 
       int cursor = side;
 
       if (pointlessDrop)
       {
         side = Constants::NONE;
         cursor = Constants::CENTER;
       }
 
       if (sourcePart)
         return this->CreateDropTarget(sourcePart, side, cursor, targetPart);
       else
         return this->CreateDropTarget(sourceContainer, side, cursor, targetPart);
     }
   }
   else
   {
     // We only allow dropping into a stack, not creating one
     if (differentWindows)
       return IDropTarget::Pointer(0);
 
     int side = Geometry::GetClosestSide(containerBounds, position);
 
     bool pointlessDrop = false; // = isZoomed();
 
     if (/*(this->IsStackType(sourceContainer) && sourceContainer == this)
         ||*/ (this->IsPaneType(sourcePart) && this->GetVisibleChildrenCount(
             sourceContainer.Cast<ILayoutContainer>()) <= 1) && sourceContainer->GetContainer() == this)
     {
       if (root == 0 || this->GetVisibleChildrenCount(ILayoutContainer::Pointer(this)) <= 1)
       {
         pointlessDrop = true;
       }
     }
 
     int cursor = Geometry::GetOppositeSide(side);
 
     if (pointlessDrop)
     {
       side = Constants::NONE;
     }
 
     if (sourcePart)
       return this->CreateDropTarget(sourcePart, side, cursor, Object::Pointer(0));
     else
       return this->CreateDropTarget(sourceContainer, side, cursor, Object::Pointer(0));
   }
 
   return IDropTarget::Pointer(0);
 }
 
 PartSashContainer::SashContainerDropTarget::Pointer
 PartSashContainer::CreateDropTarget(
     Object::Pointer sourcePart, int side, int cursor,
     Object::Pointer targetPart)
 {
   if (dropTarget == 0)
   {
     dropTarget
         = new SashContainerDropTarget(this, sourcePart, side, cursor, targetPart);
   }
   else
   {
     dropTarget->SetTarget(sourcePart, side, cursor, targetPart);
   }
   return dropTarget;
 }
 
 void PartSashContainer::Stack(LayoutPart::Pointer newPart,
     ILayoutContainer::Pointer container)
 {
   //this->GetControl().setRedraw(false);
 
   // Only deref the part if it is being referenced in -this- perspective
   Perspective::Pointer persp = page->GetActivePerspective();
   PerspectiveHelper* pres = (persp != 0) ? persp->GetPresentation() : 0;
   if (pres != 0 && container.Cast<PartStack>()->GetAppearance() != PresentationFactoryUtil::ROLE_EDITOR)
   {
     IWorkbenchPartReference::Pointer newPartRef =
         newPart.Cast<PartPane> ()->GetPartReference();
     IViewReference::Pointer vRef = newPartRef.Cast<IViewReference> ();
     if (vRef != 0)
     {
       LayoutPart::Pointer fpp = pres->FindPart(vRef->GetId(),
           vRef->GetSecondaryId());
 
       if (fpp != 0)
       {
         // Remove the part from old container.
         this->DerefPart(newPart);
       }
     }
   }
   else
   {
     // Remove the part from old container.
     this->DerefPart(newPart);
   }
 
   // Reparent part and add it to the workbook
   newPart->Reparent(this->GetParent());
   container->Add(newPart);
 
   //getControl().setRedraw(true);
 
 }
 
 void PartSashContainer::DerefPart(LayoutPart::Pointer sourcePart)
 {
   ILayoutContainer::Pointer container = sourcePart->GetContainer();
   if (container != 0)
   {
     container->Remove(sourcePart);
 
     if (this->IsStackType(container) && container.Cast<LayoutPart> () != 0)
     {
       if (container->GetChildren().size() == 0)
       {
         LayoutPart::Pointer stack = container.Cast<LayoutPart> ();
         this->Remove(stack);
         stack->Dispose();
       }
     }
   }
 }
 
 std::size_t PartSashContainer::GetVisibleChildrenCount(
     ILayoutContainer::Pointer container)
 {
   // Treat null as an empty container
   if (container == 0)
   {
     return 0;
   }
 
   ILayoutContainer::ChildrenType children = container->GetChildren();
 
   std::size_t count = 0;
   for (ILayoutContainer::ChildrenType::iterator iter = children.begin(); iter
       != children.end(); ++iter)
   {
     if (!(*iter)->IsPlaceHolder())
     {
       count++;
     }
   }
 
   return count;
 }
 
 float PartSashContainer::GetDockingRatio(Object::Pointer /*dragged*/,
     ILayoutContainer::Pointer  /*target*/)
 {
   return 0.5f;
 }
 
 void PartSashContainer::DescribeLayout(QString& buf) const
 {
   if (root == 0)
   {
     return;
   }
 
   //  if (isZoomed())
   //  {
   //    buf.append("zoomed "); //$NON-NLS-1$
   //    root.describeLayout(buf);
   //  }
   //  else
   {
     buf.append("layout "); //$NON-NLS-1$
     root->DescribeLayout(buf);
   }
 }
 
 void PartSashContainer::Add(LayoutPart::Pointer child, int relationship,
     int left, int right, LayoutPart::Pointer relative)
 {
 
   if (child == 0)
   {
     return;
   }
   if (relative != 0 && !this->IsChild(relative))
   {
     return;
   }
   if (relationship < IPageLayout::LEFT || relationship > IPageLayout::BOTTOM)
   {
     relationship = IPageLayout::LEFT;
   }
 
   // store info about relative positions
   RelationshipInfo info;
   info.part = child;
   info.relationship = relationship;
   info.left = left;
   info.right = right;
   info.relative = relative;
   this->AddChild(info);
 }
 
 bool PartSashContainer::AllowsAutoFocus()
 {
   return true;
 }
 
 void PartSashContainer::StartDeferringEvents()
 {
   LayoutPart::StartDeferringEvents();
 
   ILayoutContainer::ChildrenType deferredChildren = children;
   for (ILayoutContainer::ChildrenType::iterator iter = deferredChildren.begin(); iter
       != deferredChildren.end(); ++iter)
   {
     (*iter)->DeferUpdates(true);
   }
 }
 
 void PartSashContainer::HandleDeferredEvents()
 {
   LayoutPart::HandleDeferredEvents();
 
   ILayoutContainer::ChildrenType deferredChildren = children;
   for (ILayoutContainer::ChildrenType::iterator iter = deferredChildren.begin(); iter
       != deferredChildren.end(); ++iter)
   {
     (*iter)->DeferUpdates(false);
   }
 }
 
 void PartSashContainer::TestInvariants()
 {
   LayoutPart::TestInvariants();
 
   // If we have a parent container, ensure that we are displaying the zoomed appearance iff
   // our parent is zoomed in on us
   //  if (this->GetContainer() != 0)
   //  {
   //    Assert.isTrue((getZoomedPart() != null) == (getContainer().childIsZoomed(
   //        this)));
   //  }
 
   ILayoutContainer::ChildrenType childArray = this->GetChildren();
   for (ILayoutContainer::ChildrenType::iterator iter = childArray.begin(); iter
       != childArray.end(); ++iter)
   {
     (*iter)->TestInvariants();
   }
 
   // If we're zoomed, ensure that we're actually zoomed into one of our children
   //  if (isZoomed())
   //  {
   //    Assert.isTrue(children.contains(zoomedPart));
   //  }
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartSashContainer.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartSashContainer.h
index 8988a1b8bf..54bf71059c 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartSashContainer.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartSashContainer.h
@@ -1,702 +1,702 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYPARTSASHCONTAINER_H_
 #define BERRYPARTSASHCONTAINER_H_
 
 #include "berryLayoutPart.h"
 #include "berryILayoutContainer.h"
 #include "berryILayoutContainer.h"
 #include "berryIDragOverListener.h"
 #include "berryAbstractDropTarget.h"
 
 #include "tweaklets/berryDnDTweaklet.h"
 #include "berryRectangle.h"
 
 #include "guitk/berryGuiTkIControlListener.h"
 
 namespace berry
 {
 
 class WorkbenchPage;
 class PartPane;
 class LayoutTree;
 class PartStack;
 
 /**
  * \ingroup org_blueberry_ui_internal
  *
  * Abstract container that groups various layout
  * parts (possibly other containers) together as
  * a unit. Manages the placement and size of these
  * layout parts based on the location of sashes within
  * the container.
  *
  * GUI specializations must override the following methods
  * (read their documentation for implementation details):
  *
  * <ul>
  * <li>PartSashContainer
  */
 class PartSashContainer: public LayoutPart, public ILayoutContainer, public IDragOverListener {
 
 public:
   berryObjectMacro(PartSashContainer)
 
   friend class LayoutTree;
   friend class LayoutTreeNode;
   friend class PageLayout;
 
 private:
   void* parentWidget;
   //LayoutPart::Pointer zoomedPart;
 
   /* Indicates if the children of a sash container should be aligned from left to right
    * or the other way around. This is important if one child does
    * not occupy all of the available space. Then the empty space
    * is either on the left, or on the right side.
    */
   bool static leftToRight;
 
 protected:
 
   struct ControlListener : public GuiTk::IControlListener
   {
     ControlListener(PartSashContainer* partSashContainer);
 
     Events::Types GetEventTypes() const;
 
     void ControlResized(GuiTk::ControlEvent::Pointer e);
 
   private: PartSashContainer* partSashContainer;
   };
 
   void* parent;
   GuiTk::IControlListener::Pointer resizeListener;
   SmartPointer<LayoutTree> root;
   WorkbenchPage*  page;
 
   bool active;
   bool layoutDirty;
 
   /* Array of LayoutPart */
   ILayoutContainer::ChildrenType children;
 
 protected:
 
   struct RelationshipInfo
   {
     LayoutPart::Pointer part;
 
     LayoutPart::Pointer relative;
 
     int relationship;
 
     /**
      * Preferred size for the left child (this would be the size, in pixels of the child
      * at the time the sash was last moved)
      */
     int left;
 
     /**
      * Preferred size for the right child (this would be the size, in pixels of the child
      * at the time the sash was last moved)
      */
     int right;
   };
 
 private:
 
   class SashContainerDropTarget : public AbstractDropTarget {
     private:
 
       int side;
     int cursor;
 
     // This is a ILayoutPart or ILayoutContainer
     Object::Pointer targetPart;
 
     // This is a ILayoutPart or ILayoutContainer
     Object::Pointer sourcePart;
 
     PartSashContainer* partSashContainer;
 
     public:
 
       berryObjectMacro(SashContainerDropTarget)
 
       SashContainerDropTarget(PartSashContainer* partSashContainer, Object::Pointer sourcePart,
           int side, int cursor, Object::Pointer targetPart);
 
     void SetTarget(Object::Pointer sourcePart, int side, int cursor, Object::Pointer targetPart);
 
      void Drop();
 
     DnDTweaklet::CursorType GetCursor();
 
     Rectangle GetSnapRectangle();
 };
 
 
   SashContainerDropTarget::Pointer dropTarget;
 
 public:
 
   /**
    * Constructs a PartSashContainer with the given id under the given page
    * and parentWidget.
    *
    * GUI specializations must hook
    */
   PartSashContainer(const QString& id, WorkbenchPage*  page,
       void* parentWidget);
 
   ~PartSashContainer();
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.ILayoutContainer#obscuredByZoom(org.blueberry.ui.internal.LayoutPart)
    */
   //    public: bool childObscuredByZoom(LayoutPart toTest) {
   //        LayoutPart zoomPart = getZoomedPart();
   //
   //        if (zoomPart != null && toTest != zoomPart) {
   //            return true;
   //        }
   //        return isObscuredByZoom();
   //    }
 
   /**
    * Given an object associated with a drag (a PartPane or PartStack), this returns
    * the actual PartPanes being dragged.
    *
    * @param pane
    * @return
    */
 private:
   QList<SmartPointer<PartPane> > GetVisibleParts(Object::Pointer pane);
 
   /**
    * Find the sashs around the specified part.
    */
 public:
   void FindSashes(LayoutPart::Pointer pane, PartPane::Sashes& sashes);
 
 
 public:
 
   /**
    * Add a part.
    */
   virtual void Add(LayoutPart::Pointer child);
 
   virtual void AddPart(LayoutPart::Pointer child);
 
   /**
    * Add a part relative to another. For compatibility only. New code should use
    * addEnhanced, above.
    *
    * @param child the new part to add
    * @param relationship one of PageLayout.TOP, PageLayout.BOTTOM, PageLayout.LEFT, or PageLayout.RIGHT
    * @param ratio a value between 0.0 and 1.0, indicating how much space will be allocated to the UPPER-LEFT pane
    * @param relative part where the new part will be attached
    */
   virtual void Add(LayoutPart::Pointer child, int relationship, float ratio,
           LayoutPart::Pointer relative);
 
 
 protected:
   virtual void DropObject(const QList<PartPane::Pointer>& toDrop,
         LayoutPart::Pointer visiblePart,
             Object::Pointer targetPart, int side);
   /**
    * Add a new part relative to another. This should be used in place of <code>add</code>.
    * It differs as follows:
    * <ul>
    * <li>relationships are specified using SWT direction constants</li>
    * <li>the ratio applies to the newly added child -- not the upper-left child</li>
    * </ul>
    *
    * @param child new part to add to the layout
    * @param swtDirectionConstant one of SWT.TOP, SWT.BOTTOM, SWT.LEFT, or SWT.RIGHT
    * @param ratioForNewPart a value between 0.0 and 1.0 specifying how much space will be allocated for the newly added part
    * @param relative existing part indicating where the new child should be attached
    * @since 3.0
    */
 protected:
   virtual void AddEnhanced(LayoutPart::Pointer child, int swtDirectionConstant,
       float ratioForNewPart, LayoutPart::Pointer relative);
 
 protected:
   static int MeasureTree(const Rectangle& outerBounds,
       SmartPointer<const LayoutTree> toMeasure, bool horizontal);
 
 protected:
   virtual void AddChild(const RelationshipInfo& info);
 
   /**
    * Adds the child using ratio and position attributes
    * from the specified placeholder without replacing
    * the placeholder
    *
    * FIXME: I believe there is a bug in computeRelation()
    * when a part is positioned relative to the editorarea.
    * We end up with a null relative and 0.0 for a ratio.
    */
 public:
   virtual void AddChildForPlaceholder(LayoutPart::Pointer child,
       LayoutPart::Pointer placeholder);
 
   /**
    * See ILayoutContainer#allowBorder
    */
 public:
   virtual bool AllowsBorder();
 
   /**
    * Notification that a child layout part has been
    * added to the container. Subclasses may override
    * this method to perform any container specific
    * work.
    */
 protected:
   virtual void ChildAdded(LayoutPart::Pointer child);
 
   /**
    * Notification that a child layout part has been
    * removed from the container. Subclasses may override
    * this method to perform any container specific
    * work.
    */
 protected:
   virtual void ChildRemoved(LayoutPart::Pointer child);
 
   /**
    * Returns an array with all the relation ship between the
    * parts.
    */
 public:
   virtual QList<RelationshipInfo> ComputeRelation();
 
 public:
   virtual void SetActive(bool isActive);
 
   /**
    * @see LayoutPart#getControl
    */
 public:
   void CreateControl(void* parentWidget);
 
   /**
    * Subclasses override this method to specify
    * the composite to use to parent all children
    * layout parts it contains.
    */
 protected:
   virtual void* CreateParent(void* parentWidget) = 0;
 
   /**
    * @see LayoutPart#dispose
    */
 public:
   virtual void Dispose();
 
   /**
    * Subclasses override this method to dispose
    * of any swt resources created during createParent.
    */
 protected:
   virtual void DisposeParent() = 0;
 
   /**
    * Dispose all sashs used in this perspective.
    */
 public:
  virtual  void DisposeSashes();
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.LayoutPart#setVisible(boolean)
    */
 public:
   void SetVisible(bool makeVisible);
 
   /**
    * Return the most bottom right part or null if none.
    */
 public:
   virtual LayoutPart::Pointer FindBottomRight();
 
   /**
    * @see LayoutPart#getBounds
    */
 public:
   Rectangle GetBounds();
 
   /**
    * @see ILayoutContainer#getChildren
    */
 public:
   ChildrenType GetChildren() const;
 
   /**
    * @see LayoutPart#getControl
    */
 public:
   void* GetControl();
 
 public:
   virtual SmartPointer<LayoutTree> GetLayoutTree();
 
   /**
    * For themes.
    *
    * @return the current WorkbenchPage.
    */
 public:
   virtual SmartPointer<WorkbenchPage>  GetPage();
 
   /**
    * Returns the composite used to parent all the
    * layout parts contained within.
    */
 public:
   virtual void* GetParent();
 
 protected:
   virtual bool IsChild(LayoutPart::Pointer part);
 
   /**
    * Returns whether this container is zoomed.
    */
   //    public: bool IsZoomed() {
   //        return (zoomedPart != null);
   //    }
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.LayoutPart#forceLayout(org.blueberry.ui.internal.LayoutPart)
    */
 public:
   void ResizeChild(LayoutPart::Pointer childThatChanged);
 
   /**
    * Remove a part.
    */
 public:
   void Remove(LayoutPart::Pointer child);
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.LayoutPart#forceLayout()
    */
 public:
   void FlushLayout();
 
   /**
    * Replace one part with another.
    */
 public:
   void Replace(LayoutPart::Pointer oldChild, LayoutPart::Pointer newChild);
 
 private:
   void ResizeSashes();
 
   /**
    * Returns the maximum size that can be utilized by this part if the given width and
    * height are available. Parts can overload this if they have a quantized set of preferred
    * sizes.
    *
    * @param width available horizontal space (pixels)
    * @return returns a new point where point.x is <= availableWidth and point.y is <= availableHeight
    */
 public:
   virtual int ComputePreferredSize(bool width, int availableParallel,
       int availablePerpendicular, int preferredParallel);
 
 public:
   int GetSizeFlags(bool width);
 
   /**
    * @see LayoutPart#setBounds
    */
 public:
   void SetBounds(const Rectangle& r);
 
   /**
    * Zoom in on a particular layout part.
    *
    * The implementation of zoom is quite simple.  When zoom occurs we create
    * a zoom root which only contains the zoom part.  We store the old
    * root in unzoomRoot and then active the zoom root.  When unzoom occurs
    * we restore the unzoomRoot and dispose the zoom root.
    *
    * Note: Method assumes we are active.
    */
   //    private: void zoomIn(LayoutPart part) {
   //        // Sanity check.
   //        if (isZoomed()) {
   //      return;
   //    }
   //
   //        // Hide the sashes
   //      root.disposeSashes();
   //
   //        // Make all parts invisible except for the zoomed part
   //        LayoutPart[] children = getChildren();
   //        for (int i = 0; i < children.length; i++) {
   //            LayoutPart child = children[i];
   //            child.setVisible(child == part);
   //        }
   //
   //        zoomedPart = part;
   //
   //        // Notify the part that it has been zoomed
   //      part.setZoomed(true);
   //
   //        // Remember that we need to trigger a layout
   //        layoutDirty = true;
   //    }
 
   /**
    * Returns the currently zoomed part or null if none
    *
    * @return the currently zoomed part or null if none
    * @since 3.1
    */
   //    public: LayoutPart getZoomedPart() {
   //        return zoomedPart;
   //    }
 
   //    public: void childRequestZoomIn(LayoutPart toZoom) {
   //        if (!SwtUtil.isDisposed(this.parent)) {
   //            this.parent.setRedraw(false);
   //        }
   //        try {
   //          zoomIn(toZoom);
   //
   //          requestZoomIn();
   //
   //          if (layoutDirty) {
   //              resizeSashes();
   //          }
   //        } finally {
   //            if (!SwtUtil.isDisposed(this.parent)) {
   //                this.parent.setRedraw(true);
   //            }
   //        }
   //    }
 
   //    public: void childRequestZoomOut() {
   //        if (!SwtUtil.isDisposed(this.parent)) {
   //            this.parent.setRedraw(false);
   //        }
   //        try {
   //          zoomOut();
   //
   //          requestZoomOut();
   //
   //          if (layoutDirty) {
   //              resizeSashes();
   //          }
   //        } finally {
   //            if (!SwtUtil.isDisposed(this.parent)) {
   //                this.parent.setRedraw(true);
   //            }
   //        }
   //    }
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.LayoutPart#setZoomed(boolean)
    */
   //    public: void setZoomed(boolean isZoomed) {
   //        if (!isZoomed) {
   //            zoomOut();
   //        } else {
   //            if (!isZoomed()) {
   //                LayoutPart toZoom = pickPartToZoom();
   //
   //                if (toZoom != null) {
   //                    zoomIn(toZoom);
   //                }
   //            }
   //        }
   //        super.setZoomed(isZoomed);
   //    }
 
   //    public: LayoutPart pickPartToZoom() {
   //        return findBottomRight();
   //    }
 
   /**
    * Zoom out.
    *
    * See zoomIn for implementation details.
    *
    * Note: Method assumes we are active.
    */
   //    private: void zoomOut() {
   //        // Sanity check.
   //        if (!isZoomed()) {
   //      return;
   //    }
   //
   //        LayoutPart zoomedPart = this.zoomedPart;
   //        this.zoomedPart = null;
   //        // Inform the part that it is no longer zoomed
   //        zoomedPart.setZoomed(false);
   //
   //        // Make all children visible
   //        LayoutPart[] children = getChildren();
   //        for (int i = 0; i < children.length; i++) {
   //            LayoutPart child = children[i];
   //
   //            child.setVisible(true);
   //        }
   //
   //        // Recreate the sashes
   //        root.createControl(getParent());
   //
   //        // Ensure that the part being un-zoomed will have its size refreshed.
   //        LayoutTree node = root.find(zoomedPart);
   //        node.flushCache();
   //
   //        layoutDirty = true;
   //    }
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.dnd.IDragOverListener#drag(org.blueberry.swt.widgets.Control, java.lang.Object, org.blueberry.swt.graphics.Point, org.blueberry.swt.graphics.Rectangle)
    */
 public:
-  IDropTarget::Pointer Drag(void* currentControl, Object::Pointer draggedObject,
-             const Point& position, const Rectangle& dragRectangle);
+  IDropTarget::Pointer Drag(void* currentControl, const Object::Pointer& draggedObject,
+                            const Point& position, const Rectangle& dragRectangle);
 
   /**
    * @param sourcePart
    * @param targetPart
    * @param side
    * @param cursor
    * @return
    * @since 3.1
    */
 private:
   SashContainerDropTarget::Pointer CreateDropTarget(Object::Pointer sourcePart, int side, int cursor, Object::Pointer targetPart);
 
   /**
    * Returns true iff this PartSashContainer allows its parts to be stacked onto the given
    * container.
    *
    * @param container
    * @return
    */
 public:
   virtual bool IsStackType(ILayoutContainer::Pointer toTest) = 0;
 
 public:
   virtual bool IsPaneType(LayoutPart::Pointer toTest) = 0;
 
 protected:
   virtual SmartPointer<PartStack> CreateStack() = 0;
 
 public:
   virtual void Stack(LayoutPart::Pointer newPart, SmartPointer<ILayoutContainer> container);
 
   /**
    * @param container
    * @param visiblePart
    */
 protected:
   virtual void SetVisiblePart(ILayoutContainer::Pointer container,
       SmartPointer<PartPane>  visiblePart) = 0;
 
   /**
    * @param container
    * @return
    */
 protected:
   virtual LayoutPart::Pointer GetVisiblePart(
       ILayoutContainer::Pointer container) = 0;
 
   /**
    * @param sourcePart
    */
 protected:
   virtual void DerefPart(LayoutPart::Pointer sourcePart);
 
 protected:
   virtual std::size_t GetVisibleChildrenCount(ILayoutContainer::Pointer container);
 
 protected:
   virtual float
       GetDockingRatio(Object::Pointer dragged, ILayoutContainer::Pointer target);
 
   /**
    * Writes a description of the layout to the given string buffer.
    * This is used for drag-drop test suites to determine if two layouts are the
    * same. Like a hash code, the description should compare as equal iff the
    * layouts are the same. However, it should be user-readable in order to
    * help debug failed tests. Although these are english readable strings,
    * they should not be translated or equality tests will fail.
    *
    * @param buf
    */
 public:
   void DescribeLayout(QString& buf) const;
 
   /**
    * Adds a new child to the container relative to some part
    *
    * @param child
    * @param relationship
    * @param left preferred pixel size of the left/top child
    * @param right preferred pixel size of the right/bottom child
    * @param relative relative part
    */
 protected:
   virtual void Add(LayoutPart::Pointer child, int relationship, int left, int right,
       LayoutPart::Pointer relative);
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.ILayoutContainer#isZoomed(org.blueberry.ui.internal.LayoutPart)
    */
   //    public: bool childIsZoomed(LayoutPart toTest) {
   //        return toTest == getZoomedPart();
   //    }
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.ILayoutContainer#allowsAutoFocus()
    */
 public:
   bool AllowsAutoFocus();
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.LayoutPart#startDeferringEvents()
    */
 protected:
   void StartDeferringEvents();
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.LayoutPart#handleDeferredEvents()
    */
 protected:
   void HandleDeferredEvents();
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.LayoutPart#testInvariants()
    */
 public:
   void TestInvariants();
 };
 
 }
 
 #endif /*BERRYPARTSASHCONTAINER_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartService.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartService.cpp
index 4fbd24f105..e7af57309e 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartService.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartService.cpp
@@ -1,138 +1,138 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 #include "berryPartService.h"
 
 namespace berry
 {
 
 void PartService::FirePartActivated(IWorkbenchPartReference::Pointer ref)
 {
 //  UIListenerLogging.logPartListener2Event(debugListeners2Key, this, ref,
 //      UIListenerLogging.PE2_ACTIVATED);
 //  listeners2.firePartActivated(ref);
   partEvents.partActivated(ref);
 }
 
 /**
  * @param ref
  */
 void PartService::FirePartDeactivated(IWorkbenchPartReference::Pointer ref)
 {
 //  UIListenerLogging.logPartListener2Event(debugListeners2Key, this, ref,
 //      UIListenerLogging.PE2_PART_DEACTIVATED);
 //  listeners2.firePartDeactivated(ref);
   partEvents.partDeactivated(ref);
 }
 
 PartService::PartService(const QString& debugListenersKey,
     const QString& debugListeners2Key)
 {
   this->debugListeners2Key = debugListeners2Key;
   this->debugListenersKey = debugListenersKey;
 }
 
-void PartService::AddPartListener(IPartListener::Pointer l)
+void PartService::AddPartListener(IPartListener* l)
 {
   partEvents.AddListener(l);
 }
 
-void PartService::RemovePartListener(IPartListener::Pointer l)
+void PartService::RemovePartListener(IPartListener* l)
 {
   partEvents.RemoveListener(l);
 }
 
 void PartService::FirePartBroughtToTop(IWorkbenchPartReference::Pointer ref)
 {
 //  UIListenerLogging.logPartListener2Event(debugListeners2Key, this, ref,
 //      UIListenerLogging.PE2_PART_BROUGHT_TO_TOP);
 //  listeners2.firePartBroughtToTop(ref);
   partEvents.partBroughtToTop(ref);
 }
 
 void PartService::FirePartClosed(IWorkbenchPartReference::Pointer ref)
 {
 //  UIListenerLogging.logPartListener2Event(debugListeners2Key, this, ref,
 //      UIListenerLogging.PE2_PART_CLOSED);
 //  listeners2.firePartClosed(ref);
   partEvents.partClosed(ref);
 }
 
 void PartService::FirePartVisible(IWorkbenchPartReference::Pointer ref)
 {
 //  UIListenerLogging.logPartListener2Event(debugListeners2Key, this, ref,
 //      UIListenerLogging.PE2_PART_VISIBLE);
 //  listeners2.firePartVisible(ref);
   partEvents.partVisible(ref);
 }
 
 void PartService::FirePartHidden(IWorkbenchPartReference::Pointer ref)
 {
 //  UIListenerLogging.logPartListener2Event(debugListeners2Key, this, ref,
 //      UIListenerLogging.PE2_PART_HIDDEN);
 //  listeners2.firePartHidden(ref);
   partEvents.partHidden(ref);
 }
 
 void PartService::FirePartInputChanged(IWorkbenchPartReference::Pointer ref)
 {
 //  UIListenerLogging.logPartListener2Event(debugListeners2Key, this, ref,
 //      UIListenerLogging.PE2_PART_INPUT_CHANGED);
 //  listeners2.firePartInputChanged(ref);
   partEvents.partInputChanged(ref);
 }
 
 void PartService::FirePartOpened(IWorkbenchPartReference::Pointer ref)
 {
 //  UIListenerLogging.logPartListener2Event(debugListeners2Key, this, ref,
 //      UIListenerLogging.PE2_PART_OPENED);
 //  listeners2.firePartOpened(ref);
   partEvents.partOpened(ref);
 }
 
 IWorkbenchPart::Pointer PartService::GetActivePart()
 {
   return activePart.Expired() ? IWorkbenchPart::Pointer(0) : activePart.Lock()->GetPart(false);
 }
 
 IWorkbenchPartReference::Pointer PartService::GetActivePartReference()
 {
   return activePart.Lock();
 }
 
 void PartService::SetActivePart(IWorkbenchPartReference::Pointer ref)
 {
   IWorkbenchPartReference::Pointer oldRef = activePart.Lock();
 
   // Filter out redundant activation events
   if (oldRef == ref)
   {
     return;
   }
 
   if (oldRef.IsNotNull())
   {
     this->FirePartDeactivated(oldRef);
   }
 
   activePart = ref;
 
   if (ref.IsNotNull())
   {
     this->FirePartActivated(ref);
   }
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartService.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartService.h
index 8698a1874e..ee0bd7a59b 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartService.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartService.h
@@ -1,97 +1,97 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 #ifndef BERRYPARTSERVICE_H_
 #define BERRYPARTSERVICE_H_
 
 #include "berryIPartService.h"
 
 #include <string>
 
 namespace berry
 {
 
 class PartService : public IPartService
 {
 
 private:
 
   //PartListenerList listeners = new PartListenerList();
   IPartListener::Events partEvents;
 
   IWorkbenchPartReference::WeakPtr activePart;
 
   QString debugListenersKey;
   QString debugListeners2Key;
 
   /**
    * @param ref
    */
   void FirePartActivated(IWorkbenchPartReference::Pointer ref);
 
   /**
    * @param ref
    */
   void FirePartDeactivated(IWorkbenchPartReference::Pointer ref);
 
 public:
 
   PartService(const QString& debugListenersKey,
       const QString& debugListeners2Key);
 
   /*
    * (non-Javadoc)
    * Method declared on IPartService
    */
-  void AddPartListener(IPartListener::Pointer l);
+  void AddPartListener(IPartListener* l);
 
   /*
    * (non-Javadoc)
    * Method declared on IPartService
    */
-  void RemovePartListener(IPartListener::Pointer l);
+  void RemovePartListener(IPartListener* l);
 
   /**
    * @param ref
    */
   void FirePartBroughtToTop(IWorkbenchPartReference::Pointer ref);
 
   /**
    * @param ref
    */
   void FirePartClosed(IWorkbenchPartReference::Pointer ref);
 
   void FirePartVisible(IWorkbenchPartReference::Pointer ref);
 
   void FirePartHidden(IWorkbenchPartReference::Pointer ref);
 
   void FirePartInputChanged(IWorkbenchPartReference::Pointer ref);
 
   /**
    * @param ref
    */
   void FirePartOpened(IWorkbenchPartReference::Pointer ref);
 
   IWorkbenchPart::Pointer GetActivePart();
 
   IWorkbenchPartReference::Pointer GetActivePartReference();
 
   void SetActivePart(IWorkbenchPartReference::Pointer ref);
 
 };
 
 }
 
 #endif /*BERRYPARTSERVICE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartSite.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartSite.cpp
index d8bba1ff12..2480298a3f 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartSite.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartSite.cpp
@@ -1,395 +1,389 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryPartSite.h"
 
 #include "berryIWorkbenchPart.h"
 #include "berryIWorkbenchPage.h"
 #include "berryIWorkbenchWindow.h"
 #include "berryPartPane.h"
 #include "berryIContributor.h"
+#include "berryIServiceScopes.h"
 
 #include "services/berryIServiceFactory.h"
 
 #include "berryIServiceLocatorCreator.h"
 #include "berryWorkbenchPartReference.h"
+#include "berryWorkbenchLocationService.h"
 
 namespace berry
 {
 
 //void
 //PartSite::RegisterContextMenu(const QString& menuId,
 //      const MenuManager menuManager,
 //      const ISelectionProvider selectionProvider,
 //      bool includeEditorInput, IWorkbenchPart::ConstPointer part,
 //      const Collection menuExtenders) {
 //    /*
 //     * Check to see if the same menu manager and selection provider have
 //     * already been used. If they have, then we can just add another menu
 //     * identifier to the existing PopupMenuExtender.
 //     */
 //    final Iterator extenderItr = menuExtenders.iterator();
 //    boolean foundMatch = false;
 //    while (extenderItr.hasNext()) {
 //      final PopupMenuExtender existingExtender = (PopupMenuExtender) extenderItr
 //          .next();
 //      if (existingExtender.matches(menuManager, selectionProvider, part)) {
 //        existingExtender.addMenuId(menuId);
 //        foundMatch = true;
 //        break;
 //      }
 //    }
 //
 //    if (!foundMatch) {
 //      menuExtenders.add(new PopupMenuExtender(menuId, menuManager,
 //          selectionProvider, part, includeEditorInput));
 //    }
 //  }
 
 PartSite::PartSite(IWorkbenchPartReference::Pointer ref,
     IWorkbenchPart::Pointer _part, IWorkbenchPage* _page) :
   partReference(ref), part(_part), page(_page),
   serviceLocatorOwner(new ServiceLocatorOwner(this))
 {
 
   extensionID = "org.blueberry.ui.UnknownID"; //$NON-NLS-1$
   extensionName = "Unknown Name"; //$NON-NLS-1$
 
   // Initialize the service locator.
   IServiceLocator* parentServiceLocator = page->GetWorkbenchWindow().GetPointer();
   IServiceLocatorCreator* slc = parentServiceLocator->GetService<IServiceLocatorCreator>();
-  this->serviceLocator = slc->CreateServiceLocator(parentServiceLocator,
-      IServiceFactory::Pointer(0), IDisposable::WeakPtr(serviceLocatorOwner)).Cast<ServiceLocator>();
+  this->serviceLocator = slc->CreateServiceLocator(parentServiceLocator, NULL,
+                                                   IDisposable::WeakPtr(serviceLocatorOwner)).Cast<ServiceLocator>();
 
-  //initializeDefaultServices();
+  InitializeDefaultServices();
 }
 
 PartSite::~PartSite()
 {
 //  if (menuExtenders != null)
 //  {
 //    HashSet managers = new HashSet(menuExtenders.size());
 //    for (int i = 0; i < menuExtenders.size(); i++)
 //    {
 //      PopupMenuExtender ext = (PopupMenuExtender) menuExtenders.get(i);
 //      managers.add(ext.getManager());
 //      ext.dispose();
 //    }
 //    if (managers.size()>0)
 //    {
 //      for (Iterator iterator = managers.iterator(); iterator
 //           .hasNext();)
 //      {
 //        MenuManager mgr = (MenuManager) iterator.next();
 //        mgr.dispose();
 //      }
 //    }
 //    menuExtenders = null;
 //  }
 
 //  if (keyBindingService != null)
 //  {
 //    keyBindingService.dispose();
 //    keyBindingService = null;
 //  }
 
 //  if (progressService != null)
 //  {
 //    progressService.dispose();
 //    progressService = null;
 //  }
 
   if (serviceLocator.IsNotNull())
   {
     serviceLocator->Dispose();
   }
 }
 
 PartSite::ServiceLocatorOwner::ServiceLocatorOwner(PartSite* s)
  : site(s)
  {
 
 }
 
 void PartSite::ServiceLocatorOwner::Dispose()
 {
   void* control = site->GetPane()->GetControl();
   if (control != 0) {
     site->GetPane()->DoHide();
   }
 }
 
 void PartSite::InitializeDefaultServices()
 {
-  //    serviceLocator.registerService(IWorkbenchPartSite.class, this);
-  //    final Expression defaultExpression = new ActivePartExpression(part);
-  //
-  //    final IContextService parentContextService = (IContextService) serviceLocator
-  //        .getService(IContextService.class);
-  //    final IContextService contextService = new SlaveContextService(
-  //        parentContextService, defaultExpression);
-  //    serviceLocator.registerService(IContextService.class, contextService);
-  //
-  //    final ICommandService parentCommandService = (ICommandService) serviceLocator
-  //        .getService(ICommandService.class);
-  //    final ICommandService commandService = new SlaveCommandService(
-  //        parentCommandService, IServiceScopes.PARTSITE_SCOPE,
-  //        this);
-  //    serviceLocator.registerService(ICommandService.class, commandService);
+  workbenchLocationService.reset(
+        new WorkbenchLocationService(IServiceScopes::PARTSITE_SCOPE,
+                                     GetWorkbenchWindow()->GetWorkbench(),
+                                     GetWorkbenchWindow().GetPointer(), this, 2)
+        );
+  workbenchLocationService->Register();
+  serviceLocator->RegisterService(workbenchLocationService.data());
 }
 
 //IActionBars
 //PartSite::GetActionBars() {
 //    return actionBars;
 //  }
 
-QString PartSite::GetId()
+QString PartSite::GetId() const
 {
   return extensionID;
 }
 
 IWorkbenchPage::Pointer PartSite::GetPage()
 {
   return IWorkbenchPage::Pointer(page);
 }
 
 PartPane::Pointer PartSite::GetPane()
 {
   return partReference.Lock().Cast<WorkbenchPartReference>()->GetPane();
 }
 
 IWorkbenchPart::Pointer PartSite::GetPart()
 {
   return IWorkbenchPart::Pointer(part);
 }
 
 IWorkbenchPartReference::Pointer PartSite::GetPartReference()
 {
   return partReference.Lock();
 }
 
-QString PartSite::GetPluginId()
+QString PartSite::GetPluginId() const
 {
   return pluginID;
 }
 
-QString PartSite::GetRegisteredName()
+QString PartSite::GetRegisteredName() const
 {
   return extensionName;
 }
 
 ISelectionProvider::Pointer
 PartSite::GetSelectionProvider()
 {
   return selectionProvider;
 }
 
 Shell::Pointer PartSite::GetShell()
 {
   PartPane::Pointer pane = GetPane();
 
   if (!pane) return GetWorkbenchWindow()->GetShell();
   return pane->GetShell();
 }
 
 
 IWorkbenchWindow::Pointer PartSite::GetWorkbenchWindow()
 {
   return page->GetWorkbenchWindow();
 }
 
 // void
 // PartSite::RegisterContextMenu(const QString& menuID,
 //      MenuManager menuMgr,
 //      ISelectionProvider selProvider) {
 //    if (menuExtenders == null) {
 //      menuExtenders = new ArrayList(1);
 //    }
 //
 //    registerContextMenu(menuID, menuMgr, selProvider, true, getPart(),
 //        menuExtenders);
 //  }
 
 //void
 //PartSite::RegisterContextMenu(MenuManager menuMgr,
 //      ISelectionProvider selProvider) {
 //    registerContextMenu(getId(), menuMgr, selProvider);
 //  }
 
 //void
 //PartSite::GetContextMenuIds(QList<QString>& menuIds) {
 //    if (menuExtenders == null) {
 //      return new String[0];
 //    }
 //    ArrayList menuIds = new ArrayList(menuExtenders.size());
 //    for (Iterator iter = menuExtenders.iterator(); iter.hasNext();) {
 //      final PopupMenuExtender extender = (PopupMenuExtender) iter.next();
 //      menuIds.addAll(extender.getMenuIds());
 //    }
 //    return (String[]) menuIds.toArray(new String[menuIds.size()]);
 //  }
 
 //void
 //PartSite::SetActionBars(SubActionBars bars) {
 //    actionBars = bars;
 //  }
 
 void PartSite::SetConfigurationElement(
     IConfigurationElement::Pointer configElement)
 {
 
   // Get extension ID.
   extensionID = configElement->GetAttribute("id");
 
   // Get plugin ID.
   pluginID = configElement->GetContributor()->GetName();
 
   // Get extension name.
   QString name = configElement->GetAttribute("name");
   if (!name.isEmpty())
   {
     extensionName = name;
   }
 }
 
 void PartSite::SetPluginId(const QString& pluginId)
 {
   this->pluginID = pluginId;
 }
 
 void PartSite::SetId(const QString& id)
 {
   extensionID = id;
 }
 
 void PartSite::SetPart(IWorkbenchPart::Pointer newPart)
 {
   part = newPart;
 }
 
 void PartSite::SetRegisteredName(const QString& name)
 {
   extensionName = name;
 }
 
 void PartSite::SetSelectionProvider(ISelectionProvider::Pointer provider)
 {
   selectionProvider = provider;
 }
 
 /*
  * @see IWorkbenchPartSite#getKeyBindingService()
  *
  * TODO deprecated: use IHandlerService instead
  */
 //IKeyBindingService
 //PartSite::GetKeyBindingService() {
 //    if (keyBindingService == null) {
 //      keyBindingService = new KeyBindingService(this);
 //
 //      // TODO why is this here? and it should be using HandlerSubmissions
 //      // directly..
 //      if (this instanceof EditorSite) {
 //        EditorActionBuilder.ExternalContributor contributor = (EditorActionBuilder.ExternalContributor) ((EditorSite) this)
 //            .getExtensionActionBarContributor();
 //
 //        if (contributor != null) {
 //          ActionDescriptor[] actionDescriptors = contributor
 //              .getExtendedActions();
 //
 //          if (actionDescriptors != null) {
 //            for (int i = 0; i < actionDescriptors.length; i++) {
 //              ActionDescriptor actionDescriptor = actionDescriptors[i];
 //
 //              if (actionDescriptor != null) {
 //                IAction action = actionDescriptors[i]
 //                    .getAction();
 //
 //                if (action != null
 //                    && action.getActionDefinitionId() != null) {
 //                  keyBindingService.registerAction(action);
 //                }
 //              }
 //            }
 //          }
 //        }
 //      }
 //    }
 //
 //    return keyBindingService;
 //  }
 
 QString PartSite::GetInitialScopeId()
 {
   return "";
 }
 
 void* PartSite::GetAdapterImpl(const std::type_info& /*adapter*/) const
 {
 
   //    if (IWorkbenchSiteProgressService.class == adapter) {
   //      return getSiteProgressService();
   //    }
   //
   //    if (IWorkbenchPartTestable.class == adapter) {
   //      return new WorkbenchPartTestable(this);
   //    }
   //
   //    return Platform.getAdapterManager().getAdapter(this, adapter);
   return 0;
 }
 
 //void
 //PartSite::ActivateActionBars(bool forceVisibility) {
 //    if (actionBars != null) {
 //      actionBars.activate(forceVisibility);
 //    }
 //  }
 
 //void
 //PartSite::DeactivateActionBars(bool forceHide) {
 //    if (actionBars != null) {
 //      actionBars.deactivate(forceHide);
 //    }
 //  }
 
 //WorkbenchSiteProgressService
 //PartSite::GetSiteProgressService() {
 //    if (progressService == null) {
 //      progressService = new WorkbenchSiteProgressService(this);
 //    }
 //    return progressService;
 //  }
 
 Object*
 PartSite::GetService(const QString& api) {
   return serviceLocator->GetService(api);
 }
 
 bool
 PartSite::HasService(const QString& api) const {
   return serviceLocator->HasService(api);
 }
 
-QString PartSite::ToString()
+QString PartSite::ToString() const
 {
   QString buffer = "PartSite(id=" + this->GetId() + ",pluginId="
       + this->GetPluginId() + ",registeredName=" + this->GetRegisteredName()
       + ")";
   return buffer;
 }
 
 } // namespace berry
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartSite.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartSite.h
index 7c388fc3b0..2fcecd935a 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartSite.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartSite.h
@@ -1,310 +1,314 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYPARTSITE_H_
 #define BERRYPARTSITE_H_
 
 #include <berryIConfigurationElement.h>
 
 #include "berryServiceLocator.h"
 
 #include "berryIWorkbenchPartSite.h"
 #include "berryIWorkbenchPartReference.h"
 #include "berryISelectionProvider.h"
 
 namespace berry {
 
 struct IWorkbenchPart;
 struct IWorkbenchPage;
 struct IWorkbenchWindow;
+struct IWorkbenchLocationService;
 class  PartPane;
 class  Shell;
 
 /**
  * \ingroup org_blueberry_ui_internal
  *
  * <code>PartSite</code> is the general implementation for an
  * <code>IWorkbenchPartSite</code>. A site maintains the context for a part,
  * including the part, its pane, active contributions, selection provider, etc.
  * Together, these components make up the complete behavior for a part as if it
  * was implemented by one person.
  *
  * The <code>PartSite</code> lifecycle is as follows ..
  *
  * <ol>
  * <li>a site is constructed </li>
  * <li>a part is constructed and stored in the part </li>
  * <li>the site calls part.init() </li>
  * <li>a pane is constructed and stored in the site </li>
  * <li>the action bars for a part are constructed and stored in the site </li>
  * <li>the pane is added to a presentation </li>
  * <li>the SWT widgets for the pane and part are created </li>
  * <li>the site is activated, causing the actions to become visible </li>
  * </ol>
  */
-class PartSite : public virtual IWorkbenchPartSite {
+class PartSite : public virtual IWorkbenchPartSite
+{
 
 public:
-  berryObjectMacro(PartSite);
+  berryObjectMacro(PartSite)
 
   /**
    * This is a helper method for the register context menu functionality. It
    * is provided so that different implementations of the
    * <code>IWorkbenchPartSite</code> interface don't have to worry about how
    * context menus should work.
    *
    * @param menuId
    *            the menu id
    * @param menuManager
    *            the menu manager
    * @param selectionProvider
    *            the selection provider
    * @param includeEditorInput
    *            whether editor inputs should be included in the structured
    *            selection when calculating contributions
    * @param part
    *            the part for this site
    * @param menuExtenders
    *            the collection of menu extenders for this site
    * @see IWorkbenchPartSite#registerContextMenu(MenuManager,
    *      ISelectionProvider)
    */
 //public: static void RegisterContextMenu(const QString& menuId,
 //      const MenuManager menuManager,
 //      const ISelectionProvider selectionProvider,
 //      bool includeEditorInput, IWorkbenchPart::ConstPointer part,
 //      const Collection menuExtenders);
 
 private:
 
   IWorkbenchPartReference::WeakPtr partReference;
   WeakPointer<IWorkbenchPart> part;
   IWorkbenchPage* page;
   QString extensionID;
   QString pluginID;
   QString extensionName;
   ISelectionProvider::Pointer selectionProvider;
   //SubActionBars actionBars;
   //KeyBindingService keyBindingService;
   //ArrayList menuExtenders;
   //WorkbenchSiteProgressService progressService;
 
   struct ServiceLocatorOwner : public IDisposable
   {
     ServiceLocatorOwner(PartSite* site);
 
     PartSite* site;
 
     void Dispose();
   };
 
   ServiceLocatorOwner::Pointer serviceLocatorOwner;
 
+  QScopedPointer<IWorkbenchLocationService, QScopedPointerObjectDeleter> workbenchLocationService;
+
 protected:
   ServiceLocator::Pointer serviceLocator;
 
   /**
    * Build the part site.
    *
    * @param ref
    *            the part reference
    * @param part
    *            the part
    * @param page
    *            the page it belongs to
    */
 public: PartSite(IWorkbenchPartReference::Pointer ref, SmartPointer<IWorkbenchPart> part,
       IWorkbenchPage* page);
 
   /**
    * Initialize the local services.
    */
 private: void InitializeDefaultServices();
 
   /**
    * Dispose the contributions.
    */
 public: ~PartSite();
 
   /**
    * Returns the action bars for the part. If this part is a view then it has
    * exclusive use of the action bars. If this part is an editor then the
    * action bars are shared among this editor and other editors of the same
    * type.
    */
 //public: virtual IActionBars GetActionBars();
 
   /**
    * Returns the part registry extension ID.
    *
    * @return the registry extension ID
    */
-public: virtual QString GetId();
+public: virtual QString GetId() const;
 
   /**
    * Returns the page containing this workbench site's part.
    *
    * @return the page containing this part
    */
 public: virtual SmartPointer<IWorkbenchPage> GetPage();
 
   /**
    * Gets the part pane.
    */
 public: SmartPointer<PartPane> GetPane();
 
   /**
    * Returns the part.
    */
 public: virtual SmartPointer<IWorkbenchPart> GetPart();
 
   /**
    * Returns the part reference.
    */
 public: virtual IWorkbenchPartReference::Pointer GetPartReference();
 
   /**
    * Returns the part registry plugin ID. It cannot be <code>null</code>.
    *
    * @return the registry plugin ID
    */
-public: virtual QString GetPluginId();
+public: virtual QString GetPluginId() const;
 
   /**
    * Returns the registered name for this part.
    */
-public: virtual QString GetRegisteredName();
+public: virtual QString GetRegisteredName() const;
 
   /**
    * Returns the selection provider for a part.
    */
 public: virtual ISelectionProvider::Pointer GetSelectionProvider();
 
   /**
    * Returns the shell containing this part.
    *
    * @return the shell containing this part
    */
 public: SmartPointer<Shell> GetShell();
 
   /**
    * Returns the workbench window containing this part.
    *
    * @return the workbench window containing this part
    */
 public: virtual SmartPointer<IWorkbenchWindow> GetWorkbenchWindow();
 
   /**
    * Register a popup menu for extension.
    */
 //public: virtual void RegisterContextMenu(const QString& menuID,
 //      MenuManager menuMgr,
 //      ISelectionProvider selProvider);
 
   /**
    * Register a popup menu with the default id for extension.
    */
 //public: virtual void RegisterContextMenu(MenuManager menuMgr,
 //      ISelectionProvider selProvider);
 
   // getContextMenuIds() added by Dan Rubel (dan_rubel@instantiations.com)
   /**
    * Get the registered popup menu identifiers
    */
 //public: virtual void GetContextMenuIds(QList<QString>& menuIds);
 
   /**
    * Sets the action bars for the part.
    */
 //public: virtual void SetActionBars(SubActionBars bars);
 
   /**
    * Sets the configuration element for a part.
    */
 public: virtual void SetConfigurationElement(IConfigurationElement::Pointer configElement);
 
 protected: virtual void SetPluginId(const QString& pluginId);
 
   /**
    * Sets the part registry extension ID.
    *
    * @param id
    *            the registry extension ID
    */
 protected: virtual void SetId(const QString& id);
 
   /**
    * Sets the part.
    */
 public: virtual void SetPart(SmartPointer<IWorkbenchPart> newPart);
 
   /**
    * Sets the registered name for this part.
    *
    * @param name
    *            the registered name
    */
 protected: virtual void SetRegisteredName(const QString& name);
 
   /**
    * Set the selection provider for a part.
    */
 public: virtual void SetSelectionProvider(ISelectionProvider::Pointer provider);
 
   /*
    * @see IWorkbenchPartSite#getKeyBindingService()
    *
    * TODO deprecated: use IHandlerService instead
    */
 //public: virtual  IKeyBindingService GetKeyBindingService();
 
 protected: virtual QString GetInitialScopeId();
 
   /**
    * Get an adapter for this type.
    *
    * @param adapter
    * @return
    */
 protected: void* GetAdapterImpl(const std::type_info& adapter) const;
 
 //public: virtual void ActivateActionBars(bool forceVisibility);
 
 //public: virtual void DeactivateActionBars(bool forceHide);
 
   /**
    * Get a progress service for the receiver.
    *
    * @return WorkbenchSiteProgressService
    */
 //public: virtual WorkbenchSiteProgressService GetSiteProgressService();
 
 public: Object* GetService(const QString& api);
 
 public: bool HasService(const QString& api) const;
 
   /**
    * Prints out the identifier, the plug-in identifier and the registered
    * name. This is for debugging purposes only.
    *
    * @since 3.2
    */
-public: virtual QString ToString();
+public: virtual QString ToString() const;
 };
 
 }  // namespace berry
 
 #endif /*BERRYPARTSITE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartStack.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartStack.cpp
index 726ab88c67..3023ea10f2 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartStack.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPartStack.cpp
@@ -1,1609 +1,1609 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "tweaklets/berryGuiWidgetsTweaklet.h"
 
 #include "berryPartStack.h"
 
 #include "berryPerspective.h"
 #include "berryPresentationFactoryUtil.h"
 #include "berryWorkbenchPlugin.h"
 #include "berryPresentationSerializer.h"
 #include "berryDragUtil.h"
 #include "berryEditorAreaHelper.h"
 #include "berryPerspectiveHelper.h"
 #include "berryWorkbenchConstants.h"
 
 #include "berryXMLMemento.h"
 
 #include "berryIWorkbenchPartConstants.h"
 #include "berryGeometry.h"
 
 #include <berryObjects.h>
 
 
 namespace berry
 {
 
 const int PartStack::PROP_SELECTION = 0x42;
 PartStack::PartStackDropResult::Pointer PartStack::dropResult(
     new PartStack::PartStackDropResult());
 
 void PartStack::PartStackDropResult::SetTarget(PartStack::Pointer stack,
     PartPane::Pointer pane, StackDropResult::Pointer result)
 {
   this->pane = pane;
   this->dropResult = result;
   this->stack = stack;
 }
 
 void PartStack::PartStackDropResult::Drop()
 {
   // If we're dragging a pane over itself do nothing
   //if (dropResult.getInsertionPoint() == pane.getPresentablePart()) { return; };
 
   Object::Pointer cookie;
   if (dropResult != 0)
   {
     cookie = dropResult->GetCookie();
   }
 
   PartPane::Pointer pane(this->pane);
   PartStack::Pointer stack(this->stack);
   // Handle cross window drops by opening a new editor
   if (pane->GetPartReference().Cast<IEditorReference> () != 0)
   {
     IEditorReference::Pointer editorRef = pane->GetPartReference().Cast<
         IEditorReference> ();
     if (pane->GetWorkbenchWindow() != stack->GetWorkbenchWindow())
     {
       try
       {
         IEditorInput::Pointer input = editorRef->GetEditorInput();
 
         // Close the old editor and capture the actual closed state incase of a 'cancel'
         bool editorClosed = pane->GetPage()->CloseEditor(editorRef, true);
 
         // Only open open the new editor if the old one closed
         if (editorClosed)
           stack->GetPage()->OpenEditor(input, editorRef->GetId());
         return;
       }
       catch (const PartInitException& e)
       {
         //e.printStackTrace();
         BERRY_ERROR << e.what();
       }
 
     }
   }
 
   if (pane->GetContainer() != stack)
   {
     // Moving from another stack
     stack->DerefPart(pane);
     pane->Reparent(stack->GetParent());
     stack->Add(pane, cookie);
     stack->SetSelection(pane);
     pane->SetFocus();
   }
   else if (cookie != 0)
   {
     // Rearranging within this stack
     stack->GetPresentation()->MovePart(stack->GetPresentablePart(pane), cookie);
   }
 }
 
 DnDTweaklet::CursorType PartStack::PartStackDropResult::GetCursor()
 {
   return DnDTweaklet::CURSOR_CENTER;
 }
 
 Rectangle PartStack::PartStackDropResult::GetSnapRectangle()
 {
   if (dropResult == 0)
   {
     return DragUtil::GetDisplayBounds(stack.Lock()->GetControl());
   }
   return dropResult->GetSnapRectangle();
 }
 
 PartStack::MyStackPresentationSite::MyStackPresentationSite(PartStack* stack) :
   partStack(stack)
 {
 
 }
 
 void PartStack::MyStackPresentationSite::Close(IPresentablePart::Pointer part)
 {
   partStack->Close(part);
 }
 
 void PartStack::MyStackPresentationSite::Close(const QList<
     IPresentablePart::Pointer>& parts)
 {
   partStack->Close(parts);
 }
 
 void PartStack::MyStackPresentationSite::DragStart(
     IPresentablePart::Pointer beingDragged, Point& initialLocation,
     bool keyboard)
 {
   partStack->DragStart(beingDragged, initialLocation, keyboard);
 }
 
 void PartStack::MyStackPresentationSite::DragStart(Point& initialLocation,
     bool keyboard)
 {
   partStack->DragStart(IPresentablePart::Pointer(0), initialLocation, keyboard);
 }
 
 bool PartStack::MyStackPresentationSite::IsPartMoveable(
     IPresentablePart::Pointer part)
 {
   return partStack->IsMoveable(part);
 }
 
 void PartStack::MyStackPresentationSite::SelectPart(
     IPresentablePart::Pointer toSelect)
 {
   partStack->PresentationSelectionChanged(toSelect);
 }
 
 bool PartStack::MyStackPresentationSite::SupportsState(int state)
 {
   return partStack->SupportsState(state);
 }
 
 void PartStack::MyStackPresentationSite::SetState(int newState)
 {
   partStack->SetState(newState);
 }
 
 IPresentablePart::Pointer PartStack::MyStackPresentationSite::GetSelectedPart()
 {
   return partStack->GetSelectedPart();
 }
 
 //         void AddSystemActions(IMenuManager menuManager) {
 //            PartStack.this.addSystemActions(menuManager);
 //        }
 
 bool PartStack::MyStackPresentationSite::IsStackMoveable()
 {
   return partStack->CanMoveFolder();
 }
 
 void PartStack::MyStackPresentationSite::FlushLayout()
 {
   partStack->FlushLayout();
 }
 
 PartStack::PresentableVector PartStack::MyStackPresentationSite::GetPartList()
 {
   return partStack->GetPresentableParts();
 }
 
 QString PartStack::MyStackPresentationSite::GetProperty(
     const QString& id)
 {
   return partStack->GetProperty(id);
 }
 
 PartStack::PartStack(WorkbenchPage* p, bool allowsStateChanges,
     int appear, IPresentationFactory* fac) :
   LayoutPart("PartStack"), page(p), isActive(true), allowStateChanges(
       allowsStateChanges), appearance(appear), ignoreSelectionChanges(false),
       factory(fac)
 {
   QString str;
   QTextStream buf(&str);
   buf << "PartStack@" << this;
   this->SetID(str);
 
   presentationSite = new MyStackPresentationSite(this);
 }
 
 bool PartStack::IsMoveable(IPresentablePart::Pointer part)
 {
   PartPane::Pointer pane = this->GetPaneFor(part);
   Perspective::Pointer perspective = this->GetPage()->GetActivePerspective();
   if (perspective == 0)
   {
     // Shouldn't happen -- can't have a ViewStack without a
     // perspective
     return true;
   }
   IWorkbenchPartReference::Pointer partRef = pane->GetPartReference();
   if (partRef.Cast<IViewReference> () != 0)
     return perspective->IsMoveable(partRef.Cast<IViewReference> ());
 
   return true;
 }
 
 bool PartStack::SupportsState(int  /*newState*/)
 {
   if (page->IsFixedLayout())
   {
     return false;
   }
 
   return allowStateChanges;
 }
 
 bool PartStack::CanMoveFolder()
 {
   if (appearance == PresentationFactoryUtil::ROLE_EDITOR)
     return true;
 
   Perspective::Pointer perspective = this->GetPage()->GetActivePerspective();
 
   if (perspective == 0)
   {
     // Shouldn't happen -- can't have a ViewStack without a
     // perspective
     return false;
   }
 
   // We need to search if one of the presentations is not moveable
   // if that's the case the whole folder should not be moveable
   IStackPresentationSite::Pointer presenationSite;
 
   if ((presenationSite = this->GetPresentationSite()) != 0)
   {
     QList<IPresentablePart::Pointer> parts = presenationSite->GetPartList();
     for (QList<IPresentablePart::Pointer>::iterator iter = parts.begin(); iter
         != parts.end(); ++iter)
     {
       if (!presenationSite->IsPartMoveable(*iter))
       {
         return false;
       }
     }
   }
 
   return !perspective->IsFixedLayout();
 }
 
 void PartStack::DerefPart(LayoutPart::Pointer toDeref)
 {
   if (appearance == PresentationFactoryUtil::ROLE_EDITOR)
     EditorAreaHelper::DerefPart(toDeref);
   else
     this->GetPage()->GetActivePerspective()->GetPresentation()->DerefPart(
         toDeref);
 }
 
 bool PartStack::AllowsDrop(PartPane::Pointer part)
 {
   PartStack::Pointer stack = part->GetContainer().Cast<PartStack> ();
   if (stack != 0)
   {
     if (stack->appearance == this->appearance)
       return true;
   }
 
   return false;
 }
 
 void PartStack::AddListener(IPropertyChangeListener *listener)
 {
   propEvents.AddListener(listener);
 }
 
 void PartStack::RemoveListener(IPropertyChangeListener *listener)
 {
   propEvents.RemoveListener(listener);
 }
 
 int PartStack::GetAppearance() const
 {
   return appearance;
 }
 
 QString PartStack::GetID() const
 {
   return LayoutPart::GetID();
 }
 
 bool PartStack::IsStandalone()
 {
   return (appearance == PresentationFactoryUtil::ROLE_STANDALONE || appearance
       == PresentationFactoryUtil::ROLE_STANDALONE_NOTITLE);
 }
 
 IPresentablePart::Pointer PartStack::GetSelectedPart()
 {
   return presentationCurrent.Cast<IPresentablePart> ();
 }
 
 IStackPresentationSite::Pointer PartStack::GetPresentationSite()
 {
   return presentationSite;
 }
 
 void PartStack::TestInvariants()
 {
   void* focusControl =
       Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetFocusControl();
 
   bool currentFound = false;
 
   ChildVector children = this->GetChildren();
 
   for (ChildVector::iterator iter = children.begin(); iter != children.end(); ++iter)
   {
     LayoutPart::Pointer child = *iter;
 
     // No 0 children allowed
     poco_assert(child != 0)
 ;   // "0 children are not allowed in PartStack"
 
     // Ensure that all the PartPanes have an associated presentable part
     IPresentablePart::Pointer part = this->GetPresentablePart(child);
     if (!child->IsPlaceHolder())
     {
       poco_assert(part != 0); // "All PartPanes must have a non-0 IPresentablePart"
     }
 
     // Ensure that the child's backpointer points to this stack
     ILayoutContainer::Pointer childContainer = child->GetContainer();
 
     // Disable tests for placeholders -- PartPlaceholder backpointers don't
     // obey the usual rules -- they sometimes point to a container placeholder
     // for this stack instead of the real stack.
     if (!child->IsPlaceHolder())
     {
 
       // If the widgetry exists, the child's backpointer must point to us
       poco_assert(childContainer.GetPointer() == this); // "PartStack has a child that thinks it has a different parent"
 
       // If this child has focus, then ensure that it is selected and that we have
       // the active appearance.
 
       if (focusControl && Tweaklets::Get(GuiWidgetsTweaklet::KEY)->IsChild(child->GetControl(), focusControl))
       {
         poco_assert(child == current); // "The part with focus is not the selected part"
         //  focus check commented out since it fails when focus workaround in LayoutPart.setVisible is not present
         //              Assert.isTrue(getActive() == StackPresentation.AS_ACTIVE_FOCUS);
       }
 
     }
 
     // Ensure that "current" points to a valid child
     if (child == current)
     {
       currentFound = true;
     }
 
     // Test the child's internal state
     child->TestInvariants();
   }
 
   // If we have at least one child, ensure that the "current" pointer points to one of them
   if (this->GetPresentableParts().size()> 0)
   {
     poco_assert(currentFound);
 
     StackPresentation::Pointer presentation = this->GetPresentation();
 
     // If the presentation controls have focus, ensure that we have the active appearance
     if (focusControl && Tweaklets::Get(GuiWidgetsTweaklet::KEY)->IsChild(presentation->GetControl(), focusControl))
     {
       poco_assert(this->GetActive() == StackPresentation::AS_ACTIVE_FOCUS);
       // "The presentation has focus but does not have the active appearance"
     }
 
   }
 
   // Check to that we're displaying the zoomed icon iff we're actually maximized
   //poco_assert((this->GetState() == IStackPresentationSite::STATE_MAXIMIZED)
   //        == (this->GetContainer() != 0 && this->GetContainer()->ChildIsZoomed(this)));
 
 }
 
 void PartStack::DescribeLayout(QString& buf) const
 {
   int activeState = this->GetActive();
   if (activeState == StackPresentation::AS_ACTIVE_FOCUS)
   {
     buf.append("active "); //$NON-NLS-1$
   }
   else if (activeState == StackPresentation::AS_ACTIVE_NOFOCUS)
   {
     buf.append("active_nofocus "); //$NON-NLS-1$
   }
 
   buf.append("("); //$NON-NLS-1$
 
   ChildVector children = this->GetChildren();
 
   int visibleChildren = 0;
 
   for (ChildVector::iterator iter = children.begin(); iter != children.end(); ++iter)
   {
 
     LayoutPart::Pointer next = *iter;
     if (!next->IsPlaceHolder())
     {
       if (iter != children.begin())
       {
         buf.append(", "); //$NON-NLS-1$
       }
 
       if (next == requestedCurrent)
       {
         buf.append("*"); //$NON-NLS-1$
       }
 
       next->DescribeLayout(buf);
 
       visibleChildren++;
     }
   }
 
   buf.append(")"); //$NON-NLS-1$
 }
 
 void PartStack::Add(LayoutPart::Pointer child)
 {
   this->Add(child, Object::Pointer(0));
 }
 
 void PartStack::Add(LayoutPart::Pointer newChild, Object::Pointer cookie)
 {
   children.push_back(newChild);
 
   // Fix for bug 78470:
   if(newChild->GetContainer().Cast<ContainerPlaceholder>() == 0)
   {
     newChild->SetContainer(ILayoutContainer::Pointer(this));
   }
 
   this->ShowPart(newChild, cookie);
 }
 
 bool PartStack::AllowsAdd(LayoutPart::Pointer  /*toAdd*/)
 {
   return !this->IsStandalone();
 }
 
 bool PartStack::AllowsAutoFocus()
 {
   if (presentationSite->GetState() == IStackPresentationSite::STATE_MINIMIZED)
   {
     return false;
   }
 
   return LayoutPart::AllowsAutoFocus();
 }
 
 void PartStack::Close(const QList<IPresentablePart::Pointer>& parts)
 {
-  for (unsigned int idx = 0; idx < parts.size(); idx++)
+  for (int idx = 0; idx < parts.size(); idx++)
   {
     IPresentablePart::Pointer part = parts[idx];
 
     this->Close(part);
   }
 }
 
 void PartStack::Close(IPresentablePart::Pointer part)
 {
   if (!presentationSite->IsCloseable(part))
   {
     return;
   }
 
   PartPane::Pointer pane = this->GetPaneFor(part);
 
   if (pane != 0)
   {
     pane->DoHide();
   }
 }
 
 IPresentationFactory* PartStack::GetFactory()
 {
 
   if (factory != 0)
   {
     return factory;
   }
 
   return WorkbenchPlugin::GetDefault()->GetPresentationFactory();
 }
 
 void PartStack::CreateControl(void* parent)
 {
   if (this->GetPresentation() != 0)
   {
     return;
   }
 
   IPresentationFactory* factory = this->GetFactory();
 
   PresentableVector partList = this->GetPresentableParts();
   PresentationSerializer serializer(partList);
 
   StackPresentation::Pointer presentation = PresentationFactoryUtil
   ::CreatePresentation(factory, appearance, parent,
       presentationSite, &serializer, savedPresentationState);
 
   this->CreateControl(parent, presentation);
   Tweaklets::Get(GuiWidgetsTweaklet::KEY)->MoveBelow(this->GetControl(), 0);
 }
 
 IDropTarget::Pointer PartStack::GetDropTarget(Object::Pointer draggedObject, const Point& position)
 {
 
   if (draggedObject.Cast<PartPane>() == 0)
   {
     return IDropTarget::Pointer(0);
   }
 
   PartPane::Pointer pane = draggedObject.Cast<PartPane>();
   if (this->IsStandalone()
       || !this->AllowsDrop(pane))
   {
     return IDropTarget::Pointer(0);
   }
 
   // Don't allow views to be dragged between windows
   bool differentWindows = pane->GetWorkbenchWindow() != this->GetWorkbenchWindow();
   bool editorDropOK = ((pane->GetPartReference().Cast<IEditorReference>() != 0) &&
       pane->GetWorkbenchWindow()->GetWorkbench() ==
       this->GetWorkbenchWindow()->GetWorkbench());
   if (differentWindows && !editorDropOK)
   {
     return IDropTarget::Pointer(0);
   }
 
   StackDropResult::Pointer dropResult = this->GetPresentation()->DragOver(
       this->GetControl(), position);
 
   if (dropResult == 0)
   {
     return IDropTarget::Pointer(0);
   }
 
   return this->CreateDropTarget(pane, dropResult);
 }
 
 void PartStack::SetBounds(const Rectangle& r)
 {
   if (this->GetPresentation() != 0)
   {
     this->GetPresentation()->SetBounds(r);
   }
 }
 
 IDropTarget::Pointer PartStack::CreateDropTarget(PartPane::Pointer pane, StackDropResult::Pointer result)
 {
   dropResult->SetTarget(PartStack::Pointer(this), pane, result);
   return dropResult;
 }
 
 void PartStack::SetActive(bool isActive)
 {
 
   this->isActive = isActive;
   // Add all visible children to the presentation
   for(ChildVector::iterator iter = children.begin(); iter != children.end(); ++iter)
   {
     (*iter)->SetContainer(isActive ? ILayoutContainer::Pointer(this) : ILayoutContainer::Pointer(0));
   }
 
   for (PresentableVector::iterator iter = presentableParts.begin();
       iter != presentableParts.end(); ++iter)
   {
     PresentablePart::Pointer next = iter->Cast<PresentablePart>();
 
     next->EnableInputs(isActive);
     next->EnableOutputs(isActive);
   }
 }
 
 void PartStack::CreateControl(void*  /*parent*/, StackPresentation::Pointer presentation)
 {
 
   poco_assert(this->GetPresentation() == 0);
 
   if (presentationSite->GetPresentation() != 0)
   {
     return;
   }
 
   presentationSite->SetPresentation(presentation);
 
   // Add all visible children to the presentation
   // Use a copy of the current set of children to avoid a ConcurrentModificationException
   // if a part is added to the same stack while iterating over the children (bug 78470)
   ChildVector childParts(children);
   for (ChildVector::iterator iter = childParts.begin(); iter != childParts.end(); ++iter)
   {
     this->ShowPart(*iter, Object::Pointer(0));
   }
 
   if (savedPresentationState != 0)
   {
     PresentableVector partList = this->GetPresentableParts();
     PresentationSerializer serializer(partList);
     presentation->RestoreState(&serializer, savedPresentationState);
   }
 
   //void* ctrl = this->GetPresentation()->GetControl();
 
   //TODO control setData ?
   //ctrl.setData(this);
 
   // We should not have a placeholder selected once we've created the widgetry
   if (requestedCurrent != 0 && requestedCurrent->IsPlaceHolder())
   {
     requestedCurrent = 0;
     this->UpdateContainerVisibleTab();
   }
 
   this->RefreshPresentationSelection();
 }
 
 void PartStack::SavePresentationState()
 {
   if (this->GetPresentation() == 0)
   {
     return;
   }
 
   {// Save the presentation's state before disposing it
     XMLMemento::Pointer memento = XMLMemento
     ::CreateWriteRoot(WorkbenchConstants::TAG_PRESENTATION);
     memento->PutString(WorkbenchConstants::TAG_ID, this->GetFactory()->GetId());
 
     QList<IPresentablePart::Pointer> parts(this->GetPresentableParts());
     PresentationSerializer serializer(parts);
 
     this->GetPresentation()->SaveState(&serializer, memento);
 
     // Store the memento in savedPresentationState
     savedPresentationState = memento;
   }
 }
 
 PartStack::~PartStack()
 {
   //BERRY_INFO << "DELETING PARTSTACK";
 }
 
 void PartStack::Dispose()
 {
   if (this->GetPresentation() == 0)
   {
     return;
   }
 
   this->SavePresentationState();
 
   //  for (PresentableVector::iterator iter = presentableParts.begin();
   //       iter != presentableParts.end(); ++iter)
   //  {
   //    iter->Cast<PresentablePart>()->Dispose();
   //  }
   presentableParts.clear();
 
   presentationCurrent = 0;
   current = 0;
 
   this->FireInternalPropertyChange(PROP_SELECTION);
 }
 
 void PartStack::FindSashes(LayoutPart::Pointer /*toFind*/, PartPane::Sashes& sashes)
 {
   ILayoutContainer::Pointer container = this->GetContainer();
 
   if (container != 0)
   {
     container->FindSashes(LayoutPart::Pointer(this), sashes);
   }
 }
 
 Rectangle PartStack::GetBounds()
 {
   if (this->GetPresentation() == 0)
   {
     return Rectangle(0, 0, 0, 0);
   }
   return Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetBounds(this->GetPresentation()->GetControl());
 }
 
 QList<LayoutPart::Pointer> PartStack::GetChildren() const
 {
   return children;
 }
 
 void* PartStack::GetControl()
 {
   StackPresentation::Pointer presentation = this->GetPresentation();
 
   if (presentation == 0)
   {
     return 0;
   }
 
   return presentation->GetControl();
 }
 
 /**
  * Answer the number of children.
  */
 PartStack::ChildVector::size_type PartStack::GetItemCount()
 {
   if (this->GetPresentation() == 0)
   {
     return children.size();
   }
   return this->GetPresentableParts().size();
 }
 
 PartPane::Pointer PartStack::GetPaneFor(IPresentablePart::Pointer part)
 {
   if (part == 0 || part.Cast<PresentablePart>() == 0)
   {
     return PartPane::Pointer(0);
   }
 
   return part.Cast<PresentablePart>()->GetPane();
 }
 
 void* PartStack::GetParent()
 {
   return Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetParent(this->GetControl());
 }
 
 PartStack::PresentableVector PartStack::GetPresentableParts()
 {
   return presentableParts;
 }
 
 PresentablePart::Pointer PartStack::GetPresentablePart(LayoutPart::Pointer pane)
 {
   for (PresentableVector::iterator iter = presentableParts.begin(); iter != presentableParts.end(); ++iter)
   {
     PresentablePart::Pointer part = iter->Cast<PresentablePart>();
 
     if (part->GetPane() == pane)
     {
       return part;
     }
   }
 
   return PresentablePart::Pointer(0);
 }
 
 StackPresentation::Pointer PartStack::GetPresentation()
 {
   return presentationSite->GetPresentation();
 }
 
 PartPane::Pointer PartStack::GetSelection()
 {
   if (PartPane::Pointer partPane = current.Cast<PartPane>())
   {
     return partPane;
   }
   return PartPane::Pointer(0);
 }
 
 void PartStack::PresentationSelectionChanged(IPresentablePart::Pointer newSelection)
 {
   // Ignore selection changes that occur as a result of removing a part
   if (ignoreSelectionChanges)
   {
     return;
   }
   PartPane::Pointer newPart = this->GetPaneFor(newSelection);
 
   // This method should only be called on objects that are already in the layout
   poco_assert(newPart != 0);
 
   if (newPart == requestedCurrent)
   {
     return;
   }
 
   this->SetSelection(newPart);
 
   if (newPart != 0)
   {
     newPart->SetFocus();
   }
 
 }
 
 void PartStack::Remove(LayoutPart::Pointer child)
 {
   IPresentablePart::Pointer presentablePart = this->GetPresentablePart(child);
 
   // Need to remove it from the list of children before notifying the presentation
   // since it may setVisible(false) on the part, leading to a partHidden notification,
   // during which findView must not find the view being removed.  See bug 60039.
   children.removeAll(child);
 
   StackPresentation::Pointer presentation = this->GetPresentation();
 
   if (presentablePart != 0 && presentation != 0)
   {
     ignoreSelectionChanges = true;
     presentableParts.removeAll(presentablePart);
     presentation->RemovePart(presentablePart);
     presentablePart = 0;
     ignoreSelectionChanges = false;
   }
 
   if (this->GetPresentation() != 0)
   {
     child->SetContainer(ILayoutContainer::Pointer(0));
   }
 
   if (child == requestedCurrent)
   {
     this->UpdateContainerVisibleTab();
   }
 }
 
 void PartStack::Reparent(void* newParent)
 {
 
   void* control = this->GetControl();
   GuiWidgetsTweaklet* tweaklet = Tweaklets::Get(GuiWidgetsTweaklet::KEY);
   if ((control == 0) || (tweaklet->GetParent(control) == newParent)
       || !tweaklet->IsReparentable(control))
   {
     return;
   }
 
   LayoutPart::Reparent(newParent);
 
   for(ChildVector::iterator iter = children.begin();
       iter != children.end(); ++iter)
   {
     (*iter)->Reparent(newParent);
   }
 }
 
 void PartStack::Replace(LayoutPart::Pointer oldChild, LayoutPart::Pointer newChild)
 {
   ChildVector::iterator loc = std::find(children.begin(), children.end(), oldChild);
   int idx = 0;
   int numPlaceholders = 0;
   //subtract the number of placeholders still existing in the list
   //before this one - they wont have parts.
   for (ChildVector::iterator iter = children.begin(); iter != loc; ++iter, ++idx)
   {
     if ((*iter)->IsPlaceHolder())
     {
       numPlaceholders++;
     }
   }
   ObjectInt::Pointer cookie(new ObjectInt(idx - numPlaceholders));
   children.insert(loc, newChild);
 
   this->ShowPart(newChild, cookie);
 
   if (oldChild == requestedCurrent && newChild.Cast<PartPane>() != 0)
   {
     this->SetSelection(newChild.Cast<PartPane>());
   }
 
   this->Remove(oldChild);
 }
 
 int PartStack::ComputePreferredSize(bool width, int availableParallel,
     int availablePerpendicular, int preferredParallel)
 {
   return this->GetPresentation()->ComputePreferredSize(width, availableParallel,
       availablePerpendicular, preferredParallel);
 }
 
 int PartStack::GetSizeFlags(bool horizontal)
 {
   StackPresentation::Pointer presentation = this->GetPresentation();
 
   if (presentation != 0)
   {
     return presentation->GetSizeFlags(horizontal);
   }
 
   return 0;
 }
 
 bool PartStack::RestoreState(IMemento::Pointer memento)
 {
   // Read the active tab.
   QString activeTabID; memento->GetString(WorkbenchConstants::TAG_ACTIVE_PAGE_ID, activeTabID);
 
   // Read the page elements.
   QList<IMemento::Pointer> children = memento->GetChildren(WorkbenchConstants::TAG_PAGE);
 
   // Loop through the page elements.
-  for (std::size_t i = 0; i < children.size(); i++)
+  for (int i = 0; i < children.size(); i++)
   {
     // Get the info details.
     IMemento::Pointer childMem = children[i];
     QString partID; childMem->GetString(WorkbenchConstants::TAG_CONTENT, partID);
 
     // Create the part.
     LayoutPart::Pointer part(new PartPlaceholder(partID));
     part->SetContainer(ILayoutContainer::Pointer(this));
     this->Add(part);
     //1FUN70C: ITPUI:WIN - Shouldn't set Container when not active
     //part.setContainer(this);
     if (partID == activeTabID)
     {
       this->SetSelection(part);
       // Mark this as the active part.
       //current = part;
     }
   }
 
   //IPreferenceStore preferenceStore = PrefUtil.getAPIPreferenceStore();
   //boolean useNewMinMax = preferenceStore.getBoolean(IWorkbenchPreferenceConstants.ENABLE_NEW_MIN_MAX);
   int expanded;
   if (memento->GetInteger(WorkbenchConstants::TAG_EXPANDED, expanded))
   {
     //StartupThreading.runWithoutExceptions(new StartupRunnable()
     //    {
     //      void runWithException() throws Throwable
     //      {
     SetState(expanded != IStackPresentationSite::STATE_MINIMIZED ? IStackPresentationSite::STATE_RESTORED
         : IStackPresentationSite::STATE_MINIMIZED);
     //      }
     //    });
   }
   else
   {
     SetState(IStackPresentationSite::STATE_RESTORED);
   }
 
   int appearance;
   if (memento->GetInteger(WorkbenchConstants::TAG_APPEARANCE, appearance))
   {
     this->appearance = appearance;
   }
 
   // Determine if the presentation has saved any info here
   savedPresentationState = 0;
   QList<IMemento::Pointer> presentationMementos(memento
       ->GetChildren(WorkbenchConstants::TAG_PRESENTATION));
 
-  for (std::size_t idx = 0; idx < presentationMementos.size(); idx++)
+  for (int idx = 0; idx < presentationMementos.size(); idx++)
   {
     IMemento::Pointer child = presentationMementos[idx];
 
     QString id; child->GetString(WorkbenchConstants::TAG_ID, id);
 
     if (id == GetFactory()->GetId())
     {
       savedPresentationState = child;
       break;
     }
   }
 
   IMemento::Pointer propertiesState = memento->GetChild(WorkbenchConstants::TAG_PROPERTIES);
   if (propertiesState)
   {
     QList<IMemento::Pointer> props(propertiesState->GetChildren(WorkbenchConstants::TAG_PROPERTY));
-    for (std::size_t i = 0; i < props.size(); i++)
+    for (int i = 0; i < props.size(); i++)
     {
       QString id = props[i]->GetID();
       properties.insert(id, props[i]->GetTextData());
     }
   }
 
   //return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0, "", 0); //$NON-NLS-1$
   return true;
 }
 
 void PartStack::SetVisible(bool makeVisible)
 {
   void* ctrl = this->GetControl();
 
   bool useShortcut = makeVisible || !isActive;
 
   if (ctrl != 0 && useShortcut)
   {
     if (makeVisible == Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetVisible(ctrl))
     {
       return;
     }
   }
 
   if (makeVisible)
   {
     for (PresentableVector::iterator iter = presentableParts.begin();
         iter != presentableParts.end(); ++iter)
     {
       PresentablePart::Pointer next = iter->Cast<PresentablePart>();
 
       next->EnableInputs(isActive);
       next->EnableOutputs(isActive);
     }
   }
 
   LayoutPart::SetVisible(makeVisible);
 
   StackPresentation::Pointer presentation = this->GetPresentation();
 
   if (presentation != 0)
   {
     presentation->SetVisible(makeVisible);
   }
 
   if (!makeVisible)
   {
     for (PresentableVector::iterator iter = presentableParts.begin();
         iter != presentableParts.end(); ++iter)
     {
       PresentablePart::Pointer next = iter->Cast<PresentablePart>();
 
       next->EnableInputs(false);
     }
   }
 }
 
 bool PartStack::SaveState(IMemento::Pointer memento)
 {
 
   if (GetAppearance() != PresentationFactoryUtil::ROLE_EDITOR)
   {
     // Save the active tab.
     if (requestedCurrent)
     {
       memento->PutString(WorkbenchConstants::TAG_ACTIVE_PAGE_ID, requestedCurrent->GetID());
     }
 
     // Write out the presentable parts (in order)
     QSet<QString> cachedIds;
     PartStack::PresentableVector pparts(GetPresentableParts());
     for (PartStack::PresentableVector::iterator ppIter = pparts.begin();
         ppIter != pparts.end(); ++ppIter)
     {
       PresentablePart::Pointer presPart = ppIter->Cast<PresentablePart>();
 
       IMemento::Pointer childMem = memento->CreateChild(WorkbenchConstants::TAG_PAGE);
       PartPane::Pointer part = presPart->GetPane();
       QString tabText = part->GetPartReference()->GetPartName();
 
       childMem->PutString(WorkbenchConstants::TAG_LABEL, tabText);
       childMem->PutString(WorkbenchConstants::TAG_CONTENT, presPart->GetPane()->GetPlaceHolderId());
 
       // Cache the id so we don't write it out later
       cachedIds.insert(presPart->GetPane()->GetPlaceHolderId());
     }
 
     for (ChildVector::iterator iter = children.begin();
         iter != children.end(); ++iter)
     {
       LayoutPart::Pointer next = *iter;
 
       PartPane::Pointer part;
       if ((part = next.Cast<PartPane>()))
       {
         // Have we already written it out?
         if (cachedIds.find(part->GetPlaceHolderId()) != cachedIds.end())
         continue;
       }
 
       IMemento::Pointer childMem = memento
       ->CreateChild(WorkbenchConstants::TAG_PAGE);
 
       QString tabText = "LabelNotFound";
       if (part)
       {
         tabText = part->GetPartReference()->GetPartName();
       }
       childMem->PutString(WorkbenchConstants::TAG_LABEL, tabText);
       childMem->PutString(WorkbenchConstants::TAG_CONTENT, next->GetID());
     }
   }
 
   //  IPreferenceStore preferenceStore = PrefUtil.getAPIPreferenceStore();
   //  boolean useNewMinMax = preferenceStore.getBoolean(IWorkbenchPreferenceConstants.ENABLE_NEW_MIN_MAX);
   //  if (useNewMinMax)
   //  {
   memento->PutInteger(WorkbenchConstants::TAG_EXPANDED, presentationSite->GetState());
   //  }
   //  else
   //  {
   //    memento
   //    .putInteger(
   //        IWorkbenchConstants.TAG_EXPANDED,
   //        (presentationSite.getState() == IStackPresentationSite.STATE_MINIMIZED) ? IStackPresentationSite.STATE_MINIMIZED
   //        : IStackPresentationSite.STATE_RESTORED);
   //  }
 
   memento->PutInteger(WorkbenchConstants::TAG_APPEARANCE, appearance);
 
   this->SavePresentationState();
 
   if (savedPresentationState)
   {
     IMemento::Pointer presentationState = memento
     ->CreateChild(WorkbenchConstants::TAG_PRESENTATION);
     presentationState->PutMemento(savedPresentationState);
   }
 
   if (!properties.empty())
   {
     IMemento::Pointer propertiesState = memento->CreateChild(WorkbenchConstants::TAG_PROPERTIES);
     for (QHash<QString, QString>::iterator iterator = properties.begin();
         iterator != properties.end(); ++iterator)
     {
       if (iterator.value().isEmpty()) continue;
 
       IMemento::Pointer prop = propertiesState->CreateChild(WorkbenchConstants::TAG_PROPERTY, iterator.key());
       prop->PutTextData(iterator.value());
     }
   }
 
   //return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0, "", 0);
   return true;
 }
 
 WorkbenchPage::Pointer PartStack::GetPage()
 {
   //  WorkbenchWindow::Pointer window = this->GetWorkbenchWindow().Cast<WorkbenchWindow>();
   //
   //  if (window == 0)
   //  {
   //    return 0;
   //  }
   //
   //  return window->GetActivePage().Cast<WorkbenchPage>();
   return WorkbenchPage::Pointer(page);
 }
 
 void PartStack::SetActive(int activeState)
 {
 
   //  if (activeState == StackPresentation::AS_ACTIVE_FOCUS && isMinimized)
   //  {
   //    setMinimized(false);
   //  }
 
   presentationSite->SetActive(activeState);
 }
 
 int PartStack::GetActive() const
 {
   return presentationSite->GetActive();
 }
 
 void PartStack::SetSelection(LayoutPart::Pointer part)
 {
   if (part == requestedCurrent)
   {
     return;
   }
 
   requestedCurrent = part;
 
   this->RefreshPresentationSelection();
 }
 
 void PartStack::UpdateActions(PresentablePart::Pointer  /*current*/)
 {
 
 }
 
 void PartStack::HandleDeferredEvents()
 {
   LayoutPart::HandleDeferredEvents();
 
   this->RefreshPresentationSelection();
 }
 
 void PartStack::RefreshPresentationSelection()
 {
   // If deferring UI updates, exit.
   if (this->IsDeferred())
   {
     return;
   }
 
   // If the presentation is already displaying the desired part, then there's nothing
   // to do.
   if (current == requestedCurrent)
   {
     return;
   }
 
   StackPresentation::Pointer presentation = this->GetPresentation();
   if (presentation != 0)
   {
 
     presentationCurrent = this->GetPresentablePart(requestedCurrent);
 
     // this->UupdateActions(presentationCurrent);
 
 
     if (presentationCurrent != 0 && presentation != 0)
     {
       requestedCurrent->CreateControl(this->GetParent());
       GuiWidgetsTweaklet* tweaklet = Tweaklets::Get(GuiWidgetsTweaklet::KEY);
       if (tweaklet->GetParent(requestedCurrent->GetControl()) !=
           tweaklet->GetParent(this->GetControl()))
       {
         requestedCurrent->Reparent(tweaklet->GetParent(this->GetControl()));
       }
 
       presentation->SelectPart(presentationCurrent);
 
     }
 
     // Update the return value of getVisiblePart
     current = requestedCurrent;
     this->FireInternalPropertyChange(PROP_SELECTION);
   }
 }
 
 int PartStack::GetState()
 {
   return presentationSite->GetState();
 }
 
 void PartStack::SetState(const int newState)
 {
   int oldState = presentationSite->GetState();
   if (!this->SupportsState(newState) || newState == oldState)
   {
     return;
   }
 
   //  WorkbenchWindow::Pointer wbw = this->GetPage()->GetWorkbenchWindow().Cast<WorkbenchWindow>();
   //  if (wbw == 0 || wbw->GetShell() == 0 || wbw->GetActivePage() == 0)
   //    return;
   //
   //  WorkbenchPage::Pointer page = wbw->GetActivePage();
   //
   //  bool useNewMinMax = Perspective::UseNewMinMax(page->GetActivePerspective());
   //
   //  // we have to fiddle with the zoom behavior to satisfy Intro req's
   //  // by usning the old zoom behavior for its stack
   //  if (newState == IStackPresentationSite::STATE_MAXIMIZED)
   //    useNewMinMax = useNewMinMax; // && !this->IsIntroInStack();
   //  else if (newState == IStackPresentationSite::STATE_RESTORED)
   //  {
   //    PartStack::Pointer maxStack = page->GetActivePerspective()->GetPresentation()->GetMaximizedStack();
   //    useNewMinMax = useNewMinMax && maxStack == this;
   //  }
   //
   //  if (useNewMinMax)
   //  {
   //    //StartupThreading.runWithoutExceptions(new StartupRunnable()
   //    //    {
   //    //      void runWithException() throws Throwable
   //    //      {
   //    wbw->GetPageComposite()->SetRedraw(false);
   //    try
   //    {
   //      if (newState == IStackPresentationSite::STATE_MAXIMIZED)
   //      {
   //        smartZoom();
   //      }
   //      else if (oldState == IStackPresentationSite::STATE_MAXIMIZED)
   //      {
   //        smartUnzoom();
   //      }
   //
   //      if (newState == IStackPresentationSite::STATE_MINIMIZED)
   //      {
   //        setMinimized(true);
   //      }
   //
   //      wbw.getPageComposite().setRedraw(true);
   //
   //      // Force a redraw (fixes Mac refresh)
   //      wbw.getShell().redraw();
   //
   //    }
   //    catch (...)
   //    {
   //      wbw.getPageComposite().setRedraw(true);
   //
   //      // Force a redraw (fixes Mac refresh)
   //      wbw.getShell().redraw();
   //    }
   //
   //    this->SetPresentationState(newState);
   //    //     }
   //    //   });
   //  }
   //  else
   //  {
   ////    bool minimized = (newState == IStackPresentationSite::STATE_MINIMIZED);
   ////    this->SetMinimized(minimized);
   ////
   ////    if (newState == IStackPresentationSite::STATE_MAXIMIZED)
   ////    {
   ////      requestZoomIn();
   ////    }
   ////    else if (oldState == IStackPresentationSite::STATE_MAXIMIZED)
   ////    {
   ////      requestZoomOut();
   ////
   ////      if (newState == IStackPresentationSite::STATE_MINIMIZED)
   ////      setMinimized(true);
   ////    }
   //  }
 }
 
 void PartStack::ShowPart(LayoutPart::Pointer part, Object::Pointer cookie)
 {
 
   if (this->GetPresentation() == 0)
   {
     return;
   }
 
   if (part->IsPlaceHolder())
   {
     part->SetContainer(ILayoutContainer::Pointer(this));
     return;
   }
 
   if (part.Cast<PartPane>() == 0)
   {
     WorkbenchPlugin::Log("Incorrect part " + part->GetID() + "contained in a part stack");
     return;
   }
 
   PartPane::Pointer pane = part.Cast<PartPane>();
 
   PresentablePart::Pointer presentablePart(new PresentablePart(pane, Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetParent(this->GetControl())));
   presentableParts.push_back(presentablePart);
 
   if (isActive)
   {
     part->SetContainer(ILayoutContainer::Pointer(this));
 
     // The active part should always be enabled
     if (part->GetControl() != 0)
     Tweaklets::Get(GuiWidgetsTweaklet::KEY)->SetEnabled(part->GetControl(), true);
   }
 
   presentationSite->GetPresentation()->AddPart(presentablePart, cookie);
 
   if (requestedCurrent == 0)
   {
     this->SetSelection(pane);
   }
 
   //  if (childObscuredByZoom(part))
   //  {
   //    presentablePart.enableInputs(false);
   //  }
 }
 
 void PartStack::UpdateContainerVisibleTab()
 {
   ChildVector parts = this->GetChildren();
 
   if (parts.size() < 1)
   {
     this->SetSelection(LayoutPart::Pointer(0));
     return;
   }
 
   PartPane::Pointer selPart;
   int topIndex = 0;
   WorkbenchPage::Pointer page = this->GetPage();
 
   if (page != 0)
   {
     QList<IWorkbenchPartReference::Pointer> sortedParts = page->GetSortedParts();
     for (ChildVector::iterator partIter = parts.begin();
         partIter != parts.end(); ++partIter)
     {
       if (partIter->Cast<PartPane>() != 0)
       {
         IWorkbenchPartReference::Pointer part = partIter->Cast<PartPane>()
         ->GetPartReference();
         int index = static_cast<int>(std::find(sortedParts.begin(), sortedParts.end(), part) - sortedParts.begin());
         if (index >= topIndex)
         {
           topIndex = index;
           selPart = partIter->Cast<PartPane>();
         }
       }
     }
 
   }
 
   if (selPart == 0)
   {
     PresentableVector presentableParts = this->GetPresentableParts();
     if (presentableParts.size() != 0)
     {
       IPresentablePart::Pointer part = presentableParts.front();
 
       selPart = this->GetPaneFor(part);
     }
   }
 
   this->SetSelection(selPart);
 }
 
 void PartStack::ShowSystemMenu()
 {
   //this->GetPresentation()->ShowSystemMenu();
 }
 
 void PartStack::ShowPaneMenu()
 {
   //this->GetPresentation()->ShowPaneMenu();
 }
 
 void PartStack::ShowPartList()
 {
   this->GetPresentation()->ShowPartList();
 }
 
 QList<void*> PartStack::GetTabList(LayoutPart::Pointer part)
 {
   if (part != 0)
   {
     IPresentablePart::Pointer presentablePart = this->GetPresentablePart(part);
     StackPresentation::Pointer presentation = this->GetPresentation();
 
     if (presentablePart != 0 && presentation != 0)
     {
       return presentation->GetTabList(presentablePart);
     }
   }
 
   return QList<void*>();
 }
 
 void PartStack::DragStart(IPresentablePart::Pointer beingDragged, Point& initialLocation,
     bool keyboard)
 {
   if (beingDragged == 0)
   {
     this->PaneDragStart(PartPane::Pointer(0), initialLocation, keyboard);
   }
   else
   {
     if (presentationSite->IsPartMoveable(beingDragged))
     {
       PartPane::Pointer pane = this->GetPaneFor(beingDragged);
 
       if (pane != 0)
       {
         this->PaneDragStart(pane, initialLocation, keyboard);
       }
     }
   }
 }
 
 void PartStack::PaneDragStart(PartPane::Pointer pane, Point& initialLocation,
     bool keyboard)
 {
   if (pane == 0)
   {
     if (this->CanMoveFolder())
     {
       if (presentationSite->GetState() == IStackPresentationSite::STATE_MAXIMIZED)
       {
         // Calculate where the initial location was BEFORE the 'restore'...as a percentage
         Rectangle bounds = Geometry::ToDisplay(this->GetParent(),
             Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetBounds(this->GetPresentation()->GetControl()));
         float xpct = (initialLocation.x - bounds.x) / (float)(bounds.width);
         float ypct = (initialLocation.y - bounds.y) / (float)(bounds.height);
 
         // Only restore if we're dragging views/view stacks
         if (this->GetAppearance() != PresentationFactoryUtil::ROLE_EDITOR)
           this->SetState(IStackPresentationSite::STATE_RESTORED);
 
         // Now, adjust the initial location to be within the bounds of the restored rect
         bounds = Geometry::ToDisplay(this->GetParent(),
             Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetBounds(this->GetPresentation()->GetControl()));
         initialLocation.x = (int) (bounds.x + (xpct * bounds.width));
         initialLocation.y = (int) (bounds.y + (ypct * bounds.height));
       }
 
       DragUtil::PerformDrag(Object::Pointer(this), Geometry::ToDisplay(this->GetParent(),
               Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetBounds(this->GetPresentation()->GetControl())),
           initialLocation, !keyboard);
     }
   }
   else
   {
     if (presentationSite->GetState() == IStackPresentationSite::STATE_MAXIMIZED)
     {
       // Calculate where the initial location was BEFORE the 'restore'...as a percentage
       Rectangle bounds = Geometry::ToDisplay(this->GetParent(),
           Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetBounds(this->GetPresentation()->GetControl()));
       float xpct = (initialLocation.x - bounds.x) / (float)(bounds.width);
       float ypct = (initialLocation.y - bounds.y) / (float)(bounds.height);
 
       // Only restore if we're dragging views/view stacks
       if (this->GetAppearance() != PresentationFactoryUtil::ROLE_EDITOR)
         this->SetState(IStackPresentationSite::STATE_RESTORED);
 
       // Now, adjust the initial location to be within the bounds of the restored rect
       // See bug 100908
       bounds = Geometry::ToDisplay(this->GetParent(),
           Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetBounds(this->GetPresentation()->GetControl()));
       initialLocation.x = (int) (bounds.x + (xpct * bounds.width));
       initialLocation.y = (int) (bounds.y + (ypct * bounds.height));
     }
 
     DragUtil::PerformDrag(pane, Geometry::ToDisplay(this->GetParent(),
             Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetBounds(this->GetPresentation()->GetControl())),
         initialLocation, !keyboard);
   }
 }
 
 IMemento::Pointer PartStack::GetSavedPresentationState()
 {
   return savedPresentationState;
 }
 
 void PartStack::FireInternalPropertyChange(int id)
 {
   ObjectInt::Pointer val(new ObjectInt(id));
   Object::Pointer source(this);
   PropertyChangeEvent::Pointer event(new PropertyChangeEvent(source,
           IWorkbenchPartConstants::INTEGER_PROPERTY, val, val));
   propEvents.propertyChange(event);
 }
 
 QString PartStack::GetProperty(const QString& id)
 {
   return properties[id];
 }
 
 void PartStack::SetProperty(const QString& id, const QString& value)
 {
   if (value == "")
   {
     properties.remove(id);
   }
   else
   {
     properties.insert(id, value);
   }
 }
 
 void PartStack::CopyAppearanceProperties(PartStack::Pointer copyTo)
 {
   copyTo->appearance = this->appearance;
   if (!properties.empty())
   {
     for (QHash<QString, QString>::iterator iter = properties.begin();
         iter != properties.end(); ++iter)
     {
       copyTo->SetProperty(iter.key(), iter.value());
     }
   }
 }
 
 void PartStack::ResizeChild(LayoutPart::Pointer  /*childThatChanged*/)
 {
 
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtDnDTweaklet.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPersistentState.cpp
old mode 100755
new mode 100644
similarity index 67%
copy from BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtDnDTweaklet.cpp
copy to BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPersistentState.cpp
index 134aafa71e..abf40050bb
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtDnDTweaklet.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPersistentState.cpp
@@ -1,38 +1,35 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
-#include "berryQtDnDTweaklet.h"
-
-#include "berryQtTracker.h"
+#include "berryPersistentState.h"
 
 namespace berry {
 
-QtDnDTweaklet::QtDnDTweaklet()
-{
-
-}
+PersistentState::PersistentState()
+  : persisted(false)
+{}
 
-QtDnDTweaklet::QtDnDTweaklet(const QtDnDTweaklet& other)
+void PersistentState::SetShouldPersist(bool persisted)
 {
-  Q_UNUSED(other)
+  this->persisted = persisted;
 }
 
-ITracker* QtDnDTweaklet::CreateTracker()
+bool PersistentState::ShouldPersist()
 {
-  return new QtTracker();
+  return persisted;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPersistentState.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPersistentState.h
new file mode 100644
index 0000000000..27474165a3
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPersistentState.h
@@ -0,0 +1,102 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYPERSISTENTSTATE_H
+#define BERRYPERSISTENTSTATE_H
+
+#include "berryState.h"
+
+namespace berry {
+
+struct IPreferences;
+
+/**
+ * <p>
+ * This is a state that can be made persistent. A state is persisted to a
+ * preference store.
+ * </p>
+ * <p>
+ * Clients may extend this class.
+ * </p>
+ *
+ * @since 3.2
+ */
+class PersistentState : public State
+{
+
+public:
+
+  berryObjectMacro(berry::PersistentState)
+
+  PersistentState();
+
+  /**
+   * Loads this state from the preference store, given the location at which
+   * to look. This method must be symmetric with a call to
+   * {@link #save(IPreferenceStore, String)}.
+   *
+   * @param store
+   *            The store from which to read; must not be <code>null</code>.
+   * @param preferenceKey
+   *            The key at which the state is stored; must not be
+   *            <code>null</code>.
+   */
+  virtual void Load(const SmartPointer<IPreferences>& store,
+                    const QString& preferenceKey) = 0;
+
+  /**
+   * Saves this state to the preference store, given the location at which to
+   * write. This method must be symmetric with a call to
+   * {@link #load(IPreferenceStore, String)}.
+   *
+   * @param store
+   *            The store to which the state should be written; must not be
+   *            <code>null</code>.
+   * @param preferenceKey
+   *            The key at which the state should be stored; must not be
+   *            <code>null</code>.
+   */
+  virtual void Save(const SmartPointer<IPreferences>& store,
+                    const QString& preferenceKey) = 0;
+
+  /**
+   * Sets whether this state should be persisted.
+   *
+   * @param persisted
+   *            Whether this state should be persisted.
+   */
+  virtual void SetShouldPersist(bool persisted);
+
+  /**
+   * Whether this state should be persisted. Subclasses should check this
+   * method before loading or saving.
+   *
+   * @return <code>true</code> if this state should be persisted;
+   *         <code>false</code> otherwise.
+   */
+  virtual bool ShouldPersist();
+
+private:
+
+  /**
+   * Whether this state should be persisted.
+   */
+  bool persisted;
+};
+
+}
+
+#endif // BERRYPERSISTENTSTATE_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPerspective.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPerspective.cpp
index e741e5c651..f83af8992f 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPerspective.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPerspective.cpp
@@ -1,1804 +1,1811 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "tweaklets/berryGuiWidgetsTweaklet.h"
 
 #include "berryPerspective.h"
 
 #include "berryPerspectiveHelper.h"
 #include "berryWorkbenchPlugin.h"
 #include "berryWorkbenchConstants.h"
 #include "berryPerspectiveExtensionReader.h"
 #include "berryEditorSashContainer.h"
 #include "berryPartSite.h"
 #include "berryViewSite.h"
 #include "berryEditorAreaHelper.h"
 #include "intro/berryIntroConstants.h"
 #include "dialogs/berryMessageDialog.h"
 #include "berryWorkbenchWindow.h"
 #include "berryStatusUtil.h"
 
 #include "presentations/berryIStackPresentationSite.h"
 
 namespace berry
 {
 
 const QString Perspective::VERSION_STRING = "0.016";
 
 Perspective::Perspective(PerspectiveDescriptor::Pointer desc,
     WorkbenchPage::Pointer page)
  : descriptor(desc)
  {
   this->Init(page);
   if (desc.IsNotNull())
   {
     this->CreatePresentation(desc);
   }
 }
 
 Perspective::Perspective(WorkbenchPage::Pointer page)
 {
   this->Init(page);
 }
 
 void Perspective::Init(WorkbenchPage::Pointer page)
 {
   editorHidden = false;
   editorAreaState = IStackPresentationSite::STATE_RESTORED;
   fixed = false;
   presentation = 0;
   shouldHideEditorsOnActivate = false;
   this->page = page.GetPointer();
   this->editorArea = page->GetEditorPresentation()->GetLayoutPart();
   this->viewFactory = page->GetViewFactory();
 }
 
 bool Perspective::BringToTop(IViewReference::Pointer ref)
 {
   return presentation->BringPartToTop(this->GetPane(ref));
 }
 
 bool Perspective::ContainsView(IViewPart::Pointer view)
 {
   IViewSite::Pointer site = view->GetViewSite();
   IViewReference::Pointer ref = this->FindView(site->GetId(), site->GetSecondaryId());
   if (ref.IsNull())
   {
     return false;
   }
   return (view.Cast<IWorkbenchPart>() == ref->GetPart(false));
 }
 
 bool Perspective::ContainsView(const std::string& viewId)
 {
   return mapIDtoViewLayoutRec.contains(viewId);
 }
 
 void Perspective::CreatePresentation(PerspectiveDescriptor::Pointer persp)
 {
   if (persp->HasCustomDefinition())
   {
     this->LoadCustomPersp(persp);
   }
   else
   {
     this->LoadPredefinedPersp(persp);
   }
 }
 
 Perspective::~Perspective()
 {
   // Get rid of presentation.
   if (presentation == 0)
   {
     DisposeViewRefs();
     return;
   }
 
   presentation->Deactivate();
 
   // Release each view.
   QList<IViewReference::Pointer> refs(this->GetViewReferences());
   for (QList<IViewReference::Pointer>::size_type i = 0, length = refs.size(); i < length; i++)
   {
     this->GetViewFactory()->ReleaseView(refs[i]);
   }
 
   mapIDtoViewLayoutRec.clear();
   delete presentation;
 }
 
-void Perspective::DisposeViewRefs() {
-    if (!memento) {
-      return;
+void Perspective::DisposeViewRefs()
+{
+  if (!memento)
+  {
+    return;
+  }
+  QList<IMemento::Pointer> views(memento->GetChildren(WorkbenchConstants::TAG_VIEW));
+  for (int x = 0; x < views.size(); x++)
+  {
+    // Get the view details.
+    IMemento::Pointer childMem = views[x];
+    QString id; childMem->GetString(WorkbenchConstants::TAG_ID, id);
+    // skip creation of the intro reference - it's handled elsewhere.
+    if (id == IntroConstants::INTRO_VIEW_ID)
+    {
+      continue;
     }
-    QList<IMemento::Pointer> views(memento->GetChildren(WorkbenchConstants::TAG_VIEW));
-    for (std::size_t x = 0; x < views.size(); x++) {
-      // Get the view details.
-      IMemento::Pointer childMem = views[x];
-      QString id; childMem->GetString(WorkbenchConstants::TAG_ID, id);
-      // skip creation of the intro reference - it's handled elsewhere.
-      if (id == IntroConstants::INTRO_VIEW_ID) {
-        continue;
-      }
 
-      QString secondaryId = ViewFactory::ExtractSecondaryId(id);
-      if (!secondaryId.isEmpty()) {
-        id = ViewFactory::ExtractPrimaryId(id);
-      }
+    QString secondaryId = ViewFactory::ExtractSecondaryId(id);
+    if (!secondaryId.isEmpty())
+    {
+      id = ViewFactory::ExtractPrimaryId(id);
+    }
 
-      QString removed;
-      childMem->GetString(WorkbenchConstants::TAG_REMOVED, removed);
-      if (removed != "true") {
-        IViewReference::Pointer ref = viewFactory->GetView(id, secondaryId);
-        if (ref) {
-          viewFactory->ReleaseView(ref);
-        }
+    QString removed;
+    childMem->GetString(WorkbenchConstants::TAG_REMOVED, removed);
+    if (removed != "true")
+    {
+      IViewReference::Pointer ref = viewFactory->GetView(id, secondaryId);
+      if (ref)
+      {
+        viewFactory->ReleaseView(ref);
       }
     }
   }
+}
 
 IViewReference::Pointer Perspective::FindView(const QString& viewId)
 {
   return this->FindView(viewId, "");
 }
 
 IViewReference::Pointer Perspective::FindView(const QString& id, const QString& secondaryId)
 {
   QList<IViewReference::Pointer> refs(this->GetViewReferences());
-  for (unsigned int i = 0; i < refs.size(); i++)
+  for (int i = 0; i < refs.size(); i++)
   {
     IViewReference::Pointer ref = refs[i];
     if (id == ref->GetId()
         && (secondaryId  == ref->GetSecondaryId()))
     {
       return ref;
     }
   }
   return IViewReference::Pointer(0);
 }
 
 void* Perspective::GetClientComposite()
 {
   return page->GetClientComposite();
 }
 
 IPerspectiveDescriptor::Pointer Perspective::GetDesc()
 {
   return descriptor;
 }
 
 PartPane::Pointer Perspective::GetPane(IViewReference::Pointer ref)
 {
   return ref.Cast<WorkbenchPartReference>()->GetPane();
 }
 
 QList<QString> Perspective::GetPerspectiveShortcuts()
 {
   return perspectiveShortcuts;
 }
 
 PerspectiveHelper* Perspective::GetPresentation() const
 {
   return presentation;
 }
 
 QList<QString> Perspective::GetShowViewShortcuts()
 {
   return showViewShortcuts;
 }
 
 ViewFactory* Perspective::GetViewFactory()
 {
   return viewFactory;
 }
 
 QList<IViewReference::Pointer> Perspective::GetViewReferences()
 {
   // Get normal views.
   if (presentation == 0)
   {
     return QList<IViewReference::Pointer>();
   }
 
   QList<PartPane::Pointer> panes;
   presentation->CollectViewPanes(panes);
 
   QList<IViewReference::Pointer> result;
 //  List fastViews = (fastViewManager != 0) ?
 //  fastViewManager.getFastViews(0)
 //  : new ArrayList();
 //  IViewReference[] resultArray = new IViewReference[panes.size()
 //  + fastViews.size()];
 //
 //  // Copy fast views.
 //  int nView = 0;
 //  for (int i = 0; i < fastViews.size(); i++)
 //  {
 //    resultArray[nView] = (IViewReference) fastViews.get(i);
 //    ++nView;
 //  }
 
   // Copy normal views.
   for (QList<PartPane::Pointer>::iterator iter = panes.begin();
        iter != panes.end(); ++iter)
   {
     PartPane::Pointer pane = *iter;
     result.push_back(pane->GetPartReference().Cast<IViewReference>());
   }
 
   return result;
 }
 
 void Perspective::HideEditorArea()
 {
   if (!this->IsEditorAreaVisible())
   {
     return;
   }
 
   // Show the editor in the appropriate location
   if (this->UseNewMinMax(Perspective::Pointer(this)))
   {
     // If it's the currently maximized part we have to restore first
 //    if (this->GetPresentation().getMaximizedStack().Cast<EditorStack>() != 0)
 //    {
 //      getPresentation().getMaximizedStack().setState(IStackPresentationSite.STATE_RESTORED);
 //    }
 
     bool isMinimized = editorAreaState == IStackPresentationSite::STATE_MINIMIZED;
     if (!isMinimized)
       this->HideEditorAreaLocal();
     //else
     //  this->SetEditorAreaTrimVisibility(false);
   }
   else
   {
     this->HideEditorAreaLocal();
   }
 
   editorHidden = true;
 }
 
 void Perspective::HideEditorAreaLocal()
 {
   if (editorHolder != 0)
   {
     return;
   }
 
   // Replace the editor area with a placeholder so we
   // know where to put it back on show editor area request.
   editorHolder = new PartPlaceholder(editorArea->GetID());
   presentation->GetLayout()->Replace(editorArea, editorHolder);
 }
 
 bool Perspective::HideView(IViewReference::Pointer ref)
 {
   // If the view is locked just return.
   PartPane::Pointer pane = this->GetPane(ref);
 
   presentation->RemovePart(pane);
 
   // Dispose view if ref count == 0.
   this->GetViewFactory()->ReleaseView(ref);
   return true;
 }
 
 bool Perspective::IsEditorAreaVisible()
 {
   return !editorHidden;
 }
 
 ViewLayoutRec::Pointer Perspective::GetViewLayoutRec(IViewReference::Pointer ref, bool create)
 {
   ViewLayoutRec::Pointer result = this->GetViewLayoutRec(ViewFactory::GetKey(ref), create);
   if (result.IsNull() && create==false)
   {
     result = this->GetViewLayoutRec(ref->GetId(), false);
   }
   return result;
 }
 
 ViewLayoutRec::Pointer Perspective::GetViewLayoutRec(const QString& viewId, bool create)
 {
   ViewLayoutRec::Pointer rec = mapIDtoViewLayoutRec[viewId];
   if (rec.IsNull() && create)
   {
     rec = new ViewLayoutRec();
     mapIDtoViewLayoutRec[viewId] = rec;
   }
   return rec;
 }
 
 bool Perspective::IsFixedLayout()
 {
   //@issue is there a difference between a fixed
   //layout and a fixed perspective?? If not the API
   //may need some polish, WorkbenchPage, PageLayout
   //and Perspective all have isFixed methods.
   //PageLayout and Perspective have their own fixed
   //attribute, we are assuming they are always in sync.
   //WorkbenchPage delegates to the perspective.
   return fixed;
 }
 
 bool Perspective::IsStandaloneView(IViewReference::Pointer ref)
 {
   ViewLayoutRec::Pointer rec = this->GetViewLayoutRec(ref, false);
   return rec.IsNotNull() && rec->isStandalone;
 }
 
 bool Perspective::GetShowTitleView(IViewReference::Pointer ref)
 {
   ViewLayoutRec::Pointer rec = this->GetViewLayoutRec(ref, false);
   return rec.IsNotNull() && rec->showTitle;
 }
 
 void Perspective::LoadCustomPersp(PerspectiveDescriptor::Pointer persp)
 {
   //get the layout from the registry
   PerspectiveRegistry* perspRegistry = dynamic_cast<PerspectiveRegistry*>(WorkbenchPlugin::GetDefault()->GetPerspectiveRegistry());
   try
   {
     IMemento::Pointer memento = perspRegistry->GetCustomPersp(persp->GetId());
     // Restore the layout state.
 //    MultiStatus status = new MultiStatus(
 //        PlatformUI.PLUGIN_ID,
 //        IStatus.OK,
 //        NLS.bind(WorkbenchMessages.Perspective_unableToRestorePerspective, persp.getLabel()),
 //        0);
 //    status.merge(restoreState(memento));
 //    status.merge(restoreState());
     bool okay = true;
     okay &= this->RestoreState(memento);
     okay &= this->RestoreState();
     if (!okay)
     {
       this->UnableToOpenPerspective(persp, "Unable to open perspective: " + persp->GetLabel());
     }
   }
   //catch (IOException e)
   //{
   //  unableToOpenPerspective(persp, 0);
   //}
   catch (const WorkbenchException& e)
   {
     this->UnableToOpenPerspective(persp, e.what());
   }
 }
 
 void Perspective::UnableToOpenPerspective(PerspectiveDescriptor::Pointer persp,
     const QString& status)
 {
   PerspectiveRegistry* perspRegistry = dynamic_cast<PerspectiveRegistry*>(WorkbenchPlugin
   ::GetDefault()->GetPerspectiveRegistry());
   perspRegistry->DeletePerspective(persp);
   // If this is a predefined perspective, we will not be able to delete
   // the perspective (we wouldn't want to).  But make sure to delete the
   // customized portion.
   persp->DeleteCustomDefinition();
   QString title = "Restoring problems";
   QString msg = "Unable to read workbench state.";
   if (status == "")
   {
     MessageDialog::OpenError(Shell::Pointer(0), title, msg);
   }
   else
   {
     //TODO error dialog
     //ErrorDialog.openError((Shell) 0, title, msg, status);
     MessageDialog::OpenError(Shell::Pointer(0), title, msg + "\n" + status);
   }
 }
 
 void Perspective::LoadPredefinedPersp(PerspectiveDescriptor::Pointer persp)
 {
   // Create layout engine.
   IPerspectiveFactory::Pointer factory;
   try
   {
     factory = persp->CreateFactory();
   }
   catch (CoreException& /*e*/)
   {
     throw WorkbenchException("Unable to load perspective: " + persp->GetId());
   }
 
   /*
    * IPerspectiveFactory#createFactory() can return 0
    */
   if (factory == 0)
   {
     throw WorkbenchException("Unable to load perspective: " + persp->GetId());
   }
 
   // Create layout factory.
   ViewSashContainer::Pointer container(new ViewSashContainer(page, this->GetClientComposite()));
   layout = new PageLayout(container, this->GetViewFactory(),
       editorArea, descriptor);
   layout->SetFixed(descriptor->GetFixed());
 
 //  // add the placeholders for the sticky folders and their contents
   IPlaceholderFolderLayout::Pointer stickyFolderRight, stickyFolderLeft, stickyFolderTop, stickyFolderBottom;
 
   QList<IStickyViewDescriptor::Pointer> descs(WorkbenchPlugin::GetDefault()
   ->GetViewRegistry()->GetStickyViews());
-  for (std::size_t i = 0; i < descs.size(); i++)
+  for (int i = 0; i < descs.size(); i++)
   {
     IStickyViewDescriptor::Pointer stickyViewDescriptor = descs[i];
     QString id = stickyViewDescriptor->GetId();
     int location = stickyViewDescriptor->GetLocation();
     if (location == IPageLayout::RIGHT)
     {
       if (stickyFolderRight == 0)
       {
         stickyFolderRight = layout
         ->CreatePlaceholderFolder(
             StickyViewDescriptor::STICKY_FOLDER_RIGHT,
             IPageLayout::RIGHT, .75f,
             IPageLayout::ID_EDITOR_AREA);
       }
       stickyFolderRight->AddPlaceholder(id);
     }
     else if (location == IPageLayout::LEFT)
     {
       if (stickyFolderLeft == 0)
       {
         stickyFolderLeft = layout->CreatePlaceholderFolder(
             StickyViewDescriptor::STICKY_FOLDER_LEFT,
             IPageLayout::LEFT, .25f, IPageLayout::ID_EDITOR_AREA);
       }
       stickyFolderLeft->AddPlaceholder(id);
     }
     else if (location == IPageLayout::TOP)
     {
       if (stickyFolderTop == 0)
       {
         stickyFolderTop = layout->CreatePlaceholderFolder(
             StickyViewDescriptor::STICKY_FOLDER_TOP,
             IPageLayout::TOP, .25f, IPageLayout::ID_EDITOR_AREA);
       }
       stickyFolderTop->AddPlaceholder(id);
     }
     else if (location == IPageLayout::BOTTOM)
     {
       if (stickyFolderBottom == 0)
       {
         stickyFolderBottom = layout->CreatePlaceholderFolder(
             StickyViewDescriptor::STICKY_FOLDER_BOTTOM,
             IPageLayout::BOTTOM, .75f,
             IPageLayout::ID_EDITOR_AREA);
       }
       stickyFolderBottom->AddPlaceholder(id);
     }
 
     //should never be 0 as we've just added the view above
     IViewLayout::Pointer viewLayout = layout->GetViewLayout(id);
     viewLayout->SetCloseable(stickyViewDescriptor->IsCloseable());
     viewLayout->SetMoveable(stickyViewDescriptor->IsMoveable());
   }
 
   // Run layout engine.
   factory->CreateInitialLayout(layout);
   PerspectiveExtensionReader extender;
   extender.ExtendLayout(descriptor->GetId(), layout);
 
   // Retrieve view layout info stored in the page layout.
   QHash<QString, ViewLayoutRec::Pointer> layoutInfo = layout->GetIDtoViewLayoutRecMap();
   mapIDtoViewLayoutRec.unite(layoutInfo);
 
   //TODO Perspective action sets
   // Create action sets.
   //List temp = new ArrayList();
   //this->CreateInitialActionSets(temp, layout.getActionSets());
 
 //  IContextService service = 0;
 //  if (page != 0)
 //  {
 //    service = (IContextService) page.getWorkbenchWindow().getService(
 //        IContextService.class);
 //  }
 //  try
 //  {
 //    if (service!=0)
 //    {
 //      service.activateContext(ContextAuthority.DEFER_EVENTS);
 //    }
 //    for (Iterator iter = temp.iterator(); iter.hasNext();)
 //    {
 //      IActionSetDescriptor descriptor = (IActionSetDescriptor) iter
 //      .next();
 //      addAlwaysOn(descriptor);
 //    }
 //  }finally
 //  {
 //    if (service!=0)
 //    {
 //      service.activateContext(ContextAuthority.SEND_EVENTS);
 //    }
 //  }
 
 //  newWizardShortcuts = layout.getNewWizardShortcuts();
     showViewShortcuts = layout->GetShowViewShortcuts();
 //  perspectiveShortcuts = layout.getPerspectiveShortcuts();
 //  showInPartIds = layout.getShowInPartIds();
 //
 //  // Retrieve fast views
 //  if (fastViewManager != 0)
 //  {
 //    ArrayList fastViews = layout.getFastViews();
 //    for (Iterator fvIter = fastViews.iterator(); fvIter.hasNext();)
 //    {
 //      IViewReference ref = (IViewReference) fvIter.next();
 //      fastViewManager.addViewReference(FastViewBar.FASTVIEWBAR_ID, -1, ref,
 //          !fvIter.hasNext());
 //    }
 //  }
 
   // Is the layout fixed
   fixed = layout->IsFixed();
   showViewShortcuts = layout->GetShowViewShortcuts();
 
   // Create presentation.
   presentation = new PerspectiveHelper(page, container, this);
 
   // Hide editor area if requested by factory
   if (!layout->IsEditorAreaVisible())
   {
     this->HideEditorArea();
   }
 
 }
 
 void Perspective::OnActivate()
 {
   // Update editor area state.
   if (editorArea->GetControl() != 0)
   {
     bool visible = this->IsEditorAreaVisible();
     bool inTrim = editorAreaState == IStackPresentationSite::STATE_MINIMIZED;
 
     editorArea->SetVisible(visible && !inTrim);
   }
 
 //  // Update fast views.
 //  // Make sure the control for the fastviews are created so they can
 //  // be activated.
 //  if (fastViewManager != 0)
 //  {
 //    List fastViews = fastViewManager.getFastViews(0);
 //    for (int i = 0; i < fastViews.size(); i++)
 //    {
 //      ViewPane pane = getPane((IViewReference) fastViews.get(i));
 //      if (pane != 0)
 //      {
 //        Control ctrl = pane.getControl();
 //        if (ctrl == 0)
 //        {
 //          pane.createControl(getClientComposite());
 //          ctrl = pane.getControl();
 //        }
 //        ctrl.setEnabled(false); // Remove focus support.
 //      }
 //    }
 //  }
 
 //  // Set the visibility of all fast view pins
 //  setAllPinsVisible(true);
 
   // Trim Stack Support
   bool useNewMinMax = Perspective::UseNewMinMax(Perspective::Pointer(this));
   bool hideEditorArea = shouldHideEditorsOnActivate || (editorHidden && editorHolder == 0);
 
   // We have to set the editor area's stack state -before-
   // activating the presentation since it's used there to determine
   // size of the resulting stack
   if (useNewMinMax && !hideEditorArea)
   {
     this->RefreshEditorAreaVisibility();
   }
 
   // Show the layout
   presentation->Activate(this->GetClientComposite());
 
 //  if (useNewMinMax)
 //  {
 //    fastViewManager.activate();
 //
 //    // Move any minimized extension stacks to the trim
 //    if (layout != 0)
 //    {
 //      // Turn aimations off
 //      IPreferenceStore preferenceStore = PrefUtil.getAPIPreferenceStore();
 //      bool useAnimations = preferenceStore
 //      .getbool(IWorkbenchPreferenceConstants.ENABLE_ANIMATIONS);
 //      preferenceStore.setValue(IWorkbenchPreferenceConstants.ENABLE_ANIMATIONS, false);
 //
 //      List minStacks = layout.getMinimizedStacks();
 //      for (Iterator msIter = minStacks.iterator(); msIter.hasNext();)
 //      {
 //        ViewStack vs = (ViewStack) msIter.next();
 //        vs.setMinimized(true);
 //      }
 //
 //      // Restore the animation pref
 //      preferenceStore.setValue(IWorkbenchPreferenceConstants.ENABLE_ANIMATIONS, useAnimations);
 //
 //      // this is a one-off deal...set during the extension reading
 //      minStacks.clear();
 //      layout = 0;
 //    }
 //  }
 //  else
 //  {
 //    // Update the FVB only if not using the new min/max
 //
 //    //    WorkbenchWindow wbw = (WorkbenchWindow) page.getWorkbenchWindow();
 ////    if (wbw != 0)
 ////    {
 ////      ITrimManager tbm = wbw.getTrimManager();
 ////      if (tbm != 0)
 ////      {
 ////        IWindowTrim fvb = tbm.getTrim(FastViewBar.FASTVIEWBAR_ID);
 ////        if (fvb instanceof FastViewBar)
 ////        {
 ////          ((FastViewBar)fvb).update(true);
 ////        }
 ////      }
 ////    }
 //  }
 
 //  // If we are -not- using the new min/max then ensure that there
 //  // are no stacks in the trim. This can happen when a user switches
 //  // back to the 3.0 presentation...
 //  if (!Perspective.useNewMinMax(this) && fastViewManager != 0)
 //  {
 //    bool stacksWereRestored = fastViewManager.restoreAllTrimStacks();
 //    setEditorAreaTrimVisibility(false);
 //
 //    // Restore any 'maximized' view stack since we've restored
 //    // the minimized stacks
 //    if (stacksWereRestored && presentation.getMaximizedStack().Cast<ViewStack>() != 0)
 //    {
 //      ViewStack vs = (ViewStack) presentation.getMaximizedStack();
 //      vs.setPresentationState(IStackPresentationSite.STATE_RESTORED);
 //      presentation.setMaximizedStack(0);
 //    }
 //  }
 
   // We hide the editor area -after- the presentation activates
   if (hideEditorArea)
   {
     // We do this here to ensure that createPartControl is called on the
     // top editor
     // before it is hidden. See bug 20166.
     this->HideEditorArea();
     shouldHideEditorsOnActivate = false;
 
 //    // this is an override so it should handle both states
 //    if (useNewMinMax)
 //    setEditorAreaTrimVisibility(editorAreaState == IStackPresentationSite.STATE_MINIMIZED);
   }
 
   FixOrphan();
 }
 
 void Perspective::FixOrphan()
 {
   PerspectiveRegistry* reg = static_cast<PerspectiveRegistry*>(PlatformUI::GetWorkbench()->GetPerspectiveRegistry());
   IPerspectiveDescriptor::Pointer regDesc = reg->FindPerspectiveWithId(descriptor->GetId());
   if (regDesc.IsNull())
   {
     QString msg = "Perspective " + descriptor->GetLabel() + " has been made into a local copy";
     IStatus::Pointer status = StatusUtil::NewStatus(IStatus::WARNING_TYPE, msg, BERRY_STATUS_LOC);
     //StatusManager.getManager().handle(status, StatusManager.LOG);
     WorkbenchPlugin::Log(status);
 
     QString localCopyLabel("<%1>");
     QString newDescId = localCopyLabel.arg(descriptor->GetLabel());
     while (reg->FindPerspectiveWithId(newDescId).IsNotNull())
     {
       newDescId = localCopyLabel.arg(newDescId);
     }
     PerspectiveDescriptor::Pointer newDesc = reg->CreatePerspective(newDescId, descriptor);
     page->SavePerspectiveAs(newDesc);
   }
 }
 
 void Perspective::OnDeactivate()
 {
   presentation->Deactivate();
   //setActiveFastView(0);
   //setAllPinsVisible(false);
 
 //  // Update fast views.
 //  if (fastViewManager != 0)
 //  {
 //    List fastViews = fastViewManager.getFastViews(0);
 //    for (int i = 0; i < fastViews.size(); i++)
 //    {
 //      ViewPane pane = getPane((IViewReference) fastViews.get(i));
 //      if (pane != 0)
 //      {
 //        Control ctrl = pane.getControl();
 //        if (ctrl != 0)
 //        {
 //          ctrl.setEnabled(true); // Add focus support.
 //        }
 //      }
 //    }
 //
 //    fastViewManager.deActivate();
 //  }
 //
 //  // Ensure that the editor area trim is hidden as well
 //  setEditorAreaTrimVisibility(false);
 }
 
 void Perspective::PartActivated(IWorkbenchPart::Pointer  /*activePart*/)
 {
 //  // If a fastview is open close it.
 //  if (activeFastView != 0
 //      && activeFastView.getPart(false) != activePart)
 //  {
 //    setActiveFastView(0);
 //  }
 }
 
 void Perspective::PerformedShowIn(const QString&  /*partId*/)
 {
   //showInTimes.insert(std::make_pair(partId, new Long(System.currentTimeMillis())));
 }
 
 bool Perspective::RestoreState(IMemento::Pointer memento)
 {
 
 //  MultiStatus result = new MultiStatus(
 //      PlatformUI.PLUGIN_ID,
 //      IStatus.OK,
 //      WorkbenchMessages.Perspective_problemsRestoringPerspective, 0);
   bool result = true;
 
   // Create persp descriptor.
   descriptor = new PerspectiveDescriptor("", "", PerspectiveDescriptor::Pointer(0));
   //result.add(descriptor.restoreState(memento));
   result &= descriptor->RestoreState(memento);
   PerspectiveDescriptor::Pointer desc = WorkbenchPlugin::GetDefault()->
       GetPerspectiveRegistry()->FindPerspectiveWithId(descriptor->GetId()).Cast<PerspectiveDescriptor>();
   if (desc)
   {
     descriptor = desc;
   }
   else
   {
     try
     {
       WorkbenchPlugin::GetDefault()->GetPerspectiveRegistry()->CreatePerspective(descriptor->GetLabel(), descriptor.Cast<berry::IPerspectiveDescriptor>());
     }
     catch (...)
     {
       std::cout << "Perspective could not be loaded" << std::endl;
     }
   }
 
   this->memento = memento;
   // Add the visible views.
   QList<IMemento::Pointer> views(memento->GetChildren(WorkbenchConstants::TAG_VIEW));
   //result.merge(createReferences(views));
   result &= this->CreateReferences(views);
 
   memento = memento->GetChild(WorkbenchConstants::TAG_FAST_VIEWS);
   if (memento)
   {
     views = memento->GetChildren(WorkbenchConstants::TAG_VIEW);
     //result.merge(createReferences(views));
     result &= this->CreateReferences(views);
   }
   return result;
 }
 
 bool Perspective::CreateReferences(const QList<IMemento::Pointer>& views)
 {
 //  MultiStatus result = new MultiStatus(PlatformUI.PLUGIN_ID, IStatus.OK,
 //      WorkbenchMessages.Perspective_problemsRestoringViews, 0);
   bool result = true;
 
-  for (std::size_t x = 0; x < views.size(); x++)
+  for (int x = 0; x < views.size(); x++)
   {
     // Get the view details.
     IMemento::Pointer childMem = views[x];
     QString id; childMem->GetString(WorkbenchConstants::TAG_ID, id);
     // skip creation of the intro reference -  it's handled elsewhere.
     if (id == IntroConstants::INTRO_VIEW_ID)
     {
       continue;
     }
 
     QString secondaryId(ViewFactory::ExtractSecondaryId(id));
     if (!secondaryId.isEmpty())
     {
       id = ViewFactory::ExtractPrimaryId(id);
     }
     // Create and open the view.
     try
     {
       QString rm; childMem->GetString(WorkbenchConstants::TAG_REMOVED, rm);
       if (rm != "true")
       {
         viewFactory->CreateView(id, secondaryId);
       }
     }
     catch (const PartInitException& e)
     {
       childMem->PutString(WorkbenchConstants::TAG_REMOVED, "true");
 //      result.add(StatusUtil.newStatus(IStatus.ERR,
 //              e.getMessage() == 0 ? "" : e.getMessage(), //$NON-NLS-1$
 //              e));
       WorkbenchPlugin::Log(e.what(), e);
       result &= true;
     }
   }
   return result;
 }
 
 bool Perspective::RestoreState()
 {
   if (this->memento == 0)
   {
     //return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0, "", 0); //$NON-NLS-1$
     return true;
   }
 
 //  MultiStatus result = new MultiStatus(
 //      PlatformUI.PLUGIN_ID,
 //      IStatus.OK,
 //      WorkbenchMessages.Perspective_problemsRestoringPerspective, 0);
   bool result = true;
 
   IMemento::Pointer memento = this->memento;
   this->memento = 0;
 
   const IMemento::Pointer boundsMem(memento->GetChild(WorkbenchConstants::TAG_WINDOW));
   if (boundsMem)
   {
     Rectangle r(0, 0, 0, 0);
     boundsMem->GetInteger(WorkbenchConstants::TAG_X, r.x);
     boundsMem->GetInteger(WorkbenchConstants::TAG_Y, r.y);
     boundsMem->GetInteger(WorkbenchConstants::TAG_HEIGHT, r.height);
     boundsMem->GetInteger(WorkbenchConstants::TAG_WIDTH, r.width);
     //StartupThreading.runWithoutExceptions(new StartupRunnable()
     //    {
 
     //      void runWithException() throws Throwable
     //      {
             if (page->GetWorkbenchWindow()->GetActivePage() == 0)
             {
               page->GetWorkbenchWindow()->GetShell()->SetBounds(r);
             }
     //      }
     //    });
 
   }
 
   // Create an empty presentation..
   PerspectiveHelper* pres;
   //StartupThreading.runWithoutExceptions(new StartupRunnable()
   //    {
 
   //      void runWithException() throws Throwable
   //      {
           ViewSashContainer::Pointer mainLayout(new ViewSashContainer(page, this->GetClientComposite()));
           pres = new PerspectiveHelper(page, mainLayout, this);
   //      }});
 
 
   // Read the layout.
 //  result.merge(pres.restoreState(memento
 //          .getChild(IWorkbenchConstants.TAG_LAYOUT)));
   result &= pres->RestoreState(memento->GetChild(WorkbenchConstants::TAG_LAYOUT));
 
   //StartupThreading.runWithoutExceptions(new StartupRunnable()
   //    {
 
   //      void runWithException() throws Throwable
   //      {
           // Add the editor workbook. Do not hide it now.
           pres->ReplacePlaceholderWithPart(editorArea);
   //      }});
 
   // Add the visible views.
   QList<IMemento::Pointer> views(memento->GetChildren(WorkbenchConstants::TAG_VIEW));
 
-  for (std::size_t x = 0; x < views.size(); x++)
+  for (int x = 0; x < views.size(); x++)
   {
     // Get the view details.
     IMemento::Pointer childMem = views[x];
     QString id; childMem->GetString(WorkbenchConstants::TAG_ID, id);
     QString secondaryId(ViewFactory::ExtractSecondaryId(id));
     if (!secondaryId.isEmpty())
     {
       id = ViewFactory::ExtractPrimaryId(id);
     }
 
     // skip the intro as it is restored higher up in workbench.
     if (id == IntroConstants::INTRO_VIEW_ID)
     {
       continue;
     }
 
     // Create and open the view.
     IViewReference::Pointer viewRef = viewFactory->GetView(id, secondaryId);
     WorkbenchPartReference::Pointer ref = viewRef.Cast<WorkbenchPartReference>();
 
     // report error
     if (ref == 0)
     {
       QString key = ViewFactory::GetKey(id, secondaryId);
 //      result.add(new Status(IStatus.ERR, PlatformUI.PLUGIN_ID, 0,
 //              NLS.bind(WorkbenchMessages.Perspective_couldNotFind, key ), 0));
       WorkbenchPlugin::Log("Could not find view: " + key);
       continue;
     }
     bool willPartBeVisible = pres->WillPartBeVisible(ref->GetId(), secondaryId);
     if (willPartBeVisible)
     {
       IViewPart::Pointer view = ref->GetPart(true).Cast<IViewPart>();
       if (view)
       {
         ViewSite::Pointer site = view->GetSite().Cast<ViewSite>();
         pres->ReplacePlaceholderWithPart(site->GetPane().Cast<LayoutPart>());
       }
     }
     else
     {
       pres->ReplacePlaceholderWithPart(ref->GetPane());
     }
   }
 
 //  // Load the fast views
 //  if (fastViewManager != 0)
 //  fastViewManager.restoreState(memento, result);
 
   // Load the view layout recs
   QList<IMemento::Pointer> recMementos(memento
   ->GetChildren(WorkbenchConstants::TAG_VIEW_LAYOUT_REC));
-  for (std::size_t i = 0; i < recMementos.size(); i++)
+  for (int i = 0; i < recMementos.size(); i++)
   {
     IMemento::Pointer recMemento = recMementos[i];
     QString compoundId;
     if (recMemento->GetString(WorkbenchConstants::TAG_ID, compoundId))
     {
       ViewLayoutRec::Pointer rec = GetViewLayoutRec(compoundId, true);
       QString closeablestr; recMemento->GetString(WorkbenchConstants::TAG_CLOSEABLE, closeablestr);
       if (WorkbenchConstants::FALSE_VAL == closeablestr)
       {
         rec->isCloseable = false;
       }
       QString moveablestr; recMemento->GetString(WorkbenchConstants::TAG_MOVEABLE, moveablestr);
       if (WorkbenchConstants::FALSE_VAL == moveablestr)
       {
         rec->isMoveable = false;
       }
       QString standalonestr; recMemento->GetString(WorkbenchConstants::TAG_STANDALONE, standalonestr);
       if (WorkbenchConstants::TRUE_VAL == standalonestr)
       {
         rec->isStandalone = true;
         QString showstr; recMemento->GetString(WorkbenchConstants::TAG_SHOW_TITLE, showstr);
         rec->showTitle = WorkbenchConstants::FALSE_VAL != showstr;
       }
     }
   }
 
   //final IContextService service = (IContextService)page.getWorkbenchWindow().getService(IContextService.class);
   try
   { // one big try block, don't kill me here
 //    // defer context events
 //    if (service != 0)
 //    {
 //      service.activateContext(ContextAuthority.DEFER_EVENTS);
 //    }
 //
 //    HashSet knownActionSetIds = new HashSet();
 //
 //    // Load the always on action sets.
     QList<IMemento::Pointer> actions; // = memento
 //    .getChildren(IWorkbenchConstants.TAG_ALWAYS_ON_ACTION_SET);
 //    for (int x = 0; x < actions.length; x++)
 //    {
 //      String actionSetID = actions[x]
 //      .getString(IWorkbenchConstants.TAG_ID);
 //      final IActionSetDescriptor d = WorkbenchPlugin.getDefault()
 //      .getActionSetRegistry().findActionSet(actionSetID);
 //      if (d != 0)
 //      {
 //        StartupThreading
 //        .runWithoutExceptions(new StartupRunnable()
 //            {
 //              void runWithException() throws Throwable
 //              {
 //                addAlwaysOn(d);
 //              }
 //            });
 //
 //        knownActionSetIds.add(actionSetID);
 //      }
 //    }
 //
 //    // Load the always off action sets.
 //    actions = memento
 //    .getChildren(IWorkbenchConstants.TAG_ALWAYS_OFF_ACTION_SET);
 //    for (int x = 0; x < actions.length; x++)
 //    {
 //      String actionSetID = actions[x]
 //      .getString(IWorkbenchConstants.TAG_ID);
 //      final IActionSetDescriptor d = WorkbenchPlugin.getDefault()
 //      .getActionSetRegistry().findActionSet(actionSetID);
 //      if (d != 0)
 //      {
 //        StartupThreading
 //        .runWithoutExceptions(new StartupRunnable()
 //            {
 //              void runWithException() throws Throwable
 //              {
 //                addAlwaysOff(d);
 //              }
 //            });
 //        knownActionSetIds.add(actionSetID);
 //      }
 //    }
 
     // Load "show view actions".
     actions = memento->GetChildren(WorkbenchConstants::TAG_SHOW_VIEW_ACTION);
-    for (std::size_t x = 0; x < actions.size(); x++)
+    for (int x = 0; x < actions.size(); x++)
     {
       QString id; actions[x]->GetString(WorkbenchConstants::TAG_ID, id);
       showViewShortcuts.push_back(id);
     }
 
 //    // Load "show in times".
 //    actions = memento.getChildren(IWorkbenchConstants.TAG_SHOW_IN_TIME);
 //    for (int x = 0; x < actions.length; x++)
 //    {
 //      String id = actions[x].getString(IWorkbenchConstants.TAG_ID);
 //      String timeStr = actions[x]
 //      .getString(IWorkbenchConstants.TAG_TIME);
 //      if (id != 0 && timeStr != 0)
 //      {
 //        try
 //        {
 //          long time = Long.parseLong(timeStr);
 //          showInTimes.put(id, new Long(time));
 //        }
 //        catch (NumberFormatException e)
 //        {
 //          // skip this one
 //        }
 //      }
 //    }
 
     // Load "show in parts" from registry, not memento
     showInPartIds = this->GetShowInIdsFromRegistry();
 
 //    // Load "new wizard actions".
 //    actions = memento
 //    .getChildren(IWorkbenchConstants.TAG_NEW_WIZARD_ACTION);
 //    newWizardShortcuts = new ArrayList(actions.length);
 //    for (int x = 0; x < actions.length; x++)
 //    {
 //      String id = actions[x].getString(IWorkbenchConstants.TAG_ID);
 //      newWizardShortcuts.add(id);
 //    }
 
     // Load "perspective actions".
     actions = memento->GetChildren(WorkbenchConstants::TAG_PERSPECTIVE_ACTION);
-    for (std::size_t x = 0; x < actions.size(); x++)
+    for (int x = 0; x < actions.size(); x++)
     {
       QString id; actions[x]->GetString(WorkbenchConstants::TAG_ID, id);
       perspectiveShortcuts.push_back(id);
     }
 
 //    ArrayList extActionSets = getPerspectiveExtensionActionSets();
 //    for (int i = 0; i < extActionSets.size(); i++)
 //    {
 //      String actionSetID = (String) extActionSets.get(i);
 //      if (knownActionSetIds.contains(actionSetID))
 //      {
 //        continue;
 //      }
 //      final IActionSetDescriptor d = WorkbenchPlugin.getDefault()
 //      .getActionSetRegistry().findActionSet(actionSetID);
 //      if (d != 0)
 //      {
 //        StartupThreading
 //        .runWithoutExceptions(new StartupRunnable()
 //            {
 //              void runWithException() throws Throwable
 //              {
 //                addAlwaysOn(d);
 //              }
 //            });
 //        knownActionSetIds.add(d.getId());
 //      }
 //    }
 
 //    // Add the visible set of action sets to our knownActionSetIds
 //    // Now go through the registry to ensure we pick up any new action
 //    // sets
 //    // that have been added but not yet considered by this perspective.
 //    ActionSetRegistry reg = WorkbenchPlugin.getDefault()
 //    .getActionSetRegistry();
 //    IActionSetDescriptor[] array = reg.getActionSets();
 //    int count = array.length;
 //    for (int i = 0; i < count; i++)
 //    {
 //      IActionSetDescriptor desc = array[i];
 //      if ((!knownActionSetIds.contains(desc.getId()))
 //          && (desc.isInitiallyVisible()))
 //      {
 //        addActionSet(desc);
 //      }
 //    }
   }
   catch (...)
   {
 //    // restart context changes
 //    if (service != 0)
 //    {
 //      StartupThreading.runWithoutExceptions(new StartupRunnable()
 //          {
 //            void runWithException() throws Throwable
 //            {
 //              service.activateContext(ContextAuthority.SEND_EVENTS);
 //            }
 //          });
 //    }
   }
 
   // Save presentation.
   presentation = pres;
 
   // Hide the editor area if needed. Need to wait for the
   // presentation to be fully setup first.
   int areaVisible = 0;
   bool areaVisibleExists = memento->GetInteger(WorkbenchConstants::TAG_AREA_VISIBLE, areaVisible);
   // Rather than hiding the editors now we must wait until after their
   // controls
   // are created. This ensures that if an editor is instantiated,
   // createPartControl
   // is also called. See bug 20166.
   shouldHideEditorsOnActivate = (areaVisibleExists && areaVisible == 0);
 
 //  // Restore the trim state of the editor area
 //  IPreferenceStore preferenceStore = PrefUtil.getAPIPreferenceStore();
 //  bool useNewMinMax = preferenceStore.getbool(IWorkbenchPreferenceConstants.ENABLE_NEW_MIN_MAX);
 //  if (useNewMinMax)
 //  {
 //    Integer trimStateInt = memento.getInteger(IWorkbenchConstants.TAG_AREA_TRIM_STATE);
 //    if (trimStateInt != 0)
 //    {
 //      editorAreaState = trimStateInt.intValue() & 0x3; // low order two bits contain the state
 //      editorAreaRestoreOnUnzoom = (trimStateInt.intValue() & 4) != 0;
 //    }
 //  }
 
   // restore the fixed state
   int isFixed = 0;
   fixed = (memento->GetInteger(WorkbenchConstants::TAG_FIXED, isFixed) && isFixed == 1);
 
   return true;
 }
 
 QList<QString> Perspective::GetShowInIdsFromRegistry()
 {
   PerspectiveExtensionReader reader;
   QList<QString> tags;
   tags.push_back(WorkbenchRegistryConstants::TAG_SHOW_IN_PART);
   reader.SetIncludeOnlyTags(tags);
   PageLayout::Pointer layout(new PageLayout());
   reader.ExtendLayout(descriptor->GetOriginalId(), layout);
   return layout->GetShowInPartIds();
 }
 
 void Perspective::SaveDesc()
 {
   this->SaveDescAs(descriptor);
 }
 
 void Perspective::SaveDescAs(IPerspectiveDescriptor::Pointer  /*desc*/)
 {
   //TODO Perspective SaveDescAs
 //  PerspectiveDescriptor::Pointer realDesc = desc.Cast<PerspectiveDescriptor>();
 //  //get the layout from the registry
 //  PerspectiveRegistry* perspRegistry = dynamic_cast<PerspectiveRegistry*>(WorkbenchPlugin
 //  ::GetDefault()->GetPerspectiveRegistry());
 //  // Capture the layout state.
 //  XMLMemento memento = XMLMemento.createWriteRoot("perspective");//$NON-NLS-1$
 //  IStatus status = saveState(memento, realDesc, false);
 //  if (status.getSeverity() == IStatus.ERR)
 //  {
 //    ErrorDialog.openError((Shell) 0, WorkbenchMessages.Perspective_problemSavingTitle,
 //        WorkbenchMessages.Perspective_problemSavingMessage,
 //        status);
 //    return;
 //  }
 //  //save it to the preference store
 //  try
 //  {
 //    perspRegistry.saveCustomPersp(realDesc, memento);
 //    descriptor = realDesc;
 //  }
 //  catch (IOException e)
 //  {
 //    perspRegistry.deletePerspective(realDesc);
 //    MessageDialog.openError((Shell) 0, WorkbenchMessages.Perspective_problemSavingTitle,
 //        WorkbenchMessages.Perspective_problemSavingMessage);
 //  }
 }
 
 bool Perspective::SaveState(IMemento::Pointer memento)
 {
 //  MultiStatus result = new MultiStatus(
 //      PlatformUI.PLUGIN_ID,
 //      IStatus.OK,
 //      WorkbenchMessages.Perspective_problemsSavingPerspective, 0);
 //
 //  result.merge(saveState(memento, descriptor, true));
 
   bool result = true;
   result &= this->SaveState(memento, descriptor, true);
 
   return result;
 }
 
 bool Perspective::SaveState(IMemento::Pointer memento, PerspectiveDescriptor::Pointer p,
     bool saveInnerViewState)
 {
 
 //  MultiStatus result = new MultiStatus(
 //      PlatformUI.PLUGIN_ID,
 //      IStatus.OK,
 //      WorkbenchMessages.Perspective_problemsSavingPerspective, 0);
   bool result = true;
 
   if (this->memento)
   {
     memento->PutMemento(this->memento);
     return result;
   }
 
   // Save the version number.
   memento->PutString(WorkbenchConstants::TAG_VERSION, VERSION_STRING);
   //result.add(p.saveState(memento));
   result &= p->SaveState(memento);
   if (!saveInnerViewState)
   {
     Rectangle bounds(page->GetWorkbenchWindow()->GetShell()->GetBounds());
     IMemento::Pointer boundsMem = memento
     ->CreateChild(WorkbenchConstants::TAG_WINDOW);
     boundsMem->PutInteger(WorkbenchConstants::TAG_X, bounds.x);
     boundsMem->PutInteger(WorkbenchConstants::TAG_Y, bounds.y);
     boundsMem->PutInteger(WorkbenchConstants::TAG_HEIGHT, bounds.height);
     boundsMem->PutInteger(WorkbenchConstants::TAG_WIDTH, bounds.width);
   }
 
 //  // Save the "always on" action sets.
 //  Iterator itr = alwaysOnActionSets.iterator();
 //  while (itr.hasNext())
 //  {
 //    IActionSetDescriptor desc = (IActionSetDescriptor) itr.next();
 //    IMemento child = memento
 //    .createChild(IWorkbenchConstants.TAG_ALWAYS_ON_ACTION_SET);
 //    child.putString(IWorkbenchConstants.TAG_ID, desc.getId());
 //  }
 
 //  // Save the "always off" action sets.
 //  itr = alwaysOffActionSets.iterator();
 //  while (itr.hasNext())
 //  {
 //    IActionSetDescriptor desc = (IActionSetDescriptor) itr.next();
 //    IMemento child = memento
 //    .createChild(IWorkbenchConstants.TAG_ALWAYS_OFF_ACTION_SET);
 //    child.putString(IWorkbenchConstants.TAG_ID, desc.getId());
 //  }
 
   // Save "show view actions"
   for (QList<QString>::iterator itr = showViewShortcuts.begin();
       itr != showViewShortcuts.end(); ++itr)
   {
     IMemento::Pointer child = memento
     ->CreateChild(WorkbenchConstants::TAG_SHOW_VIEW_ACTION);
     child->PutString(WorkbenchConstants::TAG_ID, *itr);
   }
 
 //  // Save "show in times"
 //  itr = showInTimes.keySet().iterator();
 //  while (itr.hasNext())
 //  {
 //    String id = (String) itr.next();
 //    Long time = (Long) showInTimes.get(id);
 //    IMemento child = memento
 //    .createChild(IWorkbenchConstants.TAG_SHOW_IN_TIME);
 //    child.putString(IWorkbenchConstants.TAG_ID, id);
 //    child.putString(IWorkbenchConstants.TAG_TIME, time.toString());
 //  }
 
 //  // Save "new wizard actions".
 //  itr = newWizardShortcuts.iterator();
 //  while (itr.hasNext())
 //  {
 //    String str = (String) itr.next();
 //    IMemento child = memento
 //    .createChild(IWorkbenchConstants.TAG_NEW_WIZARD_ACTION);
 //    child.putString(IWorkbenchConstants.TAG_ID, str);
 //  }
 
   // Save "perspective actions".
   for (QList<QString>::iterator itr = perspectiveShortcuts.begin();
       itr != perspectiveShortcuts.end(); ++itr)
   {
     IMemento::Pointer child = memento
     ->CreateChild(WorkbenchConstants::TAG_PERSPECTIVE_ACTION);
     child->PutString(WorkbenchConstants::TAG_ID, *itr);
   }
 
   // Get visible views.
   QList<PartPane::Pointer> viewPanes;
   presentation->CollectViewPanes(viewPanes);
 
   // Save the views.
   for (QList<PartPane::Pointer>::iterator itr = viewPanes.begin();
       itr != viewPanes.end(); ++itr)
   {
     IWorkbenchPartReference::Pointer ref((*itr)->GetPartReference());
     IViewDescriptor::Pointer desc = page->GetViewFactory()->GetViewRegistry()
           ->Find(ref->GetId());
     if(desc && desc->IsRestorable())
     {
       IMemento::Pointer viewMemento = memento
       ->CreateChild(WorkbenchConstants::TAG_VIEW);
       viewMemento->PutString(WorkbenchConstants::TAG_ID, ViewFactory::GetKey(ref.Cast<IViewReference>()));
     }
   }
 
 //  // save all fastview state
 //  if (fastViewManager != 0)
 //  fastViewManager.saveState(memento);
 
   // Save the view layout recs.
   for (QHash<QString, ViewLayoutRec::Pointer>::iterator i = mapIDtoViewLayoutRec.begin();
       i != mapIDtoViewLayoutRec.end(); ++i)
   {
     QString compoundId(i.key());
     ViewLayoutRec::Pointer rec(i.value());
     if (rec && (!rec->isCloseable || !rec->isMoveable || rec->isStandalone))
     {
       IMemento::Pointer layoutMemento(memento
       ->CreateChild(WorkbenchConstants::TAG_VIEW_LAYOUT_REC));
       layoutMemento->PutString(WorkbenchConstants::TAG_ID, compoundId);
       if (!rec->isCloseable)
       {
         layoutMemento->PutString(WorkbenchConstants::TAG_CLOSEABLE,
             WorkbenchConstants::FALSE_VAL);
       }
       if (!rec->isMoveable)
       {
         layoutMemento->PutString(WorkbenchConstants::TAG_MOVEABLE,
             WorkbenchConstants::FALSE_VAL);
       }
       if (rec->isStandalone)
       {
         layoutMemento->PutString(WorkbenchConstants::TAG_STANDALONE,
             WorkbenchConstants::TRUE_VAL);
         layoutMemento->PutString(WorkbenchConstants::TAG_SHOW_TITLE,
             rec->showTitle ? WorkbenchConstants::TRUE_VAL : WorkbenchConstants::FALSE_VAL);
       }
     }
   }
 
   // Save the layout.
   IMemento::Pointer childMem(memento->CreateChild(WorkbenchConstants::TAG_LAYOUT));
   //result.add(presentation.saveState(childMem));
   result &= presentation->SaveState(childMem);
 
   // Save the editor visibility state
   if (this->IsEditorAreaVisible())
   {
     memento->PutInteger(WorkbenchConstants::TAG_AREA_VISIBLE, 1);
   }
   else
   {
     memento->PutInteger(WorkbenchConstants::TAG_AREA_VISIBLE, 0);
   }
 
 //  // Save the trim state of the editor area if using the new min/max
 //  IPreferenceStore preferenceStore = PrefUtil.getAPIPreferenceStore();
 //  bool useNewMinMax = preferenceStore.getbool(IWorkbenchPreferenceConstants.ENABLE_NEW_MIN_MAX);
 //  if (useNewMinMax)
 //  {
 //    int trimState = editorAreaState;
 //    trimState |= editorAreaRestoreOnUnzoom ? 4 : 0;
 //    memento.putInteger(IWorkbenchConstants.TAG_AREA_TRIM_STATE, trimState);
 //  }
 
   // Save the fixed state
   if (fixed)
   {
     memento->PutInteger(WorkbenchConstants::TAG_FIXED, 1);
   }
   else
   {
     memento->PutInteger(WorkbenchConstants::TAG_FIXED, 0);
   }
 
   return result;
 }
 
 void Perspective::SetPerspectiveActionIds(const QList<QString>& list)
 {
   perspectiveShortcuts = list;
 }
 
 void Perspective::SetShowInPartIds(const QList<QString>& list)
 {
   showInPartIds = list;
 }
 
 void Perspective::SetShowViewActionIds(const QList<QString>& list)
 {
   showViewShortcuts = list;
 }
 
 void Perspective::ShowEditorArea()
 {
   if (this->IsEditorAreaVisible())
   {
     return;
   }
 
   editorHidden = false;
 
   // Show the editor in the appropriate location
   if (this->UseNewMinMax(Perspective::Pointer(this)))
   {
     bool isMinimized = editorAreaState == IStackPresentationSite::STATE_MINIMIZED;
     if (!isMinimized)
     {
       // If the editor area is going to show then we have to restore
 //      if (getPresentation().getMaximizedStack() != 0)
 //      getPresentation().getMaximizedStack().setState(IStackPresentationSite.STATE_RESTORED);
 
       this->ShowEditorAreaLocal();
     }
 //    else
 //    setEditorAreaTrimVisibility(true);
   }
   else
   {
     this->ShowEditorAreaLocal();
   }
 }
 
 void Perspective::ShowEditorAreaLocal()
 {
   if (editorHolder == 0 || editorHidden)
   {
     return;
   }
 
   // Replace the part holder with the editor area.
   presentation->GetLayout()->Replace(editorHolder, editorArea);
   editorHolder = 0;
 }
 
 void Perspective::SetEditorAreaState(int newState)
 {
   if (newState == editorAreaState)
   return;
 
   editorAreaState = newState;
 
 //  // reset the restore flag if we're not minimized
 //  if (newState != IStackPresentationSite::STATE_MINIMIZED)
 //  editorAreaRestoreOnUnzoom = false;
 
   this->RefreshEditorAreaVisibility();
 }
 
 int Perspective::GetEditorAreaState()
 {
   return editorAreaState;
 }
 
 void Perspective::RefreshEditorAreaVisibility()
 {
   // Nothing shows up if the editor area isn't visible at all
   if (editorHidden)
   {
     this->HideEditorAreaLocal();
     //setEditorAreaTrimVisibility(false);
     return;
   }
 
   PartStack::Pointer editorStack = editorArea.Cast<EditorSashContainer>()->GetUpperRightEditorStack();
   if (editorStack == 0)
   return;
 
   // Whatever we're doing, make the current editor stack match it
   //editorStack->SetStateLocal(editorAreaState);
 
   // If it's minimized then it's in the trim
   if (editorAreaState == IStackPresentationSite::STATE_MINIMIZED)
   {
     // Hide the editor area and show its trim
     this->HideEditorAreaLocal();
     //setEditorAreaTrimVisibility(true);
   }
   else
   {
     // Show the editor area and hide its trim
     //setEditorAreaTrimVisibility(false);
     this->ShowEditorAreaLocal();
 
 //    if (editorAreaState == IStackPresentationSite::STATE_MAXIMIZED)
 //    getPresentation().setMaximizedStack(editorStack);
   }
 }
 
 IViewReference::Pointer Perspective::GetViewReference(const QString& viewId, const QString& secondaryId)
 {
   IViewReference::Pointer ref = page->FindViewReference(viewId, secondaryId);
   if (ref == 0)
   {
     ViewFactory* factory = this->GetViewFactory();
     try
     {
       ref = factory->CreateView(viewId, secondaryId);
     }
     catch (PartInitException& /*e*/)
     {
 //      IStatus status = StatusUtil.newStatus(IStatus.ERR,
 //          e.getMessage() == 0 ? "" : e.getMessage(), //$NON-NLS-1$
 //          e);
 //      StatusUtil.handleStatus(status, "Failed to create view: id=" + viewId, //$NON-NLS-1$
 //          StatusManager.LOG);
       //TODO Perspective status message
       WorkbenchPlugin::Log("Failed to create view: id=" + viewId);
     }
   }
   return ref;
 }
 
 IViewPart::Pointer Perspective::ShowView(const QString& viewId, const QString& secondaryId)
 {
   ViewFactory* factory = this->GetViewFactory();
   IViewReference::Pointer ref = factory->CreateView(viewId, secondaryId);
   IViewPart::Pointer part = ref->GetPart(true).Cast<IViewPart>();
   if (part == 0)
   {
     throw PartInitException("Could not create view: " + ref->GetId());
   }
   PartSite::Pointer site = part->GetSite().Cast<PartSite>();
   PartPane::Pointer pane = site->GetPane();
 
   //TODO Perspective preference store
 //  IPreferenceStore store = WorkbenchPlugin.getDefault()
 //  .getPreferenceStore();
 //  int openViewMode = store.getInt(IPreferenceConstants.OPEN_VIEW_MODE);
 //
 //  if (openViewMode == IPreferenceConstants.OVM_FAST &&
 //      fastViewManager != 0)
 //  {
 //    fastViewManager.addViewReference(FastViewBar.FASTVIEWBAR_ID, -1, ref, true);
 //    setActiveFastView(ref);
 //  }
 //  else if (openViewMode == IPreferenceConstants.OVM_FLOAT
 //      && presentation.canDetach())
 //  {
 //    presentation.addDetachedPart(pane);
 //  }
 //  else
 //  {
     if (this->UseNewMinMax(Perspective::Pointer(this)))
     {
       // Is this view going to show in the trim?
  //     LayoutPart vPart = presentation.findPart(viewId, secondaryId);
 
       // Determine if there is a trim stack that should get the view
       QString trimId;
 
 //      // If we can locate the correct trim stack then do so
 //      if (vPart != 0)
 //      {
 //        String id = 0;
 //        ILayoutContainer container = vPart.getContainer();
 //        if (container.Cast<ContainerPlaceholder>() != 0)
 //        id = ((ContainerPlaceholder)container).getID();
 //        else if (container.Cast<ViewStack>() != 0)
 //        id = ((ViewStack)container).getID();
 //
 //        // Is this place-holder in the trim?
 //        if (id != 0 && fastViewManager.getFastViews(id).size()> 0)
 //        {
 //          trimId = id;
 //        }
 //      }
 //
 //      // No explicit trim found; If we're maximized then we either have to find an
 //      // arbitrary stack...
 //      if (trimId == 0 && presentation.getMaximizedStack() != 0)
 //      {
 //        if (vPart == 0)
 //        {
 //          ViewStackTrimToolBar blTrimStack = fastViewManager.getBottomRightTrimStack();
 //          if (blTrimStack != 0)
 //          {
 //            // OK, we've found a trim stack to add it to...
 //            trimId = blTrimStack.getId();
 //
 //            // Since there was no placeholder we have to add one
 //            LayoutPart blPart = presentation.findPart(trimId, 0);
 //            if (blPart.Cast<ContainerPlaceholder>() != 0)
 //            {
 //              ContainerPlaceholder cph = (ContainerPlaceholder) blPart;
 //              if (cph.getRealContainer().Cast<ViewStack>() != 0)
 //              {
 //                ViewStack vs = (ViewStack) cph.getRealContainer();
 //
 //                // Create a 'compound' id if this is a multi-instance part
 //                String compoundId = ref.getId();
 //                if (ref.getSecondaryId() != 0)
 //                compoundId = compoundId + ':' + ref.getSecondaryId();
 //
 //                // Add the new placeholder
 //                vs.add(new PartPlaceholder(compoundId));
 //              }
 //            }
 //          }
 //        }
 //      }
 //
 //      // If we have a trim stack located then add the view to it
 //      if (trimId != "")
 //      {
 //        fastViewManager.addViewReference(trimId, -1, ref, true);
 //      }
 //      else
 //      {
 //        bool inMaximizedStack = vPart != 0 && vPart.getContainer() == presentation.getMaximizedStack();
 
         // Do the default behavior
         presentation->AddPart(pane);
 
 //        // Now, if we're maximized then we have to minimize the new stack
 //        if (presentation.getMaximizedStack() != 0 && !inMaximizedStack)
 //        {
 //          vPart = presentation.findPart(viewId, secondaryId);
 //          if (vPart != 0 && vPart.getContainer().Cast<ViewStack>() != 0)
 //          {
 //            ViewStack vs = (ViewStack)vPart.getContainer();
 //            vs.setState(IStackPresentationSite.STATE_MINIMIZED);
 //
 //            // setting the state to minimized will create the trim toolbar
 //            // so we don't need a 0 pointer check here...
 //            fastViewManager.getViewStackTrimToolbar(vs.getID()).setRestoreOnUnzoom(true);
 //          }
 //        }
   //    }
     }
     else
     {
       presentation->AddPart(pane);
     }
   //}
 
   // Ensure that the newly showing part is enabled
   if (pane != 0 && pane->GetControl() != 0)
   Tweaklets::Get(GuiWidgetsTweaklet::KEY)->SetEnabled(pane->GetControl(), true);
 
   return part;
 }
 
 IWorkbenchPartReference::Pointer Perspective::GetOldPartRef()
 {
   return oldPartRef;
 }
 
 void Perspective::SetOldPartRef(IWorkbenchPartReference::Pointer oldPartRef)
 {
   this->oldPartRef = oldPartRef;
 }
 
 bool Perspective::IsCloseable(IViewReference::Pointer reference)
 {
   ViewLayoutRec::Pointer rec = this->GetViewLayoutRec(reference, false);
   if (rec != 0)
   {
     return rec->isCloseable;
   }
   return true;
 }
 
 bool Perspective::IsMoveable(IViewReference::Pointer reference)
 {
   ViewLayoutRec::Pointer rec = this->GetViewLayoutRec(reference, false);
   if (rec != 0)
   {
     return rec->isMoveable;
   }
   return true;
 }
 
 void Perspective::DescribeLayout(QString& buf) const
 {
 //  QList<IViewReference::Pointer> fastViews = getFastViews();
 //
 //  if (fastViews.length != 0)
 //  {
 //    buf.append("fastviews ("); //$NON-NLS-1$
 //    for (int idx = 0; idx < fastViews.length; idx++)
 //    {
 //      IViewReference ref = fastViews[idx];
 //
 //      if (idx> 0)
 //      {
 //        buf.append(", "); //$NON-NLS-1$
 //      }
 //
 //      buf.append(ref.getPartName());
 //    }
 //    buf.append("), "); //$NON-NLS-1$
 //  }
 
   this->GetPresentation()->DescribeLayout(buf);
 }
 
 void Perspective::TestInvariants()
 {
   this->GetPresentation()->GetLayout()->TestInvariants();
 }
 
 bool Perspective::UseNewMinMax(Perspective::Pointer activePerspective)
 {
   // We need to have an active perspective
   if (activePerspective == 0)
   return false;
 
   // We need to have a trim manager (if we don't then we
   // don't create a FastViewManager because it'd be useless)
  // if (activePerspective->GetFastViewManager() == 0)
  // return false;
 
   // Make sure we don't NPE anyplace
   WorkbenchWindow::Pointer wbw = activePerspective->page->GetWorkbenchWindow().Cast<WorkbenchWindow>();
   if (wbw == 0)
   return false;
 
 //  WorkbenchWindowConfigurer* configurer = wbw->GetWindowConfigurer();
 //  if (configurer == 0)
 //  return false;
 
   IPresentationFactory* factory = WorkbenchPlugin::GetDefault()->GetPresentationFactory();
   if (factory == 0)
   return false;
 
   // Ok, we should be good to go, return the pref
   //IPreferenceStore preferenceStore = PrefUtil.getAPIPreferenceStore();
   //bool useNewMinMax = preferenceStore.getbool(IWorkbenchPreferenceConstants.ENABLE_NEW_MIN_MAX);
   return true;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPerspectiveExtensionReader.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPerspectiveExtensionReader.cpp
index dd7650d9dd..fa1bd55595 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPerspectiveExtensionReader.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPerspectiveExtensionReader.cpp
@@ -1,370 +1,370 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryPerspectiveExtensionReader.h"
 
 #include "berryWorkbenchPlugin.h"
 #include "berryWorkbenchRegistryConstants.h"
 
 #include <berryIExtension.h>
 
 namespace berry
 {
 
 const QString PerspectiveExtensionReader::VAL_LEFT = "left";
 const QString PerspectiveExtensionReader::VAL_RIGHT = "right";
 const QString PerspectiveExtensionReader::VAL_TOP = "top";
 const QString PerspectiveExtensionReader::VAL_BOTTOM = "bottom";
 const QString PerspectiveExtensionReader::VAL_STACK = "stack";
 const QString PerspectiveExtensionReader::VAL_FAST = "fast";
 const QString PerspectiveExtensionReader::VAL_TRUE = "true";
 //const QString PerspectiveExtensionReader::VAL_FALSE = "false";
 
 bool PerspectiveExtensionReader::IncludeTag(const QString& tag)
 {
   return includeOnlyTags.empty() ||
     std::find(includeOnlyTags.begin(), includeOnlyTags.end(), tag) != includeOnlyTags.end();
 }
 
 bool PerspectiveExtensionReader::ProcessActionSet(
     const IConfigurationElement::Pointer& element)
 {
   QString id = element->GetAttribute(WorkbenchRegistryConstants::ATT_ID);
   if (!id.isEmpty())
   {
     //TODO PerspectiveExtensionReader action set
     //pageLayout->AddActionSet(id);
   }
   return true;
 }
 
 bool PerspectiveExtensionReader::ProcessExtension(
     const IConfigurationElement::Pointer& element)
 {
   foreach (IConfigurationElement::Pointer child, element->GetChildren())
   {
     QString type = child->GetName();
     if (this->IncludeTag(type))
     {
       bool result = false;
       if (type == WorkbenchRegistryConstants::TAG_ACTION_SET)
       {
         result = this->ProcessActionSet(child);
       }
       else if (type == WorkbenchRegistryConstants::TAG_VIEW)
       {
         result = this->ProcessView(child);
       }
       else if (type == WorkbenchRegistryConstants::TAG_VIEW_SHORTCUT)
       {
         result = this->ProcessViewShortcut(child);
       }
 //      else if (type == IorkbenchRegistryConstants::TAG_NEW_WIZARD_SHORTCUT)
 //      {
 //        result = processWizardShortcut(child);
 //      }
       else if (type == WorkbenchRegistryConstants::TAG_PERSP_SHORTCUT)
       {
         result = this->ProcessPerspectiveShortcut(child);
       }
       else if (type == WorkbenchRegistryConstants::TAG_SHOW_IN_PART)
       {
         result = this->ProcessShowInPart(child);
       }
       if (!result)
       {
         WorkbenchPlugin::Log("Unable to process element: " + type + " in perspective extension: " +
                              element->GetDeclaringExtension()->GetUniqueIdentifier());
       }
     }
   }
   return true;
 }
 
 bool PerspectiveExtensionReader::ProcessPerspectiveShortcut(
     const IConfigurationElement::Pointer& element)
 {
   QString id = element->GetAttribute(WorkbenchRegistryConstants::ATT_ID);
   if (!id.isEmpty())
   {
     pageLayout->AddPerspectiveShortcut(id);
   }
   return true;
 }
 
 bool PerspectiveExtensionReader::ProcessShowInPart(
     const IConfigurationElement::Pointer& element)
 {
   QString id = element->GetAttribute(WorkbenchRegistryConstants::ATT_ID);
   if (!id.isEmpty())
   {
     pageLayout->AddShowInPart(id);
   }
   return true;
 }
 
 bool PerspectiveExtensionReader::ProcessView(
     const IConfigurationElement::Pointer& element)
 {
   // Get id, relative, and relationship.
   QString id = element->GetAttribute(WorkbenchRegistryConstants::ATT_ID);
   if (id.isEmpty())
   {
     this->LogMissingAttribute(element, WorkbenchRegistryConstants::ATT_ID);
     return false;
   }
 
   QString relative = element->GetAttribute(WorkbenchRegistryConstants::ATT_RELATIVE);
 
   QString relationship = element->GetAttribute(WorkbenchRegistryConstants::ATT_RELATIONSHIP);
   if (!relationship.isEmpty())
   {
     this->LogMissingAttribute(element, WorkbenchRegistryConstants::ATT_RELATIONSHIP);
     return false;
   }
 
   if (VAL_FAST != relationship && relative.isEmpty())
     {
       this->LogError(element, "Attribute '" + WorkbenchRegistryConstants::ATT_RELATIVE
           + "' not defined.  This attribute is required when "
           + WorkbenchRegistryConstants::ATT_RELATIONSHIP + "=\"" + relationship
           + "\"."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
       return false;
     }
 
     // Get relationship details.
     bool stack = false;
-    bool fast = false;
+    //bool fast = false;
     int intRelation = 0;
     if (relationship == VAL_LEFT)
     {
       intRelation = IPageLayout::LEFT;
     }
     else if (relationship == VAL_RIGHT)
     {
       intRelation = IPageLayout::RIGHT;
     }
     else if (relationship == VAL_TOP)
     {
       intRelation = IPageLayout::TOP;
     }
     else if (relationship == VAL_BOTTOM)
     {
       intRelation = IPageLayout::BOTTOM;
     }
     else if (relationship == VAL_STACK)
     {
       stack = true;
     }
-    else if (relationship == VAL_FAST)
-    {
-      fast = true;
-    }
+//    else if (relationship == VAL_FAST)
+//    {
+//      fast = true;
+//    }
     else
     {
       return false;
     }
 
 
 
   float ratio = 0.5f;
   QString ratioString = element->GetAttribute(WorkbenchRegistryConstants::ATT_RATIO);
   if (!ratioString.isEmpty())
   {
     bool ok = false;
     ratio = ratioString.toFloat(&ok);
     if (!ok) return false;
 
     // If the ratio is outside the allowable range, mark it as invalid.
     if (ratio < IPageLayout::RATIO_MIN || ratio > IPageLayout::RATIO_MAX)
     {
       ratio = IPageLayout::INVALID_RATIO;
     }
   }
   else
   {
     // The ratio has not been specified.
     ratio = IPageLayout::NULL_RATIO;
   }
 
 
   QString strVisible = element->GetAttribute(WorkbenchRegistryConstants::ATT_VISIBLE);
   bool visible = (VAL_TRUE == strVisible);
 
   QString closeable = element->GetAttribute(WorkbenchRegistryConstants::ATT_CLOSEABLE);
 
   QString moveable = element->GetAttribute(WorkbenchRegistryConstants::ATT_MOVEABLE);
 
   QString standalone = element->GetAttribute(WorkbenchRegistryConstants::ATT_STANDALONE);
 
   QString showTitle = element->GetAttribute(WorkbenchRegistryConstants::ATT_SHOW_TITLE);
 
   QString minVal = element->GetAttribute(WorkbenchRegistryConstants::ATT_MINIMIZED);
   // Default to 'false'
   bool minimized = (VAL_TRUE == minVal);
 
 
   if (visible)
   {
     // If adding a view (not just a placeholder), remove any existing placeholder.
     // See bug 85948 [Perspectives] Adding register & expressions view by default to debug perspective fails
     pageLayout->RemovePlaceholder(id);
   }
 
   // If stack ..
   if (stack)
   {
     if (visible)
     {
       pageLayout->StackView(id, relative);
     }
     else
     {
       pageLayout->StackPlaceholder(id, relative);
     }
   }
 //  // If the view is a fast view...
 //  else if (fast)
 //  {
 //    if (ratio == IPageLayout::NULL_RATIO)
 //    {
 //      // The ratio has not been specified.
 //      pageLayout->AddFastView(id);
 //    }
 //    else
 //    {
 //      pageLayout->AddFastView(id, ratio);
 //    }
 //  }
   else
   {
 
     // The view is a regular view.
     // If the ratio is not specified or is invalid, use the default ratio.
     if (ratio == IPageLayout::NULL_RATIO || ratio == IPageLayout::INVALID_RATIO)
     {
       ratio = IPageLayout::DEFAULT_VIEW_RATIO;
     }
 
     if (visible)
     {
       if (VAL_TRUE == standalone)
       {
         pageLayout->AddStandaloneView(id, VAL_TRUE == showTitle,
             intRelation, ratio, relative);
       }
       else
       {
         pageLayout->AddView(id, intRelation, ratio, relative, minimized);
       }
     }
     else
     {
       // Fix for 99155, CGross (schtoo@schtoo.com)
       // Adding standalone placeholder for standalone views
       if (VAL_TRUE == standalone)
       {
         pageLayout->AddStandaloneViewPlaceholder(id, intRelation, ratio,
             relative, VAL_TRUE == showTitle);
       }
       else
       {
         pageLayout->AddPlaceholder(id, intRelation, ratio, relative);
       }
     }
   }
   IViewLayout::Pointer viewLayout = pageLayout->GetViewLayout(id);
   // may be null if it's been filtered by activity
   if (viewLayout != 0)
   {
     if (!closeable.isEmpty())
     {
       viewLayout->SetCloseable(VAL_TRUE == closeable);
     }
     if (!moveable.isEmpty())
     {
       viewLayout->SetMoveable(VAL_TRUE == moveable);
     }
   }
 
   return true;
 }
 
 bool PerspectiveExtensionReader::ProcessViewShortcut(
     const IConfigurationElement::Pointer& element)
 {
   QString id = element->GetAttribute(WorkbenchRegistryConstants::ATT_ID);
   if (!id.isEmpty())
   {
     pageLayout->AddShowViewShortcut(id);
   }
   return true;
 }
 
 //bool PerspectiveExtensionReader::ProcessWizardShortcut(
 //    IConfigurationElement::Pointer element)
 //{
 //  QString id = element.getAttribute(IWorkbenchRegistryConstants.ATT_ID);
 //  if (id != null)
 //  {
 //    pageLayout.addNewWizardShortcut(id);
 //  }
 //  return true;
 //}
 
 bool PerspectiveExtensionReader::ReadElement(
     const IConfigurationElement::Pointer& element)
 {
   QString type = element->GetName();
   if (type == WorkbenchRegistryConstants::TAG_PERSPECTIVE_EXTENSION)
   {
     QString id = element->GetAttribute(WorkbenchRegistryConstants::ATT_TARGET_ID);
     if (targetID == id || "*" == id)
     {
 //      if (tracker != null)
 //      {
 //        tracker.registerObject(element.getDeclaringExtension(),
 //            new DirtyPerspectiveMarker(id), IExtensionTracker.REF_STRONG);
 //      }
       return this->ProcessExtension(element);
     }
     return true;
   }
   return false;
 }
 
 PerspectiveExtensionReader::PerspectiveExtensionReader()
 {
   // do nothing
 }
 
 void PerspectiveExtensionReader::ExtendLayout(const QString& id,
     PageLayout::Pointer out)
 {
   //tracker = extensionTracker;
   targetID = id;
   pageLayout = out;
   this->ReadRegistry(PlatformUI::PLUGIN_ID(),
       WorkbenchRegistryConstants::PL_PERSPECTIVE_EXTENSIONS);
 }
 
 void PerspectiveExtensionReader::SetIncludeOnlyTags(
     const QList<QString>& tags)
 {
   includeOnlyTags = tags;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPerspectiveHelper.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPerspectiveHelper.cpp
index 7d6ab8d2b2..6047ab95a3 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPerspectiveHelper.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPerspectiveHelper.cpp
@@ -1,1492 +1,1492 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "tweaklets/berryGuiWidgetsTweaklet.h"
 
 #include "berryPerspectiveHelper.h"
 
 #include "berryLayoutTree.h"
 #include "berryEditorSashContainer.h"
 #include "berryDragUtil.h"
 #include "berryPresentationFactoryUtil.h"
 #include "berryWorkbenchConstants.h"
 
 #include <berryDebugUtil.h>
 
 namespace berry
 {
 
 const int PerspectiveHelper::MIN_DETACH_WIDTH = 150;
 const int PerspectiveHelper::MIN_DETACH_HEIGHT = 250;
 
 PerspectiveHelper::DragOverListener::DragOverListener(PerspectiveHelper* perspHelper) :
   perspHelper(perspHelper)
 {
 
 }
 
 IDropTarget::Pointer PerspectiveHelper::DragOverListener::Drag(
-    void* /*currentControl*/, Object::Pointer draggedObject, const Point& /*position*/,
+    void* /*currentControl*/, const Object::Pointer& draggedObject, const Point& /*position*/,
     const Rectangle& dragRectangle)
 {
 
   if (draggedObject.Cast<PartPane>() != 0)
   {
     PartPane::Pointer part = draggedObject.Cast<PartPane>();
     if (part->GetContainer().Cast<PartStack>()->GetAppearance() == PresentationFactoryUtil::ROLE_EDITOR)
       return IDropTarget::Pointer(0);
 
     // Views that haven't been shown yet have no 'control' which causes
     // 'GetWorkbenchWindow' to return 'null' so check explicitly
     if (part->GetPage() != perspHelper->page)
       return IDropTarget::Pointer(0);
     else if (part->GetWorkbenchWindow() != perspHelper->page->GetWorkbenchWindow())
       return IDropTarget::Pointer(0);
 
     if (perspHelper->dropTarget == 0)
       perspHelper->dropTarget = new ActualDropTarget(perspHelper, part, dragRectangle);
     else
       perspHelper->dropTarget->SetTarget(part, dragRectangle);
   }
   else if (draggedObject.Cast<PartStack>() != 0)
   {
     PartStack::Pointer stack = draggedObject.Cast<PartStack>();
     if (stack->GetAppearance() == PresentationFactoryUtil::ROLE_EDITOR)
       return IDropTarget::Pointer(0);
 
     if (stack->GetWorkbenchWindow() != perspHelper->page->GetWorkbenchWindow())
       return IDropTarget::Pointer(0);
 
     if (perspHelper->dropTarget == 0)
       perspHelper->dropTarget = new ActualDropTarget(perspHelper, stack, dragRectangle);
     else
       perspHelper->dropTarget->SetTarget(stack, dragRectangle);
   }
 
   return perspHelper->dropTarget;
 }
 
 void PerspectiveHelper::ActualDropTarget::SetTarget(PartPane::Pointer part,
     const Rectangle& dragRectangle)
 {
   this->stack = 0;
   this->part = part;
   this->dragRectangle = dragRectangle;
 }
 
 void PerspectiveHelper::ActualDropTarget::SetTarget(PartStack::Pointer stack,
     const Rectangle& dragRectangle)
 {
   this->stack = stack;
   this->part = 0;
   this->dragRectangle = dragRectangle;
 }
 
 PerspectiveHelper::ActualDropTarget::ActualDropTarget(PerspectiveHelper* perspHelper, PartPane::Pointer part,
     const Rectangle& dragRectangle)
 : AbstractDropTarget(), perspHelper(perspHelper)
 {
   this->SetTarget(part, dragRectangle);
 }
 
 PerspectiveHelper::ActualDropTarget::ActualDropTarget(PerspectiveHelper* perspHelper, PartStack::Pointer stack,
     const Rectangle& dragRectangle)
 : AbstractDropTarget(), perspHelper(perspHelper)
 {
   this->SetTarget(stack, dragRectangle);
 }
 
 void PerspectiveHelper::ActualDropTarget::Drop()
 {
 
   if (part != 0)
   {
   Shell::Pointer shell = part->GetShell();
   if (shell->GetData().Cast<DetachedWindow> () != 0)
   {
     // if only one view in tab folder then do a window move
     ILayoutContainer::Pointer container = part->GetContainer();
     if (container.Cast<PartStack> () != 0)
     {
       if (container.Cast<PartStack>()->GetItemCount() == 1)
       {
         shell->SetLocation(dragRectangle.x, dragRectangle.y);
         return;
       }
     }
   }
 
 //  // If layout is modified always zoom out.
 //  if (isZoomed())
 //  {
 //    zoomOut();
 //  }
   // do a normal part detach
   perspHelper->DetachPart(part, dragRectangle.x, dragRectangle.y);
   }
   else if (stack != 0)
   {
     Shell::Pointer shell = stack->GetShell();
   if (shell->GetData().Cast<DetachedWindow> () != 0)
   {
     // only one tab folder in a detach window, so do window
     // move
      shell->SetLocation(dragRectangle.x, dragRectangle.y);
       return;
   }
 
 //  // If layout is modified always zoom out.
 //  if (isZoomed())
 //  {
 //    zoomOut();
 //  }
   // do a normal part detach
   perspHelper->Detach(stack, dragRectangle.x, dragRectangle.y);
   }
 }
 
 DnDTweaklet::CursorType PerspectiveHelper::ActualDropTarget::GetCursor()
 {
   return DnDTweaklet::CURSOR_OFFSCREEN;
 }
 
 PerspectiveHelper::MatchingPart::MatchingPart(const QString& pid,
     const QString& sid, LayoutPart::Pointer part)
 {
   this->pid = pid;
   this->sid = sid;
   this->part = part;
   this->len = pid.size() + sid.size();
   this->hasWildcard = (pid.indexOf(PartPlaceholder::WILD_CARD) != -1) ||
                       (sid.indexOf(PartPlaceholder::WILD_CARD) != -1);
 }
 
 bool PerspectiveHelper::CompareMatchingParts::operator()(const MatchingPart& m1, const MatchingPart& m2) const
 {
   // specific ids always outweigh ids with wildcards
   if (m1.hasWildcard && !m2.hasWildcard)
   {
     return true;
   }
   if (!m1.hasWildcard && m2.hasWildcard)
   {
     return false;
   }
   // if both are specific or both have wildcards, simply compare based on length
   return m1.len > m2.len;
 }
 
 PerspectiveHelper::PerspectiveHelper(WorkbenchPage* workbenchPage,
     ViewSashContainer::Pointer mainLayout, Perspective* persp)
 : page(workbenchPage), perspective(persp),
 mainLayout(mainLayout),
 detachable(false), active(false)
 {
 
   // Views can be detached if the feature is enabled (true by default,
   // use the plug-in customization file to disable), and if the platform
   // supports detaching.
 
-  this->dragTarget = new DragOverListener(this);
+  this->dragTarget.reset(new DragOverListener(this));
 
   //TODO preference store
   //  IPreferenceStore store = PlatformUI.getPreferenceStore();
   //  this.detachable = store.getBoolean(
   //      IWorkbenchPreferenceConstants.ENABLE_DETACHED_VIEWS);
   this->detachable = true;
 
   if (this->detachable)
   {
     // Check if some arbitrary Composite supports reparenting. If it
     // doesn't, views cannot be detached.
 
     void* client = workbenchPage->GetClientComposite();
     if (client == 0)
     {
       // The workbench page is not initialized. I don't think this can happen,
       // but if it does, silently set detachable to false.
       this->detachable = false;
     }
     else
     {
       this->detachable = Tweaklets::Get(GuiWidgetsTweaklet::KEY)->IsReparentable(client);
     }
   }
 }
 
 void PerspectiveHelper::Activate(void* parent)
 {
 
   if (active)
   {
     return;
   }
 
   parentWidget = parent;
 
   // Activate main layout
   // make sure all the views have been properly parented
   QList<PartPane::Pointer> children;
   this->CollectViewPanes(children, mainLayout->GetChildren());
   for (QList<PartPane::Pointer>::iterator iter = children.begin();
       iter != children.end(); ++iter)
   {
     PartPane::Pointer part = *iter;
     part->Reparent(parent);
   }
   mainLayout->CreateControl(parent);
   mainLayout->SetActive(true);
 
   // Open the detached windows.
   for (DetachedWindowsType::iterator iter = detachedWindowList.begin();
       iter != detachedWindowList.end(); ++iter)
   {
     (*iter)->Open();
   }
 
   this->EnableAllDrag();
 
   //  // Ensure that the maximized stack's presentation state is correct
   //  if (maximizedStackId != 0)
   //  {
   //    LayoutPart part = this->FindPart(maximizedStackId);
   //    if (part.Cast<PartStack>() != 0)
   //    {
   //      maximizedStack = (PartStack) part;
   //      maximizedStackId = 0;
   //    }
   //  }
   //
   //  // NOTE: we only handle ViewStacks here; Editor Stacks are handled by the
   //  // perspective
   //  if (maximizedStack instanceof ViewStack)
   //  {
   //    maximizedStack.setPresentationState(IStackPresentationSite.STATE_MAXIMIZED);
   //  }
 
   active = true;
 }
 
 void PerspectiveHelper::AddPart(LayoutPart::Pointer part)
 {
 
   // Look for a placeholder.
   PartPlaceholder::Pointer placeholder;
   LayoutPart::Pointer testPart;
   QString primaryId = part->GetID();
   QString secondaryId;
 
   IViewReference::Pointer ref;
   if (part.Cast<PartPane> () != 0)
   {
     PartPane::Pointer pane = part.Cast<PartPane> ();
     ref = pane->GetPartReference().Cast<IViewReference> ();
     if (ref != 0)
     secondaryId = ref->GetSecondaryId();
   }
   if (secondaryId != "")
   {
     testPart = this->FindPart(primaryId, secondaryId);
   }
   else
   {
     testPart = this->FindPart(primaryId);
   }
 
   // validate the testPart
   if (testPart != 0 && testPart.Cast<PartPlaceholder>() != 0)
   {
     placeholder = testPart.Cast<PartPlaceholder> ();
   }
 
   // If there is no placeholder do a simple add. Otherwise, replace the
   // placeholder if its not a pattern matching placholder
   if (placeholder == 0)
   {
     part->Reparent(mainLayout->GetParent());
     LayoutPart::Pointer relative = mainLayout->FindBottomRight();
     if (relative != 0 && relative.Cast<ILayoutContainer>() != 0)
     {
       ILayoutContainer::Pointer stack =
       relative.Cast<ILayoutContainer> ();
       if (stack->AllowsAdd(part))
       {
         mainLayout->Stack(part, stack);
       }
       else
       {
         mainLayout->AddPart(part);
       }
     }
     else
     {
       mainLayout->AddPart(part);
     }
   }
   else
   {
     ILayoutContainer::Pointer container = placeholder->GetContainer();
     if (container != 0)
     {
       if (container.Cast<DetachedPlaceHolder> () != 0)
       {
         //Create a detached window add the part on it.
         DetachedPlaceHolder::Pointer holder = container.Cast<DetachedPlaceHolder>();
         detachedPlaceHolderList.removeAll(holder);
         container->Remove(testPart);
         DetachedWindow::Pointer window(new DetachedWindow(page));
         detachedWindowList.push_back(window);
         window->Create();
         part->CreateControl(window->GetShell()->GetControl());
         // Open window.
         window->GetShell()->SetBounds(holder->GetBounds());
         window->Open();
         // add part to detached window.
         PartPane::Pointer pane = part.Cast<PartPane>();
         window->Add(pane);
         QList<LayoutPart::Pointer> otherChildren = holder->GetChildren();
         for (QList<LayoutPart::Pointer>::iterator iter = otherChildren.begin();
             iter != otherChildren.end(); ++iter)
         {
           part->GetContainer()->Add(*iter);
         }
       }
       else
       {
         // show parent if necessary
         if (container.Cast<ContainerPlaceholder> () != 0)
         {
           ContainerPlaceholder::Pointer containerPlaceholder =
               container.Cast<ContainerPlaceholder>();
           ILayoutContainer::Pointer parentContainer =
               containerPlaceholder->GetContainer();
           if (parentContainer == 0) return;
 
           container = containerPlaceholder->GetRealContainer().Cast<ILayoutContainer>();
           if (container.Cast<LayoutPart> () != 0)
           {
             parentContainer->Replace(containerPlaceholder,
                 container.Cast<LayoutPart>());
           }
           containerPlaceholder->SetRealContainer(ILayoutContainer::Pointer(0));
         }
 
 //        // reparent part.
 //        if (container.Cast<PartStack>() == 0)
 //        {
 //          // We don't need to reparent children of PartTabFolders since they will automatically
 //          // reparent their children when they become visible. This if statement used to be
 //          // part of an else branch. Investigate if it is still necessary.
 //          part->Reparent(mainLayout->GetParent());
 //        }
 
         // see if we should replace the placeholder
         if (placeholder->HasWildCard())
         {
           if (PartSashContainer::Pointer sashContainer = container.Cast<PartSashContainer>())
           {
             sashContainer->AddChildForPlaceholder(part, placeholder);
           }
           else
           {
             container->Add(part);
           }
         }
         else
         {
           container->Replace(placeholder, part);
         }
       }
     }
   }
 }
 
 void PerspectiveHelper::AttachPart(IViewReference::Pointer ref)
 {
   PartPane::Pointer pane = ref.Cast<WorkbenchPartReference>()->GetPane();
 
   // Restore any maximized part before re-attaching.
   // Note that 'getMaximizedStack != 0' implies 'useNewMinMax'
   //  if (getMaximizedStack() != 0)
   //  {
   //    getMaximizedStack().setState(IStackPresentationSite.STATE_RESTORED);
   //  }
 
   this->DerefPart(pane);
   this->AddPart(pane);
   this->BringPartToTop(pane);
   pane->SetFocus();
 }
 
 bool PerspectiveHelper::CanDetach()
 {
   return detachable;
 }
 
 bool PerspectiveHelper::BringPartToTop(LayoutPart::Pointer part)
 {
   ILayoutContainer::Pointer container = part->GetContainer();
   if (container != 0 && container.Cast<PartStack> () != 0)
   {
     PartStack::Pointer folder = container.Cast<PartStack> ();
     if (folder->GetSelection() != part)
     {
       folder->SetSelection(part);
       return true;
     }
   }
   return false;
 }
 
 bool PerspectiveHelper::IsPartVisible(IWorkbenchPartReference::Pointer partRef)
 {
   LayoutPart::Pointer foundPart;
   if (partRef.Cast<IViewReference> () != 0)
   {
     foundPart = this->FindPart(partRef->GetId(),
         partRef.Cast<IViewReference>()->GetSecondaryId());
   }
   else
   {
     foundPart = this->FindPart(partRef->GetId());
   }
   if (foundPart == 0)
   {
     return false;
   }
   if (foundPart.Cast<PartPlaceholder> () != 0)
   {
     return false;
   }
 
   ILayoutContainer::Pointer container = foundPart->GetContainer();
 
   if (container.Cast<ContainerPlaceholder> () != 0)
   {
     return false;
   }
 
   if (container.Cast<PartStack> () != 0)
   {
     PartStack::Pointer folder = container.Cast<PartStack>();
     LayoutPart::Pointer visiblePart = folder->GetSelection();
     if (visiblePart == 0)
     {
       return false;
     }
     return partRef == visiblePart.Cast<PartPane>()->GetPartReference();
   }
   return true;
 }
 
 bool PerspectiveHelper::WillPartBeVisible(const QString& partId)
 {
   return this->WillPartBeVisible(partId, 0);
 }
 
 bool PerspectiveHelper::WillPartBeVisible(const QString& partId,
     const QString& secondaryId)
 {
   LayoutPart::Pointer part = this->FindPart(partId, secondaryId);
   if (part == 0)
   {
     return false;
   }
   ILayoutContainer::Pointer container = part->GetContainer();
   if (container != 0 && container.Cast<ContainerPlaceholder> () != 0)
   {
     container = container.Cast<ContainerPlaceholder>()->GetRealContainer().Cast<ILayoutContainer>();
   }
 
   if (container != 0 && container.Cast<PartStack> () != 0)
   {
     PartStack::Pointer folder = container.Cast<PartStack>();
     if (folder->GetSelection() == 0)
     {
       return false;
     }
     return part->GetID() == folder->GetSelection()->GetID();
   }
   return true;
 }
 
 QList<PartPlaceholder::Pointer> PerspectiveHelper::CollectPlaceholders()
 {
   // Scan the main window.
   QList<PartPlaceholder::Pointer> results = this->CollectPlaceholders(
       mainLayout->GetChildren());
 
   // Scan each detached window.
   if (detachable)
   {
     for (DetachedWindowsType::iterator winIter = detachedWindowList.begin();
         winIter != detachedWindowList.end(); ++winIter)
     {
       DetachedWindow::Pointer win = *winIter;
       QList<LayoutPart::Pointer> moreResults = win->GetChildren();
       if (moreResults.size()> 0)
       {
         for (QList<LayoutPart::Pointer>::iterator iter = moreResults.begin();
             iter != moreResults.end(); ++iter)
         {
           if (iter->Cast<PartPlaceholder>() != 0)
           results.push_back(iter->Cast<PartPlaceholder>());
         }
       }
     }
   }
   return results;
 }
 
 QList<PartPlaceholder::Pointer> PerspectiveHelper::CollectPlaceholders(
     const QList<LayoutPart::Pointer>& parts)
 {
   QList<PartPlaceholder::Pointer> result;
 
   for (QList<LayoutPart::Pointer>::const_iterator iter = parts.begin();
       iter != parts.end(); ++iter)
   {
     LayoutPart::Pointer part = *iter;
     if (ILayoutContainer::Pointer container = part.Cast<ILayoutContainer>())
     {
       // iterate through sub containers to find sub-parts
       QList<PartPlaceholder::Pointer> newParts = this->CollectPlaceholders(
             container->GetChildren());
       result.append(newParts);
     }
     else if (PartPlaceholder::Pointer placeholder = part.Cast<PartPlaceholder>())
     {
       result.push_back(placeholder);
     }
   }
 
   return result;
 }
 
 void PerspectiveHelper::CollectViewPanes(QList<PartPane::Pointer>& result)
 {
   // Scan the main window.
   this->CollectViewPanes(result, mainLayout->GetChildren());
 
   // Scan each detached window.
   if (detachable)
   {
     for (DetachedWindowsType::iterator winIter = detachedWindowList.begin();
         winIter != detachedWindowList.end(); ++winIter)
     {
       DetachedWindow::Pointer win = *winIter;
       CollectViewPanes(result, win->GetChildren());
     }
   }
 }
 
 void PerspectiveHelper::CollectViewPanes(QList<PartPane::Pointer>& result,
     const QList<LayoutPart::Pointer>& parts)
 {
   for (QList<LayoutPart::Pointer>::const_iterator iter = parts.begin();
       iter != parts.end(); ++iter)
   {
     LayoutPart::Pointer part = *iter;
     if (PartPane::Pointer partPane = part.Cast<PartPane>())
     {
       if(partPane->GetPartReference().Cast<IViewReference>())
       {
         result.push_back(partPane);
       }
     }
     else if (ILayoutContainer::Pointer container = part.Cast<ILayoutContainer> ())
     {
       this->CollectViewPanes(result, container->GetChildren());
     }
   }
 }
 
 void PerspectiveHelper::Deactivate()
 {
   if (!active)
   {
     return;
   }
 
   this->DisableAllDrag();
 
   // Reparent all views to the main window
   void* parent = mainLayout->GetParent();
   QList<PartPane::Pointer> children;
   this->CollectViewPanes(children, mainLayout->GetChildren());
 
   for (DetachedWindowsType::iterator winIter = detachedWindowList.begin();
       winIter != detachedWindowList.end(); ++winIter)
   {
     DetachedWindow::Pointer window = *winIter;
     CollectViewPanes(children, window->GetChildren());
   }
 
   // *** Do we even need to do this if detached windows not supported?
   for (QList<PartPane::Pointer>::iterator itr = children.begin();
       itr != children.end(); ++itr)
   {
     PartPane::Pointer part = *itr;
     part->Reparent(parent);
   }
 
   // Dispose main layout.
 
   mainLayout->SetActive(false);
 
   // Dispose the detached windows
   for (DetachedWindowsType::iterator iter = detachedWindowList.begin();
       iter != detachedWindowList.end(); ++iter)
   {
     (*iter)->Close();
   }
 
   active = false;
 }
 
 PerspectiveHelper::~PerspectiveHelper()
 {
   mainLayout->Dispose();
   mainLayout->DisposeSashes();
 }
 
 void PerspectiveHelper::DescribeLayout(QString& buf) const
 {
 
   if (detachable)
   {
     if (detachedWindowList.size() != 0)
     {
       buf.append("detachedWindows ("); //$NON-NLS-1$
 
       for (DetachedWindowsType::const_iterator winIter = detachedWindowList.begin();
           winIter != detachedWindowList.end(); ++winIter)
       {
         DetachedWindow::ConstPointer window = *winIter;
         QList<LayoutPart::Pointer> children = window->GetChildren();
         unsigned int j = 0;
         if (children.size() != 0)
         {
           buf.append("dWindow ("); //$NON-NLS-1$
           for (QList<LayoutPart::Pointer>::iterator partIter = children.begin();
               partIter != children.end(); ++partIter, ++j)
           {
             if (partIter->Cast<PartPlaceholder>() != 0)
             buf.append(partIter->Cast<PartPlaceholder>()->GetPlaceHolderId());
             else if (partIter->Cast<PartPane>() != 0)
             buf.append(
                 partIter->Cast<PartPane>()->GetPartReference()->GetPartName());
 
             if (j < (children.size() - 1))
             {
               buf.append(", "); //$NON-NLS-1$
             }
           }
           buf.append(")"); //$NON-NLS-1$
         }
 
       }
       buf.append("), "); //$NON-NLS-1$
     }
   }
 
   this->GetLayout()->DescribeLayout(buf);
 }
 
 void PerspectiveHelper::DerefPart(LayoutPart::Pointer part)
 {
   //  if (part.Cast<PartPane> () != 0)
   //  {
   //    IViewReference::Pointer ref = ((ViewPane) part).getViewReference();
   //    if (perspective.isFastView(ref))
   //    {
   //      // Special check: if it's a fast view then it's actual ViewStack
   //      // may only contain placeholders and the stack is represented in
   //      // the presentation by a container placeholder...make sure the
   //      // PartPlaceHolder for 'ref' is removed from the ViewStack
   //      String id = perspective.getFastViewManager().getIdForRef(ref);
   //      LayoutPart parentPart = findPart(id, 0);
   //      if (parentPart.Cast<ContainerPlaceholder> () != 0)
   //      {
   //        ViewStack vs =
   //            (ViewStack) ((ContainerPlaceholder) parentPart).getRealContainer();
   //        QList<LayoutPart::Pointer> kids = vs.getChildren();
   //        for (int i = 0; i < kids.length; i++)
   //        {
   //          if (kids[i].Cast<PartPlaceholder> () != 0)
   //          {
   //            if (ref.getId().equals(kids[i].id))
   //              vs.remove(kids[i]);
   //          }
   //        }
   //      }
   //      perspective.getFastViewManager().removeViewReference(ref, true, true);
   //    }
   //  }
 
   // Get vital part stats before reparenting.
   ILayoutContainer::Pointer oldContainer = part->GetContainer();
   bool wasDocked = part->IsDocked();
   Shell::Pointer oldShell = part->GetShell();
 
   // Reparent the part back to the main window
   part->Reparent(mainLayout->GetParent());
 
   // Update container.
   if (oldContainer == 0)
   {
     return;
   }
 
   oldContainer->Remove(part);
 
   ILayoutContainer::ChildrenType children = oldContainer->GetChildren();
   if (wasDocked)
   {
     bool hasChildren = (children.size()> 0);
     if (hasChildren)
     {
       // make sure one is at least visible
       int childVisible = 0;
       for (ILayoutContainer::ChildrenType::iterator iter = children.begin();
           iter != children.end(); ++iter)
       {
         if ((*iter)->GetControl() != 0)
         {
           childVisible++;
         }
       }
 
       // none visible, then reprarent and remove container
       if (oldContainer.Cast<PartStack> () != 0)
       {
         PartStack::Pointer folder = oldContainer.Cast<PartStack>();
 
         // Is the part in the trim?
         bool inTrim = false;
         //        // Safety check...there may be no FastViewManager
         //        if (perspective.getFastViewManager() != 0)
         //          inTrim
         //              = perspective.getFastViewManager().getFastViews(folder.getID()).size()
         //                  > 0;
 
         if (childVisible == 0 && !inTrim)
         {
           ILayoutContainer::Pointer parentContainer = folder->GetContainer();
           hasChildren = folder->GetChildren().size()> 0;
 
           // We maintain the stack as a place-holder if it has children
           // (which at this point would represent view place-holders)
           if (hasChildren)
           {
             folder->Dispose();
 
             // replace the real container with a ContainerPlaceholder
             ContainerPlaceholder::Pointer placeholder(
             new ContainerPlaceholder(folder->GetID()));
             placeholder->SetRealContainer(folder);
             parentContainer->Replace(folder, placeholder);
           }
         }
         else if (childVisible == 1)
         {
           LayoutTree::Pointer layout = mainLayout->GetLayoutTree();
           layout = layout->Find(folder);
           layout->SetBounds(layout->GetBounds());
         }
       }
     }
 
     if (!hasChildren)
     {
       // There are no more children in this container, so get rid of
       // it
       if (oldContainer.Cast<LayoutPart> () != 0)
       {
         //BERRY_INFO << "No children left, removing container\n";
 
         LayoutPart::Pointer parent = oldContainer.Cast<LayoutPart>();
         ILayoutContainer::Pointer parentContainer = parent->GetContainer();
         if (parentContainer != 0)
         {
           parentContainer->Remove(parent);
           parent->Print(qDebug());
           parent->Dispose();
         }
       }
     }
   }
   else if (!wasDocked)
   {
     if (children.empty())
     {
       // There are no more children in this container, so get rid of
       // it
       // Turn on redraw again just in case it was off.
       //oldShell.setRedraw(true);
       DetachedWindow::Pointer w = oldShell->GetData().Cast<DetachedWindow>();
       oldShell->Close();
       detachedWindowList.removeAll(w);
     }
     else
     {
       // There are children. If none are visible hide detached
       // window.
       bool allInvisible = true;
       for (ILayoutContainer::ChildrenType::iterator iter = children.begin();
           iter != children.end(); ++iter)
       {
         if (iter->Cast<PartPlaceholder> () == 0)
         {
           allInvisible = false;
           break;
         }
       }
       if (allInvisible)
       {
         DetachedPlaceHolder::Pointer placeholder(new DetachedPlaceHolder("",
             oldShell->GetBounds()));
         for (ILayoutContainer::ChildrenType::iterator iter = children.begin();
             iter != children.end(); ++iter)
         {
           oldContainer->Remove(*iter);
           (*iter)->SetContainer(placeholder);
           placeholder->Add(*iter);
         }
         detachedPlaceHolderList.push_back(placeholder);
         DetachedWindow::Pointer w = oldShell->GetData().Cast<DetachedWindow>();
         oldShell->Close();
         detachedWindowList.removeAll(w);
       }
     }
   }
 
 }
 
 void PerspectiveHelper::Detach(LayoutPart::Pointer part, int x, int y)
 {
 
   // Detaching is disabled on some platforms ..
   if (!detachable)
   {
     return;
   }
 
   // Calculate detached window size.
   Point size = part->GetSize();
   if (size.x == 0 || size.y == 0)
   {
     ILayoutContainer::Pointer container = part->GetContainer();
     if (container.Cast<LayoutPart> () != 0)
     {
       size = container.Cast<LayoutPart>()->GetSize();
     }
   }
   int width = std::max<int>(size.x, MIN_DETACH_WIDTH);
   int height = std::max<int>(size.y, MIN_DETACH_HEIGHT);
 
   // Create detached window.
   DetachedWindow::Pointer window(new DetachedWindow(page));
   detachedWindowList.push_back(window);
 
   // Open window.
   window->Create();
   window->GetShell()->SetBounds(x, y, width, height);
   window->Open();
 
   if (part.Cast<PartStack> () != 0)
   {
     //window.getShell().setRedraw(false);
     //parentWidget.setRedraw(false);
     PartStack::Pointer stack = part.Cast<PartStack>();
     LayoutPart::Pointer visiblePart = stack->GetSelection();
     ILayoutContainer::ChildrenType children = stack->GetChildren();
     for (ILayoutContainer::ChildrenType::iterator iter = children.begin();
         iter != children.end(); ++iter)
     {
       if (PartPane::Pointer partPane = iter->Cast<PartPane>()
           // && check it is a view?
           )
       {
         // remove the part from its current container
         this->DerefPart(*iter);
         // add part to detached window.
         window->Add(*iter);
       }
     }
     if (visiblePart != 0)
     {
       this->BringPartToTop(visiblePart);
       visiblePart->SetFocus();
     }
     //window.getShell().setRedraw(true);
     //parentWidget.setRedraw(true);
   }
 
 }
 
 void PerspectiveHelper::DetachPart(LayoutPart::Pointer part, int x, int y)
 {
 
   // Detaching is disabled on some platforms ..
   if (!detachable)
   {
     return;
   }
 
   // Calculate detached window size.
   Point size = part->GetSize();
   if (size.x == 0 || size.y == 0)
   {
     ILayoutContainer::Pointer container = part->GetContainer();
     if (container.Cast<LayoutPart> () != 0)
     {
       size = container.Cast<LayoutPart>()->GetSize();
     }
   }
   int width = std::max<int>(size.x, MIN_DETACH_WIDTH);
   int height = std::max<int>(size.y, MIN_DETACH_HEIGHT);
 
   // Create detached window.
   DetachedWindow::Pointer window(new DetachedWindow(page));
   detachedWindowList.push_back(window);
 
   // Open window.
   window->Create();
   window->GetShell()->SetBounds(x, y, width, height);
   window->Open();
 
   // remove the part from its current container
   this->DerefPart(part);
   // add part to detached window.
   window->Add(part);
   part->SetFocus();
 
 }
 
 void PerspectiveHelper::DetachPart(IViewReference::Pointer ref)
 {
   PartPane::Pointer pane = ref.Cast<WorkbenchPartReference>()->GetPane();
   if (this->CanDetach() && pane != 0)
   {
     //    if (getMaximizedStack() != 0)
     //      getMaximizedStack().setState(IStackPresentationSite.STATE_RESTORED);
 
     Rectangle bounds = pane->GetParentBounds();
     this->DetachPart(pane, bounds.x, bounds.y);
   }
 }
 
 void PerspectiveHelper::AddDetachedPart(LayoutPart::Pointer part)
 {
   // Calculate detached window size.
   Rectangle bounds = Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetShell(parentWidget)->GetBounds();
   bounds.x = bounds.x + (bounds.width - 300) / 2;
   bounds.y = bounds.y + (bounds.height - 300) / 2;
 
   this->AddDetachedPart(part, bounds);
 }
 
 void PerspectiveHelper::AddDetachedPart(LayoutPart::Pointer part,
     const Rectangle& bounds)
 {
   // Detaching is disabled on some platforms ..
   if (!detachable)
   {
     this->AddPart(part);
     return;
   }
 
   // Create detached window.
   DetachedWindow::Pointer window(new DetachedWindow(page));
   detachedWindowList.push_back(window);
   window->Create();
 
   // add part to detached window.
   part->CreateControl(window->GetShell()->GetControl());
   window->Add(part);
 
   // Open window.
   window->GetShell()->SetBounds(bounds.x, bounds.y, bounds.width, bounds.height);
   window->Open();
 
   part->SetFocus();
 
 }
 
 void PerspectiveHelper::DisableAllDrag()
 {
-  DragUtil::RemoveDragTarget(0, dragTarget);
+  DragUtil::RemoveDragTarget(0, dragTarget.data());
 }
 
 void PerspectiveHelper::EnableAllDrag()
 {
-  DragUtil::AddDragTarget(0, dragTarget);
+  DragUtil::AddDragTarget(0, dragTarget.data());
 }
 
 LayoutPart::Pointer PerspectiveHelper::FindPart(const QString& id)
 {
   return this->FindPart(id, "");
 }
 
 LayoutPart::Pointer PerspectiveHelper::FindPart(const QString& primaryId,
     const QString& secondaryId)
 {
 
   //BERRY_INFO << "Looking for part: " << primaryId << ":" << secondaryId << std::endl;
 
   // check main window.
   QList<MatchingPart> matchingParts;
   LayoutPart::Pointer part = (secondaryId != "") ? this->FindPart(primaryId, secondaryId,
       mainLayout->GetChildren(), matchingParts) : this->FindPart(primaryId,
       mainLayout->GetChildren(), matchingParts);
   if (part != 0)
   {
     return part;
   }
 
   // check each detached windows.
   for (DetachedWindowsType::iterator iter = detachedWindowList.begin();
       iter != detachedWindowList.end(); ++iter)
   {
     DetachedWindow::Pointer window = *iter;
     part = (secondaryId != "") ? this->FindPart(primaryId, secondaryId,
         window->GetChildren(), matchingParts) : this->FindPart(primaryId,
         window->GetChildren(), matchingParts);
     if (part != 0)
     {
       return part;
     }
   }
 
   for (DetachedPlaceHoldersType::iterator iter = detachedPlaceHolderList.begin();
       iter != detachedPlaceHolderList.end(); ++iter)
   {
     DetachedPlaceHolder::Pointer holder = *iter;
     part = (secondaryId != "") ? this->FindPart(primaryId, secondaryId,
         holder->GetChildren(), matchingParts) : this->FindPart(primaryId,
         holder->GetChildren(), matchingParts);
     if (part != 0)
     {
       return part;
     }
   }
 
   //BERRY_INFO << "Looking through the matched parts (count: " << matchingParts.size() << ")\n";
 
   // sort the matching parts
   if (matchingParts.size()> 0)
   {
     std::partial_sort(matchingParts.begin(), (matchingParts.begin()), matchingParts.end(), CompareMatchingParts());
     const MatchingPart& mostSignificantPart = matchingParts.front();
     return mostSignificantPart.part;
   }
 
   // Not found.
   return LayoutPart::Pointer(0);
 }
 
 LayoutPart::Pointer PerspectiveHelper::FindPart(const QString& id,
     const QList<LayoutPart::Pointer>& parts,
     QList<MatchingPart>& matchingParts)
 {
   for (QList<LayoutPart::Pointer>::const_iterator iter = parts.begin();
       iter != parts.end(); ++iter)
   {
     LayoutPart::Pointer part = *iter;
     // check for part equality, parts with secondary ids fail
     if (part->GetID() == id)
     {
       if (part.Cast<PartPane> () != 0)
       {
         PartPane::Pointer pane = part.Cast<PartPane>();
         IViewReference::Pointer ref = pane->GetPartReference().Cast<IViewReference>();
         if (ref->GetSecondaryId() != "")
         {
           continue;
         }
       }
       return part;
     }
     // check pattern matching placeholders
 
     else if (part->IsPlaceHolder()
              && part.Cast<PartPlaceholder>()->HasWildCard())
     {
       QRegExp re(id, Qt::CaseInsensitive);
       if (re.exactMatch(part->GetID()))
       {
         matchingParts.push_back(MatchingPart(part->GetID(), "", part));
       }
       //      StringMatcher sm = new StringMatcher(part.getID(), true, false);
       //      if (sm.match(id))
       //      {
       //        matchingParts .add(new MatchingPart(part.getID(), 0, part));
       //      }
     }
     else if (ILayoutContainer::Pointer layoutContainer = part.Cast<ILayoutContainer>())
     {
       part = FindPart(id, layoutContainer->GetChildren(),
                       matchingParts);
       if (part)
       {
         return part;
       }
     }
   }
 
   //BERRY_INFO << "Returning 0\n";
   return LayoutPart::Pointer(0);
 }
 
 LayoutPart::Pointer PerspectiveHelper::FindPart(const QString& primaryId,
     const QString& secondaryId,
     const QList<LayoutPart::Pointer>& parts,
     QList<MatchingPart>& matchingParts)
 {
   for (QList<LayoutPart::Pointer>::const_iterator iter = parts.begin();
       iter != parts.end(); ++iter)
   {
     LayoutPart::Pointer part = *iter;
     // check containers first
     if (ILayoutContainer::Pointer layoutContainer = part.Cast<ILayoutContainer>())
     {
       LayoutPart::Pointer testPart = FindPart(primaryId, secondaryId,
                                               layoutContainer->GetChildren(), matchingParts);
       if (testPart)
       {
         return testPart;
       }
     }
     // check for view part equality
     if (part.Cast<PartPane> () != 0)
     {
       PartPane::Pointer pane = part.Cast<PartPane>();
       IViewReference::Pointer ref = pane->GetPartReference().Cast<IViewReference>();
       if (ref->GetId() == primaryId && ref->GetSecondaryId() == secondaryId)
       {
         return part;
       }
     }
     // check placeholders
 
     else if (part.Cast<PartPlaceholder> () != 0)
     {
       QString id = part->GetID();
 
       // optimization: don't bother parsing id if it has no separator -- it can't match
       QString phSecondaryId = ViewFactory::ExtractSecondaryId(id);
       if (phSecondaryId == "")
       {
         // but still need to check for wildcard case
         if (id == PartPlaceholder::WILD_CARD)
         {
           matchingParts.push_back(MatchingPart(id, "", part));
         }
         continue;
       }
 
       QString phPrimaryId = ViewFactory::ExtractPrimaryId(id);
       // perfect matching pair
       if (phPrimaryId == primaryId && phSecondaryId == secondaryId)
       {
         return part;
       }
       // check for partial matching pair
       QRegExp pre(phPrimaryId, Qt::CaseInsensitive);
       if (pre.exactMatch(primaryId))
       {
         QRegExp sre(phSecondaryId, Qt::CaseInsensitive);
         if (sre.exactMatch(secondaryId))
         {
           matchingParts.push_back(MatchingPart(phPrimaryId, phSecondaryId, part));
         }
       }
     }
   }
   return LayoutPart::Pointer(0);
 }
 
 bool PerspectiveHelper::HasPlaceholder(const QString& id)
 {
   return this->HasPlaceholder(id, 0);
 }
 
 bool PerspectiveHelper::HasPlaceholder(const QString& primaryId,
     const QString& secondaryId)
 {
   LayoutPart::Pointer testPart;
   if (secondaryId == "")
   {
     testPart = this->FindPart(primaryId);
   }
   else
   {
     testPart = this->FindPart(primaryId, secondaryId);
   }
   return (testPart != 0 && testPart.Cast<PartPlaceholder> () != 0);
 }
 
 PartSashContainer::Pointer PerspectiveHelper::GetLayout() const
 {
   return mainLayout;
 }
 
 bool PerspectiveHelper::IsActive()
 {
   return active;
 }
 
 float PerspectiveHelper::GetDockingRatio(LayoutPart::Pointer source,
     LayoutPart::Pointer target)
 {
   if ((source.Cast<PartPane> () != 0 || source.Cast<PartStack> () != 0)
       && target.Cast<EditorSashContainer> () != 0)
   {
     return 0.25f;
   }
   return 0.5f;
 }
 
 void PerspectiveHelper::RemovePart(LayoutPart::Pointer part)
 {
 
   // Reparent the part back to the main window
   void* parent = mainLayout->GetParent();
   part->Reparent(parent);
 
   // Replace part with a placeholder
   ILayoutContainer::Pointer container = part->GetContainer();
   if (container != 0)
   {
     QString placeHolderId = part->GetPlaceHolderId();
     container->Replace(part, LayoutPart::Pointer(new PartPlaceholder(placeHolderId)));
 
 //    // If the parent is root we're done. Do not try to replace
 //    // it with placeholder.
 //    if (container == mainLayout)
 //    {
 //      return;
 //    }
 
     // If the parent is empty replace it with a placeholder.
     QList<LayoutPart::Pointer> children = container->GetChildren();
 
     bool allInvisible = true;
     for (QList<LayoutPart::Pointer>::iterator childIter = children.begin();
         childIter != children.end(); ++childIter)
     {
       if (childIter->Cast<PartPlaceholder> () == 0)
       {
         allInvisible = false;
         break;
       }
     }
     if (allInvisible && (container.Cast<LayoutPart> () != 0))
     {
       // what type of window are we in?
       LayoutPart::Pointer cPart = container.Cast<LayoutPart>();
       //Window oldWindow = cPart.getWindow();
       bool wasDocked = cPart->IsDocked();
       Shell::Pointer oldShell = cPart->GetShell();
       if (wasDocked)
       {
 
         // PR 1GDFVBY: ViewStack not disposed when page
         // closed.
         if (container.Cast<PartStack> () != 0)
         {
           container.Cast<PartStack>()->Dispose();
         }
 
         // replace the real container with a
         // ContainerPlaceholder
         ILayoutContainer::Pointer parentContainer = cPart->GetContainer();
         ContainerPlaceholder::Pointer placeholder(
         new ContainerPlaceholder(cPart->GetID()));
         placeholder->SetRealContainer(container);
         parentContainer->Replace(cPart, placeholder);
 
       }
       else
       {
         DetachedPlaceHolder::Pointer placeholder(
         new DetachedPlaceHolder("", oldShell->GetBounds())); //$NON-NLS-1$
         for (QList<LayoutPart::Pointer>::iterator childIter2 = children.begin();
             childIter2 != children.end(); ++childIter2)
         {
           (*childIter2)->GetContainer()->Remove(*childIter2);
           (*childIter2)->SetContainer(placeholder);
           placeholder->Add(*childIter2);
         }
         detachedPlaceHolderList.push_back(placeholder);
         DetachedWindow::Pointer w = oldShell->GetData().Cast<DetachedWindow>();
         oldShell->Close();
         detachedWindowList.removeAll(w);
       }
 
     }
   }
 }
 
 void PerspectiveHelper::ReplacePlaceholderWithPart(LayoutPart::Pointer part)
 {
 
   // Look for a PartPlaceholder that will tell us how to position this
   // object
   QList<PartPlaceholder::Pointer> placeholders = this->CollectPlaceholders();
-  for (unsigned int i = 0; i < placeholders.size(); i++)
+  for (int i = 0; i < placeholders.size(); i++)
   {
     if (placeholders[i]->GetID() == part->GetID())
     {
       // found a matching placeholder which we can replace with the
       // new View
       ILayoutContainer::Pointer container = placeholders[i]->GetContainer();
       if (container != 0)
       {
         if (ContainerPlaceholder::Pointer containerPlaceholder = container.Cast<ContainerPlaceholder> ())
         {
           // One of the children is now visible so replace the
           // ContainerPlaceholder with the real container
           ILayoutContainer::Pointer parentContainer =
               containerPlaceholder->GetContainer();
           container = containerPlaceholder->GetRealContainer().Cast<ILayoutContainer>();
           if (LayoutPart::Pointer layoutPart = container.Cast<LayoutPart> ())
           {
             parentContainer->Replace(containerPlaceholder, layoutPart);
           }
           containerPlaceholder->SetRealContainer(ILayoutContainer::Pointer(0));
         }
         container->Replace(placeholders[i], part);
         return;
       }
     }
   }
 }
 
 bool PerspectiveHelper::RestoreState(IMemento::Pointer memento)
 {
   // Restore main window.
   IMemento::Pointer childMem = memento->GetChild(WorkbenchConstants::TAG_MAIN_WINDOW);
   //IStatus r = mainLayout->RestoreState(childMem);
   bool r = mainLayout->RestoreState(childMem);
 
   // Restore each floating window.
   if (detachable)
   {
     QList<IMemento::Pointer> detachedWindows(memento->GetChildren(
         WorkbenchConstants::TAG_DETACHED_WINDOW));
     for (QList<IMemento::Pointer>::iterator iter = detachedWindows.begin();
         iter != detachedWindows.end(); ++iter)
     {
       DetachedWindow::Pointer win(new DetachedWindow(page));
       detachedWindowList.push_back(win);
       win->RestoreState(*iter);
     }
 
     QList<IMemento::Pointer> childrenMem(memento->GetChildren(
         WorkbenchConstants::TAG_HIDDEN_WINDOW));
     for (QList<IMemento::Pointer>::iterator iter = childrenMem.begin();
         iter != childrenMem.end(); ++iter)
     {
       DetachedPlaceHolder::Pointer holder(
           new DetachedPlaceHolder("", Rectangle(0, 0, 0, 0)));
       holder->RestoreState(*iter);
       detachedPlaceHolderList.push_back(holder);
     }
   }
 
   // Get the cached id of the currently maximized stack
   //maximizedStackId = childMem.getString(IWorkbenchConstants.TAG_MAXIMIZED);
 
   return r;
 }
 
 bool PerspectiveHelper::SaveState(IMemento::Pointer memento)
 {
   // Persist main window.
   IMemento::Pointer childMem = memento->CreateChild(WorkbenchConstants::TAG_MAIN_WINDOW);
   //IStatus r = mainLayout->SaveState(childMem);
   bool r = mainLayout->SaveState(childMem);
 
   if (detachable)
   {
     // Persist each detached window.
     for (DetachedWindowsType::iterator iter = detachedWindowList.begin();
         iter != detachedWindowList.end(); ++iter)
     {
       childMem = memento->CreateChild(WorkbenchConstants::TAG_DETACHED_WINDOW);
       (*iter)->SaveState(childMem);
     }
     for (DetachedPlaceHoldersType::iterator iter = detachedPlaceHolderList.begin();
         iter != detachedPlaceHolderList.end(); ++iter)
     {
       childMem = memento->CreateChild(WorkbenchConstants::TAG_HIDDEN_WINDOW);
       (*iter)->SaveState(childMem);
     }
   }
 
   // Write out the id of the maximized (View) stack (if any)
   // NOTE: we only write this out if it's a ViewStack since the
   // Editor Area is handled by the perspective
 //  if (maximizedStack.Cast<PartStack> () != 0)
 //  {
 //    childMem.putString(IWorkbenchConstants.TAG_MAXIMIZED,
 //        maximizedStack.getID());
 //  }
 //  else if (maximizedStackId != 0)
 //  {
 //    // Maintain the cache if the perspective has never been activated
 //    childMem.putString(IWorkbenchConstants.TAG_MAXIMIZED, maximizedStackId);
 //  }
 
   return r;
 }
 
 void PerspectiveHelper::UpdateBoundsMap()
 {
   boundsMap.clear();
 
   // Walk the layout gathering the current bounds of each stack
   // and the editor area
   QList<LayoutPart::Pointer> kids = mainLayout->GetChildren();
   for (QList<LayoutPart::Pointer>::iterator iter = kids.begin();
       iter != kids.end(); ++iter)
   {
     if (iter->Cast<PartStack> () != 0)
     {
       PartStack::Pointer vs = iter->Cast<PartStack>();
       boundsMap.insert(vs->GetID(), vs->GetBounds());
     }
     else if (iter->Cast<EditorSashContainer> () != 0)
     {
       EditorSashContainer::Pointer esc = iter->Cast<EditorSashContainer>();
       boundsMap.insert(esc->GetID(), esc->GetBounds());
     }
   }
 }
 
 void PerspectiveHelper::ResetBoundsMap()
 {
   boundsMap.clear();
 }
 
 Rectangle PerspectiveHelper::GetCachedBoundsFor(const QString& id)
 {
   return boundsMap[id];
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPerspectiveHelper.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPerspectiveHelper.h
index 147b61a190..8c81cf371e 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPerspectiveHelper.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPerspectiveHelper.h
@@ -1,573 +1,573 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYPERSPECTIVEHELPER_H_
 #define BERRYPERSPECTIVEHELPER_H_
 
 #include "berryWorkbenchPage.h"
 #include "berryPartPlaceholder.h"
 #include "berryPerspective.h"
 #include "berryViewSashContainer.h"
 #include "berryPartPlaceholder.h"
 #include "berryDetachedWindow.h"
 #include "berryDetachedPlaceHolder.h"
 #include "berryIDragOverListener.h"
 #include "berryAbstractDropTarget.h"
 #include "berryPartPane.h"
 
 namespace berry
 {
 
 class WorkbenchPage;
 
 /**
  * A perspective presentation is a collection of parts with a layout. Each part
  * is parented to a main window, so you can create more than one presentation
  * on a set of parts and change the layout just by activating / deactivating a
  * presentation.
  *
  * In addition, the user can change the position of any part by mouse
  * manipulation (drag & drop). If a part is removed, we leave a placeholder
  * behind to indicate where it goes should the part be added back.
  */
 class PerspectiveHelper
 {
 
   friend class PartStack;
   friend class ViewSashContainer;
 
 private:
   WorkbenchPage* page;
 
 protected:
   Perspective* perspective;
 
 protected:
   void* parentWidget;
 
 private:
   ViewSashContainer::Pointer mainLayout;
 
   //private: PartStack maximizedStack;
 
   /**
    * If there is a ViewStack maximized on shutdown the id is
    * cached and restored into this field on 'restoreState'.
    * This is then used to bash the ViewStack's presentation state
    * into the correct value on activation (the startup life-cycle
    * is such that we have to use this 'latch' because the window
    * state isn't valid until the activate happens.
    */
   //private: String maximizedStackId;
 
 private:
   typedef QList<DetachedWindow::Pointer> DetachedWindowsType;
   DetachedWindowsType detachedWindowList;
 
 private:
   typedef QList<DetachedPlaceHolder::Pointer> DetachedPlaceHoldersType;
   DetachedPlaceHoldersType detachedPlaceHolderList;
 
   /**
    * Maps a stack's id to its current bounds
    * this is used to capture the current bounds of all
    * stacks -before- starting a maximize (since the
    * iterative 'minimize' calls cause the intial stack's
    * bounds to change.
    */
 private:
   QHash<QString, Rectangle> boundsMap;
 
 private:
   bool detachable;
 
 protected:
   bool active;
 
   // key is the LayoutPart object, value is the PartDragDrop object
   //private: IPartDropListener partDropListener;
 
 private:
   static const int MIN_DETACH_WIDTH;
 
 private:
   static const int MIN_DETACH_HEIGHT;
 
   struct DragOverListener: public IDragOverListener
   {
 
     DragOverListener(PerspectiveHelper* perspHelper);
 
     IDropTarget::Pointer Drag(void* currentControl,
-        Object::Pointer draggedObject, const Point& position,
+        const Object::Pointer& draggedObject, const Point& position,
         const Rectangle& dragRectangle);
 
   private:
     PerspectiveHelper* perspHelper;
 
   };
 
-  IDragOverListener::Pointer dragTarget;
+  QScopedPointer<IDragOverListener> dragTarget;
 
   struct ActualDropTarget: public AbstractDropTarget
   {
 
     berryObjectMacro(ActualDropTarget);
 
     /**
      * @param part
      * @param dragRectangle
      * @since 3.1
      */
     void SetTarget(PartPane::Pointer part, const Rectangle& dragRectangle);
 
     /**
      * @param part
      * @param dragRectangle
      * @since 3.1
      */
     void SetTarget(PartStack::Pointer part, const Rectangle& dragRectangle);
 
     ActualDropTarget(PerspectiveHelper* perspHelper, PartPane::Pointer part, const Rectangle& dragRectangle);
 
     ActualDropTarget(PerspectiveHelper* perspHelper, PartStack::Pointer part, const Rectangle& dragRectangle);
 
     void Drop();
 
     DnDTweaklet::CursorType GetCursor();
 
   private:
 
     PartPane::Pointer part;
     PartStack::Pointer stack;
 
     Rectangle dragRectangle;
 
     PerspectiveHelper* perspHelper;
   };
 
   ActualDropTarget::Pointer dropTarget;
 
 private:
   struct MatchingPart
   {
 
     QString pid;
     QString sid;
     LayoutPart::Pointer part;
     bool hasWildcard;
     int len;
 
     MatchingPart(const QString& pid, const QString& sid,
         LayoutPart::Pointer part);
 
   };
 
   struct CompareMatchingParts: public std::binary_function<MatchingPart, MatchingPart, bool>
   {
     bool operator()(const MatchingPart& m1, const MatchingPart& m2) const;
   };
 
   /**
    * Constructs a new object.
    */
 public:
   PerspectiveHelper(WorkbenchPage* workbenchPage,
       ViewSashContainer::Pointer mainLayout, Perspective* perspective);
 
   /**
    * Show the presentation.
    */
 public:
   void Activate(void* parent);
 
   /**
    * Adds a part to the presentation. If a placeholder exists for the part
    * then swap the part in. Otherwise, add the part in the bottom right
    * corner of the presentation.
    */
 public:
   void AddPart(LayoutPart::Pointer part);
 
   /**
    * Attaches a part that was previously detached to the mainLayout.
    *
    * @param ref
    */
 public:
   void AttachPart(IViewReference::Pointer ref);
 
   /**
    * Return whether detachable parts can be supported.
    */
 public:
   bool CanDetach();
 
   /**
    * Bring a part forward so it is visible.
    *
    * @return true if the part was brought to top, false if not.
    */
 public:
   bool BringPartToTop(LayoutPart::Pointer part);
 
   /**
    * Returns true if the given part is visible.
    * A part is visible if it's top-level (not in a tab folder) or if it is the top one
    * in a tab folder.
    */
 public:
   bool IsPartVisible(IWorkbenchPartReference::Pointer partRef);
 
   /**
    * Returns true is not in a tab folder or if it is the top one in a tab
    * folder.
    */
 public:
   bool WillPartBeVisible(const QString& partId);
 
 public:
   bool WillPartBeVisible(const QString& partId,
       const QString& secondaryId);
 
   /**
    * Answer a list of the PartPlaceholder objects.
    */
 private:
   QList<PartPlaceholder::Pointer> CollectPlaceholders();
 
   /**
    * Answer a list of the PartPlaceholder objects.
    */
 private:
   QList<PartPlaceholder::Pointer> CollectPlaceholders(
       const QList<LayoutPart::Pointer>& parts);
 
   /**
    * Answer a list of the view panes.
    */
 public:
   void CollectViewPanes(QList<PartPane::Pointer>& result);
 
   /**
    * Answer a list of the view panes.
    */
 private:
   void CollectViewPanes(QList<PartPane::Pointer>& result,
       const QList<LayoutPart::Pointer>& parts);
 
   /**
    * Hide the presentation.
    */
 public:
   void Deactivate();
 
 public:
   ~PerspectiveHelper();
 
   /**
    * Writes a description of the layout to the given string buffer.
    * This is used for drag-drop test suites to determine if two layouts are the
    * same. Like a hash code, the description should compare as equal iff the
    * layouts are the same. However, it should be user-readable in order to
    * help debug failed tests. Although these are english readable strings,
    * they should not be translated or equality tests will fail.
    * <p>
    * This is only intended for use by test suites.
    * </p>
    *
    * @param buf
    */
 public:
   void DescribeLayout(QString& buf) const;
 
   /**
    * Deref a given part. Deconstruct its container as required. Do not remove
    * drag listeners.
    */
 protected:
   /* package */void DerefPart(LayoutPart::Pointer part);
 
   /**
    * Create a detached window containing a part.
    */
 private:
   void DetachPart(LayoutPart::Pointer source, int x, int y);
 
 private:
   void Detach(LayoutPart::Pointer source, int x, int y);
 
   /**
    * Detached a part from the mainLayout. Presently this does not use placeholders
    * since the current implementation is not robust enough to remember a view's position
    * in more than one root container. For now the view is simply derefed and will dock
    * in the default position when attachPart is called.
    *
    * By default parts detached this way are set to float on top of the workbench
    * without docking. It is assumed that people that want to drag a part back onto
    * the WorkbenchWindow will detach it via drag and drop.
    *
    * @param ref
    */
 public:
   void DetachPart(IViewReference::Pointer ref);
 
   /**
    * Create a detached window containing a part.
    */
 public:
   void AddDetachedPart(LayoutPart::Pointer part);
 
 public:
   void AddDetachedPart(LayoutPart::Pointer part, const Rectangle& bounds);
 
   /**
    * disableDragging.
    */
 private:
   void DisableAllDrag();
 
   /**
    * enableDragging.
    */
 private:
   void EnableAllDrag();
 
   /**
    * Find the first part with a given ID in the presentation.
    * Wild cards now supported.
    */
 private:
   LayoutPart::Pointer FindPart(const QString& id);
 
   /**
    * Find the first part that matches the specified
    * primary and secondary id pair.  Wild cards
    * are supported.
    */
 public:
   LayoutPart::Pointer FindPart(const QString& primaryId,
       const QString& secondaryId);
 
   /**
    * Find the first part with a given ID in the presentation.
    */
 private:
   LayoutPart::Pointer FindPart(const QString& id,
       const QList<LayoutPart::Pointer>& parts,
       QList<MatchingPart>& matchingParts);
 
   /**
    * Find the first part that matches the specified
    * primary and secondary id pair.  Wild cards
    * are supported.
    */
 private:
   LayoutPart::Pointer FindPart(const QString& primaryId,
       const QString& secondaryId,
       const QList<LayoutPart::Pointer>& parts,
       QList<MatchingPart>& matchingParts);
 
   /**
    * Returns true if a placeholder exists for a given ID.
    */
 public:
   bool HasPlaceholder(const QString& id);
 
   /**
    * Returns true if a placeholder exists for a given ID.
    * @since 3.0
    */
 public:
   bool HasPlaceholder(const QString& primaryId,
       const QString& secondaryId);
 
   /**
    * Returns the layout container.
    */
 public:
   PartSashContainer::Pointer GetLayout() const;
 
   /**
    * Gets the active state.
    */
 public:
   bool IsActive();
 
   /**
    * Returns whether the presentation is zoomed.
    *
    * <strong>NOTE:</strong> As of 3.3 this method should always return 'false'
    * when using the new min/max behavior. It is only used for
    * legacy 'zoom' handling.
    */
   //    public: bool IsZoomed() {
   //        return mainLayout.getZoomedPart() != null;
   //    }
 
   /**
    * @return The currently maxmized stack (if any)
    */
   //  public: PartStack::Pointer GetMaximizedStack() {
   //    return maximizedStack;
   //  }
 
   /**
    * Sets the currently maximized stack. Used for query
    * and 'unZoom' purposes in the 3.3 presentation.
    *
    * @param stack The newly maximized stack
    */
   //  public: void SetMaximizedStack(PartStack::Pointer stack) {
   //    if (stack == maximizedStack)
   //      return;
   //
   //    maximizedStack = stack;
   //  }
 
   /**
    * Returns the ratio that should be used when docking the given source
    * part onto the given target
    *
    * @param source newly added part
    * @param target existing part being dragged over
    * @return the final size of the source part (wrt the current size of target)
    * after it is docked
    */
 public:
   static float GetDockingRatio(LayoutPart::Pointer source,
       LayoutPart::Pointer target);
 
   /**
    * Returns whether changes to a part will affect zoom. There are a few
    * conditions for this .. - we are zoomed. - the part is contained in the
    * main window. - the part is not the zoom part - the part is not a fast
    * view - the part and the zoom part are not in the same editor workbook
    * - the part and the zoom part are not in the same view stack.
    */
   //    public: bool PartChangeAffectsZoom(LayoutPart::Pointer pane) {
   //        return pane.isObscuredByZoom();
   //    }
 
   /**
    * Remove all references to a part.
    */
 public:
   void RemovePart(LayoutPart::Pointer part);
 
   /**
    * Add a part to the presentation.
    *
    * Note: unlike all other LayoutParts, PartPlaceholders will still point to
    * their parent container even when it is inactive. This method relies on this
    * fact to locate the parent.
    */
 public:
   void ReplacePlaceholderWithPart(LayoutPart::Pointer part);
 
   /**
    * @see org.blueberry.ui.IPersistable
    */
 public:
   bool RestoreState(IMemento::Pointer memento);
 
   /**
    * @see org.blueberry.ui.IPersistable
    */
 public:
   bool SaveState(IMemento::Pointer memento);
 
   /**
    * Zoom in on a particular layout part.
    */
   //    public: void zoomIn(IWorkbenchPartReference ref) {
   //        PartPane pane = ((WorkbenchPartReference) ref).getPane();
   //
   //
   //        parentWidget.setRedraw(false);
   //        try {
   //            pane.requestZoomIn();
   //        } finally {
   //            parentWidget.setRedraw(true);
   //        }
   //    }
 
   /**
    * Zoom out.
    */
   //    public: void zoomOut() {
   //      // New 3.3 behavior
   //    if (Perspective.useNewMinMax(perspective)) {
   //       if (maximizedStack != null)
   //         maximizedStack.setState(IStackPresentationSite.STATE_RESTORED);
   //       return;
   //    }
   //
   //        LayoutPart zoomPart = mainLayout.getZoomedPart();
   //        if (zoomPart != null) {
   //            zoomPart.requestZoomOut();
   //        }
   //    }
 
   /**
    * Forces the perspective to have no zoomed or minimized parts.
    * This is used when switching to the 3.3 presentation...
    */
   //    public: void forceNoZoom() {
   //      // Ensure that nobody's zoomed
   //      zoomOut();
   //
   //      // Now, walk the layout ensuring that nothing is minimized
   //      LayoutPart[] kids = mainLayout.getChildren();
   //      for (int i = 0; i < kids.length; i++) {
   //      if (kids[i] instanceof ViewStack) {
   //        ((ViewStack)kids[i]).setMinimized(false);
   //      }
   //      else if (kids[i] instanceof EditorSashContainer) {
   //        LayoutPart[] editorStacks = ((EditorSashContainer)kids[i]).getChildren();
   //        for (int j = 0; j < editorStacks.length; j++) {
   //          if (editorStacks[j] instanceof EditorStack) {
   //            ((EditorStack)editorStacks[j]).setMinimized(false);
   //          }
   //        }
   //      }
   //    }
   //    }
 
   /**
    * Captures the current bounds of all ViewStacks and the editor
    * area and puts them into an ID -> Rectangle map. This info is
    * used to cache the bounds so that we can correctly place minimized
    * stacks during a 'maximized' operation (where the iterative min's
    * affect the current layout while being performed.
    */
 public:
   void UpdateBoundsMap();
 
   /**
    * Resets the bounds map so that it won't interfere with normal minimize
    * operations
    */
 public:
   void ResetBoundsMap();
 
 public:
   Rectangle GetCachedBoundsFor(const QString& id);
 };
 
 }
 
 #endif /* BERRYPERSPECTIVEHELPER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPresentablePart.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPresentablePart.cpp
index 74ae0a6733..0c255fd5c0 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPresentablePart.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPresentablePart.cpp
@@ -1,316 +1,316 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryPresentablePart.h"
 
 #include "berryIWorkbenchPartConstants.h"
 #include "berryPartPane.h"
 #include "berryWorkbenchPage.h"
 
 #include <berryObjects.h>
 
 namespace berry
 {
 
 PresentablePart::
 PropertyListenerProxy::PropertyListenerProxy(PresentablePart* p)
 : part(p)
 {
 }
 
 void
 PresentablePart::
-PropertyListenerProxy::PropertyChange(PropertyChangeEvent::Pointer e)
+PropertyListenerProxy::PropertyChange(const PropertyChangeEvent::Pointer& e)
 {
   if (e->GetProperty() == IWorkbenchPartConstants::INTEGER_PROPERTY)
   {
     // these are "part" events
     PropertyChangeEvent::Pointer event(new PropertyChangeEvent(Object::Pointer(part), e->GetProperty(),
                                                                e->GetOldValue(), e->GetNewValue()));
     part->FirePropertyChange(event);
   }
   else
   {
     part->FirePropertyChange(e);
   }
 }
 
 IPropertyChangeListener* PresentablePart::GetPropertyListenerProxy()
 {
   if (lazyPropertyListenerProxy == 0)
   {
     lazyPropertyListenerProxy.reset(new PropertyListenerProxy(this));
   }
   return lazyPropertyListenerProxy.data();
 }
 
 WorkbenchPartReference::Pointer PresentablePart::GetPartReference() const
 {
   return part->GetPartReference().Cast<WorkbenchPartReference>();
 }
 
-void PresentablePart::FirePropertyChange(PropertyChangeEvent::Pointer event)
+void PresentablePart::FirePropertyChange(const PropertyChangeEvent::Pointer& event)
 {
   partPropertyChangeEvents.propertyChange(event);
 }
 
 void PresentablePart::FirePropertyChange(int propId)
 {
   ObjectInt::Pointer val(new ObjectInt(propId));
   Object::Pointer source(this);
   PropertyChangeEvent::Pointer event(new PropertyChangeEvent(source, IWorkbenchPartConstants::INTEGER_PROPERTY, val, val));
   this->FirePropertyChange(event);
 }
 
 PresentablePart::PresentablePart(PartPane::Pointer part, void*  /*parent*/)
 {
   enableInputs = true;
   enableOutputs = true;
   isVisible = false;
   isDirty = false;
   isBusy = false;
   hasViewMenu = false;
 
   this->part = part;
   this->GetPane()->AddPropertyListener(this->GetPropertyListenerProxy());
 }
 
 PartPane::Pointer PresentablePart::GetPane() const
 {
   return part;
 }
 
 PresentablePart::~PresentablePart()
 {
   // Ensure that the property listener is detached (necessary to prevent leaks)
   this->GetPane()->RemovePropertyListener(this->GetPropertyListenerProxy());
 }
 
 void PresentablePart::AddPropertyListener(IPropertyChangeListener* listener)
 {
   partPropertyChangeEvents.AddListener(listener);
 }
 
 void PresentablePart::RemovePropertyListener(IPropertyChangeListener* listener)
 {
   partPropertyChangeEvents.RemoveListener(listener);
 }
 
 void PresentablePart::SetBounds(const Rectangle& bounds)
 {
   savedBounds = bounds;
   if (enableInputs && part != 0)
   {
     part->SetBounds(bounds);
   }
 }
 
 void PresentablePart::SetVisible(bool isVisible)
 {
   this->isVisible = isVisible;
   if (enableInputs)
   {
     part->SetVisible(isVisible);
   }
 }
 
 void PresentablePart::SetFocus()
 {
   if (part != 0)
   {
     if (part->GetPage()->GetActivePart()
         == part->GetPartReference()->GetPart(false))
     {
       part->SetFocus();
     }
     else
     {
       part->RequestActivation();
     }
   }
 }
 
 QString PresentablePart::GetName() const
 {
   if (enableOutputs)
   {
     return this->GetPartReference()->GetPartName();
   }
   return name;
 }
 
 QString PresentablePart::GetTitle() const
 {
   return this->GetPartReference()->GetPartName();
 }
 
 QString PresentablePart::GetTitleStatus() const
 {
   if (enableOutputs)
   {
     return this->GetPartReference()->GetContentDescription();
   }
 
   return titleStatus;
 }
 
 void* PresentablePart::GetTitleImage()
 {
 
   if (enableOutputs)
   {
     return this->GetPartReference()->GetTitleImage();
   }
 
 //  return PlatformUI.getWorkbench().getSharedImages().getImage(
 //      ISharedImages.IMG_DEF_VIEW);
   return 0;
 }
 
 QString PresentablePart::GetTitleToolTip() const
 {
   return this->GetPartReference()->GetTitleToolTip();
 }
 
 bool PresentablePart::IsDirty() const
 {
   if (enableOutputs)
   {
     return this->GetPartReference()->IsDirty();
   }
   return isDirty;
 }
 
 bool PresentablePart::IsBusy() const
 {
   if (enableOutputs)
   {
     return part->IsBusy();
   }
   return isBusy;
 }
 
 void* PresentablePart::GetToolBar()
 {
   if (enableOutputs)
   {
     return this->GetPane()->GetToolBar();
   }
   return 0;
 }
 
 bool PresentablePart::IsCloseable() const
 {
   return part->IsCloseable();
 }
 
 void* PresentablePart::GetControl()
 {
   return part->GetControl();
 }
 
 void PresentablePart::EnableOutputs(bool isActive)
 {
   if (isActive == this->enableOutputs)
   {
     return;
   }
 
   this->enableOutputs = isActive;
 
   if (isActive)
   {
     if (isBusy != this->GetPane()->IsBusy())
     {
       this->FirePropertyChange(PROP_BUSY);
     }
     if (isDirty != this->IsDirty())
     {
       this->FirePropertyChange(PROP_DIRTY);
     }
     if (name != this->GetName())
     {
       this->FirePropertyChange(PROP_PART_NAME);
     }
     if (titleStatus != this->GetTitleStatus())
     {
       this->FirePropertyChange(PROP_CONTENT_DESCRIPTION);
     }
     if (hasViewMenu != this->GetPane()->HasViewMenu())
     {
       this->FirePropertyChange(PROP_PANE_MENU);
     }
     // Always assume that the toolbar and title has changed (keeping track of this for real
     // would be too expensive)
     this->FirePropertyChange(PROP_TOOLBAR);
     this->FirePropertyChange(PROP_TITLE);
 
     this->GetPane()->AddPropertyListener(this->GetPropertyListenerProxy());
   }
   else
   {
     this->GetPane()->RemovePropertyListener(this->GetPropertyListenerProxy());
 
     WorkbenchPartReference::Pointer ref = this->GetPartReference();
     isBusy = this->GetPane()->IsBusy();
     isDirty = ref->IsDirty();
     name = ref->GetPartName();
     titleStatus = ref->GetContentDescription();
     hasViewMenu = this->GetPane()->HasViewMenu();
     this->FirePropertyChange(PROP_TITLE);
     this->FirePropertyChange(PROP_TOOLBAR);
   }
 }
 
 void PresentablePart::EnableInputs(bool isActive)
 {
   if (isActive == this->enableInputs)
   {
     return;
   }
 
   this->enableInputs = isActive;
 
   if (isActive)
   {
     if (isActive && part != 0)
     {
       part->SetBounds(savedBounds);
     }
 
     part->SetVisible(isVisible);
   }
 }
 
 QString PresentablePart::GetPartProperty(const QString& key) const
 {
   return this->GetPartReference()->GetPartProperty(key);
 }
 
 int PresentablePart::ComputePreferredSize(bool width, int availableParallel,
     int availablePerpendicular, int preferredResult)
 {
 
   return this->GetPane()->ComputePreferredSize(width, availableParallel,
       availablePerpendicular, preferredResult);
 }
 
 int PresentablePart::GetSizeFlags(bool width)
 {
   return this->GetPane()->GetSizeFlags(width);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPresentablePart.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPresentablePart.h
index 6a1d86d1fa..e536dcf272 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPresentablePart.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPresentablePart.h
@@ -1,265 +1,266 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYPRESENTABLEPART_H_
 #define BERRYPRESENTABLEPART_H_
 
 #include "presentations/berryIPresentablePart.h"
 
 #include "berryWorkbenchPartReference.h"
 
 namespace berry
 {
 
 class PartPane;
 
 /**
  * This is a lightweight adapter that allows PartPanes to be used by a StackPresentation. All methods
  * either redirect directly to PartPane or do trivial type conversions. All listeners registered by
  * the presentation are kept here rather than registering them directly on the PartPane. This allows
  * us to remove all listeners registered by a presentation that has been disposed, offering some
  * protection against memory leaks.
  */
 class PresentablePart: public IPresentablePart
 {
 
 public:
 
   berryObjectMacro(PresentablePart);
 
 private:
 
   SmartPointer<PartPane> part;
 
   /**
    * Local listener list -- we use this rather than registering listeners directly on the part
    * in order to protect against memory leaks in badly behaved presentations.
    */
   //List listeners = new ArrayList();
 
   // Lazily initialized. Use getPropertyListenerProxy() to access.
   QScopedPointer<IPropertyChangeListener> lazyPropertyListenerProxy;
 
   //ListenerList partPropertyChangeListeners = new ListenerList();
   IPropertyChangeListener::Events partPropertyChangeEvents;
 
   //IPropertyChangeListener::Pointer lazyPartPropertyChangeListener;
 
   // Lazily initialized. Use getMenu() to access
   //IPartMenu viewMenu;
 
   // True iff the "set" methods on this object are talking to the real part (disabled
   // if the part is currently being managed by another presentation stack)
   bool enableInputs;
 
   // True iff the "get" methods are returning up-to-date info from the real part (disabled
   // for efficiency if the presentation is invisible)
   bool enableOutputs;
   Rectangle savedBounds;
   bool isVisible;
 
   // Saved state (only used when the part is inactive)
   QString name;
   QString titleStatus;
   bool isDirty;
   bool isBusy;
   bool hasViewMenu;
 
   struct PropertyListenerProxy: public IPropertyChangeListener
   {
 
     PropertyListenerProxy(PresentablePart* part);
 
-    void PropertyChange(PropertyChangeEvent::Pointer e);
+    using IPropertyChangeListener::PropertyChange;
+    void PropertyChange(const PropertyChangeEvent::Pointer& e);
 
   private:
     PresentablePart* part;
 
   };
 
   friend struct PropertyListenerProxy;
 
   IPropertyChangeListener* GetPropertyListenerProxy();
 
   WorkbenchPartReference::Pointer GetPartReference() const;
 
 protected:
 
   void FirePropertyChange(int propId);
-  void FirePropertyChange(PropertyChangeEvent::Pointer event);
+  void FirePropertyChange(const PropertyChangeEvent::Pointer& event);
 
 public:
 
   /**
    * Constructor
    *
    * @param part
    */
   PresentablePart(SmartPointer<PartPane> part, void* parent);
 
   SmartPointer<PartPane> GetPane() const;
 
   /**
    * Detach this PresentablePart from the real part. No further methods should
    * be invoked on this object.
    */
   ~PresentablePart();
 
   //    void firePropertyChange(int propertyId) {
   //        for (int i = 0; i < listeners.size(); i++) {
   //            ((IPropertyListener) listeners.get(i)).propertyChanged(this, propertyId);
   //        }
   //    }
 
   void AddPropertyListener(IPropertyChangeListener* listener);
 
   void RemovePropertyListener(IPropertyChangeListener* listener);
 
   //    void addPartPropertyListener(IPropertyChangeListener listener) {
   //      partPropertyChangeListeners.add(listener);
   //    }
   //
   //    void removePartPropertyListener(IPropertyChangeListener listener) {
   //      partPropertyChangeListeners.remove(listener);
   //    }
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.presentations.IPresentablePart#setBounds(org.blueberry.swt.graphics.Rectangle)
    */
   void SetBounds(const Rectangle& bounds);
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.presentations.IPresentablePart#setVisible(boolean)
    */
   void SetVisible(bool isVisible);
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.presentations.IPresentablePart#setFocus()
    */
   void SetFocus();
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.presentations.IPresentablePart#getName()
    */
   QString GetName() const;
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.presentations.IPresentablePart#getTitle()
    */
   QString GetTitle() const;
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.presentations.IPresentablePart#getTitleStatus()
    */
   QString GetTitleStatus() const;
 
   /*
    * (non-Javadoc)
    *
    * @see org.blueberry.ui.presentations.IPresentablePart#getTitleImage()
    */
   void* GetTitleImage();
 
   /*
    * (non-Javadoc)
    *
    * @see org.blueberry.ui.presentations.IPresentablePart#getTitleToolTip()
    */
   QString GetTitleToolTip() const;
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.presentations.IPresentablePart#isDirty()
    */
   bool IsDirty() const;
 
   /*
    * (non-Javadoc)
    *
    * @see org.blueberry.ui.presentations.IPresentablePart#isBusy()
    */
   bool IsBusy() const;
 
   /*
    * (non-Javadoc)
    *
    * @see org.blueberry.ui.presentations.IPresentablePart#getToolBar()
    */
   void* GetToolBar();
 
   /*
    * (non-Javadoc)
    *
    * @see org.blueberry.ui.presentations.IPresentablePart#getMenu()
    */
   //    IPartMenu getMenu() {
   //        boolean hasMenu;
   //
   //        if (enableOutputs) {
   //            hasMenu = part.hasViewMenu();
   //        } else {
   //            hasMenu = this.hasViewMenu;
   //        }
   //
   //        if (!hasMenu) {
   //            return null;
   //        }
   //
   //        if (viewMenu == null) {
   //            viewMenu = new IPartMenu() {
   //                public void showMenu(Point location) {
   //                    part.showViewMenu(location);
   //                }
   //            };
   //        }
   //
   //        return viewMenu;
   //    }
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.presentations.IPresentablePart#isCloseable()
    */
   bool IsCloseable() const;
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.presentations.IPresentablePart#getControl()
    */
   void* GetControl();
 
   void EnableOutputs(bool isActive);
 
   void EnableInputs(bool isActive);
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.presentations.IPresentablePart#getPartProperty(java.lang.String)
    */
   QString GetPartProperty(const QString& key) const;
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.ISizeProvider#computePreferredSize(boolean, int, int, int)
    */
   int ComputePreferredSize(bool width, int availableParallel,
       int availablePerpendicular, int preferredResult);
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.ISizeProvider#getSizeFlags(boolean)
    */
   int GetSizeFlags(bool width);
 
 };
 
 }
 
 #endif /* BERRYPRESENTABLEPART_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPresentationSerializer.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPresentationSerializer.cpp
index c5bce1a32d..4384b16e15 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPresentationSerializer.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryPresentationSerializer.cpp
@@ -1,49 +1,49 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryPresentationSerializer.h"
 
 namespace berry
 {
 
 PresentationSerializer::PresentationSerializer(
     const QList<IPresentablePart::Pointer>& presentableParts) :
   parts(presentableParts)
 {
 
 }
 
 QString PresentationSerializer::GetId(IPresentablePart::Pointer part)
 {
   int index = parts.indexOf(part);
 
   return QString::number(index);
 }
 
 IPresentablePart::Pointer PresentationSerializer::GetPart(const QString& id)
 {
   bool okay = false;
-  unsigned int index = id.toUInt(&okay);
+  int index = id.toInt(&okay);
   if (!okay) return IPresentablePart::Pointer(0);
 
   IPresentablePart::Pointer result;
   if (index < parts.size())
     result = parts[index];
 
   return result;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtDnDTweaklet.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtDnDTweaklet.cpp
index 134aafa71e..43e21a8551 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtDnDTweaklet.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtDnDTweaklet.cpp
@@ -1,38 +1,33 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryQtDnDTweaklet.h"
 
 #include "berryQtTracker.h"
 
 namespace berry {
 
 QtDnDTweaklet::QtDnDTweaklet()
 {
 
 }
 
-QtDnDTweaklet::QtDnDTweaklet(const QtDnDTweaklet& other)
-{
-  Q_UNUSED(other)
-}
-
 ITracker* QtDnDTweaklet::CreateTracker()
 {
   return new QtTracker();
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtDnDTweaklet.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtDnDTweaklet.h
index 57589ad2f8..78b7cf5e24 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtDnDTweaklet.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtDnDTweaklet.h
@@ -1,40 +1,39 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYQTDNDTWEAKLET_H_
 #define BERRYQTDNDTWEAKLET_H_
 
 #include <berryDnDTweaklet.h>
 
 namespace berry {
 
 class QtDnDTweaklet : public QObject, public DnDTweaklet
 {
   Q_OBJECT
   Q_INTERFACES(berry::DnDTweaklet)
 
 public:
 
   QtDnDTweaklet();
-  QtDnDTweaklet(const QtDnDTweaklet& other);
 
   ITracker* CreateTracker();
 };
 
 }
 
 #endif /* BERRYQTDNDTWEAKLET_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtFileImageDescriptor.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtFileImageDescriptor.cpp
index 225f64b193..f7ccde3bc5 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtFileImageDescriptor.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtFileImageDescriptor.cpp
@@ -1,95 +1,99 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryQtFileImageDescriptor.h"
 
 #include "tweaklets/berryImageTweaklet.h"
 
+#include <ctkPlugin.h>
+
 #include <QIcon>
 #include <QPixmap>
 #include <QByteArray>
 
 namespace berry
 {
 
 QtFileImageDescriptor::QtFileImageDescriptor(const QString& filename,
     const QString& pluginid) :
   filename(filename), pluginid(pluginid)
 {
 
 }
 
 void* QtFileImageDescriptor::CreateImage(bool returnMissingImageOnError)
 {
   if (pluginid.isEmpty())
   {
     QFile f(filename);
     if (f.open(QFile::ReadOnly))
     {
       QByteArray ba = f.readAll();
       return this->CreateFromByteArray(ba);
     }
     else
     {
       BERRY_ERROR << "Could not open file: " << filename;
       if (returnMissingImageOnError)
         return GetMissingImageDescriptor()->CreateImage();
+
+      return 0;
     }
   }
   else
   {
     QSharedPointer<ctkPlugin> plugin(Platform::GetCTKPlugin(pluginid));
     if (!plugin)
     {
       if (returnMissingImageOnError)
         return GetMissingImageDescriptor()->CreateImage();
 
       return 0;
     }
 
     QByteArray ba = plugin->getResource(filename);
     if (ba.isEmpty() && returnMissingImageOnError)
       return GetMissingImageDescriptor()->CreateImage();
 
     return this->CreateFromByteArray(ba);
   }
 }
 
 void QtFileImageDescriptor::DestroyImage(void* img)
 {
   const QIcon* icon = static_cast<const QIcon*>(img);
   delete icon;
 }
 
 QIcon* QtFileImageDescriptor::CreateFromByteArray(const QByteArray& ba)
 {
   QPixmap pixmap;
   pixmap.loadFromData(ba);
   QIcon* icon = new QIcon(pixmap);
   return icon;
 }
 
 bool QtFileImageDescriptor::operator ==(const Object* o) const
 {
   if (const QtFileImageDescriptor* obj = dynamic_cast<const QtFileImageDescriptor*>(o))
   {
     return this->pluginid == obj->pluginid && this->filename == obj->filename;
   }
 
   return false;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtGlobalEventFilter.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtGlobalEventFilter.cpp
index 78f16e543d..bea98833de 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtGlobalEventFilter.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtGlobalEventFilter.cpp
@@ -1,60 +1,61 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryQtGlobalEventFilter.h"
+#include "berryShell.h"
 #include "internal/berryQtControlWidget.h"
 
 #include <QEvent>
 #include <QMouseEvent>
 #include <QApplication>
 #include <QWidget>
 
 #include <iostream>
 
 namespace berry {
 
 QtGlobalEventFilter::QtGlobalEventFilter(QObject* parent)
  : QObject(parent)
 {
 
 }
 
 bool QtGlobalEventFilter::eventFilter(QObject*  /*obj*/, QEvent* event)
 {
   if (event->type() == QEvent::MouseButtonPress)
   {
     QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(event);
     QWidget* widget = QApplication::widgetAt(mouseEvent->globalPos());
     if (widget)
     {
       QObject* parent = widget;
       while (parent)
       {
         if (parent->objectName() == "PartPaneControl")
         {
           (dynamic_cast<QtControlWidget*>(parent))->FireActivateEvent();
           break;
         }
         parent = parent->parent();
       }
     }
   }
 
   return false;
 }
 
 }
 
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtImageTweaklet.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtImageTweaklet.cpp
index 862959e9d5..99a86f9524 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtImageTweaklet.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtImageTweaklet.cpp
@@ -1,59 +1,54 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryQtImageTweaklet.h"
 
 #include <berryImageDescriptor.h>
 #include "berryQtFileImageDescriptor.h"
 #include "berryQtIconImageDescriptor.h"
 #include "berryQtMissingImageDescriptor.h"
 
 namespace berry {
 
 QtImageTweaklet::QtImageTweaklet()
 {
 
 }
 
-QtImageTweaklet::QtImageTweaklet(const QtImageTweaklet& other)
-{
-  Q_UNUSED(other)
-}
-
 SmartPointer<ImageDescriptor> QtImageTweaklet::CreateFromFile(const QString& filename, const QString& pluginid)
 {
   ImageDescriptor::Pointer descriptor(new QtFileImageDescriptor(filename, pluginid));
   return descriptor;
 }
 
 SmartPointer<ImageDescriptor> QtImageTweaklet::CreateFromImage(void* img)
 {
   ImageDescriptor::Pointer descriptor(new QtIconImageDescriptor(img));
   return descriptor;
 }
 
 SmartPointer<ImageDescriptor> QtImageTweaklet::GetMissingImageDescriptor()
 {
   SmartPointer<QtMissingImageDescriptor> descriptor(new QtMissingImageDescriptor());
   return descriptor;
 }
 
 void QtImageTweaklet::DestroyImage(const void*  /*img*/)
 {
 
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtImageTweaklet.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtImageTweaklet.h
index be709ec89b..d47cc5c1f1 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtImageTweaklet.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtImageTweaklet.h
@@ -1,45 +1,44 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYQTIMAGETWEAKLET_H_
 #define BERRYQTIMAGETWEAKLET_H_
 
 #include <berryImageTweaklet.h>
 
 namespace berry {
 
 class QtImageTweaklet : public QObject, public ImageTweaklet
 {
   Q_OBJECT
   Q_INTERFACES(berry::ImageTweaklet)
 
 public:
 
   QtImageTweaklet();
-  QtImageTweaklet(const QtImageTweaklet& other);
 
   virtual SmartPointer<ImageDescriptor> CreateFromFile(const QString& filename, const QString& pluginid);
   virtual SmartPointer<ImageDescriptor> CreateFromImage(void* img);
   virtual SmartPointer<ImageDescriptor> GetMissingImageDescriptor();
 
   virtual void DestroyImage(const void* img);
 
 };
 
 }
 
 #endif /* BERRYQTIMAGETWEAKLET_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtMainWindowControl.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtMainWindowControl.h
index 6b811189c0..4e399f9a50 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtMainWindowControl.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtMainWindowControl.h
@@ -1,55 +1,56 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYQTMAINWINDOWCONTROL_H_
 #define BERRYQTMAINWINDOWCONTROL_H_
 
 #include <QMainWindow>
 
+#include <berryShell.h>
 #include <internal/berryQtWidgetController.h>
 
 namespace berry {
 
 class QtMainWindowControl : public QMainWindow
 {
 
   Q_OBJECT
 
 public:
 
   QtMainWindowControl(Shell* shell, QWidget* parent = 0, Qt::WindowFlags flags = 0);
 
 protected:
 
   // used for shell listeners
   void changeEvent(QEvent* event);
   void closeEvent(QCloseEvent* closeEvent);
 
   // used for control listeners
   void moveEvent(QMoveEvent* event);
   void resizeEvent(QResizeEvent* event);
   void inFocusEvent(QFocusEvent* event);
 
 private:
 
   QtWidgetController::Pointer controller;
 
 };
 
 }
 
 #endif /* BERRYQTMAINWINDOWCONTROL_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtMessageDialogTweaklet.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtMessageDialogTweaklet.cpp
index 1be3d3b27b..c08e13a275 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtMessageDialogTweaklet.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtMessageDialogTweaklet.cpp
@@ -1,157 +1,152 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryQtMessageDialogTweaklet.h"
 
 #include <QMessageBox>
 #include <map>
 
 namespace berry
 {
 
 class QtDialog: public IDialog
 {
 private:
   QMessageBox msgBox;
   QHash<QAbstractButton*, std::size_t> mapButtonToIndex;
 
 public:
 
   QtDialog(Shell::Pointer, const QString& dialogTitle,
       void* /*dialogTitleImage*/, const QString& dialogMessage,
       int dialogImageType, const QList<QString>& dialogButtonLabels,
       int defaultIndex)
   {
     msgBox.setWindowTitle(dialogTitle);
     msgBox.setText(dialogMessage);
 
     if (dialogImageType == IDialog::ERR)
       msgBox.setIcon(QMessageBox::Critical);
     else if (dialogImageType == IDialog::INFORMATION)
       msgBox.setIcon(QMessageBox::Information);
     else if (dialogImageType == IDialog::QUESTION)
       msgBox.setIcon(QMessageBox::Question);
     else if (dialogImageType == IDialog::WARNING)
       msgBox.setIcon(QMessageBox::Warning);
 
 
     QPushButton* defaultButton(NULL);
-    for (std::size_t i = 0; i < dialogButtonLabels.size(); ++i)
+    for (int i = 0; i < dialogButtonLabels.size(); ++i)
     {
       QPushButton* button = msgBox.addButton(dialogButtonLabels[i],
                                              QMessageBox::ActionRole);
       mapButtonToIndex[(QAbstractButton*)button] = i;
       if (i == (std::size_t)defaultIndex)
         defaultButton = button;
     }
 
     msgBox.setDefaultButton(defaultButton);
   }
 
   int Open()
   {
     msgBox.exec();
     return static_cast<int>(mapButtonToIndex[msgBox.clickedButton()]);
   }
 };
 
 QtMessageDialogTweaklet::QtMessageDialogTweaklet()
 {
 
 }
 
-QtMessageDialogTweaklet::QtMessageDialogTweaklet(const QtMessageDialogTweaklet& other)
-{
-
-}
-
 bool QtMessageDialogTweaklet::OpenConfirm(Shell::Pointer,
     const QString& title, const QString& message)
 {
   QMessageBox msgBox;
   msgBox.setWindowTitle(title);
   msgBox.setText(message);
   msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
   msgBox.setDefaultButton(QMessageBox::Cancel);
   msgBox.setEscapeButton(QMessageBox::Cancel);
   return msgBox.exec() == QMessageBox::Ok;
 }
 
 void QtMessageDialogTweaklet::OpenError(Shell::Pointer,
     const QString& title, const QString& message)
 {
   QMessageBox msgBox;
   msgBox.setWindowTitle(title);
   msgBox.setText(message);
   msgBox.setStandardButtons(QMessageBox::Ok);
   msgBox.setDefaultButton(QMessageBox::Ok);
   msgBox.setEscapeButton(QMessageBox::Ok);
   msgBox.setIcon(QMessageBox::Critical);
   msgBox.exec();
 }
 
 void QtMessageDialogTweaklet::OpenInformation(Shell::Pointer,
     const QString& title, const QString& message)
 {
   QMessageBox msgBox;
   msgBox.setWindowTitle(title);
   msgBox.setText(message);
   msgBox.setStandardButtons(QMessageBox::Ok);
   msgBox.setDefaultButton(QMessageBox::Ok);
   msgBox.setEscapeButton(QMessageBox::Ok);
   msgBox.setIcon(QMessageBox::Information);
   msgBox.exec();
 }
 
 bool QtMessageDialogTweaklet::OpenQuestion(Shell::Pointer,
     const QString& title, const QString& message)
 {
   QMessageBox msgBox;
   msgBox.setWindowTitle(title);
   msgBox.setText(message);
   msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
   msgBox.setDefaultButton(QMessageBox::No);
   msgBox.setEscapeButton(QMessageBox::No);
   msgBox.setIcon(QMessageBox::Question);
   return msgBox.exec() == QMessageBox::Yes;
 }
 
 void QtMessageDialogTweaklet::OpenWarning(Shell::Pointer,
     const QString& title, const QString& message)
 {
   QMessageBox msgBox;
   msgBox.setWindowTitle(title);
   msgBox.setText(message);
   msgBox.setStandardButtons(QMessageBox::Ok);
   msgBox.setDefaultButton(QMessageBox::Ok);
   msgBox.setEscapeButton(QMessageBox::Ok);
   msgBox.setIcon(QMessageBox::Warning);
   msgBox.exec();
 }
 
 IDialog::Pointer QtMessageDialogTweaklet::MessageDialog(
     Shell::Pointer parentShell, const QString& dialogTitle,
     void* dialogTitleImage, const QString& dialogMessage,
     int dialogImageType, const QList<QString>& dialogButtonLabels,
     int defaultIndex)
 {
   IDialog::Pointer dialog(new QtDialog(parentShell, dialogTitle,
       dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels,
       defaultIndex));
   return dialog;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtMessageDialogTweaklet.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtMessageDialogTweaklet.h
index 5b082fc980..dc063a2b5c 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtMessageDialogTweaklet.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtMessageDialogTweaklet.h
@@ -1,55 +1,54 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYQTMESSAGEDIALOGTWEAKLET_H_
 #define BERRYQTMESSAGEDIALOGTWEAKLET_H_
 
 #include <berryMessageDialogTweaklet.h>
 
 namespace berry
 {
 
 class QtMessageDialogTweaklet: public QObject, public MessageDialogTweaklet
 {
   Q_OBJECT
   Q_INTERFACES(berry::MessageDialogTweaklet)
 
 public:
 
   QtMessageDialogTweaklet();
-  QtMessageDialogTweaklet(const QtMessageDialogTweaklet& other);
 
   bool OpenConfirm(Shell::Pointer, const QString& title,
       const QString& message);
   void OpenError(Shell::Pointer, const QString& title,
       const QString& message);
   void OpenInformation(Shell::Pointer, const QString& title,
       const QString& message);
   bool OpenQuestion(Shell::Pointer, const QString& title,
       const QString& message);
   void OpenWarning(Shell::Pointer, const QString& title,
       const QString& message);
 
   IDialog::Pointer MessageDialog(Shell::Pointer parentShell,
       const QString& dialogTitle, void* dialogTitleImage,
       const QString& dialogMessage, int dialogImageType, const QList<
           QString>& dialogButtonLabels, int defaultIndex);
 
 };
 
 }
 
 #endif /* BERRYQTMESSAGEDIALOGTWEAKLET_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtPerspectiveSwitcher.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtPerspectiveSwitcher.cpp
index 21e337e1b0..132c712207 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtPerspectiveSwitcher.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtPerspectiveSwitcher.cpp
@@ -1,82 +1,82 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryQtPerspectiveSwitcher.h"
 
 #include "berryQtOpenPerspectiveAction.h"
 #include <berryIWorkbench.h>
 #include <berryIWorkbenchPage.h>
 #include <berryIPerspectiveRegistry.h>
 
 #include <QActionGroup>
 
 namespace berry {
 
 struct QtPerspectiveSwitcherListener : public IPerspectiveListener
 {
   QtPerspectiveSwitcherListener(QtPerspectiveSwitcher* switcher)
   : switcher(switcher)
   {}
 
   Events::Types GetPerspectiveEventTypes() const
   {
     return Events::ACTIVATED;
   }
 
-  void PerspectiveActivated(IWorkbenchPage::Pointer /*page*/,
-          IPerspectiveDescriptor::Pointer perspective)
+  void PerspectiveActivated(const IWorkbenchPage::Pointer& /*page*/,
+                            const IPerspectiveDescriptor::Pointer& perspective)
   {
     QAction* action = switcher->perspIdToActionMap[perspective->GetId()];
     if (action) action->setChecked(true);
   }
 
 private:
 
   QtPerspectiveSwitcher* switcher;
 };
 
 
 QtPerspectiveSwitcher::QtPerspectiveSwitcher(IWorkbenchWindow::Pointer window)
 : window(window)
 {
   QWidget* parent = static_cast<QWidget*>(window->GetShell()->GetControl());
   this->setParent(parent);
 
   this->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
 
   QActionGroup* perspGroup = new QActionGroup(this);
 
   IPerspectiveRegistry* perspRegistry = window->GetWorkbench()->GetPerspectiveRegistry();
 
   QList<IPerspectiveDescriptor::Pointer> perspectives(perspRegistry->GetPerspectives());
   for (QList<IPerspectiveDescriptor::Pointer>::iterator perspIt =
       perspectives.begin(); perspIt != perspectives.end(); ++perspIt)
   {
     QAction* perspAction = new QtOpenPerspectiveAction(window, *perspIt, perspGroup);
     perspIdToActionMap[(*perspIt)->GetId()] = perspAction;
   }
   this->addActions(perspGroup->actions());
 
-  perspListener = new QtPerspectiveSwitcherListener(this);
-  window->AddPerspectiveListener(perspListener);
+  perspListener.reset(new QtPerspectiveSwitcherListener(this));
+  window->AddPerspectiveListener(perspListener.data());
 }
 
 QtPerspectiveSwitcher::~QtPerspectiveSwitcher()
 {
-  window->RemovePerspectiveListener(perspListener);
+  window->RemovePerspectiveListener(perspListener.data());
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtPerspectiveSwitcher.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtPerspectiveSwitcher.h
index eb733435fa..209c1a6a6f 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtPerspectiveSwitcher.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtPerspectiveSwitcher.h
@@ -1,50 +1,50 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYQTPERSPECTIVESWITCHER_H_
 #define BERRYQTPERSPECTIVESWITCHER_H_
 
 #include <QToolBar>
 #include <QHash>
 
 #include <berryIPerspectiveListener.h>
 #include <berryIWorkbenchWindow.h>
 
 namespace berry {
 
 class QtPerspectiveSwitcher : public QToolBar
 {
   Q_OBJECT
 
 public:
 
   QtPerspectiveSwitcher(IWorkbenchWindow::Pointer window);
   ~QtPerspectiveSwitcher();
 
 private:
 
   IWorkbenchWindow::Pointer window;
-  IPerspectiveListener::Pointer perspListener;
+  QScopedPointer<IPerspectiveListener> perspListener;
 
   QHash<QString, QAction*> perspIdToActionMap;
 
   friend struct QtPerspectiveSwitcherListener;
 };
 
 }
 
 #endif /* BERRYQTPERSPECTIVESWITCHER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtShell.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtShell.cpp
index 235cc3d0ef..7ced1614c1 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtShell.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtShell.cpp
@@ -1,204 +1,207 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include <tweaklets/berryGuiWidgetsTweaklet.h>
 
 #include "berryQtShell.h"
 
 #include "berryQtWidgetsTweakletImpl.h"
 #include "berryQtMainWindowControl.h"
 #include <internal/berryQtControlWidget.h>
 
 #include <berryConstants.h>
 #include <internal/berryTweaklets.h>
 
 #include <QApplication>
 #include <QVariant>
 
 namespace berry
 {
 
 QtShell::QtShell(QWidget* parent, Qt::WindowFlags flags)
  : updatesDisabled(false)
 {
   if (parent == 0 || flags.testFlag(Qt::Window))
   {
     widget = new QtMainWindowControl(this, parent, flags);
     widget->setUpdatesEnabled(false);
     updatesDisabled = true;
 
     widget->setAttribute(Qt::WA_DeleteOnClose);
+
   }
   else
   {
     widget = new QtControlWidget(parent, this, flags | Qt::Dialog);
     widget->setObjectName("shell widget");
   }
+
+  widget->setProperty("shell", QVariant::fromValue(static_cast<Shell*>(this)));
 }
 
 QtShell::~QtShell()
 {
   widget->deleteLater();
 }
 
 void QtShell::SetBounds(const Rectangle& bounds)
 {
   widget->move(bounds.x, bounds.y);
   widget->resize(bounds.width, bounds.height);
 }
 
 Rectangle QtShell::GetBounds() const
 {
   const QRect& qRect = widget->frameGeometry();
   const QSize& size = widget->size();
   Rectangle rect(qRect.x(), qRect.y(), size.width(), size.height());
   return rect;
 }
 
 void QtShell::SetLocation(int x, int y)
 {
   widget->move(x, y);
 }
 
 Point QtShell::ComputeSize(int  /*wHint*/, int  /*hHint*/, bool changed)
 {
   if (changed) widget->updateGeometry();
   QSize size(widget->size());
   Point point(size.width(), size.height());
   return point;
 }
 
 QString QtShell::GetText() const
 {
   return widget->windowTitle();
 }
 
 void QtShell::SetText(const QString& title)
 {
   widget->setWindowTitle(title);
   widget->setObjectName(title);
 }
 
 bool QtShell::IsVisible()
 {
   return widget->isVisible();
 }
 
 void QtShell::SetVisible(bool visible)
 {
   widget->setVisible(visible);
 }
 
 void QtShell::SetActive()
 {
   widget->activateWindow();
   widget->raise();
 }
 
 QWidget *QtShell::GetControl()
 {
   return widget;
 }
 
 void QtShell::SetImages(const QList<void*>&  /*images*/)
 {
 }
 
 bool QtShell::GetMaximized()
 {
   return widget->isMaximized();
 }
 
 bool QtShell::GetMinimized()
 {
   return widget->isMinimized();
 }
 
 void QtShell::SetMaximized(bool maximized)
 {
   maximized ? widget->showMaximized() : widget->showNormal();
 }
 
 void QtShell::SetMinimized(bool minimized)
 {
   minimized ? widget->showMinimized() : widget->showNormal();
 }
 
-void QtShell::AddShellListener(IShellListener::Pointer listener)
+void QtShell::AddShellListener(IShellListener* listener)
 {
   QVariant variant = widget->property(QtWidgetController::PROPERTY_ID);
   poco_assert(variant.isValid());
   QtWidgetController::Pointer controller = variant.value<QtWidgetController::Pointer>();
   poco_assert(controller != 0);
   controller->AddShellListener(listener);
 }
 
-void QtShell::RemoveShellListener(IShellListener::Pointer listener)
+void QtShell::RemoveShellListener(IShellListener* listener)
 {
   QVariant variant = widget->property(QtWidgetController::PROPERTY_ID);
   if (variant.isValid())
   {
     QtWidgetController::Pointer controller = variant.value<QtWidgetController::Pointer>();
     if (controller != 0)
       controller->RemoveShellListener(listener);
   }
 }
 
 void QtShell::Open(bool block)
 {
   if (updatesDisabled)
   {
     widget->setUpdatesEnabled(true);
     updatesDisabled = false;
   }
   widget->setWindowModality(block ? Qt::WindowModal : Qt::NonModal);
   widget->show();
 }
 
 void QtShell::Close()
 {
   widget->close();
 }
 
 QList<Shell::Pointer> QtShell::GetShells()
 {
   GuiWidgetsTweaklet* widgetTweaklet = Tweaklets::Get(GuiWidgetsTweaklet::KEY);
   QList<Shell::Pointer> allShells(widgetTweaklet->GetShells());
   QList<Shell::Pointer> descendants;
 
-  for (std::size_t i = 0; i < allShells.size(); ++i)
+  for (int i = 0; i < allShells.size(); ++i)
   {
     Shell::Pointer shell = allShells[i];
     if (widgetTweaklet->GetShell(shell->GetControl()) == this)
     {
       descendants.push_back(shell);
     }
   }
 
   return descendants;
 }
 
 Qt::WindowFlags QtShell::GetStyle() const
 {
   return widget->windowFlags();
 }
 
 QWidget* QtShell::GetWidget()
 {
   return widget;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtShell.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtShell.h
index a3c3d6ffe1..eada61c8e5 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtShell.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtShell.h
@@ -1,86 +1,86 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYQTMAINWINDOWSHELL_H_
 #define BERRYQTMAINWINDOWSHELL_H_
 
 #include <berryShell.h>
 #include <berryPoint.h>
 
 #include <QWidget>
 
 namespace berry {
 
 class QtAbstractControlWidget;
 
 class QtShell : public Shell
 {
 
 public:
 
   QtShell(QWidget* parent = 0, Qt::WindowFlags flags = 0);
 
   ~QtShell();
 
   // berry::Shell
   void SetBounds(const Rectangle& bounds);
   Rectangle GetBounds() const;
 
   void SetLocation(int x, int y);
 
   Point ComputeSize(int wHint, int hHint, bool changed);
 
   QString GetText() const;
   void SetText(const QString& text);
 
   bool IsVisible();
   void SetVisible(bool visible);
 
   void SetActive();
 
   QWidget* GetControl();
 
   void SetImages(const QList<void*>& images);
 
   bool GetMaximized();
   bool GetMinimized();
   void SetMaximized(bool maximized);
   void SetMinimized(bool minimized);
 
-  void AddShellListener(IShellListener::Pointer listener);
-  void RemoveShellListener(IShellListener::Pointer listener);
+  void AddShellListener(IShellListener* listener);
+  void RemoveShellListener(IShellListener* listener);
 
   void Open(bool block = false);
 
   void Close();
 
   QList<Shell::Pointer> GetShells();
 
   Qt::WindowFlags GetStyle () const;
 
   QWidget* GetWidget();
 
 private:
 
   QWidget* widget;
   bool updatesDisabled;
 
 };
 
 }
 
 #endif /* BERRYQTMAINWINDOWSHELL_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.cpp
index ae6d7a8b75..18cedf8bda 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.cpp
@@ -1,252 +1,247 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryQtStylePreferencePage.h"
 
 #include <berryIPreferencesService.h>
 #include <berryQtPreferences.h>
 
 #include "berryWorkbenchPlugin.h"
 
 #include <QFileDialog>
 #include <QDirIterator>
 
 namespace berry
 {
 
 QtStylePreferencePage::QtStylePreferencePage()
 {
 
 }
 
-QtStylePreferencePage::QtStylePreferencePage(const QtStylePreferencePage& other)
-{
-  Q_UNUSED(other)
-}
-
 void QtStylePreferencePage::Init(IWorkbench::Pointer )
 {
 
 }
 
 void QtStylePreferencePage::CreateQtControl(QWidget* parent)
 {
   mainWidget = new QWidget(parent);
   controls.setupUi(mainWidget);
 
   berry::IPreferencesService* prefService = berry::WorkbenchPlugin::GetDefault()->GetPreferencesService();
 
   ctkPluginContext* context = berry::WorkbenchPlugin::GetDefault()->GetPluginContext();
   ctkServiceReference styleManagerRef = context->getServiceReference<berry::IQtStyleManager>();
   if (styleManagerRef)
   {
     styleManager = context->getService<berry::IQtStyleManager>(styleManagerRef);
   }
 
   m_StylePref = prefService->GetSystemPreferences()->Node(berry::QtPreferences::QT_STYLES_NODE);
 
   Update();
 
   connect(controls.m_StylesCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(StyleChanged(int)));
   connect(controls.m_IconThemeComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(IconThemeChanged(int)));
   connect(controls.m_PathList, SIGNAL(itemSelectionChanged()), this, SLOT(UpdatePathListButtons()));
   connect(controls.m_AddButton, SIGNAL(clicked(bool)), this, SLOT(AddPathClicked(bool)));
   connect(controls.m_EditButton, SIGNAL(clicked(bool)), this, SLOT(EditPathClicked(bool)));
   connect(controls.m_RemoveButton, SIGNAL(clicked(bool)), this, SLOT(RemovePathClicked(bool)));
 }
 
 void QtStylePreferencePage::FillStyleCombo(const berry::IQtStyleManager::Style& currentStyle)
 {
   controls.m_StylesCombo->clear();
   styles.clear();
   styleManager->GetStyles(styles);
 
   qSort(styles);
   for (int i = 0; i < styles.size(); ++i)
   {
     controls.m_StylesCombo->addItem(styles.at(i).name, QVariant(styles.at(i).fileName));
   }
   controls.m_StylesCombo->setCurrentIndex(styles.indexOf(currentStyle));
 }
 
 void QtStylePreferencePage::FillIconThemeComboBox(const QString currentIconTheme)
 {
   controls.m_IconThemeComboBox->clear();
   berry::IQtStyleManager::IconThemeList iconThemes;
   styleManager->GetIconThemes(iconThemes);
 
   qSort(iconThemes);
   for (int i = 0; i < iconThemes.size(); ++i)
   {
     controls.m_IconThemeComboBox->addItem(iconThemes.at(i).name);
   }
 
   QString currentTheme = currentIconTheme;
 
   if(currentTheme == QString(""))
   {
     currentTheme = QString("<<default>>");
   }
 
   controls.m_IconThemeComboBox->setCurrentIndex(iconThemes.indexOf( currentTheme ));
 }
 
 void QtStylePreferencePage::AddPath(const QString& path, bool updateCombo)
 {
   if (!controls.m_PathList->findItems(path, Qt::MatchCaseSensitive).isEmpty()) return;
 
   new QListWidgetItem(path, controls.m_PathList);
 
   styleManager->AddStyles(path);
 
   if (updateCombo)
     FillStyleCombo(oldStyle);
 }
 
 void QtStylePreferencePage::StyleChanged(int /*index*/)
 {
   QString fileName = controls.m_StylesCombo->itemData(controls.m_StylesCombo->currentIndex()).toString();
   styleManager->SetStyle(fileName);
 }
 
 void QtStylePreferencePage::IconThemeChanged(int /*index*/)
 {
   QString themeName = controls.m_IconThemeComboBox->currentText();
   styleManager->SetIconTheme(themeName);
 }
 
 void QtStylePreferencePage::AddPathClicked(bool /*checked*/)
 {
   QListWidgetItem* item = controls.m_PathList->currentItem();
   QString initialDir;
   if (item) initialDir = item->text();
   QString dir = QFileDialog::getExistingDirectory(mainWidget, "", initialDir);
 
   if (!dir.isEmpty()) this->AddPath(dir, true);
 }
 
 void QtStylePreferencePage::RemovePathClicked(bool /*checked*/)
 {
   QList<QListWidgetItem*> selection = controls.m_PathList->selectedItems();
   QListIterator<QListWidgetItem*> it(selection);
   while (it.hasNext())
   {
     QListWidgetItem* item = it.next();
     QString dir = item->text();
 
     controls.m_PathList->takeItem(controls.m_PathList->row(item));
     delete item;
     styleManager->RemoveStyles(dir);
   }
 
   if (!styleManager->Contains(oldStyle.fileName))
   {
     oldStyle = styleManager->GetDefaultStyle();
   }
 
   FillStyleCombo(oldStyle);
 }
 
 void QtStylePreferencePage::EditPathClicked(bool checked)
 {
   QListWidgetItem* item = controls.m_PathList->currentItem();
   QString initialDir = item->text();
   QString dir = QFileDialog::getExistingDirectory(mainWidget, "", initialDir);
 
   if (!dir.isEmpty())
   {
     this->RemovePathClicked(checked);
     this->AddPath(dir, true);
   }
 }
 
 void QtStylePreferencePage::UpdatePathListButtons()
 {
   int s = controls.m_PathList->selectedItems().size();
 
   if (s == 0)
   {
     controls.m_EditButton->setEnabled(false);
     controls.m_RemoveButton->setEnabled(false);
   }
   else if (s == 1)
   {
     controls.m_EditButton->setEnabled(true);
     controls.m_RemoveButton->setEnabled(true);
   }
   else
   {
     controls.m_EditButton->setEnabled(false);
     controls.m_RemoveButton->setEnabled(true);
   }
 }
 
 QWidget* QtStylePreferencePage::GetQtControl() const
 {
   return mainWidget;
 }
 
 bool QtStylePreferencePage::PerformOk()
 {
   m_StylePref->Put(berry::QtPreferences::QT_STYLE_NAME,
       controls.m_StylesCombo->itemData(controls.m_StylesCombo->currentIndex()).toString());
 
   QString paths;
   for (int i = 0; i < controls.m_PathList->count(); ++i)
   {
     QString path = controls.m_PathList->item(i)->text() + ";";
     paths += path;
   }
 
   QString currentTheme = QIcon::themeName();
   if(currentTheme.isEmpty())
   {
     currentTheme = QString("<<default>>");
   }
   m_StylePref->Put(berry::QtPreferences::QT_STYLE_SEARCHPATHS, paths);
   m_StylePref->Put(berry::QtPreferences::QT_ICON_THEME, currentTheme);
   return true;
 }
 
 void QtStylePreferencePage::PerformCancel()
 {
   Update();
 }
 
 void QtStylePreferencePage::Update()
 {
   styleManager->RemoveStyles();
 
   QString paths = m_StylePref->Get(berry::QtPreferences::QT_STYLE_SEARCHPATHS, "");
   QStringList pathList = paths.split(";", QString::SkipEmptyParts);
   QStringListIterator it(pathList);
   while (it.hasNext())
   {
     AddPath(it.next(), false);
   }
 
   QString iconTheme = QString::fromStdString(m_StylePref->Get(berry::QtPreferences::QT_ICON_THEME, "<<default>>"));
   styleManager->SetIconTheme( iconTheme );
 
   QString name = m_StylePref->Get(berry::QtPreferences::QT_STYLE_NAME, "");
   styleManager->SetStyle(name);
   oldStyle = styleManager->GetStyle();
 
   FillStyleCombo(oldStyle);
   FillIconThemeComboBox( iconTheme );
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.h
index 02ead4ac0e..ed03e00ea5 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.h
@@ -1,82 +1,81 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYQTSTYLEPREFERENCEPAGE_H_
 #define BERRYQTSTYLEPREFERENCEPAGE_H_
 
 #include <berryIQtPreferencePage.h>
 #include <berryIQtStyleManager.h>
 #include <berryIPreferences.h>
 
 #include <ui_berryQtStylePreferencePage.h>
 
 #include <QStringList>
 
 namespace berry {
 
 class QtStylePreferencePage : public QObject, public IQtPreferencePage
 {
 
   Q_OBJECT
   Q_INTERFACES(berry::IPreferencePage)
 
 public:
 
   QtStylePreferencePage();
-  QtStylePreferencePage(const QtStylePreferencePage& other);
 
   void Init(IWorkbench::Pointer workbench);
 
   void CreateQtControl(QWidget* parent);
   QWidget* GetQtControl() const;
 
   bool PerformOk();
   void PerformCancel();
   void Update();
 
 protected:
 
   void AddPath(const QString& path, bool updateCombo);
   void FillStyleCombo(const berry::IQtStyleManager::Style& currentStyle);
   void FillIconThemeComboBox(const QString currentIconTheme);
 
 protected slots:
 
   void StyleChanged(int /*index*/);
   void IconThemeChanged(int /*index*/);
   void AddPathClicked(bool /*checked*/);
   void RemovePathClicked(bool /*checked*/);
   void EditPathClicked(bool checked);
 
   void UpdatePathListButtons();
 
 private:
 
   berry::IQtStyleManager* styleManager;
 
   Ui::QtStylePreferencePageUI controls;
   berry::IPreferences::Pointer m_StylePref;
   berry::IQtStyleManager::Style oldStyle;
 
   berry::IQtStyleManager::StyleList styles;
 
   QWidget* mainWidget;
 };
 
 }
 
 #endif /* BERRYQTSTYLEPREFERENCEPAGE_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWidgetController.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWidgetController.cpp
index 52e269adb8..41ac436a2f 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWidgetController.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWidgetController.cpp
@@ -1,76 +1,76 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryQtWidgetController.h"
 
 #include <berryShell.h>
 
 namespace berry {
 
 const char QtWidgetController::PROPERTY_ID[] = "QtWidgetController_property";
 
 QtWidgetController::QtWidgetController(Shell* shell)
  : shell(shell)
 {
   if (shell)
   {
     // Normally, a Shell outlives a QtWidgetController, but
     // in QtWorkbenchWindow::~QtWorkbenchWindow the main widget is
     // deleted via widget->deleteLater() and hence an instance of this
     // class could still be alive when the Shell is deleted
     shell->AddDestroyListener(MessageDelegate<QtWidgetController>(this, &QtWidgetController::ShellDestroyed));
   }
 }
 
 QtWidgetController::~QtWidgetController()
 {
   if (shell)
   {
     shell->RemoveDestroyListener(MessageDelegate<QtWidgetController>(this, &QtWidgetController::ShellDestroyed));
   }
 }
 
 Shell::Pointer QtWidgetController::GetShell()
 {
   return Shell::Pointer(shell);
 }
 
 void QtWidgetController::ShellDestroyed()
 {
   shell = 0;
 }
 
 void QtWidgetController::AddControlListener(GuiTk::IControlListener::Pointer listener)
 {
   controlEvents.AddListener(listener);
 }
 
 void QtWidgetController::RemoveControlListener(GuiTk::IControlListener::Pointer listener)
 {
   controlEvents.RemoveListener(listener);
 }
 
-void QtWidgetController::AddShellListener(IShellListener::Pointer listener)
+void QtWidgetController::AddShellListener(IShellListener* listener)
 {
   shellEvents.AddListener(listener);
 }
 
-void QtWidgetController::RemoveShellListener(IShellListener::Pointer listener)
+void QtWidgetController::RemoveShellListener(IShellListener* listener)
 {
   shellEvents.RemoveListener(listener);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWidgetController.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWidgetController.h
index d3481e50b7..33d501c4f1 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWidgetController.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWidgetController.h
@@ -1,72 +1,72 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIQTCONTROLWIDGET_H_
 #define BERRYIQTCONTROLWIDGET_H_
 
 #include <berryGuiTkIControlListener.h>
 #include <berryIShellListener.h>
 
 #include <QMetaType>
 
 #include <org_blueberry_ui_qt_Export.h>
 
 namespace berry {
 
 class Shell;
 
 class BERRY_UI_QT QtWidgetController : public Object
 {
 
 public:
 
   berryObjectMacro(QtWidgetController);
 
   static const char PROPERTY_ID[];
 
   QtWidgetController(Shell* shell);
 
   ~QtWidgetController();
 
   void AddControlListener(GuiTk::IControlListener::Pointer listener);
   void RemoveControlListener(GuiTk::IControlListener::Pointer listener);
 
-  void AddShellListener(IShellListener::Pointer listener);
-  void RemoveShellListener(IShellListener::Pointer listener);
+  void AddShellListener(IShellListener* listener);
+  void RemoveShellListener(IShellListener* listener);
 
   SmartPointer<Shell> GetShell();
 
 protected:
 
   friend class QtControlWidget;
   friend class QtMainWindowControl;
 
   GuiTk::IControlListener::Events controlEvents;
   IShellListener::Events shellEvents;
 
   void ShellDestroyed();
 
   Shell* shell;
 
 };
 
 }
 
 //TODO WeakPointer: register a weak pointer as metatype
 Q_DECLARE_METATYPE(berry::QtWidgetController::Pointer)
 
 #endif /* BERRYIQTCONTROLWIDGET_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWidgetsTweaklet.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWidgetsTweaklet.cpp
index 799e4304d6..56fb8a0272 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWidgetsTweaklet.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWidgetsTweaklet.cpp
@@ -1,280 +1,275 @@
 
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryQtWidgetsTweaklet.h"
 
 #include <QWidget>
 #include <QVariant>
 
 namespace berry
 {
 
 QtWidgetsTweaklet::QtWidgetsTweaklet()
 {
 
 }
 
-QtWidgetsTweaklet::QtWidgetsTweaklet(const QtWidgetsTweaklet& other)
-{
-  Q_UNUSED(other)
-}
-
 void QtWidgetsTweaklet::AddSelectionListener(void* widget,
     GuiTk::ISelectionListener::Pointer listener)
 {
   impl.AddSelectionListener(static_cast<QWidget*>(widget), listener);
 }
 
 void QtWidgetsTweaklet::RemoveSelectionListener(void* widget,
     GuiTk::ISelectionListener::Pointer listener)
 {
   impl.RemoveSelectionListener(static_cast<QWidget*>(widget), listener);
 }
 
 Rectangle QtWidgetsTweaklet::GetScreenSize(int i)
 {
   return impl.GetScreenSize(i);
 }
 
 unsigned int QtWidgetsTweaklet::GetScreenNumber()
 {
   return impl.GetScreenNumber();
 }
 
 int QtWidgetsTweaklet::GetPrimaryScreenNumber()
 {
   return impl.GetPrimaryScreenNumber();
 }
 
 Rectangle QtWidgetsTweaklet::GetAvailableScreenSize(int i)
 {
   return impl.GetAvailableScreenSize(i);
 }
 
 int QtWidgetsTweaklet::GetClosestScreenNumber(const Rectangle& rect)
 {
   return impl.GetClosestScreenNumber(rect);
 }
 
 //IMenu::Pointer QtWidgetsTweaklet::CreateMenu(void*, IMenu::Style style)
 //{
 //  //TODO Qt CreateMenu
 //  return IMenu::Pointer(0);
 //}
 
 //IMenu::Pointer QtWidgetsTweaklet::CreateMenu(IMenu::Pointer parent)
 //{
 //  //TODO Qt CreateMenu
 //  return IMenu::Pointer(0);
 //}
 
 //IMenuItem::Pointer QtWidgetsTweaklet::CreateMenuItem(IMenu::Pointer, IMenuItem::Style, int index)
 //{
 //  //TODO Qt CreateMenuItem
 //  return IMenuItem::Pointer(0);
 //}
 
 void QtWidgetsTweaklet::AddControlListener(void* widget,
     GuiTk::IControlListener::Pointer listener)
 {
   QWidget* qwidget = static_cast<QWidget*>(widget);
   QVariant variant = qwidget->property(QtWidgetController::PROPERTY_ID);
   if (variant.isValid())
   {
     QtWidgetController::Pointer controller = variant.value<QtWidgetController::Pointer>();
     if (controller != 0)
       impl.AddControlListener(controller.GetPointer(), listener);
   }
 }
 
 void QtWidgetsTweaklet::RemoveControlListener(void* widget,
     GuiTk::IControlListener::Pointer listener)
 {
   QWidget* qwidget = static_cast<QWidget*>(widget);
   QVariant variant = qwidget->property(QtWidgetController::PROPERTY_ID);
   if (variant.isValid())
   {
     QtWidgetController::Pointer controller = variant.value<QtWidgetController::Pointer>();
     if (controller != 0)
       impl.RemoveControlListener(controller.GetPointer(), listener);
   }
 }
 
 bool QtWidgetsTweaklet::GetEnabled(void* widget)
 {
   return impl.GetEnabled(static_cast<QWidget*>(widget));
 }
 
 void QtWidgetsTweaklet::SetEnabled(void* widget, bool enabled)
 {
   impl.SetEnabled(static_cast<QWidget*>(widget), enabled);
 }
 
 void QtWidgetsTweaklet::SetBounds(void* widget, const Rectangle& bounds)
 {
   impl.SetBounds(static_cast<QWidget*>(widget), bounds);
 }
 
 Rectangle QtWidgetsTweaklet::GetBounds(void* widget)
 {
   return impl.GetBounds(static_cast<QWidget*>(widget));
 }
 
 void QtWidgetsTweaklet::SetVisible(void* widget, bool visible)
 {
   impl.SetVisible(static_cast<QWidget*>(widget), visible);
 }
 
 bool QtWidgetsTweaklet::GetVisible(void* widget)
 {
   return impl.GetVisible(static_cast<QWidget*>(widget));
 }
 
 bool QtWidgetsTweaklet::IsVisible(void* widget)
 {
   return impl.IsVisible(static_cast<QWidget*>(widget));
 }
 
 Rectangle QtWidgetsTweaklet::GetClientArea(void* widget)
 {
   return impl.GetClientArea(static_cast<QWidget*>(widget));
 }
 
 void* QtWidgetsTweaklet::GetParent(void* widget)
 {
   return impl.GetParent(static_cast<QWidget*>(widget));
 }
 
 bool QtWidgetsTweaklet::SetParent(void* widget, void* parent)
 {
   return impl.SetParent(static_cast<QWidget*>(widget),
                         static_cast<QWidget*>(parent));
 }
 
 void QtWidgetsTweaklet::SetData(void* widget, const QString& id, Object::Pointer data)
 {
   impl.SetData(static_cast<QWidget*>(widget), id, data);
 }
 
 Object::Pointer QtWidgetsTweaklet::GetData(void* widget, const QString& id)
 {
   return impl.GetData(static_cast<QWidget*>(widget), id);
 }
 
 Point QtWidgetsTweaklet::GetCursorLocation()
 {
   return impl.GetCursorLocation();
 }
 
 void* QtWidgetsTweaklet::GetCursorControl()
 {
   return impl.GetCursorControl();
 }
 
 void* QtWidgetsTweaklet::FindControl(const QList<Shell::Pointer>& shells, const Point& location)
 {
   return impl.FindControl(shells, location);
 }
 
 bool QtWidgetsTweaklet::IsChild(void* parentToTest, void* childToTest)
 {
   return impl.IsChild(static_cast<QObject*>(parentToTest),
                       static_cast<QObject*>(childToTest));
 }
 
 void* QtWidgetsTweaklet::GetFocusControl()
 {
   return impl.GetFocusControl();
 }
 
 bool QtWidgetsTweaklet::IsReparentable(void* widget)
 {
   return impl.IsReparentable(static_cast<QWidget*>(widget));
 }
 
 void QtWidgetsTweaklet::MoveAbove(void* widgetToMove, void* widget)
 {
   impl.MoveAbove(static_cast<QWidget*>(widgetToMove),
                  static_cast<QWidget*>(widget));
 }
 
 void QtWidgetsTweaklet::MoveBelow(void* widgetToMove, void* widget)
 {
   impl.MoveBelow(static_cast<QWidget*>(widgetToMove),
                  static_cast<QWidget*>(widget));
 }
 
 void QtWidgetsTweaklet::Dispose(void* widget)
 {
   impl.Dispose(static_cast<QWidget*>(widget));
 }
 
 Shell::Pointer QtWidgetsTweaklet::CreateShell(Shell::Pointer parent, int style)
 {
   return impl.CreateShell(parent, style);
 }
 
 void* QtWidgetsTweaklet::CreateComposite(void* parent)
 {
   return impl.CreateComposite(static_cast<QWidget*>(parent));
 }
 
 void QtWidgetsTweaklet::DisposeShell(Shell::Pointer shell)
 {
   impl.DisposeShell(shell);
 }
 
 QList<Shell::Pointer> QtWidgetsTweaklet::GetShells()
 {
   return impl.GetShells();
 }
 
 Shell::Pointer QtWidgetsTweaklet::GetShell(void* widget)
 {
   return impl.GetShell(static_cast<QWidget*>(widget));
 }
 
 Shell::Pointer QtWidgetsTweaklet::GetActiveShell()
 {
   return impl.GetActiveShell();
 }
 
 Rectangle QtWidgetsTweaklet::ToControl(void* coordinateSystem,
           const Rectangle& toConvert)
 {
   return impl.ToControl(static_cast<QWidget*>(coordinateSystem), toConvert);
 }
 
 Point QtWidgetsTweaklet::ToControl(void* coordinateSystem,
           const Point& toConvert)
 {
   return impl.ToControl(static_cast<QWidget*>(coordinateSystem), toConvert);
 }
 
 Rectangle QtWidgetsTweaklet::ToDisplay(void* coordinateSystem,
         const Rectangle& toConvert)
 {
   return impl.ToDisplay(static_cast<QWidget*>(coordinateSystem), toConvert);
 }
 
 Point QtWidgetsTweaklet::ToDisplay(void* coordinateSystem,
         const Point& toConvert)
 {
   return impl.ToDisplay(static_cast<QWidget*>(coordinateSystem), toConvert);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWidgetsTweaklet.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWidgetsTweaklet.h
index efc254da11..e4cab00e33 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWidgetsTweaklet.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWidgetsTweaklet.h
@@ -1,132 +1,131 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYQTWIDGETSTWEAKLET_H_
 #define BERRYQTWIDGETSTWEAKLET_H_
 
 #include <berryGuiWidgetsTweaklet.h>
 
 #include "berryQtWidgetsTweakletImpl.h"
 
 namespace berry {
 
 
 class QtWidgetsTweaklet : public QObject, public GuiWidgetsTweaklet
 {
   Q_OBJECT
   Q_INTERFACES(berry::GuiWidgetsTweaklet)
 
 public:
 
   QtWidgetsTweaklet();
-  QtWidgetsTweaklet(const QtWidgetsTweaklet& other);
 
   void AddSelectionListener(void* widget, GuiTk::ISelectionListener::Pointer listener);
   void RemoveSelectionListener(void* widget, GuiTk::ISelectionListener::Pointer listener);
 
   void AddControlListener(void* widget, GuiTk::IControlListener::Pointer listener);
   void RemoveControlListener(void* widget, GuiTk::IControlListener::Pointer listener);
 
   bool GetEnabled(void* widget);
   void SetEnabled(void* widget, bool enabled);
 
   void SetBounds(void* widget, const Rectangle& bounds);
   Rectangle GetBounds(void* widget);
 
   void SetVisible(void* widget, bool visible);
   bool GetVisible(void* widget);
   bool IsVisible(void* widget);
 
   Rectangle GetClientArea(void* widget);
 
   void* GetParent(void* widget);
   bool SetParent(void* widget, void* parent);
 
   void SetData(void* widget, const QString& id, Object::Pointer data);
   Object::Pointer GetData(void* widget, const QString& id);
 
   //IMenu::Pointer CreateMenu(void*, IMenu::Style = IMenu::POP_UP);
   //IMenu::Pointer CreateMenu(IMenu::Pointer parent);
   //IMenuItem::Pointer CreateMenuItem(IMenu::Pointer, IMenuItem::Style, int index = -1);
 
   Rectangle GetScreenSize(int i = -1);
   unsigned int GetScreenNumber();
   int GetPrimaryScreenNumber();
   Rectangle GetAvailableScreenSize(int i = -1);
   int GetClosestScreenNumber(const Rectangle&);
 
   Point GetCursorLocation();
   void* GetCursorControl();
   void* FindControl(const QList<Shell::Pointer>& shells, const Point& location);
 
   /**
    * Determines if one control is a child of another. Returns true iff the second
    * argument is a child of the first (or the same object).
    *
    * @param potentialParent
    * @param childToTest
    * @return
    */
   bool IsChild(void* potentialParent, void* childToTest);
 
   /**
    * Returns the control which currently has keyboard focus,
    * or null if keyboard events are not currently going to
    * any of the controls built by the currently running
    * application.
    *
    * @return the control under the cursor
    */
   void* GetFocusControl();
 
   bool IsReparentable(void* widget);
 
   void MoveAbove(void* widgetToMove, void* widget);
   void MoveBelow(void* widgetToMove, void* widget);
 
   void Dispose(void* widget);
 
   Shell::Pointer CreateShell(Shell::Pointer parent, int style);
   void DisposeShell(Shell::Pointer shell);
 
   void* CreateComposite(void* parent);
 
   QList<Shell::Pointer> GetShells();
   Shell::Pointer GetShell(void* widget);
   Shell::Pointer GetActiveShell();
 
   Rectangle ToControl(void* coordinateSystem,
           const Rectangle& toConvert);
 
   Point ToControl(void* coordinateSystem,
           const Point& toConvert);
 
   Rectangle ToDisplay(void* coordinateSystem,
           const Rectangle& toConvert);
 
   Point ToDisplay(void* coordinateSystem,
           const Point& toConvert);
 
 private:
 
   QtWidgetsTweakletImpl impl;
 
 };
 
 }
 
 #endif /* BERRYQTWIDGETSTWEAKLET_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWorkbenchPageTweaklet.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWorkbenchPageTweaklet.cpp
index 79c8190587..fb2c05d711 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWorkbenchPageTweaklet.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWorkbenchPageTweaklet.cpp
@@ -1,79 +1,74 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryQtWorkbenchPageTweaklet.h"
 
 #include <internal/berryQtControlWidget.h>
 
 #include <ui_berryQtStatusPart.h>
 
 #include <QWidget>
 #include <QHBoxLayout>
 
 namespace berry
 {
 
 QtWorkbenchPageTweaklet::QtWorkbenchPageTweaklet()
 {
 
 }
 
-QtWorkbenchPageTweaklet::QtWorkbenchPageTweaklet(const QtWorkbenchPageTweaklet& other)
-{
-  Q_UNUSED(other)
-}
-
 void* QtWorkbenchPageTweaklet::CreateClientComposite(void* pageControl)
 {
   QWidget* parent = static_cast<QWidget*>(pageControl);
   QtControlWidget* client = new QtControlWidget(parent, 0);
   client->setObjectName("ClientComposite");
   parent->layout()->addWidget(client);
 
   // we have to enable visibility to get a proper layout (see bug #1654)
   client->setVisible(true);
 
   return client;
 }
 
 void* QtWorkbenchPageTweaklet::CreatePaneControl(void* parent)
 {
   QWidget* qParent = static_cast<QWidget*>(parent);
   QtControlWidget* control = new QtControlWidget(qParent, 0);
   // the object name is used in the global event filter to find
   // the pane control over which a mouse pressed event occured
   // --> do not change the object name
   control->setObjectName("PartPaneControl");
 
   return control;
 }
 
 Object::Pointer QtWorkbenchPageTweaklet::CreateStatusPart(void* parent, const QString& title, const QString& msg)
 {
   Ui::QtStatusPart statusPart;
   statusPart.setupUi(static_cast<QWidget*>(parent));
   statusPart.m_TitleLabel->setText(title);
   statusPart.m_DetailsLabel->setText(msg);
 
   return Object::Pointer(0);
 }
 
 IEditorPart::Pointer QtWorkbenchPageTweaklet::CreateErrorEditorPart(const QString&  /*partName*/, const QString&  /*msg*/)
 {
   return IEditorPart::Pointer(0);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWorkbenchPageTweaklet.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWorkbenchPageTweaklet.h
index f3ee2a600b..0b0ddae882 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWorkbenchPageTweaklet.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWorkbenchPageTweaklet.h
@@ -1,50 +1,49 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYQTWORKBENCHPAGETWEAKLET_H_
 #define BERRYQTWORKBENCHPAGETWEAKLET_H_
 
 #include <berryWorkbenchPageTweaklet.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 
 namespace berry
 {
 
 class BERRY_UI_QT QtWorkbenchPageTweaklet : public QObject, public WorkbenchPageTweaklet
 {
   Q_OBJECT
   Q_INTERFACES(berry::WorkbenchPageTweaklet)
 
 public:
 
-  berryObjectMacro(QtWorkbenchPageTweaklet);
+  berryObjectMacro(QtWorkbenchPageTweaklet)
 
   QtWorkbenchPageTweaklet();
-  QtWorkbenchPageTweaklet(const QtWorkbenchPageTweaklet& other);
 
   void* CreateClientComposite(void* pageControl);
   void* CreatePaneControl(void* parent);
 
   Object::Pointer CreateStatusPart(void* parent, const QString& title, const QString& msg);
   IEditorPart::Pointer CreateErrorEditorPart(const QString& partName, const QString& msg);
 
 };
 
 }
 
 #endif /* BERRYQTWORKBENCHPAGETWEAKLET_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWorkbenchTweaklet.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWorkbenchTweaklet.cpp
index a108572992..f9b929f42a 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWorkbenchTweaklet.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWorkbenchTweaklet.cpp
@@ -1,64 +1,59 @@
 
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryQtWorkbenchTweaklet.h"
 #include <internal/berryQtControlWidget.h>
 
 #include <QApplication>
 #include <QMainWindow>
 
 #include "berryQtShowViewDialog.h"
 #include "berryQtDisplay.h"
 
 #include <berryPlatform.h>
 #include <berryPlatformUI.h>
 
 #include <internal/berryWorkbenchWindow.h>
 
 namespace berry {
 
 QtWorkbenchTweaklet::QtWorkbenchTweaklet()
 {
 
 }
 
-QtWorkbenchTweaklet::QtWorkbenchTweaklet(const QtWorkbenchTweaklet& other)
-{
-
-}
-
 Display* QtWorkbenchTweaklet::CreateDisplay()
 {
   return new QtDisplay();
 }
 
 bool QtWorkbenchTweaklet::IsRunning()
 {
   return QApplication::instance() != 0;
 }
 
 IDialog::Pointer
 QtWorkbenchTweaklet::CreateStandardDialog(const QString& dialogid)
 {
   if (dialogid == DIALOG_ID_SHOW_VIEW)
     return IDialog::Pointer(new QtShowViewDialog(PlatformUI::GetWorkbench()->GetViewRegistry()));
   else
     return IDialog::Pointer(0);
 }
 
 
 }  // namespace berry
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWorkbenchTweaklet.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWorkbenchTweaklet.h
index 58911549a0..005293585f 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWorkbenchTweaklet.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryQtWorkbenchTweaklet.h
@@ -1,48 +1,47 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYQTWORKBENCHTWEAKLET_H_
 #define BERRYQTWORKBENCHTWEAKLET_H_
 
 #include <berryWorkbenchTweaklet.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 
 namespace berry {
 
 class BERRY_UI_QT QtWorkbenchTweaklet : public QObject, public WorkbenchTweaklet
 {
   Q_OBJECT
   Q_INTERFACES(berry::WorkbenchTweaklet)
 
 public:
 
   berryObjectMacro(QtWorkbenchTweaklet);
 
   QtWorkbenchTweaklet();
-  QtWorkbenchTweaklet(const QtWorkbenchTweaklet& other);
 
   Display* CreateDisplay();
 
   bool IsRunning();
 
   IDialog::Pointer CreateStandardDialog(const QString& id);
 
 };
 
 } // namespace berry
 
 #endif /*BERRYQTWORKBENCHTWEAKLET_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryRegistryPersistence.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryRegistryPersistence.cpp
new file mode 100644
index 0000000000..8295b1775e
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryRegistryPersistence.cpp
@@ -0,0 +1,415 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berryRegistryPersistence.h"
+
+#include "berryExpression.h"
+#include "berryIConfigurationElement.h"
+#include "berryIContributor.h"
+#include "berryStatus.h"
+#include "berryMultiStatus.h"
+#include "berryParameterizedCommand.h"
+#include "berryParameterization.h"
+#include "berryICommandService.h"
+#include "berryCommand.h"
+#include "berryElementHandler.h"
+#include "berryExpressionConverter.h"
+#include "berryIRegistryEventListener.h"
+
+#include "berryPlatformUI.h"
+
+#include "berryWorkbenchPlugin.h"
+
+namespace {
+
+class ErrorExpression : public berry::Expression
+{
+public:
+  berry::EvaluationResult::ConstPointer Evaluate(berry::IEvaluationContext* /*context*/) const
+  {
+    return berry::EvaluationResult::ConstPointer(0);
+  }
+};
+
+}
+
+namespace berry {
+
+const SmartPointer<Expression> RegistryPersistence::ERROR_EXPRESSION(new ErrorExpression());
+
+class RegistryPersistence::ReadRunnable : public Poco::Runnable
+{
+public:
+  ReadRunnable(berry::RegistryPersistence* registryPersistence)
+    : registryPersistence(registryPersistence)
+  {}
+
+  void run()
+  {
+    registryPersistence->Read();
+  }
+
+private:
+  berry::RegistryPersistence* registryPersistence;
+};
+
+void RegistryPersistence::AddWarning(QList<SmartPointer<IStatus> >& warningsToLog,
+                       const QString& message,
+                       const SmartPointer<IConfigurationElement>& element)
+{
+  AddWarning(warningsToLog, message, element, QString(), QString(), QString());
+}
+
+void RegistryPersistence::AddWarning(QList<SmartPointer<IStatus> >& warningsToLog,
+                       const QString& message,
+                       const SmartPointer<IConfigurationElement>& element,
+                       const QString& id)
+{
+  AddWarning(warningsToLog, message, element, id, QString(), QString());
+}
+
+void RegistryPersistence::AddWarning(QList<SmartPointer<IStatus> >& warningsToLog,
+                       const QString& message,
+                       const SmartPointer<IConfigurationElement>& element,
+                       const QString& id,
+                       const QString& extraAttributeName,
+                       const QString& extraAttributeValue)
+{
+  QString statusMessage = message;
+  if (element.IsNotNull())
+  {
+    statusMessage += ": plug-in='" + element->GetContributor()->GetName() + '\'';
+  }
+  if (!id.isNull())
+  {
+    if (element.IsNotNull())
+    {
+      statusMessage += ',';
+    }
+    else
+    {
+      statusMessage += ':';
+    }
+    statusMessage += " id='" + id + '\'';
+  }
+  if (!extraAttributeName.isNull())
+  {
+    if ((element.IsNotNull()) || (!id.isNull()))
+    {
+      statusMessage += ',';
+    }
+    else
+    {
+      statusMessage += ':';
+    }
+    statusMessage += ' ' + extraAttributeName + "='" + extraAttributeValue + '\'';
+  }
+
+  IStatus::Pointer status(new Status(IStatus::WARNING_TYPE, PlatformUI::PLUGIN_ID(), 0,
+                                     statusMessage, BERRY_STATUS_LOC));
+  warningsToLog.push_back(status);
+}
+
+bool RegistryPersistence::CheckClass(const SmartPointer<IConfigurationElement>& configurationElement,
+                                     QList<SmartPointer<IStatus> >& warningsToLog,
+                                     const QString& message,
+                                     const QString& id)
+{
+  // Check to see if we have a handler class.
+  if ((configurationElement->GetAttribute(ATT_CLASS).isNull())
+      && (configurationElement->GetChildren(TAG_CLASS).isEmpty()))
+  {
+    AddWarning(warningsToLog, message, configurationElement, id);
+    return false;
+  }
+
+  return true;
+}
+
+bool RegistryPersistence::IsPulldown(const SmartPointer<IConfigurationElement>& element)
+{
+  const QString style = ReadOptional(element, ATT_STYLE);
+  const bool pulldown = ReadBoolean(element, ATT_PULLDOWN, false);
+  return (pulldown || STYLE_PULLDOWN == style);
+}
+
+void RegistryPersistence::LogWarnings(QList<SmartPointer<IStatus> >& warningsToLog,
+                        const QString& message)
+{
+  // If there were any warnings, then log them now.
+  if (!warningsToLog.isEmpty())
+  {
+    IStatus::Pointer status(new MultiStatus(PlatformUI::PLUGIN_ID(), 0, warningsToLog,
+                                            message, BERRY_STATUS_LOC));
+    WorkbenchPlugin::Log(status);
+  }
+}
+
+bool RegistryPersistence::ReadBoolean(const SmartPointer<IConfigurationElement>& configurationElement,
+                        const QString& attribute,
+                        const bool defaultValue)
+{
+  const QString value = configurationElement->GetAttribute(attribute);
+  if (value.isNull())
+  {
+    return defaultValue;
+  }
+
+  if (defaultValue)
+  {
+    return value.compare("false", Qt::CaseInsensitive) != 0;
+  }
+
+  return value.compare("true", Qt::CaseInsensitive) == 0;
+}
+
+QString RegistryPersistence::ReadOptional(const SmartPointer<IConfigurationElement>& configurationElement,
+                            const QString& attribute)
+{
+  QString value = configurationElement->GetAttribute(attribute);
+  if (value.isEmpty())
+  {
+    value = QString();
+  }
+
+  return value;
+}
+
+SmartPointer<ParameterizedCommand> RegistryPersistence::ReadParameterizedCommand(
+    const SmartPointer<IConfigurationElement>& configurationElement,
+    ICommandService* const commandService,
+    QList<SmartPointer<IStatus> >& warningsToLog,
+    const QString& message, const QString& id)
+{
+  const QString commandId = ReadRequired(configurationElement,
+                                         ATT_COMMAND_ID, warningsToLog, message, id);
+  if (commandId.isNull())
+  {
+    return ParameterizedCommand::Pointer(0);
+  }
+
+  const Command::Pointer command = commandService->GetCommand(commandId);
+  const ParameterizedCommand::Pointer parameterizedCommand = ReadParameters(
+        configurationElement, warningsToLog, command);
+
+  return parameterizedCommand;
+}
+
+SmartPointer<ParameterizedCommand> RegistryPersistence::ReadParameters(
+    const SmartPointer<IConfigurationElement>& configurationElement,
+    QList<SmartPointer<IStatus> >& warningsToLog,
+    const SmartPointer<Command>& command)
+{
+  const QList<IConfigurationElement::Pointer> parameterElements = configurationElement
+      ->GetChildren(TAG_PARAMETER);
+  if (parameterElements.isEmpty())
+  {
+    ParameterizedCommand::Pointer result(new ParameterizedCommand(command, QList<Parameterization>()));
+    return result;
+  }
+
+  QList<Parameterization> parameters;
+  foreach (const IConfigurationElement::Pointer& parameterElement, parameterElements)
+  {
+    // Read out the id.
+    const QString id = parameterElement->GetAttribute(ATT_ID);
+    if (id.isEmpty())
+    {
+      // The id should never be null. This is invalid.
+      AddWarning(warningsToLog, "Parameters need an id", configurationElement);
+      continue;
+    }
+
+    // Find the parameter on the command.
+    IParameter::Pointer parameter;
+    try
+    {
+      const QList<IParameter::Pointer> commandParameters = command->GetParameters();
+      foreach (const IParameter::Pointer& currentParameter, commandParameters)
+      {
+        if (currentParameter->GetId() == id)
+        {
+          parameter = currentParameter;
+          break;
+        }
+      }
+    }
+    catch (const NotDefinedException& /*e*/)
+    {
+      // This should not happen.
+    }
+    if (parameter.IsNull())
+    {
+      // The name should never be null. This is invalid.
+      AddWarning(warningsToLog, "Could not find a matching parameter",
+                 configurationElement, id);
+      continue;
+    }
+
+    // Read out the value.
+    const QString value = parameterElement->GetAttribute(ATT_VALUE);
+    if (value.isEmpty())
+    {
+      // The name should never be null. This is invalid.
+      AddWarning(warningsToLog, "Parameters need a value",
+                 configurationElement, id);
+      continue;
+    }
+
+    parameters.push_back(Parameterization(parameter, value));
+  }
+
+  if (parameters.isEmpty())
+  {
+    ParameterizedCommand::Pointer result(new ParameterizedCommand(command, QList<Parameterization>()));
+    return result;
+  }
+
+  ParameterizedCommand::Pointer result(new ParameterizedCommand(command, parameters));
+  return result;
+}
+
+QString RegistryPersistence::ReadRequired(const SmartPointer<IConfigurationElement>& configurationElement,
+                            const QString& attribute,
+                            QList<SmartPointer<IStatus> >& warningsToLog,
+                            const QString& message)
+{
+  return ReadRequired(configurationElement, attribute, warningsToLog, message, QString());
+}
+
+QString RegistryPersistence::ReadRequired(const SmartPointer<IConfigurationElement>& configurationElement,
+                            const QString& attribute,
+                            QList<SmartPointer<IStatus> >& warningsToLog,
+                            const QString& message, const QString& id)
+{
+  const QString value = configurationElement->GetAttribute(attribute);
+  if (value.isEmpty())
+  {
+    AddWarning(warningsToLog, message, configurationElement, id);
+    return QString();
+  }
+
+  return value;
+}
+
+SmartPointer<Expression> RegistryPersistence::ReadWhenElement(
+    const SmartPointer<IConfigurationElement>& parentElement,
+    const QString& whenElementName, const QString& id,
+    QList<SmartPointer<IStatus> >& warningsToLog)
+{
+  // Check to see if we have an when expression.
+  const QList<IConfigurationElement::Pointer> whenElements = parentElement
+      ->GetChildren(whenElementName);
+  Expression::Pointer whenExpression;
+  if (!whenElements.isEmpty())
+  {
+    // Check if we have too many when elements.
+    if (whenElements.size() > 1)
+    {
+      // There should only be one when element
+      AddWarning(warningsToLog,
+                 "There should only be one when element", parentElement,
+                 id, "whenElementName", whenElementName);
+      return ERROR_EXPRESSION;
+    }
+
+    const IConfigurationElement::Pointer whenElement = whenElements.front();
+    const QList<IConfigurationElement::Pointer> expressionElements = whenElement->GetChildren();
+    if (!expressionElements.isEmpty())
+    {
+      // Check if we have too many expression elements
+      if (expressionElements.size() > 1)
+      {
+        // There should only be one expression element
+        AddWarning(warningsToLog, "There should only be one expression element", parentElement,
+                   id, "whenElementName", whenElementName);
+        return ERROR_EXPRESSION;
+      }
+
+      // Convert the activeWhen element into an expression.
+      const ElementHandler::Pointer elementHandler = ElementHandler::GetDefault();
+      ExpressionConverter* const converter = ExpressionConverter::GetDefault();
+      const IConfigurationElement::Pointer expressionElement = expressionElements.front();
+      try
+      {
+        whenExpression = elementHandler->Create(converter, expressionElement);
+      }
+      catch (const CoreException& /*e*/)
+      {
+        // There when expression could not be created.
+        AddWarning(warningsToLog, "Problem creating when element",
+                   parentElement, id, "whenElementName", whenElementName);
+        return ERROR_EXPRESSION;
+      }
+    }
+  }
+
+  return whenExpression;
+}
+
+RegistryPersistence::RegistryPersistence()
+  : registryListenerAttached(false)
+{
+}
+
+RegistryPersistence::~RegistryPersistence()
+{
+  Platform::GetExtensionRegistry()->RemoveListener(this);
+  registryListenerAttached = false;
+}
+
+void RegistryPersistence::Read()
+{
+  if (!registryListenerAttached)
+  {
+    Platform::GetExtensionRegistry()->AddListener(this);
+    registryListenerAttached = true;
+  }
+}
+
+void RegistryPersistence::Added(const QList<SmartPointer<IExtension> >& extensions)
+{
+  if (this->IsChangeImportant(extensions, OBJECTS_ADDED))
+  {
+    Display::GetDefault()->AsyncExec(new ReadRunnable(this));
+  }
+}
+
+void RegistryPersistence::Removed(const QList<SmartPointer<IExtension> >& extensions)
+{
+  if (this->IsChangeImportant(extensions, OBJECTS_REMOVED))
+  {
+    Display::GetDefault()->AsyncExec(new ReadRunnable(this));
+  }
+}
+
+void RegistryPersistence::Added(const QList<SmartPointer<IExtensionPoint> >& extensionPoints)
+{
+  if (this->IsChangeImportant(extensionPoints, OBJECTS_ADDED))
+  {
+    Display::GetDefault()->AsyncExec(new ReadRunnable(this));
+  }
+}
+
+void RegistryPersistence::Removed(const QList<SmartPointer<IExtensionPoint> >& extensionPoints)
+{
+  if (this->IsChangeImportant(extensionPoints, OBJECTS_REMOVED))
+  {
+    Display::GetDefault()->AsyncExec(new ReadRunnable(this));
+  }
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryRegistryPersistence.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryRegistryPersistence.h
new file mode 100644
index 0000000000..ca00cae824
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryRegistryPersistence.h
@@ -0,0 +1,393 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYREGISTRYPERSISTENCE_H
+#define BERRYREGISTRYPERSISTENCE_H
+
+#include "berryWorkbenchRegistryConstants.h"
+#include "berryIRegistryEventListener.h"
+
+#include <QScopedPointer>
+
+namespace berry {
+
+template<class T> class SmartPointer;
+
+class Command;
+class Expression;
+class ParameterizedCommand;
+
+struct ICommandService;
+struct IConfigurationElement;
+struct IExtension;
+struct IExtensionPoint;
+struct IRegistryEventListener;
+struct IStatus;
+
+/**
+ * <p>
+ * A manager for items parsed from the registry. This attaches a listener to the
+ * registry after the first read, and monitors the registry for changes from
+ * that point on. When the destructor is called, the listener is detached.
+ * </p>
+ * <p>
+ * This class is only intended for internal use within the
+ * <code>org.blueberry.ui.qt</code> plug-in.
+ * </p>
+ */
+class RegistryPersistence : public WorkbenchRegistryConstants, private IRegistryEventListener
+{
+
+protected:
+
+  /**
+   * The expression to return when there is an error. Never <code>null</code>.
+   */
+  static const SmartPointer<Expression> ERROR_EXPRESSION;
+
+  /**
+   * Adds a warning to be logged at some later point in time.
+   *
+   * @param warningsToLog
+   *            The collection of warnings to be logged; must not be
+   *            <code>null</code>.
+   * @param message
+   *            The mesaage to log; must not be <code>null</code>.
+   * @param element
+   *            The element from which the warning originates; may be
+   *            <code>null</code>.
+   */
+  static void AddWarning(QList<SmartPointer<IStatus> >& warningsToLog,
+                         const QString& message,
+                         const SmartPointer<IConfigurationElement>& element);
+
+  /**
+   * Adds a warning to be logged at some later point in time. This logs the
+   * identifier of the item.
+   *
+   * @param warningsToLog
+   *            The collection of warnings to be logged; must not be
+   *            <code>null</code>.
+   * @param message
+   *            The mesaage to log; must not be <code>null</code>.
+   * @param element
+   *            The element from which the warning originates; may be
+   *            <code>null</code>.
+   * @param id
+   *            The identifier of the item for which a warning is being
+   *            logged; may be <code>null</code>.
+   */
+  static void AddWarning(QList<SmartPointer<IStatus> >& warningsToLog,
+                         const QString& message,
+                         const SmartPointer<IConfigurationElement>& element,
+                         const QString& id);
+
+  /**
+   * Adds a warning to be logged at some later point in time. This logs the
+   * identifier of the item, as well as an extra attribute.
+   *
+   * @param warningsToLog
+   *            The collection of warnings to be logged; must not be
+   *            <code>null</code>.
+   * @param message
+   *            The mesaage to log; must not be <code>null</code>.
+   * @param element
+   *            The element from which the warning originates; may be
+   *            <code>null</code>.
+   * @param id
+   *            The identifier of the item for which a warning is being
+   *            logged; may be <code>null</code>.
+   * @param extraAttributeName
+   *            The name of extra attribute to be logged; may be
+   *            <code>null</code>.
+   * @param extraAttributeValue
+   *            The value of the extra attribute to be logged; may be
+   *            <code>null</code>.
+   */
+  static void AddWarning(QList<SmartPointer<IStatus> >& warningsToLog,
+                         const QString& message,
+                         const SmartPointer<IConfigurationElement>& element,
+                         const QString& id,
+                         const QString& extraAttributeName,
+                         const QString& extraAttributeValue);
+
+  /**
+   * Checks that the class attribute or element exists for this element. This
+   * is used for executable extensions that are being read in.
+   *
+   * @param configurationElement
+   *            The configuration element which should contain a class
+   *            attribute or a class child element; must not be
+   *            <code>null</code>.
+   * @param warningsToLog
+   *            The list of warnings to be logged; never <code>null</code>.
+   * @param message
+   *            The message to log if something goes wrong; may be
+   *            <code>null</code>.
+   * @param id
+   *            The identifier of the handle object; may be <code>null</code>.
+   * @return <code>true</code> if the class attribute or element exists;
+   *         <code>false</code> otherwise.
+   */
+  static bool CheckClass(const SmartPointer<IConfigurationElement>& configurationElement,
+                         QList<SmartPointer<IStatus> >& warningsToLog,
+                         const QString& message,
+                         const QString& id);
+
+  /**
+   * Checks to see whether the configuration element represents a pulldown
+   * action. This involves reading the <code>style</code> and
+   * <code>pulldown</code> attributes.
+   *
+   * @param element
+   *            The element to check; must not be <code>null</code>.
+   * @return <code>true</code> if the element is a pulldown action;
+   *         <code>false</code> otherwise.
+   */
+  static bool IsPulldown(const SmartPointer<IConfigurationElement>& element);
+
+  /**
+   * Logs any warnings in <code>warningsToLog</code>.
+   *
+   * @param warningsToLog
+   *            The warnings to log; may be <code>null</code>.
+   * @param message
+   *            The message to include in the log entry; must not be
+   *            <code>null</code>.
+   */
+  static void LogWarnings(QList<SmartPointer<IStatus> >& warningsToLog,
+                          const QString& message);
+
+  /**
+   * Reads a boolean attribute from an element.
+   *
+   * @param configurationElement
+   *            The configuration element from which to read the attribute;
+   *            must not be <code>null</code>.
+   * @param attribute
+   *            The attribute to read; must not be <code>null</code>.
+   * @param defaultValue
+   *            The default boolean value.
+   * @return The attribute's value; may be <code>null</code> if none.
+   */
+  static bool ReadBoolean(const SmartPointer<IConfigurationElement>& configurationElement,
+                          const QString& attribute,
+                          const bool defaultValue);
+
+  /**
+   * Reads an optional attribute from an element. This converts zero-length
+   * strings into <code>null</code>.
+   *
+   * @param configurationElement
+   *            The configuration element from which to read the attribute;
+   *            must not be <code>null</code>.
+   * @param attribute
+   *            The attribute to read; must not be <code>null</code>.
+   * @return The attribute's value; may be <code>null</code> if none.
+   */
+  static QString ReadOptional(const SmartPointer<IConfigurationElement>& configurationElement,
+                              const QString& attribute);
+
+  /**
+   * Reads the parameterized command from a parent configuration element. This
+   * is used to read the parameter sub-elements from a key element, as well as
+   * the command id. Each parameter is guaranteed to be valid. If invalid
+   * parameters are found, then a warning status will be appended to the
+   * <code>warningsToLog</code> list. The command id is required, or a
+   * warning will be logged.
+   *
+   * @param configurationElement
+   *            The configuration element from which the parameters should be
+   *            read; must not be <code>null</code>.
+   * @param commandService
+   *            The service providing commands for the workbench; must not be
+   *            <code>null</code>.
+   * @param warningsToLog
+   *            The list of warnings found during parsing. Warnings found will
+   *            parsing the parameters will be appended to this list. This
+   *            value must not be <code>null</code>.
+   * @param message
+   *            The message to print if the command identifier is not present;
+   *            must not be <code>null</code>.
+   * @return The array of parameters found for this configuration element;
+   *         <code>null</code> if none can be found.
+   */
+  static SmartPointer<ParameterizedCommand> ReadParameterizedCommand(
+      const SmartPointer<IConfigurationElement>& configurationElement,
+      ICommandService* const commandService,
+      QList<SmartPointer<IStatus> >& warningsToLog,
+      const QString& message, const QString& id);
+
+  /**
+   * Reads the parameters from a parent configuration element. This is used to
+   * read the parameter sub-elements from a key element. Each parameter is
+   * guaranteed to be valid. If invalid parameters are found, then a warning
+   * status will be appended to the <code>warningsToLog</code> list.
+   *
+   * @param configurationElement
+   *            The configuration element from which the parameters should be
+   *            read; must not be <code>null</code>.
+   * @param warningsToLog
+   *            The list of warnings found during parsing. Warnings found will
+   *            parsing the parameters will be appended to this list. This
+   *            value must not be <code>null</code>.
+   * @param command
+   *            The command around which the parameterization should be
+   *            created; must not be <code>null</code>.
+   * @return The array of parameters found for this configuration element;
+   *         <code>null</code> if none can be found.
+   */
+  static SmartPointer<ParameterizedCommand> ReadParameters(
+      const SmartPointer<IConfigurationElement>& configurationElement,
+      QList<SmartPointer<IStatus> >& warningsToLog,
+      const SmartPointer<Command>& command);
+
+  /**
+   * Reads a required attribute from the configuration element.
+   *
+   * @param configurationElement
+   *            The configuration element from which to read; must not be
+   *            <code>null</code>.
+   * @param attribute
+   *            The attribute to read; must not be <code>null</code>.
+   * @param warningsToLog
+   *            The list of warnings; must not be <code>null</code>.
+   * @param message
+   *            The warning message to use if the attribute is missing; must
+   *            not be <code>null</code>.
+   * @return The required attribute; may be <code>null</code> if missing.
+   */
+  static QString ReadRequired(const SmartPointer<IConfigurationElement>& configurationElement,
+                              const QString& attribute,
+                              QList<SmartPointer<IStatus> >& warningsToLog,
+                              const QString& message);
+
+  /**
+   * Reads a required attribute from the configuration element. This logs the
+   * identifier of the item if this required element cannot be found.
+   *
+   * @param configurationElement
+   *            The configuration element from which to read; must not be
+   *            <code>null</code>.
+   * @param attribute
+   *            The attribute to read; must not be <code>null</code>.
+   * @param warningsToLog
+   *            The list of warnings; must not be <code>null</code>.
+   * @param message
+   *            The warning message to use if the attribute is missing; must
+   *            not be <code>null</code>.
+   * @param id
+   *            The identifier of the element for which this is a required
+   *            attribute; may be <code>null</code>.
+   * @return The required attribute; may be <code>null</code> if missing.
+   */
+  static QString ReadRequired(const SmartPointer<IConfigurationElement>& configurationElement,
+                              const QString& attribute,
+                              QList<SmartPointer<IStatus> >& warningsToLog,
+                              const QString& message, const QString& id);
+
+  /**
+   * Reads a <code>when</code> child element from the given configuration
+   * element. Warnings will be appended to <code>warningsToLog</code>.
+   *
+   * @param parentElement
+   *            The configuration element which might have a <code>when</code>
+   *            element as a child; never <code>null</code>.
+   * @param whenElementName
+   *            The name of the when element to find; never <code>null</code>.
+   * @param id
+   *            The identifier of the menu element whose <code>when</code>
+   *            expression is being read; never <code>null</code>.
+   * @param warningsToLog
+   *            The list of warnings while parsing the extension point; never
+   *            <code>null</code>.
+   * @return The <code>when</code> expression for the
+   *         <code>configurationElement</code>, if any; otherwise,
+   *         <code>null</code>.
+   */
+  static SmartPointer<Expression> ReadWhenElement(
+      const SmartPointer<IConfigurationElement>& parentElement,
+      const QString& whenElementName, const QString& id,
+      QList<SmartPointer<IStatus> >& warningsToLog);
+
+  /**
+   * Whether the preference and registry change listeners have been attached
+   * yet.
+   */
+  bool registryListenerAttached;
+
+  /**
+   * Constructs a new instance of {@link RegistryPersistence}. A registry
+   * change listener is created.
+   */
+  RegistryPersistence();
+
+  /**
+   * Detaches the registry change listener from the registry.
+   */
+  virtual ~RegistryPersistence();
+
+  enum RegistryChangeType {
+    OBJECTS_ADDED,
+    OBJECTS_REMOVED
+  };
+
+  /**
+   * Checks whether the registry change could affect this persistence class.
+   *
+   * @param extension
+   *            The added or removed extensions.
+   * @return <code>true</code> if the persistence instance is affected by
+   *         this change; <code>false</code> otherwise.
+   */
+  virtual bool IsChangeImportant(const QList<SmartPointer<IExtension> >& extensions,
+                                 RegistryChangeType changeType) = 0;
+
+  /**
+   * Checks whether the registry change could affect this persistence class.
+   *
+   * @param extensionPoints
+   *            The added or removed extension points.
+   * @return <code>true</code> if the persistence instance is affected by
+   *         this change; <code>false</code> otherwise.
+   */
+  virtual bool IsChangeImportant(const QList<SmartPointer<IExtensionPoint> >& extensionPoints,
+                                 RegistryChangeType changeType) = 0;
+
+  /**
+   * Reads the various elements from the registry. Subclasses should extend,
+   * but must not override.
+   */
+  virtual void Read();
+
+private:
+
+  class ReadRunnable;
+
+  friend class ReadRunnable;
+
+  void Added(const QList<SmartPointer<IExtension> >& extensions);
+
+  void Removed(const QList<SmartPointer<IExtension> >& extensions);
+
+  void Added(const QList<SmartPointer<IExtensionPoint> >& extensionPoints);
+
+  void Removed(const QList<SmartPointer<IExtensionPoint> >& extensionPoints);
+};
+
+}
+
+#endif // BERRYREGISTRYPERSISTENCE_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryRegistryReader.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryRegistryReader.cpp
index c639cdfd97..2079319136 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryRegistryReader.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryRegistryReader.cpp
@@ -1,164 +1,164 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include <berryIExtensionRegistry.h>
 #include <berryIExtension.h>
 #include <berryIConfigurationElement.h>
 #include <berryIContributor.h>
 
 #include "berryRegistryReader.h"
 
 #include "berryWorkbenchPlugin.h"
 #include "berryWorkbenchRegistryConstants.h"
 #include "berryImageDescriptor.h"
 
 namespace {
 
 bool CompareExtensionsByContributor(const berry::IExtension::Pointer& e1,
                                     const berry::IExtension::Pointer& e2)
 {
   return e1->GetContributor()->GetName().compare(e2->GetContributor()->GetName(), Qt::CaseInsensitive) < 0;
 }
 
 }
 
 namespace berry
 {
 
 RegistryReader::RegistryReader()
 {
 }
 
 RegistryReader::~RegistryReader()
 {
 }
 
 void RegistryReader::LogError(const IConfigurationElement::Pointer& element,
                               const QString& text)
 {
   IExtension::Pointer extension = element->GetDeclaringExtension();
   QString buf = QString("Plugin ") + extension->GetContributor()->GetName() + ", extension "
       + extension->GetExtensionPointUniqueIdentifier();
   // look for an ID if available - this should help debugging
   QString id = element->GetAttribute("id");
   if (!id.isEmpty())
   {
     buf.append(", id ");
     buf.append(id);
   }
   buf.append(": " + text);
   WorkbenchPlugin::Log(buf);
 }
 
 void RegistryReader::LogMissingAttribute(
     const IConfigurationElement::Pointer& element, const QString& attributeName)
 {
   RegistryReader::LogError(element, "Required attribute '" + attributeName + "' not defined");
 }
 
 void RegistryReader::LogMissingElement(
     const IConfigurationElement::Pointer& element, const QString& elementName)
 {
   RegistryReader::LogError(element, "Required sub element '" + elementName + "' not defined");
 }
 
 void RegistryReader::LogUnknownElement(
     const IConfigurationElement::Pointer& element)
 {
   RegistryReader::LogError(element, "Unknown extension tag found: " + element->GetName());
 }
 
 QList<IExtension::Pointer> RegistryReader::OrderExtensions(
     const QList<IExtension::Pointer>& extensions)
 {
   // By default, the order is based on plugin id sorted
   // in ascending order. The order for a plugin providing
   // more than one extension for an extension point is
   // dependent in the order listed in the XML file.
   QList<IExtension::Pointer> sortedExtension(extensions);
   qStableSort(sortedExtension.begin(), sortedExtension.end(),
               CompareExtensionsByContributor);
   return sortedExtension;
 }
 
 void RegistryReader::ReadElementChildren(
     const IConfigurationElement::Pointer& element)
 {
   this->ReadElements(element->GetChildren());
 }
 
 void RegistryReader::ReadElements(
     const QList<IConfigurationElement::Pointer>& elements)
 {
-  for (unsigned int i = 0; i < elements.size(); i++)
+  for (int i = 0; i < elements.size(); i++)
   {
     if (!this->ReadElement(elements[i]))
     {
       RegistryReader::LogUnknownElement(elements[i]);
     }
   }
 }
 
 void RegistryReader::ReadExtension(const IExtension::Pointer& extension)
 {
   this->ReadElements(extension->GetConfigurationElements());
 }
 
 void RegistryReader::ReadRegistry(
     const QString& pluginId, const QString& extensionPoint)
 {
   IExtensionPoint::Pointer point = Platform::GetExtensionRegistry()->GetExtensionPoint(pluginId + "." + extensionPoint);
   if (point == 0)
   {
     return;
   }
   QList<IExtension::Pointer> extensions(point->GetExtensions());
   extensions = this->OrderExtensions(extensions);
-  for (unsigned int i = 0; i < extensions.size(); i++)
+  for (int i = 0; i < extensions.size(); i++)
   {
     this->ReadExtension(extensions[i]);
   }
 }
 
 QString RegistryReader::GetDescription(const IConfigurationElement::Pointer& configElement)
 {
   QList<IConfigurationElement::Pointer> children(configElement->GetChildren(WorkbenchRegistryConstants::TAG_DESCRIPTION));
   if (children.size() >= 1)
   {
     return children[0]->GetValue();
   }
   return "";
 }
 
 QString RegistryReader::GetClassValue(
     const IConfigurationElement::Pointer& configElement,
     const QString& classAttributeName)
 {
   QString className = configElement->GetAttribute(classAttributeName);
   if (!className.isEmpty())
   {
     return className;
   }
   QList<IConfigurationElement::Pointer> candidateChildren(configElement->GetChildren(classAttributeName));
   if (candidateChildren.isEmpty())
   {
     return "";
   }
 
   return candidateChildren[0]->GetAttribute(WorkbenchRegistryConstants::ATT_CLASS);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySaveablesList.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySaveablesList.cpp
index 540537d934..fbceea83cf 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySaveablesList.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySaveablesList.cpp
@@ -1,635 +1,633 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berrySaveablesList.h"
 #include "berryWorkbenchPlugin.h"
 #include "berryDefaultSaveable.h"
 #include "berryImageDescriptor.h"
 
 #include "berryWorkbenchPart.h"
 
 namespace berry
 {
 
 bool SaveablesList::AddModel(Object::Pointer source, Saveable::Pointer model)
 {
   if (model == 0)
   {
     this->LogWarning("Ignored attempt to add invalid saveable", source, model); //$NON-NLS-1$
     return false;
   }
   bool result = false;
   Saveable::Set& modelsForSource = modelMap[source.GetPointer()];
 
   if (modelsForSource.find(model) == modelsForSource.end())
   {
     modelsForSource.insert(model);
     result = this->IncrementRefCount(modelRefCounts, model);
   }
   else
   {
     this->LogWarning("Ignored attempt to add saveable that was already registered",
         source, model); //$NON-NLS-1$
   }
   return result;
 }
 
 bool SaveablesList::IncrementRefCount(
     QHash<Saveable::Pointer, int>& referenceMap, Saveable::Pointer key)
 {
   bool result = false;
   int& refCount = referenceMap[key];
   if (refCount == 0)
   {
     result = true;
   }
   refCount++;
   return result;
 }
 
 bool SaveablesList::DecrementRefCount(
     QHash<Saveable::Pointer, int>& referenceMap, Saveable::Pointer key)
 {
   bool result = false;
   int& refCount = referenceMap[key];
   poco_assert(refCount != 0);
   if (refCount == 1)
   {
     referenceMap.remove(key);
     result = true;
   }
   else
   {
     --refCount;
   }
   return result;
 }
 
 bool SaveablesList::RemoveModel(Object::Pointer source, Saveable::Pointer model)
 {
   bool result = false;
   QHash<Object*, Saveable::Set>::iterator it = modelMap.find(source.GetPointer());
   if (it == modelMap.end())
   {
     this->LogWarning(
         "Ignored attempt to remove a saveable when no saveables were known",
         source, model); //$NON-NLS-1$
   }
   else
   {
     Saveable::Set& modelsForSource = it.value();
     if (modelsForSource.remove(model))
     {
       result = this->DecrementRefCount(modelRefCounts, model);
       if (modelsForSource.empty())
       {
         modelMap.remove(source.GetPointer());
       }
     }
     else
     {
       this->LogWarning(
           "Ignored attempt to remove a saveable that was not registered",
           source, model); //$NON-NLS-1$
     }
   }
   return result;
 }
 
 void SaveablesList::LogWarning(const QString& message,
     Object::Pointer source, Saveable::Pointer model)
 {
   // create a new exception
   QString text = message + "; " + "unknown saveable: " + model->GetName()
           + " from part: " + source->GetClassName();
   // record the current stack trace to help with debugging
   //assertionFailedException.fillInStackTrace();
   WorkbenchPlugin::Log(text);
 }
 
 void SaveablesList::UpdateNonPartSource(ISaveablesSource::Pointer source)
 {
   QList<Saveable::Pointer> saveables = source->GetSaveables();
   if (saveables.empty())
   {
     nonPartSources.remove(source);
   }
   else
   {
     nonPartSources.insert(source);
   }
 }
 
 void SaveablesList::RemoveModels(Object::Pointer source,
     const QList<Saveable::Pointer>& modelArray)
 {
   QList<Saveable::Pointer> removed;
-  for (unsigned int i = 0; i < modelArray.size(); i++)
+  for (int i = 0; i < modelArray.size(); i++)
   {
     Saveable::Pointer model = modelArray[i];
     if (this->RemoveModel(source, model))
     {
       removed.push_back(model);
     }
   }
   if (removed.size() > 0)
   {
     Object::Pointer source(this);
     SaveablesLifecycleEvent::Pointer event(new SaveablesLifecycleEvent(source,
         SaveablesLifecycleEvent::POST_OPEN, removed, false));
     this->FireModelLifecycleEvent(event);
   }
 }
 
 void SaveablesList::AddModels(Object::Pointer source,
     const QList<Saveable::Pointer>& modelArray)
 {
   QList<Saveable::Pointer> added;
-  for (unsigned int i = 0; i < modelArray.size(); i++)
+  for (int i = 0; i < modelArray.size(); i++)
   {
     Saveable::Pointer model = modelArray[i];
     if (this->AddModel(source, model))
     {
       added.push_back(model);
     }
   }
   if (added.size() > 0)
   {
     Object::Pointer source(this);
     SaveablesLifecycleEvent::Pointer event(new SaveablesLifecycleEvent(source,
         SaveablesLifecycleEvent::POST_OPEN, added, false));
     this->FireModelLifecycleEvent(event);
   }
 }
 
 void SaveablesList::FireModelLifecycleEvent(
     SaveablesLifecycleEvent::Pointer event)
 {
   events.lifecycleChange(event);
 }
 
 bool SaveablesList::PromptForSavingIfNecessary(
     IWorkbenchWindow::Pointer /*window*/, const Saveable::Set& /*modelsClosing*/,
     const QHash<Saveable::Pointer, int>& /*modelsDecrementing*/, bool /*canCancel*/)
 {
 //  List modelsToOptionallySave = new ArrayList();
 //  for (Iterator it = modelsDecrementing.keySet().iterator(); it.hasNext();)
 //  {
 //    Saveable modelDecrementing = (Saveable) it.next();
 //    if (modelDecrementing.isDirty() && !modelsClosing.contains(
 //        modelDecrementing))
 //    {
 //      modelsToOptionallySave.add(modelDecrementing);
 //    }
 //  }
 //
 //  boolean shouldCancel =
 //      modelsToOptionallySave.isEmpty() ? false : promptForSaving(
 //          modelsToOptionallySave, window, window, canCancel, true);
 //
 //  if (shouldCancel)
 //  {
 //    return true;
 //  }
 //
 //  List modelsToSave = new ArrayList();
 //  for (Iterator it = modelsClosing.iterator(); it.hasNext();)
 //  {
 //    Saveable modelClosing = (Saveable) it.next();
 //    if (modelClosing.isDirty())
 //    {
 //      modelsToSave.add(modelClosing);
 //    }
 //  }
 //  return modelsToSave.isEmpty() ? false : promptForSaving(modelsToSave, window,
 //      window, canCancel, false);
   return false;
 }
 
 void SaveablesList::FillModelsClosing(Saveable::Set& modelsClosing,
     const QHash<Saveable::Pointer, int>& modelsDecrementing)
 {
   for (QHash<Saveable::Pointer, int>::const_iterator it = modelsDecrementing.begin();
        it != modelsDecrementing.end(); ++it)
   {
     Saveable::Pointer model = it.key();
     if (it.value() == modelRefCounts[model])
     {
       modelsClosing.insert(model);
     }
   }
 }
 
 QList<Saveable::Pointer> SaveablesList::GetSaveables(
     IWorkbenchPart::Pointer part)
 {
   if (part.Cast<ISaveablesSource> () != 0)
   {
     ISaveablesSource::Pointer source = part.Cast<ISaveablesSource>();
     return source->GetSaveables();
   }
   else if (part.Cast<ISaveablePart> () != 0)
   {
     QList<Saveable::Pointer> result;
     Saveable::Pointer defaultSaveable(new DefaultSaveable(part));
     result.push_back(defaultSaveable);
     return result;
   }
   else
   {
     return QList<Saveable::Pointer>();
   }
 }
 
 Saveable::Set SaveablesList::GetOpenModels()
 {
   Saveable::Set allDistinctModels;
   for (QHash<Object*, Saveable::Set>::iterator it = modelMap.begin();
        it != modelMap.end(); ++it)
     allDistinctModels.unite(it.value());
 
   return allDistinctModels;
 }
 
-void SaveablesList::HandleLifecycleEvent(SaveablesLifecycleEvent::Pointer event)
+void SaveablesList::HandleLifecycleEvent(const SaveablesLifecycleEvent::Pointer& event)
 {
   if (event->GetSource().Cast<IWorkbenchPart> () == 0)
   {
     // just update the set of non-part sources. No prompting necessary.
     // See bug 139004.
     this->UpdateNonPartSource(event->GetSource().Cast<ISaveablesSource>());
     return;
   }
   QList<Saveable::Pointer> modelArray = event->GetSaveables();
   int eventType = event->GetEventType();
   if (eventType == SaveablesLifecycleEvent::POST_OPEN)
   {
     this->AddModels(event->GetSource(), modelArray);
   }
   else if (eventType == SaveablesLifecycleEvent::PRE_CLOSE)
   {
     QList<Saveable::Pointer> models = event->GetSaveables();
     QHash<Saveable::Pointer, int> modelsDecrementing;
     Saveable::Set modelsClosing;
-    for (unsigned int i = 0; i < models.size(); i++)
+    for (int i = 0; i < models.size(); i++)
     {
       this->IncrementRefCount(modelsDecrementing, models[i]);
     }
 
     this->FillModelsClosing(modelsClosing, modelsDecrementing);
     bool canceled = this->PromptForSavingIfNecessary(
         PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow(), modelsClosing,
         modelsDecrementing, !event->IsForce());
     if (canceled)
     {
       event->SetVeto(true);
     }
   }
   else if (eventType == SaveablesLifecycleEvent::POST_CLOSE)
   {
     this->RemoveModels(event->GetSource(), modelArray);
   }
   else if (eventType == SaveablesLifecycleEvent::DIRTY_CHANGED)
   {
     Object::Pointer source(this);
     SaveablesLifecycleEvent::Pointer lifeCycleEvent(
       new SaveablesLifecycleEvent(source, event->GetEventType(), event->GetSaveables(), false));
     this->FireModelLifecycleEvent(lifeCycleEvent);
   }
 }
 
-void SaveablesList::AddModelLifecycleListener(
-    ISaveablesLifecycleListener::Pointer listener)
+void SaveablesList::AddModelLifecycleListener(ISaveablesLifecycleListener* listener)
 {
   events.AddListener(listener);
 }
 
-void SaveablesList::RemoveModelLifecycleListener(
-    ISaveablesLifecycleListener::Pointer listener)
+void SaveablesList::RemoveModelLifecycleListener(ISaveablesLifecycleListener* listener)
 {
   events.RemoveListener(listener);
 }
 
 SaveablesList::PostCloseInfo::Pointer SaveablesList::PreCloseParts(
     const QList<IWorkbenchPart::Pointer>& partsToClose, bool save,
     IWorkbenchWindow::Pointer window)
 {
   // reference count (how many occurrences of a model will go away?)
   PostCloseInfo::Pointer postCloseInfo(new PostCloseInfo());
   for (QList<IWorkbenchPart::Pointer>::const_iterator it = partsToClose.begin();
        it != partsToClose.end(); ++it)
   {
     WorkbenchPart::Pointer part = it->Cast<WorkbenchPart>();
     postCloseInfo->partsClosing.push_back(part);
     if (part.Cast<ISaveablePart> () != 0)
     {
       ISaveablePart::Pointer saveablePart = part.Cast<ISaveablePart>();
       if (save && !saveablePart->IsSaveOnCloseNeeded())
       {
         // pretend for now that this part is not closing
         continue;
       }
     }
 //    if (save && part.Cast<ISaveablePart2> () != 0)
 //    {
 //      ISaveablePart2 saveablePart2 = (ISaveablePart2) part;
 //      // TODO show saveablePart2 before prompting, see
 //      // EditorManager.saveAll
 //      int response = SaveableHelper.savePart(saveablePart2, window, true);
 //      if (response == ISaveablePart2.CANCEL)
 //      {
 //        // user canceled
 //        return 0;
 //      }
 //      else if (response != ISaveablePart2.DEFAULT)
 //      {
 //        // only include this part in the following logic if it returned
 //        // DEFAULT
 //        continue;
 //      }
 //    }
     QList<Saveable::Pointer> modelsFromSource = this->GetSaveables(part);
-    for (unsigned int i = 0; i < modelsFromSource.size(); i++)
+    for (int i = 0; i < modelsFromSource.size(); i++)
     {
       this->IncrementRefCount(postCloseInfo->modelsDecrementing, modelsFromSource[i]);
     }
   }
   this->FillModelsClosing(postCloseInfo->modelsClosing,
       postCloseInfo->modelsDecrementing);
   if (save)
   {
     bool canceled = this->PromptForSavingIfNecessary(window,
         postCloseInfo->modelsClosing, postCloseInfo->modelsDecrementing, true);
     if (canceled)
     {
       return PostCloseInfo::Pointer(0);
     }
   }
   return postCloseInfo;
 }
 
 bool SaveablesList::PromptForSaving(
     const QList<Saveable::Pointer>& /*modelsToSave*/,
     /*final IShellProvider shellProvider, IRunnableContext runnableContext,*/
     bool /*canCancel*/, bool /*stillOpenElsewhere*/)
 {
   //  // Save parts, exit the method if cancel is pressed.
   //  if (modelsToSave.size() > 0) {
   //    boolean canceled = SaveableHelper.waitForBackgroundSaveJobs(modelsToSave);
   //    if (canceled) {
   //      return true;
   //    }
   //
   //    IPreferenceStore apiPreferenceStore = PrefUtil.getAPIPreferenceStore();
   //    boolean dontPrompt = stillOpenElsewhere && !apiPreferenceStore.getBoolean(IWorkbenchPreferenceConstants.PROMPT_WHEN_SAVEABLE_STILL_OPEN);
   //
   //    if (dontPrompt) {
   //      modelsToSave.clear();
   //      return false;
   //    } else if (modelsToSave.size() == 1) {
   //      Saveable model = (Saveable) modelsToSave.get(0);
   //      // Show a dialog.
   //      QList<QString> buttons;
   //      if(canCancel) {
   //        buttons.push_back(IDialogConstants.YES_LABEL);
   //            buttons.push_back(IDialogConstants.NO_LABEL);
   //            buttons.push_back(IDialogConstants.CANCEL_LABEL);
   //      } else {
   //        buttons.push_back(IDialogConstants.YES_LABEL);
   //            buttons.push_back(IDialogConstants.NO_LABEL);
   //      }
   //
   //      // don't save if we don't prompt
   //      int choice = ISaveablePart2.NO;
   //
   //      MessageDialog dialog;
   //      if (stillOpenElsewhere) {
   //        String message = NLS
   //            .bind(
   //                WorkbenchMessages.EditorManager_saveChangesOptionallyQuestion,
   //                model.getName());
   //        MessageDialogWithToggle dialogWithToggle = new MessageDialogWithToggle(shellProvider.getShell(),
   //            WorkbenchMessages.Save_Resource, 0, message,
   //            MessageDialog.QUESTION, buttons, 0, WorkbenchMessages.EditorManager_closeWithoutPromptingOption, false) {
   //          protected int getShellStyle() {
   //            return (canCancel ? SWT.CLOSE : SWT.NONE)
   //                | SWT.TITLE | SWT.BORDER
   //                | SWT.APPLICATION_MODAL
   //                | getDefaultOrientation();
   //          }
   //        };
   //        dialog = dialogWithToggle;
   //      } else {
   //        String message = NLS
   //            .bind(
   //                WorkbenchMessages.EditorManager_saveChangesQuestion,
   //                model.getName());
   //        dialog = new MessageDialog(shellProvider.getShell(),
   //            WorkbenchMessages.Save_Resource, 0, message,
   //            MessageDialog.QUESTION, buttons, 0) {
   //          protected int getShellStyle() {
   //            return (canCancel ? SWT.CLOSE : SWT.NONE)
   //                | SWT.TITLE | SWT.BORDER
   //                | SWT.APPLICATION_MODAL
   //                | getDefaultOrientation();
   //          }
   //        };
   //      }
   //
   //      choice = SaveableHelper.testGetAutomatedResponse();
   //      if (SaveableHelper.testGetAutomatedResponse() == SaveableHelper.USER_RESPONSE) {
   //        choice = dialog.open();
   //
   //        if(stillOpenElsewhere) {
   //          // map value of choice back to ISaveablePart2 values
   //          switch (choice) {
   //          case IDialogConstants.YES_ID:
   //            choice = ISaveablePart2.YES;
   //            break;
   //          case IDialogConstants.NO_ID:
   //            choice = ISaveablePart2.NO;
   //            break;
   //          case IDialogConstants.CANCEL_ID:
   //            choice = ISaveablePart2.CANCEL;
   //            break;
   //          default:
   //            break;
   //          }
   //          MessageDialogWithToggle dialogWithToggle = (MessageDialogWithToggle) dialog;
   //          if (choice != ISaveablePart2.CANCEL && dialogWithToggle.getToggleState()) {
   //            apiPreferenceStore.setValue(IWorkbenchPreferenceConstants.PROMPT_WHEN_SAVEABLE_STILL_OPEN, false);
   //          }
   //        }
   //      }
   //
   //      // Branch on the user choice.
   //      // The choice id is based on the order of button labels
   //      // above.
   //      switch (choice) {
   //      case ISaveablePart2.YES: // yes
   //        break;
   //      case ISaveablePart2.NO: // no
   //        modelsToSave.clear();
   //        break;
   //      default:
   //      case ISaveablePart2.CANCEL: // cancel
   //        return true;
   //      }
   //    } else {
   //      MyListSelectionDialog dlg = new MyListSelectionDialog(
   //          shellProvider.getShell(),
   //          modelsToSave,
   //          new ArrayContentProvider(),
   //          new WorkbenchPartLabelProvider(),
   //          stillOpenElsewhere ? WorkbenchMessages.EditorManager_saveResourcesOptionallyMessage
   //              : WorkbenchMessages.EditorManager_saveResourcesMessage,
   //          canCancel, stillOpenElsewhere);
   //      dlg.setInitialSelections(modelsToSave.toArray());
   //      dlg.setTitle(EditorManager.SAVE_RESOURCES_TITLE);
   //
   //      // this "if" statement aids in testing.
   //      if (SaveableHelper.testGetAutomatedResponse() == SaveableHelper.USER_RESPONSE) {
   //        int result = dlg.open();
   //        // Just return 0 to prevent the operation continuing
   //        if (result == IDialogConstants.CANCEL_ID)
   //          return true;
   //
   //        if (dlg.getDontPromptSelection()) {
   //          apiPreferenceStore.setValue(IWorkbenchPreferenceConstants.PROMPT_WHEN_SAVEABLE_STILL_OPEN, false);
   //        }
   //
   //        modelsToSave = Arrays.asList(dlg.getResult());
   //      }
   //    }
   //  }
   //  // Create save block.
   //  return saveModels(modelsToSave, shellProvider, runnableContext);
   return true;
 }
 
 bool SaveablesList::SaveModels(const QList<Saveable::Pointer>& /*finalModels*/
 /*final IShellProvider shellProvider, IRunnableContext runnableContext*/)
 {
   //  IRunnableWithProgress progressOp = new IRunnableWithProgress() {
   //    public void run(IProgressMonitor monitor) {
   //      IProgressMonitor monitorWrap = new EventLoopProgressMonitor(
   //          monitor);
   //      monitorWrap.beginTask("", finalModels.size()); //$NON-NLS-1$
   //      for (Iterator i = finalModels.iterator(); i.hasNext();) {
   //        Saveable model = (Saveable) i.next();
   //        // handle case where this model got saved as a result of
   //        // saving another
   //        if (!model.isDirty()) {
   //          monitor.worked(1);
   //          continue;
   //        }
   //        SaveableHelper.doSaveModel(model, new SubProgressMonitor(monitorWrap, 1), shellProvider, true);
   //        if (monitorWrap.isCanceled())
   //          break;
   //      }
   //      monitorWrap.done();
   //    }
   //  };
   //
   //  // Do the save.
   //  return !SaveableHelper.runProgressMonitorOperation(
   //      WorkbenchMessages.Save_All, progressOp, runnableContext,
   //      shellProvider);
   return true;
 }
 
 void SaveablesList::PostClose(PostCloseInfo::Pointer postCloseInfo)
 {
   QList<Saveable::Pointer> removed;
   for (QList<WorkbenchPart::Pointer>::const_iterator it = postCloseInfo->partsClosing.begin();
       it != postCloseInfo->partsClosing.end(); ++it)
   {
     IWorkbenchPart::Pointer part = *it;
     QHash<Object*, Saveable::Set>::iterator it2 = modelMap.find(part.GetPointer());
     if (it2 != modelMap.end()) {
       // make a copy to avoid a ConcurrentModificationException - we
       // will remove from the original set as we iterate
       Saveable::Set saveables(it2.value());
       for (Saveable::Set::const_iterator it3 = saveables.begin();
           it3 != saveables.end(); ++it3)
       {
         if (RemoveModel(part, *it3)) {
           removed.push_back(*it3);
         }
       }
     }
   }
   if (!removed.empty()) {
     Object::Pointer source(this);
     SaveablesLifecycleEvent::Pointer event(new SaveablesLifecycleEvent(source,
         SaveablesLifecycleEvent::POST_CLOSE, removed, false));
     this->FireModelLifecycleEvent(event);
   }
 }
 
 void SaveablesList::PostOpen(IWorkbenchPart::Pointer part)
 {
   this->AddModels(part, this->GetSaveables(part));
 }
 
 void SaveablesList::DirtyChanged(IWorkbenchPart::Pointer part)
 {
   QList<Saveable::Pointer> saveables = this->GetSaveables(part);
   if (saveables.size() > 0) {
     Object::Pointer source(this);
     SaveablesLifecycleEvent::Pointer event(new SaveablesLifecycleEvent(source,
         SaveablesLifecycleEvent::DIRTY_CHANGED, saveables, false));
     this->FireModelLifecycleEvent(event);
   }
 }
 
 QList<Object::Pointer> SaveablesList::TestGetSourcesForModel(
     Saveable::Pointer /*model*/)
 {
   QList<Object::Pointer> result;
   //  for (Iterator it = modelMap.entrySet().iterator(); it.hasNext();) {
   //    Map.Entry entry = (Map.Entry) it.next();
   //    Set values = (Set) entry.getValue();
   //    if (values.contains(model)) {
   //      result.add(entry.getKey());
   //    }
   //  }
   return result;
 }
 
 QList<ISaveablesSource::Pointer> SaveablesList::GetNonPartSources()
 {
   return nonPartSources.toList();
 }
 
 QList<IWorkbenchPart::Pointer> SaveablesList::GetPartsForSaveable(
     Saveable::Pointer model)
 {
   QList<IWorkbenchPart::Pointer> result;
   for (QHash<Object*, Saveable::Set>::iterator it = modelMap.begin(); it
       != modelMap.end(); ++it)
   {
     Saveable::Set& values = it.value();
     IWorkbenchPart::Pointer part(dynamic_cast<IWorkbenchPart*>(it.key()));
     if (values.find(model) != values.end() && part)
     {
       result.push_back(part);
     }
   }
   return result;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySaveablesList.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySaveablesList.h
index 537fdf2c66..f4fac2ba0b 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySaveablesList.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySaveablesList.h
@@ -1,362 +1,359 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYSAVEABLESLIST_H_
 #define BERRYSAVEABLESLIST_H_
 
 #include "berryISaveablesLifecycleListener.h"
 
 #include "berryISaveablesSource.h"
 #include "berryIWorkbenchWindow.h"
 #include "berryIWorkbenchPart.h"
 
 #include "berryWorkbenchPart.h"
 
 #include <map>
 #include <set>
 #include <list>
 #include <vector>
 
 namespace berry
 {
 
 /**
  * The model manager maintains a list of open saveable models.
  *
  * @see Saveable
  * @see ISaveablesSource
- *
- * @since 3.2
  */
 class SaveablesList: public ISaveablesLifecycleListener
 {
 
 public:
 
-  berryObjectMacro(SaveablesList);
+  berryObjectMacro(SaveablesList)
 
 private:
 
   ISaveablesLifecycleListener::Events events;
 
   // event source (mostly ISaveablesSource) -> Set of Saveable
   QHash<Object*, Saveable::Set> modelMap;
 
   // reference counting map, Saveable -> Integer
   QHash<Saveable::Pointer, int> modelRefCounts;
 
   QSet<ISaveablesSource::Pointer> nonPartSources;
 
   // returns true if this model has not yet been in getModels()
   bool AddModel(Object::Pointer source, Saveable::Pointer model);
 
   /**
    * returns true if the given key was added for the first time
    *
    * @param referenceMap
    * @param key
    * @return true if the ref count of the given key is now 1
    */
   bool IncrementRefCount(QHash<Saveable::Pointer, int>& referenceMap,
       Saveable::Pointer key);
 
   /**
    * returns true if the given key has been removed
    *
    * @param referenceMap
    * @param key
    * @return true if the ref count of the given key was 1
    */
   bool DecrementRefCount(QHash<Saveable::Pointer, int>& referenceMap,
       Saveable::Pointer key);
 
   // returns true if this model was removed from getModels();
   bool RemoveModel(Object::Pointer source, Saveable::Pointer model);
 
   void LogWarning(const QString& message, Object::Pointer source,
       Saveable::Pointer model);
 
   /**
    * Updates the set of non-part saveables sources.
    * @param source
    */
   void UpdateNonPartSource(ISaveablesSource::Pointer source);
 
   /**
    * @param source
    * @param modelArray
    */
   void RemoveModels(Object::Pointer source,
       const QList<Saveable::Pointer>& modelArray);
 
   /**
    * @param source
    * @param modelArray
    */
   void AddModels(Object::Pointer source,
       const QList<Saveable::Pointer>& modelArray);
 
   /**
    * @param event
    */
   void FireModelLifecycleEvent(SaveablesLifecycleEvent::Pointer event);
 
   /**
    * @param window
    * @param modelsClosing
    * @param canCancel
    * @return true if the user canceled
    */
   bool
       PromptForSavingIfNecessary(IWorkbenchWindow::Pointer window,
           const Saveable::Set& modelsClosing,
           const QHash<Saveable::Pointer, int>& modelsDecrementing,
           bool canCancel);
 
   /**
    * @param modelsClosing
    * @param modelsDecrementing
    */
   void FillModelsClosing(Saveable::Set& modelsClosing,
       const QHash<Saveable::Pointer, int>& modelsDecrementing);
 
 
   /**
    * Returns the saveable models provided by the given part. If the part does
    * not provide any models, a default model is returned representing the
    * part.
    *
    * @param part
    *            the workbench part
    * @return the saveable models
    */
   QList<Saveable::Pointer> GetSaveables(IWorkbenchPart::Pointer part);
 
   //TODO SaveablesList ListSelectionDialog
   //  class MyListSelectionDialog extends
   //     ListSelectionDialog {
   //   private final boolean canCancel;
   //   private Button checkbox;
   //   private boolean dontPromptSelection;
   //   private boolean stillOpenElsewhere;
   //
   //   private MyListSelectionDialog(Shell shell, Object input,
   //       IStructuredContentProvider contentprovider,
   //       ILabelProvider labelProvider, String message, boolean canCancel, boolean stillOpenElsewhere) {
   //     super(shell, input, contentprovider, labelProvider, message);
   //     this.canCancel = canCancel;
   //     this.stillOpenElsewhere = stillOpenElsewhere;
   //     if (!canCancel) {
   //       int shellStyle = getShellStyle();
   //       shellStyle &= ~SWT.CLOSE;
   //       setShellStyle(shellStyle);
   //     }
   //   }
   //
   //   /**
   //    * @return
   //    */
   //   public boolean getDontPromptSelection() {
   //     return dontPromptSelection;
   //   }
   //
   //   protected void createButtonsForButtonBar(Composite parent) {
   //     createButton(parent, IDialogConstants.OK_ID,
   //         IDialogConstants.OK_LABEL, true);
   //     if (canCancel) {
   //       createButton(parent, IDialogConstants.CANCEL_ID,
   //           IDialogConstants.CANCEL_LABEL, false);
   //     }
   //   }
   //
   //   protected Control createDialogArea(Composite parent) {
   //      Composite dialogAreaComposite = (Composite) super.createDialogArea(parent);
   //
   //      if (stillOpenElsewhere) {
   //        Composite checkboxComposite = new Composite(dialogAreaComposite, SWT.NONE);
   //        checkboxComposite.setLayout(new GridLayout(2, false));
   //
   //        checkbox = new Button(checkboxComposite, SWT.CHECK);
   //        checkbox.addSelectionListener(new SelectionAdapter() {
   //         public void widgetSelected(SelectionEvent e) {
   //           dontPromptSelection = checkbox.getSelection();
   //         }
   //        });
   //        GridData gd = new GridData();
   //        gd.horizontalAlignment = SWT.BEGINNING;
   //        checkbox.setLayoutData(gd);
   //
   //        Label label = new Label(checkboxComposite, SWT.NONE);
   //        label.setText(WorkbenchMessages.EditorManager_closeWithoutPromptingOption);
   //        gd = new GridData();
   //        gd.grabExcessHorizontalSpace = true;
   //        gd.horizontalAlignment = SWT.BEGINNING;
   //      }
   //
   //      return dialogAreaComposite;
   //   }
   // }
 
 public:
 
   struct PostCloseInfo : public Object
   {
     berryObjectMacro(PostCloseInfo);
 
     QList<SmartPointer<WorkbenchPart> > partsClosing;
 
     QHash<Saveable::Pointer, int> modelsDecrementing;
 
     Saveable::Set modelsClosing;
 
   private:
     PostCloseInfo() {}
 
     friend class SaveablesList;
   };
 
   /**
    * Returns the list of open models managed by this model manager.
    *
    * @return a list of models
    */
   Saveable::Set GetOpenModels();
 
   /**
    * This implementation of handleModelLifecycleEvent must be called by
    * implementers of ISaveablesSource whenever the list of models of the model
    * source changes, or when the dirty state of models changes. The
    * ISaveablesSource instance must be passed as the source of the event
    * object.
    * <p>
    * This method may also be called by objects that hold on to models but are
    * not workbench parts. In this case, the event source must be set to an
    * object that is not an instanceof IWorkbenchPart.
    * </p>
    * <p>
    * Corresponding open and close events must originate from the same
    * (identical) event source.
    * </p>
    * <p>
    * This method must be called on the UI thread.
    * </p>
    */
-  void HandleLifecycleEvent(SaveablesLifecycleEvent::Pointer event);
+  void HandleLifecycleEvent(const SaveablesLifecycleEvent::Pointer& event);
 
   /**
    * Adds the given listener to the list of listeners. Has no effect if the
    * same (identical) listener has already been added. The listener will be
    * notified about changes to the models managed by this model manager. Event
    * types include: <br>
    * POST_OPEN when models were added to the list of models <br>
    * POST_CLOSE when models were removed from the list of models <br>
    * DIRTY_CHANGED when the dirty state of models changed
    * <p>
    * Listeners should ignore all other event types, including PRE_CLOSE. There
    * is no guarantee that listeners are notified before models are closed.
    *
    * @param listener
    */
-  void AddModelLifecycleListener(ISaveablesLifecycleListener::Pointer listener);
+  void AddModelLifecycleListener(ISaveablesLifecycleListener* listener);
 
   /**
    * Removes the given listener from the list of listeners. Has no effect if
    * the given listener is not contained in the list.
    *
    * @param listener
    */
-  void RemoveModelLifecycleListener(
-      ISaveablesLifecycleListener::Pointer listener);
+  void RemoveModelLifecycleListener(ISaveablesLifecycleListener* listener);
 
   /**
    * @param partsToClose
    * @param save
    * @param window
    * @return the post close info to be passed to postClose
    */
   PostCloseInfo::Pointer PreCloseParts(
       const QList<SmartPointer<IWorkbenchPart> >& partsToClose, bool save,
       IWorkbenchWindow::Pointer window);
 
   /**
    * Prompt the user to save the given saveables.
    * @param modelsToSave the saveables to be saved
    * @param shellProvider the provider used to obtain a shell in prompting is
    *            required. Clients can use a workbench window for this.
    * @param runnableContext a runnable context that will be used to provide a
    *            progress monitor while the save is taking place. Clients can
    *            use a workbench window for this.
    * @param canCancel whether the operation can be canceled
    * @param stillOpenElsewhere whether the models are referenced by open parts
    * @return true if the user canceled
    */
   bool PromptForSaving(const QList<Saveable::Pointer>& modelsToSave,
   /*final IShellProvider shellProvider, IRunnableContext runnableContext,*/
   bool canCancel, bool stillOpenElsewhere);
 
   /**
    * Save the given models.
    * @param finalModels the list of models to be saved
    * @param shellProvider the provider used to obtain a shell in prompting is
    *            required. Clients can use a workbench window for this.
    * @param runnableContext a runnable context that will be used to provide a
    *            progress monitor while the save is taking place. Clients can
    *            use a workbench window for this.
    * @return <code>true</code> if the operation was canceled
    */
   bool SaveModels(const QList<Saveable::Pointer>& finalModels
   /*final IShellProvider shellProvider, IRunnableContext runnableContext*/);
 
   /**
    * @param postCloseInfoObject
    */
   void PostClose(PostCloseInfo::Pointer postCloseInfoObject);
 
   /**
    * @param actualPart
    */
   void PostOpen(IWorkbenchPart::Pointer part);
 
   /**
    * @param actualPart
    */
   void DirtyChanged(IWorkbenchPart::Pointer part);
 
   /**
    * For testing purposes. Not to be called by clients.
    *
    * @param model
    * @return
    */
   QList<Object::Pointer> TestGetSourcesForModel(Saveable::Pointer model);
 
   /**
    * @return a list of ISaveablesSource objects registered with this saveables
    *         list which are not workbench parts.
    */
   QList<ISaveablesSource::Pointer> GetNonPartSources();
 
   /**
    * @param model
    */
   QList<IWorkbenchPart::Pointer> GetPartsForSaveable(
       Saveable::Pointer model);
 
 };
 
 }
 
 #endif /* BERRYSAVEABLESLIST_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryServiceLocator.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryServiceLocator.cpp
index d061672da8..edfd443550 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryServiceLocator.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryServiceLocator.cpp
@@ -1,232 +1,236 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryServiceLocator.h"
 
 #include "berryWorkbenchServiceRegistry.h"
 
 #include "services/berryIServiceFactory.h"
 #include "services/berryINestable.h"
 
 
 namespace berry
 {
 
 ServiceLocator::ParentLocator::ParentLocator(
     IServiceLocator* parent,
     const QString& serviceInterface)
   : locator(parent), key(serviceInterface)
 {
 }
 
 Object* ServiceLocator::ParentLocator::GetService(const QString& api)
 {
   if (key == api)
   {
     try {
       return locator->GetService(key);
     }
     catch (const BadWeakPointerException& /*e*/)
     {
 
     }
   }
   return NULL;
 }
 
 bool ServiceLocator::ParentLocator::HasService(const QString& api) const
 {
   if (key == api)
   {
     return true;
   }
   return false;
 }
 
-ServiceLocator::ServiceLocator() :
-  activated(false), disposed(false)
+ServiceLocator::ServiceLocator()
+  : activated(false)
+  , factory(NULL)
+  , parent(NULL)
+  , disposed(false)
 {
 
 }
 
 ServiceLocator::ServiceLocator(IServiceLocator* _parent,
-    const IServiceFactory::ConstPointer _factory, IDisposable::WeakPtr _owner) :
+    const IServiceFactory* _factory, IDisposable::WeakPtr _owner) :
   activated(false), factory(_factory), parent(_parent),
   disposed(false), owner(_owner)
 {
 
 }
 
 void ServiceLocator::Activate()
 {
   activated = true;
   for (KeyToServiceMapType::iterator serviceItr = services.begin(); serviceItr
       != services.end(); ++serviceItr)
   {
     Object* service = serviceItr.value();
     if (INestable* nestableService = dynamic_cast<INestable*>(service))
     {
       nestableService->Activate();
     }
   }
 
 }
 
 void ServiceLocator::Deactivate()
 {
   activated = false;
   for (KeyToServiceMapType::iterator serviceItr = services.begin(); serviceItr
       != services.end(); ++serviceItr)
   {
     Object* service = serviceItr.value();
     if (INestable* nestableService = dynamic_cast<INestable*>(service))
     {
       nestableService->Deactivate();
     }
   }
 
 }
 
 void ServiceLocator::Dispose()
 {
   for (KeyToServiceMapType::iterator serviceItr = services.begin(); serviceItr
       != services.end(); ++serviceItr)
   {
     Object* object = serviceItr.value();
     if (IDisposable* service = dynamic_cast<IDisposable*>(object))
     {
       service->Dispose();
     }
   }
   services.clear();
 
   parent = 0;
   disposed = true;
 }
 
 Object* ServiceLocator::GetService(const QString& key)
 {
   if (disposed)
   {
     return NULL;
   }
 
   KeyToServiceMapType::const_iterator iter = services.find(key);
   Object* service = NULL;
 
   if (iter != services.end())
   {
     service = iter.value();
   }
   else
   {
     // if we don't have a service in our cache then:
     // 1. check our local factory
     // 2. go to the registry
     // or 3. use the parent service
     IServiceLocator::Pointer factoryParent = WorkbenchServiceRegistry::GLOBAL_PARENT;
     if (parent)
     {
       factoryParent = new ParentLocator(parent, key);
     }
     if (factory)
     {
       service = factory->Create(key, factoryParent.GetPointer(), this);
     }
     if (!service)
     {
-      service = WorkbenchServiceRegistry::GetRegistry()->GetService(key,
-                                                                    factoryParent.GetPointer(),
-                                                                    this);
+      Object::Pointer factoryService =
+          WorkbenchServiceRegistry::GetRegistry()->GetService(key,
+                                                              factoryParent.GetPointer(),
+                                                              this);
+      managedFactoryServices.push_back(factoryService);
+      service = factoryService.GetPointer();
     }
     if (!service)
     {
       service = factoryParent->GetService(key);
     }
     else
     {
       this->RegisterService(key, service);
     }
   }
   return service;
 }
 
 bool ServiceLocator::HasService(const QString& key) const
 {
   if (disposed)
   {
     return false;
   }
-   if (services.find(key) != services.end())
-    {
-      return true;
-    }
-
-
+  if (services.find(key) != services.end())
+  {
+    return true;
+  }
   return false;
 }
 
 void ServiceLocator::RegisterService(const QString& api,
     Object* service) const
 {
   if (api.isEmpty())
   {
     throw ctkInvalidArgumentException("The service key cannot be empty");
   }
 
 //  if (!api.isInstance(service))
 //  {
 //    throw new IllegalArgumentException("The service does not implement the given interface"); //$NON-NLS-1$
 //  }
 
   if (services.find(api) != services.end())
   {
     Object* currentService = services[api];
     services.remove(api);
     if (IDisposable* disposable = dynamic_cast<IDisposable*>(currentService))
     {
       disposable->Dispose();
     }
   }
 
   if (service)
   {
     services.insert(api, service);
     if (INestable* nestable = dynamic_cast<INestable*>(service))
     {
       if (activated)
       {
         nestable->Activate();
       }
     }
   }
 }
 
 bool ServiceLocator::IsDisposed() const
 {
   return disposed;
 }
 
 void ServiceLocator::UnregisterServices(const QList<QString>& /*serviceNames*/)
 {
   IDisposable::Pointer d(owner);
   if (d)
   {
     d->Dispose();
   }
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryServiceLocator.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryServiceLocator.h
index 1f9ce71471..5da2f6dc1d 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryServiceLocator.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryServiceLocator.h
@@ -1,156 +1,158 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYSERVICELOCATOR_H_
 #define BERRYSERVICELOCATOR_H_
 
 #include "services/berryIServiceLocator.h"
 #include "services/berryINestable.h"
 #include "services/berryIDisposable.h"
 
 
 namespace berry
 {
 
 struct IServiceFactory;
 
 class ServiceLocator: public IDisposable,
     public INestable,
     public IServiceLocator
 {
 
 private:
 
   bool activated;
 
   class ParentLocator: public IServiceLocator
   {
 
     IServiceLocator* const locator;
     const QString& key;
 
   public:
 
     ParentLocator(IServiceLocator* parent,
                   const QString& serviceInterface);
 
     /*
      * (non-Javadoc)
      *
      * @see org.blueberry.ui.services.IServiceLocator#getService(java.lang.Class)
      */
     Object* GetService(const QString& api);
 
     /*
      * (non-Javadoc)
      *
      * @see org.blueberry.ui.services.IServiceLocator#hasService(java.lang.Class)
      */
     bool HasService(const QString& api) const;
   };
 
-  const SmartPointer<const IServiceFactory> factory;
+  const IServiceFactory* const factory;
 
   /**
    * The parent for this service locator. If a service can't be found in this
    * locator, then the parent is asked. This value may be <code>null</code>
    * if there is no parent.
    */
   IServiceLocator* parent;
 
   /**
    * The map of services This value is <code>null</code> until a service is
    * registered.
    */
   typedef QHash<const QString, Object*> KeyToServiceMapType;
   mutable KeyToServiceMapType services;
 
   bool disposed;
 
   IDisposable::WeakPtr owner;
 
+  QList<Object::Pointer> managedFactoryServices;
+
 public:
 
   berryObjectMacro(ServiceLocator);
 
   /**
    * Constructs a service locator with no parent.
    */
   ServiceLocator();
 
   /**
    * Constructs a service locator with the given parent.
    *
    * @param parent
    *            The parent for this service locator; this value may be
    *            <code>null</code>.
    * @param factory
    *            a local factory that can provide services at this level
    * @param owner
    */
-  ServiceLocator(IServiceLocator* parent, const SmartPointer<const IServiceFactory> factory,
+  ServiceLocator(IServiceLocator* parent, const IServiceFactory* factory,
       IDisposable::WeakPtr owner);
 
   void Activate();
 
   void Deactivate();
 
   void Dispose();
 
   using IServiceLocator::GetService;
   Object* GetService(const QString& key);
 
   bool HasService(const QString& key) const;
 
   /**
    * Registers a service with this locator. If there is an existing service
    * matching the same <code>api</code> and it implements
    * {@link IDisposable}, it will be disposed.
    *
    * @param api
    *            This is the interface that the service implements. Must not be
    *            <code>null</code>.
    * @param service
    *            The service to register. This must be some implementation of
    *            <code>api</code>. This value must not be <code>null</code>.
    */
   template<class S>
   void RegisterService(S* service) const
   {
     this->RegisterService(qobject_interface_iid<S*>(), service);
   }
 
   /**
    * @return
    */
   bool IsDisposed() const;
 
   /**
    * Some services that were contributed to this locator are no longer available
    * (because the plug-in containing the AbstractServiceFactory is no longer
    * available). Notify the owner of the locator about this.
    */
   void UnregisterServices(const QList<QString> &serviceNames);
 
 private:
 
   void RegisterService(const QString& api, Object* service) const;
 
 };
 
 }
 
 #endif // BERRYSERVICELOCATOR_H_
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryServiceLocatorCreator.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryServiceLocatorCreator.cpp
index c2b730ef2e..37c9b39987 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryServiceLocatorCreator.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryServiceLocatorCreator.cpp
@@ -1,35 +1,35 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryServiceLocatorCreator.h"
 
 #include "berryServiceLocator.h"
 #include "services/berryIServiceFactory.h"
 #include "services/berryIDisposable.h"
 
 namespace berry {
 
 SmartPointer<IServiceLocator>
 ServiceLocatorCreator::CreateServiceLocator(
       IServiceLocator* parent,
-      const SmartPointer<const IServiceFactory> factory,
+      const IServiceFactory* factory,
       WeakPointer<IDisposable> owner)
 {
   IServiceLocator::Pointer locator(new ServiceLocator(parent, factory, owner));
   return locator;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryServiceLocatorCreator.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryServiceLocatorCreator.h
index f46fba4cf9..1d6d8eaf90 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryServiceLocatorCreator.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryServiceLocatorCreator.h
@@ -1,45 +1,45 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYSERVICELOCATORCREATOR_H_
 #define BERRYSERVICELOCATORCREATOR_H_
 
 #include "berryIServiceLocatorCreator.h"
 
 namespace berry {
 
 /**
  * A simple service locator creator.
  *
  * @since 3.4
  */
 class ServiceLocatorCreator : public IServiceLocatorCreator
 {
 
 public:
 
   berryObjectMacro(ServiceLocatorCreator);
 
   SmartPointer<IServiceLocator> CreateServiceLocator(
       IServiceLocator* parent,
-      const SmartPointer<const IServiceFactory> factory,
+      const IServiceFactory* factory,
       WeakPointer<IDisposable> owner);
 };
 
 }
 
 #endif /* BERRYSERVICELOCATORCREATOR_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryShellPool.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryShellPool.cpp
index 5fffc20fa6..2c871ce5de 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryShellPool.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryShellPool.cpp
@@ -1,83 +1,82 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "tweaklets/berryGuiWidgetsTweaklet.h"
 
 #include "berryShellPool.h"
 
 namespace berry
 {
 
 const QString ShellPool::CLOSE_LISTENER = "close listener"; //$NON-NLS-1$
 
-void ShellPool::ShellClosed(ShellEvent::Pointer e)
+void ShellPool::ShellClosed(const ShellEvent::Pointer& e)
 {
 
   if (e->doit)
   {
     Shell::Pointer s = e->GetSource();
-    IShellListener::Pointer l =
-        s->GetData(CLOSE_LISTENER).Cast<IShellListener> ();
+    IShellListener* l =  s->GetExtraShellListener();
 
     if (l != 0)
     {
-      s->SetData(Object::Pointer(0), CLOSE_LISTENER);
+      s->SetExtraShellListener(NULL);
       l->ShellClosed(e);
 
       // The shell can 'cancel' the close by setting
       // the 'doit' to false...if so, do nothing
       if (e->doit)
       {
         availableShells.push_back(s);
         s->SetVisible(false);
       }
       else
       {
         // Restore the listener
-        s->SetData(l, CLOSE_LISTENER);
+        s->SetExtraShellListener(l);
       }
     }
   }
   e->doit = false;
 }
 
 ShellPool::ShellPool(Shell::Pointer parentShell, int childFlags) :
   flags(childFlags), parentShell(parentShell)
 {
 
 }
 
-Shell::Pointer ShellPool::AllocateShell(IShellListener::Pointer closeListener)
+Shell::Pointer ShellPool::AllocateShell(IShellListener* closeListener)
 {
   Shell::Pointer result;
   if (!availableShells.empty())
   {
     result = availableShells.front();
     availableShells.pop_front();
   }
   else
   {
     result = Tweaklets::Get(GuiWidgetsTweaklet::KEY)->CreateShell(parentShell.Lock(),
         flags);
-    result->AddShellListener(IShellListener::Pointer(this));
+    result->AddShellListener(this);
     //result.addDisposeListener(disposeListener);
   }
 
-  result->SetData(closeListener, CLOSE_LISTENER);
+  result->SetExtraShellListener(closeListener);
   return result;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryShellPool.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryShellPool.h
index 74b0ecbb66..95c84e054a 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryShellPool.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryShellPool.h
@@ -1,87 +1,87 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYSHELLPOOL_H_
 #define BERRYSHELLPOOL_H_
 
 #include "berryShell.h"
 
 #include <list>
 
 namespace berry
 {
 
 /**
  * Manages a pool of shells. This can be used instead of creating and destroying
  * shells. By reusing shells, they will never be disposed until the pool goes away.
  * This is useful in situations where client code may have cached pointers to the
  * shells to use as a parent for dialogs. It also works around bug 86226 (SWT menus
  * cannot be reparented).
  *
  * @since 3.1
  */
-class ShellPool: public IShellListener
+class ShellPool: public Object, public IShellListener
 {
 
   int flags;
 
   /**
    * Parent shell (or null if none)
    *
    * The parentShell is owned by the WorkbenchWindow, which also owns a ShellPool instance
    */
   Shell::WeakPtr parentShell;
 
   QList<Shell::Pointer> availableShells;
 
   static const QString CLOSE_LISTENER; // = "close listener";
 
   //    DisposeListener disposeListener = new DisposeListener() {
   //        public void widgetDisposed(DisposeEvent e) {
   //            WorkbenchPlugin.log(new RuntimeException("Widget disposed too early!")); //$NON-NLS-1$
   //        }
   //    };
 
   friend class WorkbenchWindow;
 
 public:
 
-  berryObjectMacro(ShellPool);
+  berryObjectMacro(ShellPool)
 
-  void ShellClosed(ShellEvent::Pointer e);
+  void ShellClosed(const ShellEvent::Pointer& e);
 
   /**
    * Creates a shell pool that allocates shells that are children of the
    * given parent and are created with the given flags.
    *
    * @param parentShell parent shell (may be null, indicating that this pool creates
    * top-level shells)
    * @param childFlags flags for all child shells
    */
   ShellPool(Shell::Pointer parentShell, int childFlags);
 
   /**
    * Returns a new shell. The shell must not be disposed directly, but it may be closed.
    * Once the shell is closed, it will be returned to the shell pool. Note: callers must
    * remove all listeners from the shell before closing it.
    */
-  Shell::Pointer AllocateShell(IShellListener::Pointer closeListener);
+  Shell::Pointer AllocateShell(IShellListener* closeListener);
 
 };
 
 }
 
 #endif /* BERRYSHELLPOOL_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryShowViewMenu.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryShowViewMenu.h
index f56d5db78b..5c7b6d1c6a 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryShowViewMenu.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryShowViewMenu.h
@@ -1,122 +1,124 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYSHOWVIEWMENU_H
 #define BERRYSHOWVIEWMENU_H
 
 #include <berryContributionItem.h>
 
 #include <QPair>
 
 namespace berry {
 
 struct IWorkbenchPage;
 struct IWorkbenchWindow;
 struct IMenuManager;
 
 class CommandContributionItemParameter;
 
 /**
  * A <code>ShowViewMenu</code> is used to populate a menu manager with Show
  * View actions. The visible views are determined by user preference from the
  * Perspective Customize dialog.
  */
 class ShowViewMenu : public ContributionItem
 {
 
 public:
 
   /**
    * Creates a Show View menu.
    *
    * @param window
    *            the window containing the menu
    * @param id
    *            the id
    */
   ShowViewMenu(IWorkbenchWindow* window, const QString& id);
 
   bool IsDirty() const;
 
   /**
    * Overridden to always return true and force dynamic menu building.
    */
   bool IsDynamic() const;
 
+  using ContributionItem::Fill;
+
   QAction* Fill(QMenu* menu, QAction *before);
 
 private:
 
   bool dirty;
 
   IWorkbenchWindow* window;
 
   //static const QString NO_TARGETS_MSG = WorkbenchMessages.Workbench_showInNoTargets;
 
   /**
    * Fills the menu with Show View actions.
    */
   void FillMenu(IMenuManager* innerMgr);
 
   QSet<QPair<QString, QString> > GetShortcuts(IWorkbenchPage* page) const;
 
 //  Action showDlgAction;
 
 //  IMenuListener menuListener = new IMenuListener() {
 //    public void menuAboutToShow(IMenuManager manager) {
 //      manager.markDirty();
 //      dirty = true;
 //    }
 //  };
 
 //  bool makeFast;
 
 
   SmartPointer<CommandContributionItemParameter> GetItem(const QString& viewId, const QString& secondaryId) const;
 
   QSet<QPair<QString,QString> > AddOpenedViews(IWorkbenchPage* page, QSet<QPair<QString,QString> >& actions) const;
 
   QSet<QPair<QString,QString> > GetParts(IWorkbenchPage* page) const;
 
 
   /**
    * @param commandService
    * @param makeFast
    */
 //  ParameterizedCommand GetCommand(ICommandService* commandService,
 //                                  bool makeFast)
 //  {
 //    Command c = commandService.getCommand(IWorkbenchCommandConstants.VIEWS_SHOW_VIEW);
 //    Parameterization[] parms = null;
 //    if (makeFast) {
 //      try {
 //        IParameter parmDef = c
 //            .getParameter(IWorkbenchCommandConstants.VIEWS_SHOW_VIEW_PARM_FASTVIEW);
 //        parms = new Parameterization[] { new Parameterization(parmDef,
 //            "true") //$NON-NLS-1$
 //        };
 //      } catch (NotDefinedException e) {
 //        // this should never happen
 //      }
 //    }
 //    return new ParameterizedCommand(c, parms);
 //  }
 };
 
 }
 
 #endif // BERRYSHOWVIEWMENU_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySlaveCommandService.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySlaveCommandService.cpp
new file mode 100644
index 0000000000..0849f4ec61
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySlaveCommandService.cpp
@@ -0,0 +1,199 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berrySlaveCommandService.h"
+
+#include "berryCommandExceptions.h"
+#include "berryElementReference.h"
+#include "berryCommand.h"
+#include "berryParameterizedCommand.h"
+#include "berryCommandCategory.h"
+
+#include "berryObjectString.h"
+
+#include <QStringList>
+
+namespace berry {
+
+SlaveCommandService::SlaveCommandService(ICommandService* parent, const QString& scopeName,
+                    const Object::Pointer& scopeValue)
+  : fParentService(parent)
+  , fScopingName(scopeName)
+  , fScopingValue(scopeValue)
+{
+  if (parent == NULL)
+  {
+    throw ctkInvalidArgumentException("The parent command service must not be null");
+  }
+}
+
+void SlaveCommandService::AddExecutionListener(IExecutionListener* listener)
+{
+  if (!fExecutionListeners.contains(listener))
+  {
+    fExecutionListeners.push_back(listener);
+  }
+  fParentService->AddExecutionListener(listener);
+}
+
+void SlaveCommandService::DefineUncategorizedCategory(const QString& name, const QString& description)
+{
+  fParentService->DefineUncategorizedCategory(name, description);
+}
+
+SmartPointer<ParameterizedCommand> SlaveCommandService::Deserialize(const QString& serializedParameterizedCommand) const
+{
+  return fParentService->Deserialize(serializedParameterizedCommand);
+}
+
+void SlaveCommandService::Dispose()
+{
+  if (!fExecutionListeners.isEmpty())
+  {
+    for (int i = 0; i < fExecutionListeners.size(); i++)
+    {
+      RemoveExecutionListener(fExecutionListeners[i]);
+    }
+    fExecutionListeners.clear();
+  }
+  foreach(IElementReference* ref, fCallbackCache)
+  {
+    UnregisterElement(IElementReference::Pointer(ref));
+  }
+  fCallbackCache.clear();
+}
+
+SmartPointer<CommandCategory> SlaveCommandService::GetCategory(const QString& categoryId) const
+{
+  return fParentService->GetCategory(categoryId);
+}
+
+SmartPointer<Command> SlaveCommandService::GetCommand(const QString& commandId) const
+{
+  return fParentService->GetCommand(commandId);
+}
+
+QList<SmartPointer<CommandCategory> > SlaveCommandService::GetDefinedCategories() const
+{
+  return fParentService->GetDefinedCategories();
+}
+
+QStringList SlaveCommandService::GetDefinedCategoryIds() const
+{
+  return fParentService->GetDefinedCategoryIds();
+}
+
+QStringList SlaveCommandService::GetDefinedCommandIds() const
+{
+  return fParentService->GetDefinedCommandIds();
+}
+
+QList<SmartPointer<Command> > SlaveCommandService::GetDefinedCommands() const
+{
+  return fParentService->GetDefinedCommands();
+}
+
+QStringList SlaveCommandService::GetDefinedParameterTypeIds() const
+{
+  return fParentService->GetDefinedParameterTypeIds();
+}
+
+QList<SmartPointer<ParameterType> > SlaveCommandService::GetDefinedParameterTypes() const
+{
+  return fParentService->GetDefinedParameterTypes();
+}
+
+QString SlaveCommandService::GetHelpContextId(const SmartPointer<const Command>& command) const
+{
+  return fParentService->GetHelpContextId(command);
+}
+
+QString SlaveCommandService::GetHelpContextId(const QString& commandId) const
+{
+  return fParentService->GetHelpContextId(commandId);
+}
+
+SmartPointer<ParameterType> SlaveCommandService::GetParameterType(const QString& parameterTypeId) const
+{
+  return fParentService->GetParameterType(parameterTypeId);
+}
+
+void SlaveCommandService::ReadRegistry()
+{
+  fParentService->ReadRegistry();
+}
+
+void SlaveCommandService::RemoveExecutionListener(IExecutionListener* listener)
+{
+  fExecutionListeners.removeAll(listener);
+  fParentService->RemoveExecutionListener(listener);
+}
+
+void SlaveCommandService::SetHelpContextId(const SmartPointer<IHandler>& handler,
+                      const QString& helpContextId)
+{
+  fParentService->SetHelpContextId(handler, helpContextId);
+}
+
+void SlaveCommandService::RefreshElements(const QString& commandId, const QHash<QString, Object::Pointer>& filter)
+{
+  fParentService->RefreshElements(commandId, filter);
+}
+
+SmartPointer<IElementReference> SlaveCommandService::RegisterElementForCommand(
+    const SmartPointer<ParameterizedCommand>& command,
+    const SmartPointer<UIElement>& element)
+{
+  if (!command->GetCommand()->IsDefined())
+  {
+    throw NotDefinedException(QString("Cannot define a callback for undefined command ")
+                              + command->GetCommand()->GetId());
+  }
+  if (element.IsNull())
+  {
+    throw NotDefinedException(QString("No callback defined for command ")
+                              + command->GetCommand()->GetId());
+  }
+
+  QHash<QString, Object::Pointer> elemParams;
+  QHash<QString, QString> paramMap = command->GetParameterMap();
+  QHashIterator<QString,QString> iter(paramMap);
+  while(iter.hasNext())
+  {
+    iter.next();
+    elemParams.insert(iter.key(), Object::Pointer(new ObjectString(iter.value())));
+  }
+
+  ElementReference::Pointer ref(
+        new ElementReference(command->GetId(), element, elemParams));
+  RegisterElement(ref);
+  return ref;
+}
+
+void SlaveCommandService::RegisterElement(const SmartPointer<IElementReference>& elementReference)
+{
+  fCallbackCache.insert(elementReference.GetPointer());
+  elementReference.Cast<ElementReference>()->AddParameter(fScopingName, fScopingValue);
+  fParentService->RegisterElement(elementReference);
+}
+
+void SlaveCommandService::UnregisterElement(const SmartPointer<IElementReference>& elementReference)
+{
+  fCallbackCache.remove(elementReference.GetPointer());
+  fParentService->UnregisterElement(elementReference);
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySlaveCommandService.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySlaveCommandService.h
new file mode 100644
index 0000000000..acf4228a0d
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySlaveCommandService.h
@@ -0,0 +1,119 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYSLAVECOMMANDSERVICE_H
+#define BERRYSLAVECOMMANDSERVICE_H
+
+#include "berryICommandService.h"
+
+namespace berry {
+
+/**
+ * A command service which delegates almost all responsibility to the parent
+ * service.
+ * <p>
+ * This class is not intended for use outside of the
+ * <code>org.blueberry.ui</code> plug-in.
+ * </p>
+ */
+class SlaveCommandService : public ICommandService
+{
+
+private:
+
+  QList<IExecutionListener*> fExecutionListeners;
+
+  /**
+   * The collection of ICallbackReferences added through this service.
+   */
+  QSet<IElementReference*> fCallbackCache;
+
+  ICommandService* const fParentService;
+
+  /**
+   * The scoping constant added to callback registrations submitted through
+   * this service.
+   */
+  const QString fScopingName;
+
+  /**
+   * The object to scope. In theory, the service locator that would find this
+   * service.
+   */
+  const Object::Pointer fScopingValue;
+
+public:
+
+  /**
+   * Build the slave service.
+   *
+   * @param parent
+   *            the parent service. This must not be <code>null</code>.
+   */
+  SlaveCommandService(ICommandService* parent, const QString& scopeName,
+                      const Object::Pointer& scopeValue);
+
+  void AddExecutionListener(IExecutionListener* listener);
+
+  void DefineUncategorizedCategory(const QString& name, const QString& description);
+
+  SmartPointer<ParameterizedCommand> Deserialize(const QString& serializedParameterizedCommand) const;
+
+  void Dispose();
+
+  SmartPointer<CommandCategory> GetCategory(const QString& categoryId) const;
+
+  SmartPointer<Command> GetCommand(const QString& commandId) const;
+
+  QList<SmartPointer<CommandCategory> > GetDefinedCategories() const;
+
+  QStringList GetDefinedCategoryIds() const;
+
+  QStringList GetDefinedCommandIds() const;
+
+  QList<SmartPointer<Command> > GetDefinedCommands() const;
+
+  QStringList GetDefinedParameterTypeIds() const;
+
+  QList<SmartPointer<ParameterType> > GetDefinedParameterTypes() const;
+
+  QString GetHelpContextId(const SmartPointer<const Command>& command) const;
+
+  QString GetHelpContextId(const QString& commandId) const;
+
+  SmartPointer<ParameterType> GetParameterType(const QString& parameterTypeId) const;
+
+  void ReadRegistry();
+
+  void RemoveExecutionListener(IExecutionListener* listener);
+
+  void SetHelpContextId(const SmartPointer<IHandler>& handler,
+                        const QString& helpContextId);
+
+  void RefreshElements(const QString& commandId, const QHash<QString, Object::Pointer>& filter);
+
+  SmartPointer<IElementReference> RegisterElementForCommand(
+      const SmartPointer<ParameterizedCommand>& command,
+      const SmartPointer<UIElement>& element);
+
+  void RegisterElement(const SmartPointer<IElementReference>& elementReference);
+
+  void UnregisterElement(const SmartPointer<IElementReference>& elementReference);
+};
+
+}
+
+#endif // BERRYSLAVECOMMANDSERVICE_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySlaveHandlerService.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySlaveHandlerService.cpp
new file mode 100644
index 0000000000..6297f82761
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySlaveHandlerService.cpp
@@ -0,0 +1,236 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berrySlaveHandlerService.h"
+
+#include "berryIHandler.h"
+#include "berryIHandlerActivation.h"
+#include "berryISourceProvider.h"
+
+#include "berryAndExpression.h"
+#include "berryHandlerActivation.h"
+#include "berryExecutionEvent.h"
+
+namespace berry {
+
+SlaveHandlerService::SlaveHandlerService(IHandlerService* parentHandlerService,
+                    const SmartPointer<Expression>& defaultExpression)
+  : defaultExpression(defaultExpression)
+  , parent(parentHandlerService)
+{
+  if (parentHandlerService == NULL)
+  {
+    throw ctkInvalidArgumentException("The parent handler service cannot be null");
+  }
+}
+
+SmartPointer<IHandlerActivation> SlaveHandlerService::ActivateHandler(const SmartPointer<IHandlerActivation>& childActivation)
+{
+  const QString commandId = childActivation->GetCommandId();
+  const IHandler::Pointer handler = childActivation->GetHandler();
+  const Expression::Pointer childExpression = childActivation->GetExpression();
+  Expression::Pointer expression = defaultExpression;
+  if (childExpression.IsNotNull() && defaultExpression.IsNotNull())
+  {
+    const AndExpression::Pointer andExpression(new AndExpression());
+    andExpression->Add(childExpression);
+    andExpression->Add(defaultExpression);
+    expression = andExpression;
+  }
+  else if (childExpression.IsNotNull())
+  {
+    expression = childExpression;
+  }
+  const int depth = childActivation->GetDepth() + 1;
+  const IHandlerActivation::Pointer localActivation(
+        new HandlerActivation(commandId, handler, expression, depth, this));
+
+  return DoActivation(localActivation);
+}
+
+SmartPointer<IHandlerActivation> SlaveHandlerService::ActivateHandler(const QString& commandId,
+                                                 const SmartPointer<IHandler>& handler)
+{
+  const IHandlerActivation::Pointer localActivation(
+        new HandlerActivation(commandId, handler, defaultExpression, IHandlerActivation::ROOT_DEPTH, this));
+  return DoActivation(localActivation);
+}
+
+SmartPointer<IHandlerActivation> SlaveHandlerService::ActivateHandler(const QString& commandId,
+                                                 const SmartPointer<IHandler>& handler,
+                                                 const SmartPointer<Expression>& expression)
+{
+  return ActivateHandler(commandId, handler, expression, false);
+}
+
+SmartPointer<IHandlerActivation> SlaveHandlerService::ActivateHandler(const QString& commandId,
+                                                 const SmartPointer<IHandler>& handler,
+                                                 const SmartPointer<Expression>& expression,
+                                                 bool global)
+{
+  if (global)
+  {
+    const IHandlerActivation::Pointer activation = parent->ActivateHandler(
+          commandId, handler, expression, global);
+    parentActivations.insert(activation);
+    return activation;
+  }
+
+  Expression::Pointer aExpression = defaultExpression;
+  if (expression.IsNotNull() && defaultExpression.IsNotNull())
+  {
+    const AndExpression::Pointer andExpression(new AndExpression());
+    andExpression->Add(expression);
+    andExpression->Add(defaultExpression);
+    aExpression = andExpression;
+  }
+  else if (expression.IsNotNull())
+  {
+    aExpression = expression;
+  }
+  const IHandlerActivation::Pointer localActivation(
+        new HandlerActivation(commandId, handler, aExpression, IHandlerActivation::ROOT_DEPTH, this));
+  return DoActivation(localActivation);
+}
+
+void SlaveHandlerService::AddSourceProvider(const SmartPointer<ISourceProvider>& provider)
+{
+  if (!fSourceProviders.contains(provider))
+  {
+    fSourceProviders.push_back(provider);
+  }
+  parent->AddSourceProvider(provider);
+}
+
+SmartPointer<const ExecutionEvent> SlaveHandlerService::CreateExecutionEvent(const SmartPointer<const Command>& command,
+                                                        const SmartPointer<const UIElement>& event)
+{
+  return parent->CreateExecutionEvent(command, event);
+}
+
+SmartPointer<const ExecutionEvent> SlaveHandlerService::CreateExecutionEvent(
+    const SmartPointer<const ParameterizedCommand>& command,
+    const SmartPointer<const UIElement>& event)
+{
+  return parent->CreateExecutionEvent(command, event);
+}
+
+void SlaveHandlerService::DeactivateHandler(const SmartPointer<IHandlerActivation>& activation)
+{
+  IHandlerActivation::Pointer parentActivation;
+  if (localActivationsToParentActivations.contains(activation))
+  {
+    parentActivation = localActivationsToParentActivations.take(activation);
+  }
+  else
+  {
+    parentActivation = activation;
+  }
+
+  if (parentActivation.IsNotNull())
+  {
+    parent->DeactivateHandler(parentActivation);
+    parentActivations.remove(parentActivation);
+  }
+}
+
+void SlaveHandlerService::DeactivateHandlers(const QList<SmartPointer<IHandlerActivation> >& activations)
+{
+  for (int i = 0; i < activations.size(); i++)
+  {
+    DeactivateHandler(activations[i]);
+  }
+}
+
+void SlaveHandlerService::Dispose()
+{
+  parent->DeactivateHandlers(parentActivations.toList());
+  parentActivations.clear();
+  localActivationsToParentActivations.clear();
+
+  // Remove any "resource", like listeners, that were associated
+  // with this service.
+  if (!fSourceProviders.isEmpty())
+  {
+    for (int i = 0; i < fSourceProviders.size(); i++)
+    {
+      RemoveSourceProvider(fSourceProviders[i]);
+    }
+    fSourceProviders.clear();
+  }
+}
+
+Object::Pointer SlaveHandlerService::ExecuteCommand(const SmartPointer<ParameterizedCommand>& command,
+                               const SmartPointer<const UIElement>& event)
+{
+  return parent->ExecuteCommand(command, event);
+}
+
+Object::Pointer SlaveHandlerService::ExecuteCommand(const QString& commandId,
+                               const SmartPointer<const UIElement>& event)
+{
+  return parent->ExecuteCommand(commandId, event);
+}
+
+SmartPointer<IEvaluationContext> SlaveHandlerService::GetCurrentState() const
+{
+  return parent->GetCurrentState();
+}
+
+void SlaveHandlerService::ReadRegistry()
+{
+  parent->ReadRegistry();
+}
+
+void SlaveHandlerService::RemoveSourceProvider(const SmartPointer<ISourceProvider>& provider)
+{
+  fSourceProviders.removeAll(provider);
+  parent->RemoveSourceProvider(provider);
+}
+
+void SlaveHandlerService::SetHelpContextId(const SmartPointer<IHandler>& handler,
+                      const QString& helpContextId)
+{
+  parent->SetHelpContextId(handler, helpContextId);
+}
+
+SmartPointer<Expression> SlaveHandlerService::GetDefaultExpression() const
+{
+  return defaultExpression;
+}
+
+SmartPointer<IEvaluationContext> SlaveHandlerService::CreateContextSnapshot(bool includeSelection)
+{
+  return parent->CreateContextSnapshot(includeSelection);
+}
+
+Object::Pointer SlaveHandlerService::ExecuteCommandInContext(const SmartPointer<ParameterizedCommand>& command,
+                                        const SmartPointer<const UIElement>& event,
+                                        const SmartPointer<IEvaluationContext>& context)
+{
+  return parent->ExecuteCommandInContext(command, event, context);
+}
+
+SmartPointer<IHandlerActivation> SlaveHandlerService::DoActivation(
+    const SmartPointer<IHandlerActivation>& localActivation)
+{
+  const IHandlerActivation::Pointer parentActivation = parent->ActivateHandler(localActivation);
+  parentActivations.insert(parentActivation);
+  localActivationsToParentActivations.insert(localActivation, parentActivation.GetPointer());
+  return localActivation;
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySlaveHandlerService.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySlaveHandlerService.h
new file mode 100644
index 0000000000..ff7e61e4b5
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySlaveHandlerService.h
@@ -0,0 +1,151 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYSLAVEHANDLERSERVICE_H
+#define BERRYSLAVEHANDLERSERVICE_H
+
+#include "berryIHandlerService.h"
+
+namespace berry {
+
+/**
+ * A handler service which delegates almost all responsibility to the parent
+ * service. It is only responsible for disposing of locally activated handlers
+ * when it is disposed.
+ * <p>
+ * This class is not intended for use outside of the
+ * <code>org.eclipse.ui.workbench</code> plug-in.
+ * </p>
+ */
+class SlaveHandlerService : public IHandlerService
+{
+
+protected:
+
+  /**
+   * The default expression to use when
+   * {@link #activateHandler(String, IHandler)} is called. Handlers
+   * contributed using that method will only be active when this service is
+   * active. However, this expression will be used for conflict resolution.
+   */
+  const SmartPointer<Expression> defaultExpression;
+
+  /**
+   * A map of the local activation to the parent activations. If this service
+   * is inactive, then all parent activations are <code>null</code>.
+   * Otherwise, they point to the corresponding activation in the parent
+   * service.
+   */
+  QMap<SmartPointer<IHandlerActivation>, IHandlerActivation*> localActivationsToParentActivations;
+
+  /**
+   * The parent handler service to which all requests are ultimately routed.
+   * This value is never <code>null</code>.
+   */
+  IHandlerService* const parent;
+
+  /**
+   * The activations registered with the parent handler service. This value is
+   * never <code>null</code>.
+   */
+  QSet<SmartPointer<IHandlerActivation> > parentActivations;
+
+private:
+
+  /**
+   * A collection of source providers. The listeners are not
+   * activated/deactivated, but they will be removed when this service is
+   * disposed.
+   */
+  QList<SmartPointer<ISourceProvider> > fSourceProviders;
+
+public:
+
+  /**
+   * Constructs a new instance.
+   *
+   * @param parentHandlerService
+   *            The parent handler service for this slave; must not be
+   *            <code>null</code>.
+   * @param defaultExpression
+   *            The default expression to use if none is provided. This is
+   *            primarily used for conflict resolution. This value may be
+   *            <code>null</code>.
+   */
+  SlaveHandlerService(IHandlerService* parentHandlerService,
+                      const SmartPointer<Expression>& defaultExpression);
+
+  SmartPointer<IHandlerActivation> ActivateHandler(const SmartPointer<IHandlerActivation>& childActivation);
+
+  SmartPointer<IHandlerActivation> ActivateHandler(const QString& commandId,
+                                                   const SmartPointer<IHandler>& handler);
+
+  SmartPointer<IHandlerActivation> ActivateHandler(const QString& commandId,
+                                                   const SmartPointer<IHandler>& handler,
+                                                   const SmartPointer<Expression>& expression);
+
+  SmartPointer<IHandlerActivation> ActivateHandler(const QString& commandId,
+                                                   const SmartPointer<IHandler>& handler,
+                                                   const SmartPointer<Expression>& expression,
+                                                   bool global);
+
+  void AddSourceProvider(const SmartPointer<ISourceProvider>& provider);
+
+  SmartPointer<const ExecutionEvent> CreateExecutionEvent(const SmartPointer<const Command>& command,
+                                                          const SmartPointer<const UIElement>& event);
+
+  SmartPointer<const ExecutionEvent> CreateExecutionEvent(
+      const SmartPointer<const ParameterizedCommand>& command,
+      const SmartPointer<const UIElement>& event);
+
+  void DeactivateHandler(const SmartPointer<IHandlerActivation>& activation);
+
+  void DeactivateHandlers(const QList<SmartPointer<IHandlerActivation> >& activations);
+
+  void Dispose();
+
+  Object::Pointer ExecuteCommand(const SmartPointer<ParameterizedCommand>& command,
+                                 const SmartPointer<const UIElement>& event);
+
+  Object::Pointer ExecuteCommand(const QString& commandId,
+                                 const SmartPointer<const UIElement>& event);
+
+  SmartPointer<IEvaluationContext> GetCurrentState() const;
+
+  void ReadRegistry();
+
+  void RemoveSourceProvider(const SmartPointer<ISourceProvider>& provider);
+
+  void SetHelpContextId(const SmartPointer<IHandler>& handler,
+                        const QString& helpContextId);
+
+  SmartPointer<Expression> GetDefaultExpression() const;
+
+  SmartPointer<IEvaluationContext> CreateContextSnapshot(bool includeSelection);
+
+  Object::Pointer ExecuteCommandInContext(const SmartPointer<ParameterizedCommand>& command,
+                                          const SmartPointer<const UIElement>& event,
+                                          const SmartPointer<IEvaluationContext>& context);
+
+protected:
+
+  virtual SmartPointer<IHandlerActivation> DoActivation(
+      const SmartPointer<IHandlerActivation>& localActivation);
+};
+
+}
+
+#endif // BERRYSLAVEHANDLERSERVICE_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySlaveMenuService.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySlaveMenuService.cpp
new file mode 100644
index 0000000000..77afd09699
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySlaveMenuService.cpp
@@ -0,0 +1,136 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berrySlaveMenuService.h"
+
+#include "berryIEvaluationContext.h"
+#include "berryIEvaluationReference.h"
+#include "berryISourceProvider.h"
+
+#include "berryAbstractContributionFactory.h"
+
+namespace berry {
+
+SlaveMenuService::SlaveMenuService(InternalMenuService* parent,
+                 IServiceLocator* serviceLocator,
+                 const QSet<SmartPointer<IEvaluationReference> >& restrictions)
+  : parent(parent)
+  , serviceLocator(serviceLocator)
+  , restrictionExpression(restrictions)
+{
+}
+
+void SlaveMenuService::PopulateContributionManager(ContributionManager* mgr, const QString& uri)
+{
+  parent->PopulateContributionManager(serviceLocator,
+                                      restrictionExpression, mgr, uri, true);
+}
+
+void SlaveMenuService::PopulateContributionManager(ContributionManager* mgr,
+                                                   const QString& uri, bool recurse)
+{
+  parent->PopulateContributionManager(serviceLocator,
+                                      restrictionExpression, mgr, uri, recurse);
+}
+
+SmartPointer<IEvaluationContext> SlaveMenuService::GetCurrentState() const
+{
+  return parent->GetCurrentState();
+}
+
+void SlaveMenuService::AddContributionFactory(const SmartPointer<AbstractContributionFactory>& cache)
+{
+  if (!factories.contains(cache)) {
+    factories.push_back(cache);
+  }
+  parent->AddContributionFactory(cache);
+}
+
+void SlaveMenuService::ReleaseContributions(ContributionManager* mgr)
+{
+  parent->ReleaseContributions(mgr);
+}
+
+void SlaveMenuService::RemoveContributionFactory(const SmartPointer<AbstractContributionFactory>& factory)
+{
+  factories.removeAll(factory);
+  parent->RemoveContributionFactory(factory);
+}
+
+void SlaveMenuService::Dispose()
+{
+  if (!providers.isEmpty())
+  {
+    for (int i = 0; i < providers.size(); i++)
+    {
+      parent->RemoveSourceProvider(providers[i]);
+    }
+    providers.clear();
+  }
+  if (!factories.isEmpty())
+  {
+    for (int i = 0; i < factories.size(); i++)
+    {
+      parent->RemoveContributionFactory(factories[i]);
+    }
+    factories.clear();
+  }
+  restrictionExpression.clear();
+}
+
+void SlaveMenuService::AddSourceProvider(const SmartPointer<ISourceProvider>& provider)
+{
+  if (!providers.contains(provider))
+  {
+    providers.push_back(provider);
+  }
+  parent->AddSourceProvider(provider);
+}
+
+void SlaveMenuService::RemoveSourceProvider(const SmartPointer<ISourceProvider>& provider)
+{
+  providers.removeAll(provider);
+  parent->RemoveSourceProvider(provider);
+}
+
+QList<SmartPointer<AbstractContributionFactory> > SlaveMenuService::GetAdditionsForURI(const QUrl& uri)
+{
+  return parent->GetAdditionsForURI(uri);
+}
+
+void SlaveMenuService::RegisterVisibleWhen(const SmartPointer<IContributionItem>& item,
+                                           const SmartPointer<Expression>& visibleWhen,
+                                           QSet<SmartPointer<IEvaluationReference> >& restriction,
+                                           const QString& identifierID)
+{
+  parent->RegisterVisibleWhen(item, visibleWhen, restriction, identifierID);
+}
+
+void SlaveMenuService::UnregisterVisibleWhen(const SmartPointer<IContributionItem>& item,
+                                             QSet<SmartPointer<IEvaluationReference> >& restriction)
+{
+  parent->UnregisterVisibleWhen(item, restriction);
+}
+
+void SlaveMenuService::PopulateContributionManager(
+    IServiceLocator* serviceLocatorToUse, const QSet<SmartPointer<IEvaluationReference> >& restriction,
+    ContributionManager* mgr, const QString& uri, bool recurse)
+{
+  parent->PopulateContributionManager(serviceLocatorToUse, restriction,
+                                      mgr, uri, recurse);
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySlaveMenuService.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySlaveMenuService.h
new file mode 100644
index 0000000000..57648afbb3
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySlaveMenuService.h
@@ -0,0 +1,100 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYSLAVEMENUSERVICE_H
+#define BERRYSLAVEMENUSERVICE_H
+
+#include "berryInternalMenuService.h"
+
+namespace berry {
+
+/**
+ * <p>
+ * Provides services related to contributing menu elements to a workbench
+ * window. Visibility and showing are tracked at the workbench window level.
+ * </p>
+ * <p>
+ * This class is only intended for internal use within the
+ * <code>org.eclipse.ui.workbench</code> plug-in.
+ * </p>
+ */
+class SlaveMenuService : public InternalMenuService
+{
+
+private:
+
+  QList<SmartPointer<ISourceProvider> > providers;
+  QList<SmartPointer<AbstractContributionFactory> > factories;
+
+  /**
+   * The parent menu service for this window. This parent must track menu
+   * definitions and the registry. Must not be <code>null</code>
+   */
+  InternalMenuService* const parent;
+  IServiceLocator* const serviceLocator;
+  QSet<SmartPointer<IEvaluationReference> > restrictionExpression;
+
+public:
+
+  /**
+   * Constructs a new instance of <code>MenuService</code> using a menu
+   * manager.
+   *
+   * @param parent
+   *     The parent menu service for this window. This parent must track menu
+   *     definitions and the regsitry. Must not be <code>null</code>
+   */
+  SlaveMenuService(InternalMenuService* parent,
+                   IServiceLocator* serviceLocator,
+                   const QSet<SmartPointer<IEvaluationReference> >& restrictions);
+
+  void PopulateContributionManager(ContributionManager* mgr, const QString& uri);
+
+  void PopulateContributionManager(ContributionManager* mgr,
+                                   const QString& uri, bool recurse);
+
+  SmartPointer<IEvaluationContext> GetCurrentState() const;
+
+  void AddContributionFactory(const SmartPointer<AbstractContributionFactory>& cache);
+
+  void ReleaseContributions(ContributionManager* mgr);
+
+  void RemoveContributionFactory(const SmartPointer<AbstractContributionFactory>& factory);
+
+  void Dispose();
+
+  void AddSourceProvider(const SmartPointer<ISourceProvider>& provider);
+
+  void RemoveSourceProvider(const SmartPointer<ISourceProvider>& provider);
+
+  QList<SmartPointer<AbstractContributionFactory> > GetAdditionsForURI(const QUrl& uri);
+
+  void RegisterVisibleWhen(const SmartPointer<IContributionItem>& item,
+                           const SmartPointer<Expression>& visibleWhen,
+                           QSet<SmartPointer<IEvaluationReference> >& restriction,
+                           const QString& identifierID);
+
+  void UnregisterVisibleWhen(const SmartPointer<IContributionItem>& item,
+                             QSet<SmartPointer<IEvaluationReference> >& restriction);
+
+  void PopulateContributionManager(
+      IServiceLocator* serviceLocatorToUse, const QSet<SmartPointer<IEvaluationReference> >& restriction,
+      ContributionManager* mgr, const QString& uri, bool recurse);
+};
+
+}
+
+#endif // BERRYSLAVEMENUSERVICE_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySourcePriorityNameMapping.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySourcePriorityNameMapping.cpp
index cacc24c3a9..0fcc25990f 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySourcePriorityNameMapping.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySourcePriorityNameMapping.cpp
@@ -1,134 +1,133 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berrySourcePriorityNameMapping.h"
 
 #include <Poco/Exception.h>
 
 
 namespace berry
 {
 
 QHash<QString,int> SourcePriorityNameMapping::sourcePrioritiesByName;
 
 SourcePriorityNameMapping::SourcePriorityNameMapping()
 {
   // This class should not be instantiated.
 }
 
 const QString SourcePriorityNameMapping::LEGACY_LEGACY_NAME()
 {
   static const QString val = "LEGACY";
   return val;
 }
 
 int SourcePriorityNameMapping::NO_SOURCE_PRIORITY()
 {
   static int val = 0;
   return val;
 }
 
 SourcePriorityNameMapping::Initializer::Initializer()
 {
   SourcePriorityNameMapping::AddMapping(ISources::ACTIVE_ACTION_SETS_NAME(),
       ISources::ACTIVE_ACTION_SETS());
   SourcePriorityNameMapping::AddMapping(ISources::ACTIVE_CONTEXT_NAME(), ISources::ACTIVE_CONTEXT());
   SourcePriorityNameMapping::AddMapping(ISources::ACTIVE_CURRENT_SELECTION_NAME(),
       ISources::ACTIVE_CURRENT_SELECTION());
   SourcePriorityNameMapping::AddMapping(ISources::ACTIVE_EDITOR_NAME(), ISources::ACTIVE_EDITOR());
   SourcePriorityNameMapping::AddMapping(ISources::ACTIVE_EDITOR_ID_NAME(), ISources::ACTIVE_EDITOR_ID());
   SourcePriorityNameMapping::AddMapping(ISources::ACTIVE_MENU_NAME(), ISources::ACTIVE_MENU());
   SourcePriorityNameMapping::AddMapping(ISources::ACTIVE_MENU_SELECTION_NAME(), ISources::ACTIVE_MENU());
   SourcePriorityNameMapping::AddMapping(ISources::ACTIVE_MENU_EDITOR_INPUT_NAME(),
       ISources::ACTIVE_MENU());
   SourcePriorityNameMapping::AddMapping(ISources::ACTIVE_FOCUS_CONTROL_ID_NAME(),
       ISources::ACTIVE_MENU());
   SourcePriorityNameMapping::AddMapping(ISources::ACTIVE_FOCUS_CONTROL_NAME(), ISources::ACTIVE_MENU());
   SourcePriorityNameMapping::AddMapping(ISources::ACTIVE_PART_NAME(), ISources::ACTIVE_PART());
   SourcePriorityNameMapping::AddMapping(ISources::ACTIVE_PART_ID_NAME(), ISources::ACTIVE_PART_ID());
   SourcePriorityNameMapping::AddMapping(ISources::ACTIVE_SHELL_NAME(), ISources::ACTIVE_SHELL());
   SourcePriorityNameMapping::AddMapping(ISources::ACTIVE_SITE_NAME(), ISources::ACTIVE_SITE());
   SourcePriorityNameMapping::AddMapping(ISources::ACTIVE_WORKBENCH_WINDOW_NAME(),
       ISources::ACTIVE_WORKBENCH_WINDOW());
   SourcePriorityNameMapping::AddMapping(ISources::ACTIVE_WORKBENCH_WINDOW_SHELL_NAME(),
       ISources::ACTIVE_WORKBENCH_WINDOW_SHELL());
   SourcePriorityNameMapping::AddMapping(
-      ISources::ACTIVE_WORKBENCH_WINDOW_IS_COOLBAR_VISIBLE_NAME(),
+      ISources::ACTIVE_WORKBENCH_WINDOW_IS_TOOLBAR_VISIBLE_NAME(),
       ISources::ACTIVE_WORKBENCH_WINDOW_SUBORDINATE());
   SourcePriorityNameMapping::AddMapping(
       ISources::ACTIVE_WORKBENCH_WINDOW_ACTIVE_PERSPECTIVE_NAME(),
       ISources::ACTIVE_WORKBENCH_WINDOW_SUBORDINATE());
   SourcePriorityNameMapping::AddMapping(
       ISources::ACTIVE_WORKBENCH_WINDOW_IS_PERSPECTIVEBAR_VISIBLE_NAME(),
       ISources::ACTIVE_WORKBENCH_WINDOW_SUBORDINATE());
-  SourcePriorityNameMapping::AddMapping(LEGACY_LEGACY_NAME(), LEGACY_LEGACY());
   SourcePriorityNameMapping::AddMapping("workbench", ISources::WORKBENCH());
 }
 
 SourcePriorityNameMapping::Initializer SourcePriorityNameMapping::initializer;
 
 void SourcePriorityNameMapping::AddMapping(const QString& sourceName,
     int sourcePriority)
 {
   if (sourceName == "")
   {
     throw Poco::InvalidArgumentException("The source name cannot be empty."); //$NON-NLS-1$
   }
 
   if (sourcePrioritiesByName.find(sourceName) == sourcePrioritiesByName.end())
   {
     sourcePrioritiesByName.insert(sourceName, sourcePriority);
   }
 }
 
 int SourcePriorityNameMapping::ComputeSourcePriority(
     Expression::ConstPointer expression)
 {
   int sourcePriority = ISources::WORKBENCH();
 
   if (expression == 0)
   {
     return sourcePriority;
   }
 
   const ExpressionInfo* info = expression->ComputeExpressionInfo();
 
   // Add the default variable, if any.
   if (info->HasDefaultVariableAccess())
   {
     sourcePriority |= ISources::ACTIVE_CURRENT_SELECTION();
   }
 
   // Add all of the reference variables.
   QSet<QString> sourceNames = info->GetAccessedVariableNames();
   foreach (QString name, sourceNames)
   {
     sourcePriority |= GetMapping(name);
   }
 
   return sourcePriority;
 }
 
 int SourcePriorityNameMapping::GetMapping(const QString& sourceName)
 {
   if (sourcePrioritiesByName.contains(sourceName))
   {
     return sourcePrioritiesByName[sourceName];
   }
   return NO_SOURCE_PRIORITY();
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySourceProviderService.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySourceProviderService.cpp
new file mode 100644
index 0000000000..3e1586f5ae
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySourceProviderService.cpp
@@ -0,0 +1,85 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berrySourceProviderService.h"
+
+#include "berryAbstractSourceProvider.h"
+#include "berryWorkbenchServiceRegistry.h"
+
+namespace berry {
+
+SourceProviderService::SourceProviderService(IServiceLocator *locator)
+  : locator(locator)
+{
+}
+
+void SourceProviderService::Dispose()
+{
+  sourceProvidersByName.clear();
+}
+
+SmartPointer<ISourceProvider> SourceProviderService::GetSourceProvider(const QString& sourceName) const
+{
+  return sourceProvidersByName.value(sourceName);
+}
+
+QList<SmartPointer<ISourceProvider> > SourceProviderService::GetSourceProviders() const
+{
+  return sourceProviders.toList();
+}
+
+void SourceProviderService::RegisterProvider(const SmartPointer<ISourceProvider>& sourceProvider)
+{
+  if (sourceProvider.IsNull())
+  {
+    throw ctkInvalidArgumentException("The source provider cannot be null");
+  }
+
+  const QList<QString> sourceNames = sourceProvider->GetProvidedSourceNames();
+  for (int i = 0; i < sourceNames.size(); i++)
+  {
+    const QString sourceName = sourceNames[i];
+    sourceProvidersByName.insert(sourceName, sourceProvider);
+  }
+  sourceProviders.insert(sourceProvider);
+}
+
+void SourceProviderService::UnregisterProvider(const SmartPointer<ISourceProvider>& sourceProvider)
+{
+  if (sourceProvider.IsNull())
+  {
+    throw ctkInvalidArgumentException("The source provider cannot be null");
+  }
+
+  const QList<QString> sourceNames = sourceProvider->GetProvidedSourceNames();
+  for (int i = 0; i < sourceNames.size(); i++)
+  {
+    sourceProvidersByName.remove(sourceNames[i]);
+  }
+  sourceProviders.remove(sourceProvider);
+}
+
+void SourceProviderService::ReadRegistry()
+{
+  QList<AbstractSourceProvider::Pointer> sp = WorkbenchServiceRegistry::GetRegistry()->GetSourceProviders();
+  for (int i = 0; i < sp.size(); i++)
+  {
+    sp[i]->Initialize(locator);
+    RegisterProvider(sp[i]);
+  }
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySourceProviderService.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySourceProviderService.h
new file mode 100644
index 0000000000..8edeb666e2
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berrySourceProviderService.h
@@ -0,0 +1,77 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYSOURCEPROVIDERSERVICE_H
+#define BERRYSOURCEPROVIDERSERVICE_H
+
+#include "berryISourceProviderService.h"
+#include "berryIDisposable.h"
+
+namespace berry {
+
+struct IServiceLocator;
+
+/**
+ * <p>
+ * A service holding all of the registered source providers.
+ * </p>
+ * <p>
+ * This class is not intended for use outside of the
+ * <code>org.eclipse.ui.workbench</code> plug-in.
+ * </p>
+ */
+class SourceProviderService : public ISourceProviderService, public IDisposable
+{
+
+private:
+
+  /**
+   * The source providers registered with this service. This value is never
+   * <code>null</code>. This is a map of the source name ({@link String})
+   * to the source provider ({@link ISourceProvider}).
+   */
+  QHash<QString,SmartPointer<ISourceProvider> > sourceProvidersByName;
+
+  /**
+   * All of the source providers registered with this service. This value is
+   * never <code>null</code>.
+   */
+  QSet<SmartPointer<ISourceProvider> > sourceProviders;
+
+  IServiceLocator* locator;
+
+public:
+
+  berryObjectMacro(berry::SourceProviderService)
+
+  SourceProviderService(IServiceLocator* locator);
+
+  void Dispose();
+
+  SmartPointer<ISourceProvider> GetSourceProvider(const QString& sourceName) const;
+
+  QList<SmartPointer<ISourceProvider> > GetSourceProviders() const;
+
+  void RegisterProvider(const SmartPointer<ISourceProvider>& sourceProvider);
+
+  void UnregisterProvider(const SmartPointer<ISourceProvider>& sourceProvider);
+
+  void ReadRegistry();
+};
+
+}
+
+#endif // BERRYSOURCEPROVIDERSERVICE_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryStickyViewManager.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryStickyViewManager.cpp
index 8750e3a5a1..57e785cdee 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryStickyViewManager.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryStickyViewManager.cpp
@@ -1,110 +1,110 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryStickyViewManager.h"
 
 #include "berryPerspective.h"
 #include "berryWorkbenchPlugin.h"
 
 #include <berryIStickyViewDescriptor.h>
 #include <berryIWorkbenchPage.h>
 
 namespace berry
 {
 
 StickyViewManager::StickyViewManager(IWorkbenchPage* page) :
   page(page)
 {
 
 }
 
 IStickyViewManager::Pointer StickyViewManager::GetInstance(IWorkbenchPage* page)
 {
   IStickyViewManager::Pointer stickyViewMan;
   //    IPreferenceStore preferenceStore = PrefUtil.getAPIPreferenceStore();
   //    boolean enable32Behavior = preferenceStore
   //        .getBoolean(IWorkbenchPreferenceConstants.ENABLE_32_STICKY_CLOSE_BEHAVIOR);
   //    if (enable32Behavior)
   //      stickyViewMan = new StickyViewManager32(page);
   //    else
   stickyViewMan = IStickyViewManager::Pointer(new StickyViewManager(page));
 
   return stickyViewMan;
 }
 
 void StickyViewManager::Add(const QString& /*perspectiveId*/, const std::set<QString>& /*stickyViewSet*/)
 {
   // do nothing
 }
 
 void StickyViewManager::Clear()
 {
   // do nothing
 }
 
 void StickyViewManager::Remove(const QString& /*perspectiveId*/)
 {
   // do nothing
 }
 
 void StickyViewManager::Restore(IMemento::Pointer /*memento*/)
 {
   // do nothing
 }
 
 void StickyViewManager::Save(IMemento::Pointer /*memento*/)
 {
   // do nothing
 }
 
 void StickyViewManager::Update(Perspective::Pointer oldPersp,
     Perspective::Pointer newPersp)
 {
   if (oldPersp == 0 || newPersp == 0)
   {
     return;
   }
   IViewRegistry* viewReg = WorkbenchPlugin::GetDefault()->GetViewRegistry();
   QList<IStickyViewDescriptor::Pointer> stickyDescs(
       viewReg->GetStickyViews());
-  for (std::size_t i = 0; i < stickyDescs.size(); i++)
+  for (int i = 0; i < stickyDescs.size(); i++)
   {
     const QString viewId = stickyDescs[i]->GetId();
     try
     {
       // show a sticky view if it was in the last perspective and
       // hasn't already been activated in this one
       if (oldPersp->FindView(viewId))
       {
         page->ShowView(viewId, "", IWorkbenchPage::VIEW_CREATE);
       }
       // remove a view if it's sticky and its not visible in the old
       // perspective
       else if (newPersp->FindView(viewId) && oldPersp->FindView(viewId) == 0)
       {
         page->HideView(newPersp->FindView(viewId));
       }
     } catch (PartInitException& e)
     {
       //TODO IStatus
       //        WorkbenchPlugin::Log(
       //                "Could not open view :" + viewId, new Status(IStatus.ERROR, WorkbenchPlugin.PI_WORKBENCH, IStatus.ERROR, "Could not open view :" + viewId, e)); //$NON-NLS-1$ //$NON-NLS-2$
       WorkbenchPlugin::Log("Could not open view: " + viewId, e);
     }
   }
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryTweaklets.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryTweaklets.h
index 69321b89e0..cc91cc9426 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryTweaklets.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryTweaklets.h
@@ -1,157 +1,157 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYTWEAKLETS_H_
 #define BERRYTWEAKLETS_H_
 
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include <QString>
 
 namespace berry {
 
 struct BERRY_UI_QT TweakKey_base
 {
   QString tweakClass;
 
   /**
    * @param tweakClass
    */
   TweakKey_base(const QString& _tweakClass);
 
   bool operator==(const TweakKey_base& obj) const;
   bool operator<(const TweakKey_base& obj) const;
 };
 
 }
 
 BERRY_UI_QT uint qHash(const berry::TweakKey_base& key);
 
 #include <berryIConfigurationElement.h>
 #include <berryPlatform.h>
 #include <berryIExtensionRegistry.h>
 #include <berryCoreException.h>
 
 
 namespace berry {
 
 class BERRY_UI_QT Tweaklets
 {
 
 public:
 
   template<typename I>
   struct TweakKey: public TweakKey_base
   {
     TweakKey() :
       TweakKey_base("")
     {
 
       tweakClass = QString(qobject_interface_iid<I*>());
     }
 
     TweakKey(const QString& _tweakClass) :
       TweakKey_base(_tweakClass)
     {
     }
   };
 
   static void SetDefault(const TweakKey_base& definition,
                          QObject* implementation);
 
   static void Clear();
 
   template<typename I>
   static I* Get(const TweakKey<I>& definition)
   {
     TweakletMap::const_iterator iter = tweaklets.find(definition);
     QObject* result;
     if (iter == tweaklets.end())
     {
       result = CreateTweaklet(definition);
       if (result == 0)
       {
         result = GetDefault(definition);
       }
       Q_ASSERT(result != 0);
       tweaklets.insert(definition, result);
       return qobject_cast<I*>(result);
     }
 
     return qobject_cast<I*>(iter.value());
   }
 
 private:
 
   typedef QHash<TweakKey_base, QObject*> TweakletMap;
 
   static TweakletMap defaults;
   static TweakletMap tweaklets;
 
   /**
    * @param definition
    * @return
    */
   template<typename I>
   static QObject* GetDefault(const TweakKey<I>& definition)
   {
     TweakletMap::const_iterator iter = defaults.find(definition);
     if (iter == defaults.end())
       return 0;
 
     return iter.value();
   }
 
   /**
    * @param definition
    * @return
    */
   template<typename I>
   static QObject* CreateTweaklet(const TweakKey<I>& definition)
   {
     QList<IConfigurationElement::Pointer> elements =
         Platform::GetExtensionRegistry()
         ->GetConfigurationElementsFor("org.blueberry.ui.tweaklets");
-    for (unsigned int i = 0; i < elements.size(); i++)
+    for (int i = 0; i < elements.size(); i++)
     {
       QString attr = elements[i]->GetAttribute("definition");
       if (!attr.isNull() && definition.tweakClass == attr)
       {
         try
         {
           QObject* tweaklet = elements[i]->CreateExecutableExtension("implementation");
           tweaklets.insert(definition, tweaklet);
           return tweaklet;
         }
         catch (const CoreException& e)
         {
           //StatusManager.getManager().handle(
           //    StatusUtil.newStatus(IStatus.ERR,
           BERRY_ERROR << "Error with extension " << elements[i] << e.what();
           //    StatusManager.LOG);
         }
       }
     }
     return 0;
   }
 
 };
 
 }
 
 
 #endif /* BERRYTWEAKLETS_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryRuntime.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryUiUtil.cpp
similarity index 78%
copy from BlueBerry/Bundles/org.blueberry.core.runtime/src/berryRuntime.cpp
copy to BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryUiUtil.cpp
index 7be762e2ce..3ef0ddb2f1 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryRuntime.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryUiUtil.cpp
@@ -1,23 +1,21 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
-#include "berryRuntime.h"
-
-namespace berry {
-
-const std::string Runtime::ADAPTER_SERVICE_ID = "org.blueberry.service.adapter";
+#include "berryUiUtil.h"
 
+berryUiUtil::berryUiUtil()
+{
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryUtil.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryUiUtil.h
similarity index 56%
copy from BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryUtil.h
copy to BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryUiUtil.h
index 26cad2fac4..433b7051db 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryUtil.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryUiUtil.h
@@ -1,88 +1,95 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
-#ifndef BERRYUTIL_H_
-#define BERRYUTIL_H_
+#ifndef BERRYUIUTIL_H
+#define BERRYUIUTIL_H
 
-namespace berry
-{
+#include "berryIAdaptable.h"
+#include "berryIAdapterManager.h"
+#include "berryPlatformObject.h"
+#include "berryPlatform.h"
+
+namespace berry {
 
-class Util
+class UiUtil
 {
 
 public:
 
   /**
    * If it is possible to adapt the given object to the given type, this
    * returns the adapter. Performs the following checks:
    *
    * <ol>
    * <li>Returns <code>sourceObject</code> if it is an instance of the
    * adapter type.</li>
    * <li>If sourceObject implements IAdaptable, it is queried for adapters.</li>
    * <li>If sourceObject is not an instance of PlatformObject (which would have
    * already done so), the adapter manager is queried for adapters</li>
    * </ol>
    *
    * Otherwise returns null.
    *
    * @param sourceObject
    *            object to adapt, or null
    * @param adapterType
    *            type to adapt to
    * @return a representation of sourceObject that is assignable to the
    *         adapter type, or null if no such representation exists
    */
   template<class A>
-  static A* GetAdapter(Object::Pointer sourceObject)
+  static A* GetAdapter(Object* sourceObject)
   {
-    if (sourceObject == 0)
+    if (sourceObject == NULL)
     {
-      return 0;
+      return NULL;
     }
-    if (A* adapter = dynamic_cast<A*>(sourceObject.GetPointer()))
+    if (A* adapter = dynamic_cast<A*>(sourceObject))
     {
       return adapter;
     }
 
-    if (/*IAdaptable* adaptable =*/ dynamic_cast<IAdaptable*>(sourceObject.GetPointer()))
+    if (IAdaptable* adaptable = dynamic_cast<IAdaptable*>(sourceObject))
     {
-      // TODO IAdaptable
-      //            IAdaptable adaptable = (IAdaptable) sourceObject;
-      //
-      //            Object result = adaptable.getAdapter(adapterType);
-      //            if (result != null) {
-      //                // Sanity-check
-      //                Assert.isTrue(adapterType.isInstance(result));
-      //                return result;
-      //            }
-      return 0;
+      A* result = adaptable->GetAdapter<A>();
+      if (result != NULL)
+      {
+        return result;
+      }
     }
 
-    //        if (!(sourceObject instanceof PlatformObject)) {
-    //            Object result = Platform.getAdapterManager().getAdapter(sourceObject, adapterType);
-    //            if (result != null) {
-    //                return result;
-    //            }
-    //        }
+    if (dynamic_cast<PlatformObject*>(sourceObject) == NULL)
+    {
+      A* result = NULL;
+      IAdapterManager* adapterManager = Platform::GetAdapterManager();
+      if (adapterManager)
+      {
+        result = adapterManager->GetAdapter<A>(sourceObject);
+      }
+      if (result != NULL)
+      {
+        return result;
+      }
+    }
 
-    return 0;
+    return NULL;
   }
+
 };
 
 }
 
-#endif /* BERRYUTIL_H_ */
+#endif // BERRYUIUTIL_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryUtil.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryUtil.cpp
new file mode 100644
index 0000000000..de50a3841c
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryUtil.cpp
@@ -0,0 +1,35 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berryUtil.h"
+
+#include "berryShell.h"
+#include "berryPlatformUI.h"
+
+namespace berry {
+
+SmartPointer<Shell> Util::GetShellToParentOn()
+{
+  IWorkbench* workbench = PlatformUI::GetWorkbench();
+  IWorkbenchWindow::Pointer activeWindow = workbench->GetActiveWorkbenchWindow();
+  IWorkbenchWindow::Pointer windowToParentOn = activeWindow.IsNull() ?
+        (workbench->GetWorkbenchWindowCount() > 0 ?
+           workbench->GetWorkbenchWindows()[0] : IWorkbenchWindow::Pointer(0))
+      : activeWindow;
+  return windowToParentOn.IsNull() ? Shell::Pointer(0) : activeWindow->GetShell();
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryUtil.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryUtil.h
index 26cad2fac4..e05cb90b63 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryUtil.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryUtil.h
@@ -1,88 +1,103 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYUTIL_H_
 #define BERRYUTIL_H_
 
-namespace berry
-{
+#include "berryObject.h"
+#include "berryIAdaptable.h"
+
+namespace berry {
+
+class Shell;
 
 class Util
 {
 
 public:
 
   /**
    * If it is possible to adapt the given object to the given type, this
    * returns the adapter. Performs the following checks:
    *
    * <ol>
    * <li>Returns <code>sourceObject</code> if it is an instance of the
    * adapter type.</li>
    * <li>If sourceObject implements IAdaptable, it is queried for adapters.</li>
    * <li>If sourceObject is not an instance of PlatformObject (which would have
    * already done so), the adapter manager is queried for adapters</li>
    * </ol>
    *
    * Otherwise returns null.
    *
    * @param sourceObject
    *            object to adapt, or null
    * @param adapterType
    *            type to adapt to
    * @return a representation of sourceObject that is assignable to the
    *         adapter type, or null if no such representation exists
    */
   template<class A>
   static A* GetAdapter(Object::Pointer sourceObject)
   {
     if (sourceObject == 0)
     {
       return 0;
     }
     if (A* adapter = dynamic_cast<A*>(sourceObject.GetPointer()))
     {
       return adapter;
     }
 
     if (/*IAdaptable* adaptable =*/ dynamic_cast<IAdaptable*>(sourceObject.GetPointer()))
     {
       // TODO IAdaptable
       //            IAdaptable adaptable = (IAdaptable) sourceObject;
       //
       //            Object result = adaptable.getAdapter(adapterType);
       //            if (result != null) {
       //                // Sanity-check
       //                Assert.isTrue(adapterType.isInstance(result));
       //                return result;
       //            }
       return 0;
     }
 
     //        if (!(sourceObject instanceof PlatformObject)) {
     //            Object result = Platform.getAdapterManager().getAdapter(sourceObject, adapterType);
     //            if (result != null) {
     //                return result;
     //            }
     //        }
 
     return 0;
   }
+
+  /**
+   * Return an appropriate shell to parent dialogs on. This will be one of the
+   * workbench windows (the active one) should any exist. Otherwise
+   * <code>null</code> is returned.
+   *
+   * @return the shell to parent on or <code>null</code> if there is no
+   *         appropriate shell
+   */
+  static SmartPointer<Shell> GetShellToParentOn();
+
 };
 
 }
 
 #endif /* BERRYUTIL_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryViewDescriptor.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryViewDescriptor.cpp
index 413e3df1e5..a0af8e075d 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryViewDescriptor.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryViewDescriptor.cpp
@@ -1,222 +1,222 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryViewDescriptor.h"
 
 #include "berryIConfigurationElement.h"
 #include "berryCoreException.h"
 #include "berryIExtension.h"
 #include "berryIContributor.h"
 #include "berryStatus.h"
 
 #include "berryRegistryReader.h"
 #include "berryWorkbenchRegistryConstants.h"
 
 #include "berryImageDescriptor.h"
 #include "berryAbstractUICTKPlugin.h"
 #include "berryImageDescriptor.h"
 #include "handlers/berryIHandlerActivation.h"
 
 namespace berry
 {
 
 ViewDescriptor::ViewDescriptor(const IConfigurationElement::Pointer& e) :
   configElement(e)
 {
   this->LoadFromExtension();
 }
 
 IViewPart::Pointer ViewDescriptor::CreateView()
 {
   IViewPart::Pointer part(configElement->CreateExecutableExtension<IViewPart> (
       WorkbenchRegistryConstants::ATT_CLASS));
   return part;
 }
 
 const QList<QString>& ViewDescriptor::GetCategoryPath() const
 {
   return categoryPath;
 }
 
 IConfigurationElement::Pointer ViewDescriptor::GetConfigurationElement() const
 {
   return configElement;
 }
 
 QString ViewDescriptor::GetDescription() const
 {
   return RegistryReader::GetDescription(configElement);
 }
 
 QString ViewDescriptor::GetId() const
 {
   return id;
 }
 
 bool ViewDescriptor::operator==(const Object* o) const
 {
   if (const IViewDescriptor* other = dynamic_cast<const IViewDescriptor*>(o))
   return this->GetId() == other->GetId();
 
   return false;
 }
 
 ImageDescriptor::Pointer ViewDescriptor::GetImageDescriptor() const
 {
   if (imageDescriptor)
   {
     return imageDescriptor;
   }
   QString iconName = configElement->GetAttribute(WorkbenchRegistryConstants::ATT_ICON);
   // If the icon attribute was omitted, use the default one
   if (iconName.isEmpty())
   {
     //TODO default image descriptor
     //return PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_DEF_VIEW);
     return ImageDescriptor::GetMissingImageDescriptor();
   }
   IExtension::Pointer extension(configElement->GetDeclaringExtension());
   const QString extendingPluginId(extension->GetContributor()->GetName());
   imageDescriptor = AbstractUICTKPlugin::ImageDescriptorFromPlugin(
       extendingPluginId, iconName);
   if (!imageDescriptor)
   {
     // Try legacy BlueBerry method
     imageDescriptor = AbstractUICTKPlugin::ImageDescriptorFromPlugin(
       extendingPluginId, iconName);
   }
 
   // If the icon attribute was invalid, use the error icon
   if (!imageDescriptor)
   {
     imageDescriptor = ImageDescriptor::GetMissingImageDescriptor();
   }
 
   return imageDescriptor;
 }
 
 QString ViewDescriptor::GetLabel() const
 {
   return configElement->GetAttribute(WorkbenchRegistryConstants::ATT_NAME);
 }
 
 QString ViewDescriptor::GetAccelerator() const
 {
   return configElement->GetAttribute(WorkbenchRegistryConstants::ATT_ACCELERATOR);
 }
 
 bool ViewDescriptor::GetAllowMultiple() const
 {
   return configElement->GetAttribute(WorkbenchRegistryConstants::ATT_ALLOW_MULTIPLE).compare("true", Qt::CaseInsensitive) == 0;
 }
 
 bool ViewDescriptor::IsRestorable() const
 {
   QString str = configElement->GetAttribute(WorkbenchRegistryConstants::ATT_RESTORABLE);
   return str.isNull() ? true : str.compare("true", Qt::CaseInsensitive) == 0;
 }
 
-Poco::Any ViewDescriptor::GetAdapter(const QString& adapter)
+Object* ViewDescriptor::GetAdapter(const QString& adapter)
 {
-  if (adapter == IConfigurationElement::GetStaticClassName())
+  if (adapter == qobject_interface_iid<IConfigurationElement*>())
   {
-    return Poco::Any(GetConfigurationElement());
+    return GetConfigurationElement().GetPointer();
   }
-  return Poco::Any();
+  return NULL;
 }
 
 void
 ViewDescriptor::ActivateHandler()
 {
   //TODO ViewDescriptor handler activation
 //  if (!handlerActivation)
 //  {
 //    IHandler::Pointer handler(new ShowViewHandler(this->GetId()));
 //    IHandlerService::Pointer handlerService(
 //        PlatformUI::GetWorkbench()->GetService(IHandlerService::GetManifestName()).Cast<IHandlerService>());
 //    handlerActivation = handlerService
 //    ->ActivateHandler(this->GetId(), handler);
 //  }
 }
 
 void
 ViewDescriptor::DeactivateHandler()
 {
   //TODO ViewDescriptor handler deactivation
 //  if (handlerActivation)
 //  {
 //    IHandlerService::Pointer handlerService(
 //        PlatformUI::GetWorkbench()->GetService(IHandlerService::GetManifestName()).Cast<IHandlerService>());
 //    handlerService->DeactivateHandler(handlerActivation);
 //    handlerActivation = 0;
 //  }
 }
 
 std::vector< std::string> ViewDescriptor::GetKeywordReferences() const
 {
   std::vector<std::string> result;
   std::string keywordRefId;
   std::vector<berry::IConfigurationElement::Pointer> keywordRefs;
   berry::IConfigurationElement::vector::iterator keywordRefsIt;
   keywordRefs = configElement->GetChildren("keywordReference");
   for (keywordRefsIt = keywordRefs.begin()
           ; keywordRefsIt != keywordRefs.end(); ++keywordRefsIt) // iterate over all refs
   {
     (*keywordRefsIt)->GetAttribute("id", keywordRefId);
     result.push_back(keywordRefId);
   }
   return result;
 }
 
 QString ViewDescriptor::GetPluginId() const
 {
   return configElement->GetContributor()->GetName();
 }
 
 QString ViewDescriptor::GetLocalId() const
 {
   return this->GetId();
 }
 
 void ViewDescriptor::LoadFromExtension()
 {
   id = configElement->GetAttribute(WorkbenchRegistryConstants::ATT_ID);
 
   // Sanity check.
   QString name = configElement->GetAttribute(WorkbenchRegistryConstants::ATT_NAME);
   if (name.isEmpty() ||
       RegistryReader::GetClassValue(configElement, WorkbenchRegistryConstants::ATT_CLASS).isEmpty())
   {
     IStatus::Pointer status(new Status(IStatus::ERROR_TYPE, configElement->GetContributor()->GetName(), 0,
                                        QString("Invalid extension (missing label or class name): ") + id));
     throw CoreException(status);
   }
 
   QString category = configElement->GetAttribute(WorkbenchRegistryConstants::TAG_CATEGORY);
   if (!category.isEmpty())
   {
     // Parse the path tokens and store them
     foreach (QString pathElement, category.split('/', QString::SkipEmptyParts))
     {
       if (!pathElement.trimmed().isEmpty())
       {
         categoryPath.push_back(pathElement.trimmed());
       }
     }
   }
 }
 
 } // namespace berry
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryViewDescriptor.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryViewDescriptor.h
index 66e53c1691..e63af84b04 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryViewDescriptor.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryViewDescriptor.h
@@ -1,164 +1,164 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYVIEWDESCRIPTOR_H_
 #define BERRYVIEWDESCRIPTOR_H_
 
 #include "berryIViewPart.h"
 #include "berryIViewDescriptor.h"
 #include "berryIPluginContribution.h"
 
 #include <string>
 #include <vector>
 
 namespace berry
 {
 
 struct IConfigurationElement;
 struct IHandlerActivation;
 
 /**
  * \ingroup org_blueberry_ui_internal
  *
  */
 class ViewDescriptor : public IViewDescriptor, public IPluginContribution
 {
 private:
 
   QString id;
   mutable SmartPointer<ImageDescriptor> imageDescriptor;
   IConfigurationElement::Pointer configElement;
   QList<QString> categoryPath;
 
   /**
    * The activation token returned when activating the show view handler with
    * the workbench.
    */
   SmartPointer<IHandlerActivation> handlerActivation;
 
 public:
 
   berryObjectMacro(ViewDescriptor);
 
   /**
    * Create a new <code>ViewDescriptor</code> for an extension.
    *
    * @param e the configuration element
    * @throws CoreException thrown if there are errors in the configuration
    */
   ViewDescriptor(const SmartPointer<IConfigurationElement>& e);
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.registry.IViewDescriptor#createView()
    */
   IViewPart::Pointer CreateView();
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.registry.IViewDescriptor#getCategoryPath()
    */
   const QList<QString>& GetCategoryPath() const;
 
   /**
    * Return the configuration element for this descriptor.
    *
    * @return the configuration element
    */
   IConfigurationElement::Pointer GetConfigurationElement() const;
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.registry.IViewDescriptor#getDescription()
    */
   QString GetDescription() const;
 
   std::vector<std::string> GetKeywordReferences() const;
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.IWorkbenchPartDescriptor#getId()
    */
   QString GetId() const;
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.IWorkbenchPartDescriptor#getImageDescriptor()
    */
   SmartPointer<ImageDescriptor> GetImageDescriptor() const;
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.IWorkbenchPartDescriptor#getLabel()
    */
   QString GetLabel() const;
 
   /**
    * Return the accelerator attribute.
    *
    * @return the accelerator attribute
    */
   QString GetAccelerator() const;
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.registry.IViewDescriptor#getAllowMultiple()
    */
   bool GetAllowMultiple() const;
 
   /* (non-Javadoc)
    * @see org.eclipse.ui.views.IViewDescriptor#getRestorable()
    */
   bool IsRestorable() const;
 
   bool operator==(const Object*) const;
 
   /**
    * Activates a show view handler for this descriptor. This handler can later
    * be deactivated by calling {@link ViewDescriptor#deactivateHandler()}.
    * This method will only activate the handler if it is not currently active.
    *
    */
   void ActivateHandler();
 
   /**
    * Deactivates the show view handler for this descriptor. This handler was
    * previously activated by calling {@link ViewDescriptor#activateHandler()}.
    * This method will only deactivative the handler if it is currently active.
    *
    */
   void DeactivateHandler();
 
   /*
    * @see IPluginContribution#GetPluginId()
    */
    QString GetPluginId() const;
 
    /*
     * @see IPluginContribution#GetLocalId()
     */
    QString GetLocalId() const;
 
 protected:
 
   /* (non-Javadoc)
    * @see IAdaptable#GetAdapterImpl(const std::type_info&)
    */
-  Poco::Any GetAdapter(const QString& adapter);
+  Object* GetAdapter(const QString& adapter);
 
 private:
   /**
    * load a view descriptor from the registry.
    */
   void LoadFromExtension();
 };
 
 }
 
 #endif /*BERRYVIEWDESCRIPTOR_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryViewFactory.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryViewFactory.cpp
index bad872440a..9efae57c0f 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryViewFactory.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryViewFactory.cpp
@@ -1,324 +1,324 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryViewFactory.h"
 
 #include "berryUIException.h"
 #include "berryIViewRegistry.h"
 #include "berryImageDescriptor.h"
 
 #include "berryViewReference.h"
 #include "berryViewDescriptor.h"
 #include "berryWorkbenchPage.h"
 #include "berryWorkbenchConstants.h"
 #include "util/berrySafeRunnable.h"
 
 #include <berrySafeRunner.h>
 
 namespace berry
 {
 
 const QString ViewFactory::ID_SEP = ":"; //$NON-NLS-1$
 
 QString ViewFactory::GetKey(const QString& id,
     const QString& secondaryId)
 {
   return secondaryId.isEmpty() ? id : id + ID_SEP + secondaryId;
 }
 
 QString ViewFactory::GetKey(IViewReference::Pointer viewRef)
 {
   return GetKey(viewRef->GetId(), viewRef->GetSecondaryId());
 }
 
 QString ViewFactory::ExtractPrimaryId(const QString& compoundId)
 {
   int i = compoundId.lastIndexOf(ID_SEP);
   if (i == -1)
   {
     return compoundId;
   }
   return compoundId.left(i);
 }
 
 QString ViewFactory::ExtractSecondaryId(const QString& compoundId)
 {
   int i = compoundId.lastIndexOf(ID_SEP);
   if (i == -1)
   {
     return QString();
   }
   return compoundId.mid(i + 1);
 }
 
 bool ViewFactory::HasWildcard(const QString& viewId)
 {
   return viewId.indexOf('*') != -1;
 }
 
 ViewFactory::ViewFactory(WorkbenchPage* p, IViewRegistry* reg) :
   page(p), viewReg(reg)
 {
   //page.getExtensionTracker().registerHandler(this, null);
 }
 
 IViewReference::Pointer ViewFactory::CreateView(const QString& id,
     const QString& secondaryId)
 {
   IViewDescriptor::Pointer desc = viewReg->Find(id);
   // ensure that the view id is valid
   if (desc.IsNull())
   {
     throw PartInitException(QString("Could not create view: ") + id);
   }
   // ensure that multiple instances are allowed if a secondary id is given
   if (secondaryId != "")
   {
     if (!desc->GetAllowMultiple())
     {
       throw PartInitException(QString("View does not allow multiple instances:") + id);
     }
   }
   QString key = this->GetKey(id, secondaryId);
   IViewReference::Pointer ref = counter.Get(key);
   if (ref.IsNull())
   {
     IMemento::Pointer memento = mementoTable[key];
     ref = new ViewReference(this, id, secondaryId, memento);
     mementoTable.remove(key);
     counter.Put(key, ref);
     this->GetWorkbenchPage()->PartAdded(ref.Cast<ViewReference> ());
   }
   else
   {
     counter.AddRef(key);
   }
 
   return ref;
 }
 
 QList<IViewReference::Pointer> ViewFactory::GetViewReferences()
 {
   QList<IViewReference::Pointer> values(counter.Values());
 
   return values;
 }
 
 IViewReference::Pointer ViewFactory::GetView(const QString& id)
 {
   return this->GetView(id, "");
 }
 
 IViewReference::Pointer ViewFactory::GetView(const QString& id,
     const QString& secondaryId)
 {
   QString key = this->GetKey(id, secondaryId);
   return counter.Get(key);
 }
 
 const IViewRegistry* ViewFactory::GetViewRegistry() const
 {
   return viewReg;
 }
 
 QList<IViewReference::Pointer> ViewFactory::GetViews()
 {
   QList<IViewReference::Pointer> values(counter.Values());
 
   return values;
 }
 
 WorkbenchPage* ViewFactory::GetWorkbenchPage() const
 {
   return page;
 }
 
 int ViewFactory::GetReferenceCount(IViewReference::Pointer viewRef)
 {
   QString key = this->GetKey(viewRef);
   IViewReference::Pointer ref = counter.Get(key);
   return ref.IsNull() ? 0 : counter.GetRef(key);
 }
 
 void ViewFactory::ReleaseView(IViewReference::Pointer viewRef)
 {
   QString key = this->GetKey(viewRef);
   IViewReference::Pointer ref = counter.Get(key);
   if (ref.IsNull())
   {
     return;
   }
   int count = counter.RemoveRef(key);
   if (count <= 0)
   {
     this->GetWorkbenchPage()->PartRemoved(ref.Cast<ViewReference> ());
   }
 }
 
 bool ViewFactory::RestoreState(IMemento::Pointer memento)
 {
   QList<IMemento::Pointer> mem(memento->GetChildren(
       WorkbenchConstants::TAG_VIEW));
-  for (std::size_t i = 0; i < mem.size(); i++)
+  for (int i = 0; i < mem.size(); i++)
   {
     //for dynamic UI - add the next line to replace subsequent code that is commented out
     RestoreViewState(mem[i]);
   }
   //  return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
   return true;
 }
 
 bool ViewFactory::SaveState(IMemento::Pointer memento)
 {
   //  final MultiStatus result = new MultiStatus(PlatformUI.PLUGIN_ID,
   //      IStatus.OK, WorkbenchMessages.ViewFactory_problemsSavingViews, null);
   bool result = true;
   QList<IViewReference::Pointer> refs(GetViews());
-  for (std::size_t i = 0; i < refs.size(); i++)
+  for (int i = 0; i < refs.size(); i++)
   {
     IViewDescriptor::Pointer desc = viewReg->Find(refs[i]->GetId());
     if (desc->IsRestorable())
     {
       //for dynamic UI - add the following line to replace subsequent code which is commented out
       SaveViewState(memento, refs[i], result);
     }
   }
   return result;
 }
 
 struct SaveViewRunnable: public SafeRunnable
 {
   SaveViewRunnable(IViewPart::Pointer view, IMemento::Pointer viewMemento,
       bool& result) :
     view(view), viewMemento(viewMemento), result(result)
   {
   }
 
   void Run()
   {
 
     const QHash<QString, QString>& properties =
         view->GetPartProperties();
     if (!properties.empty())
     {
       IMemento::Pointer propBag = viewMemento ->CreateChild(
           WorkbenchConstants::TAG_PROPERTIES);
       for (QHash<QString, QString>::const_iterator i =
           properties.begin(); i != properties.end(); ++i)
       {
         IMemento::Pointer p = propBag->CreateChild(
             WorkbenchConstants::TAG_PROPERTY, i.key());
         p->PutTextData(i.value());
       }
     }
 
     view->SaveState(viewMemento ->CreateChild(
         WorkbenchConstants::TAG_VIEW_STATE));
   }
 
   void HandleException(const std::exception& /*e*/)
   {
     //            result
     //            .add(new Status(
     //                    IStatus.ERR,
     //                    PlatformUI.PLUGIN_ID,
     //                    0,
     //                    NLS.bind(WorkbenchMessages.ViewFactory_couldNotSave, viewRef.getTitle() ),
     //                    e));
     result = false;
   }
 
 private:
 
   IViewPart::Pointer view;
   IMemento::Pointer viewMemento;
   bool& result;
 };
 
 //  for dynamic UI
 IMemento::Pointer ViewFactory::SaveViewState(IMemento::Pointer memento,
     IViewReference::Pointer ref, bool& res)
 {
   //final MultiStatus result = res;
   bool& result = res;
 
   IMemento::Pointer viewMemento = memento->CreateChild(
       WorkbenchConstants::TAG_VIEW);
   viewMemento->PutString(WorkbenchConstants::TAG_ID, ViewFactory::GetKey(ref));
   if (ViewReference::Pointer viewRef = ref.Cast<ViewReference>())
   {
     viewMemento->PutString(WorkbenchConstants::TAG_PART_NAME,
         viewRef->GetPartName());
   }
   const IViewReference::Pointer viewRef = ref;
   const IViewPart::Pointer view = ref->GetPart(false).Cast<IViewPart> ();
   if (view)
   {
     ISafeRunnable::Pointer runnable(new SaveViewRunnable(view, viewMemento,
         result));
     SafeRunner::Run(runnable);
   }
   else
   {
     IMemento::Pointer mem;
     IMemento::Pointer props;
 
     // if we've created the reference once, any previous workbench
     // state memento is there.  After once, there is no previous
     // session state, so it should be null.
     if (ref.Cast<ViewReference> ())
     {
       mem = ref.Cast<ViewReference> ()->GetMemento();
       if (mem)
       {
         props = mem->GetChild(WorkbenchConstants::TAG_PROPERTIES);
         mem = mem->GetChild(WorkbenchConstants::TAG_VIEW_STATE);
       }
     }
     if (props)
     {
       viewMemento->CreateChild(WorkbenchConstants::TAG_PROPERTIES) ->PutMemento(
           props);
     }
     if (mem)
     {
       IMemento::Pointer child = viewMemento ->CreateChild(
           WorkbenchConstants::TAG_VIEW_STATE);
       child->PutMemento(mem);
     }
   }
   return viewMemento;
 }
 
 // for dynamic UI
 void ViewFactory::RestoreViewState(IMemento::Pointer memento)
 {
   QString compoundId;
   memento->GetString(WorkbenchConstants::TAG_ID, compoundId);
   mementoTable.insert(compoundId, memento);
 }
 
 IMemento::Pointer ViewFactory::GetViewState(const QString& key)
 {
   IMemento::Pointer memento = mementoTable[key];
 
   if (!memento)
     return IMemento::Pointer(0);
 
   return memento->GetChild(WorkbenchConstants::TAG_VIEW_STATE);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryViewRegistry.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryViewRegistry.cpp
index 86559d6dae..866b8a9071 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryViewRegistry.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryViewRegistry.cpp
@@ -1,277 +1,276 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryViewRegistry.h"
 
 #include "berryPlatformUI.h"
 #include "berryImageDescriptor.h"
 #include "berryWorkbenchPlugin.h"
 #include "berryWorkbenchRegistryConstants.h"
 
 #include "berryPlatform.h"
 
 namespace berry
 {
 
 ViewRegistry::ViewCategoryProxy::ViewCategoryProxy(
     IViewDescriptorCategoryPtr rawCategory) :
   rawCategory(rawCategory)
 {
 }
 
 QList<IViewDescriptor::Pointer> ViewRegistry::ViewCategoryProxy::GetViews() const
 {
   return rawCategory->GetElements();
 }
 
 QString ViewRegistry::ViewCategoryProxy::GetId() const
 {
   return rawCategory->GetId();
 }
 
 QStringList ViewRegistry::ViewCategoryProxy::GetPath() const
 {
   QList<QString> path;
   QString rawParentPath = rawCategory->GetRawParentPath();
   // nested categories are not supported yet
   // assume an empty raw parent path
   path.push_back(rawParentPath);
   return path;
 }
 
 QString ViewRegistry::ViewCategoryProxy::GetLabel() const
 {
   return rawCategory->GetLabel();
 }
 
 bool ViewRegistry::ViewCategoryProxy::operator==(const Object* o) const
 {
   if (const IViewCategory* other = dynamic_cast<const IViewCategory*>(o))
     return this->GetId() == other->GetId();
 
   return false;
 }
 
-int ViewRegistry::ViewCategoryProxy::HashCode()
+uint ViewRegistry::ViewCategoryProxy::HashCode() const
 {
-  //return GetId().hashCode();
-  return 0;
+  return qHash(GetId());
 }
 
 QString ViewRegistry::EXTENSIONPOINT_UNIQUE_ID = "org.blueberry.ui.views";
     // PlatformUI::PLUGIN_ID + "." + WorkbenchRegistryConstants::PL_VIEWS;
 
 
 Category<IViewDescriptor::Pointer>::Pointer ViewRegistry::InternalFindCategory(const QString& id)
 {
   for (QList<IViewDescriptorCategoryPtr>::iterator itr = categories.begin();
        itr != categories.end(); ++itr)
   {
     if (id == (*itr)->GetRootPath())
     {
       return *itr;
     }
   }
   return IViewDescriptorCategoryPtr(0);
 }
 
 IExtensionPoint::Pointer ViewRegistry::GetExtensionPointFilter()
 {
   return Platform::GetExtensionRegistry()->GetExtensionPoint(EXTENSIONPOINT_UNIQUE_ID);
 }
 
 const QString ViewRegistry::TAG_DESCRIPTION = "description";
 
 ViewRegistry::ViewRegistry() :
   dirtyViewCategoryMappings(true)
 {
   miscCategory = new IViewDescriptorCategory();
   this->Add(miscCategory);
 
   //PlatformUI.getWorkbench().getExtensionTracker().registerHandler(this,
   //    ExtensionTracker.createExtensionPointFilter(getExtensionPointFilter()));
   reader.ReadViews(this);
 }
 
 void ViewRegistry::Add(IViewDescriptorCategoryPtr desc)
 {
   /* fix for 1877 */
   if (this->InternalFindCategory(desc->GetId()).IsNull())
   {
     dirtyViewCategoryMappings = true;
     // Mark categories list as dirty
     categories.push_back(desc);
 //    IConfigurationElement::Pointer element(
 //        dynamic_cast<IConfigurationElement*>(
 //            desc->GetAdapter(typeid(IConfigurationElement))
 //            ));
 //    if (element.IsNull())
 //    {
 //      return;
 //    }
 //    PlatformUI::GetWorkbench()->GetExtensionTracker()
 //    .registerObject(element->GetDeclaringExtension(), desc,
 //        IExtensionTracker::REF_WEAK);
   }
 }
 
 void ViewRegistry::Add(ViewDescriptor::Pointer desc)
 {
   for (QList<IViewDescriptor::Pointer>::const_iterator itr = views.begin();
        itr != views.end(); ++itr)
   {
     if (desc.GetPointer() == itr->GetPointer()) return;
   }
 
   views.push_back(desc);
   dirtyViewCategoryMappings = true;
   //desc.activateHandler();
 }
 
 void ViewRegistry::Add(StickyViewDescriptor::Pointer desc)
 {
   if (std::find(sticky.begin(), sticky.end(), desc) == sticky.end())
   {
     sticky.push_back(desc);
 //    PlatformUI::GetWorkbench()->GetExtensionTracker()
 //  .registerObject(desc.getConfigurationElement().getDeclaringExtension(),
 //      desc, IExtensionTracker.REF_WEAK);
   }
 }
 
 IViewDescriptor::Pointer ViewRegistry::Find(const QString& id) const
 {
   for (QList<IViewDescriptor::Pointer>::const_iterator itr = views.begin();
        itr != views.end(); ++itr)
   {
     if (id == (*itr)->GetId())
     {
       return *itr;
     }
   }
   return IViewDescriptor::Pointer(0);
 }
 
 IViewCategory::Pointer ViewRegistry::FindCategory(const QString& id)
 {
   this->MapViewsToCategories();
   IViewDescriptorCategoryPtr category(this->InternalFindCategory(id));
   if (category.IsNull())
   {
     return IViewCategory::Pointer(0);
   }
   IViewCategory::Pointer cat(new ViewCategoryProxy(category));
   return cat;
 }
 
 QList<IViewCategory::Pointer> ViewRegistry::GetCategories()
 {
   this->MapViewsToCategories();
   QList<IViewCategory::Pointer> retArray;
   for (QList<IViewDescriptorCategoryPtr>::iterator itr = categories.begin();
        itr != categories.end(); ++itr)
   {
     retArray.push_back(IViewCategory::Pointer(new ViewCategoryProxy(*itr)));
   }
   return retArray;
 }
 
 QList<IStickyViewDescriptor::Pointer> ViewRegistry::GetStickyViews() const
 {
   return sticky;
 }
 
 Category<IViewDescriptor::Pointer>::Pointer ViewRegistry::GetMiscCategory() const
 {
   return miscCategory;
 }
 
 QList<IViewDescriptor::Pointer> ViewRegistry::GetViews() const
 {
   return views;
 }
 
 void ViewRegistry::MapViewsToCategories()
 {
   if (dirtyViewCategoryMappings)
   {
     dirtyViewCategoryMappings = false;
     // clear all category mappings
     for (QList<IViewDescriptorCategoryPtr>::iterator i = categories.begin();
          i != categories.end(); ++i)
     {
       (*i)->Clear(); // this is bad
     }
 
     miscCategory->Clear();
 
     for (QList<IViewDescriptor::Pointer>::iterator i = views.begin();
          i != views.end(); ++i)
     {
       IViewDescriptor::Pointer desc(*i);
       IViewDescriptorCategoryPtr cat(0);
       const QList<QString>& catPath = desc->GetCategoryPath();
       if (catPath.size() > 0)
       {
         cat = this->InternalFindCategory(catPath[0]);
       }
       if (cat.IsNotNull())
       {
         if (!cat->HasElement(desc))
         {
           cat->AddElement(desc);
         }
       }
       else
       {
         if (catPath.size() > 0)
         {
           // If we get here, this view specified a category which
           // does not exist. Add this view to the 'Other' category
           // but give out a message (to the log only) indicating
           // this has been done.
           QString fmt("Category %1 not found for view %2.  This view added to ''%3'' category.");
           WorkbenchPlugin::Log(fmt.arg(catPath[0]).arg(desc->GetId()).arg(miscCategory->GetLabel()));
         }
         miscCategory->AddElement(desc);
       }
     }
   }
 }
 
 //void ViewRegistry::AddExtension(IExtensionTracker tracker,
 //    IExtension addedExtension)
 //{
 //  IConfigurationElement[] addedElements = addedExtension.getConfigurationElements();
 //  for (int i = 0; i < addedElements.length; i++)
 //  {
 //    IConfigurationElement element = addedElements[i];
 //    if (element.getName().equals(IWorkbenchRegistryConstants.TAG_VIEW))
 //    {
 //      reader.readView(element);
 //    }
 //    else if (element.getName().equals(IWorkbenchRegistryConstants.TAG_CATEGORY))
 //    {
 //      reader.readCategory(element);
 //    }
 //    else if (element.getName().equals(IWorkbenchRegistryConstants.TAG_STICKYVIEW))
 //    {
 //      reader.readSticky(element);
 //    }
 //  }
 //}
 
 } // namespace berry
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryViewRegistry.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryViewRegistry.h
index d576c9f8d4..890c461239 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryViewRegistry.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryViewRegistry.h
@@ -1,221 +1,221 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYVIEWREGISTRY_H_
 #define BERRYVIEWREGISTRY_H_
 
 #include "berryIViewRegistry.h"
 #include "berryIViewCategory.h"
 #include "berryIViewDescriptor.h"
 
 #include "berryCategory.h"
 #include "berryViewDescriptor.h"
 #include "berryViewRegistryReader.h"
 #include "berryStickyViewDescriptor.h"
 
 #include "berryIExtensionPoint.h"
 
 
 namespace berry
 {
 
 /**
  * \ingroup org_blueberry_ui_internal
  *
  * The central manager for view descriptors.
  */
 class ViewRegistry : public IViewRegistry
 {
 
 public:
 
   typedef Category<IViewDescriptor::Pointer> IViewDescriptorCategory;
   typedef IViewDescriptorCategory::Pointer IViewDescriptorCategoryPtr;
 
 private:
 
   /**
    * Proxies a Category implementation.
    *
    */
   class ViewCategoryProxy : public IViewCategory
   {
 
   private:
 
     typedef Category<IViewDescriptor::Pointer> IViewDescriptorCategory;
 
     IViewDescriptorCategoryPtr rawCategory;
 
     /**
      * Create a new instance of this class
      *
      * @param rawCategory the category
      */
   public:
     ViewCategoryProxy(IViewDescriptorCategoryPtr rawCategory);
 
     /* (non-Javadoc)
      * @see org.blueberry.ui.views.IViewCategory#getViews()
      */
     QList<IViewDescriptor::Pointer> GetViews() const;
 
     /* (non-Javadoc)
      * @see org.blueberry.ui.views.IViewCategory#getId()
      */
     QString GetId() const;
 
     /* (non-Javadoc)
      * @see org.blueberry.ui.views.IViewCategory#getPath()
      */
     QStringList GetPath() const;
 
     /* (non-Javadoc)
      * @see org.blueberry.ui.views.IViewCategory#getLabel()
      */
     QString GetLabel() const;
 
     /* (non-Javadoc)
      * @see java.lang.Object#equals(java.lang.Object)
      */
     bool operator==(const Object* o) const;
 
     /* (non-Javadoc)
      * @see java.lang.Object#hashCode()
      */
-    int HashCode();
+    uint HashCode() const;
   };
 
 private:
 
   static QString EXTENSIONPOINT_UNIQUE_ID;
 
   /**
    * A set that will only ever contain ViewDescriptors.
    */
   QList<IViewDescriptor::Pointer> views; // = new TreeSet(new Comparator() {
   //    public int compare(Object o1, Object o2) {
   //      String id1 = ((ViewDescriptor) o1).getId();
   //      String id2 = ((ViewDescriptor) o2).getId();
   //
   //      return id1.compareTo(id2);
   //    }});
 
   QList<IStickyViewDescriptor::Pointer> sticky;
 
   QList<IViewDescriptorCategoryPtr> categories;
 
   IViewDescriptorCategoryPtr miscCategory;
 
   ViewRegistryReader reader;
 
   bool dirtyViewCategoryMappings;
 
   /**
    * Returns the category with no updating of the view/category mappings.
    *
    * @param id the category id
    * @return the Category
    * @since 3.1
    */
   IViewDescriptorCategoryPtr InternalFindCategory(const QString& id);
 
   SmartPointer<IExtensionPoint> GetExtensionPointFilter();
 
 protected:
 
   static const QString TAG_DESCRIPTION; // = "description";
 
 
 public:
 
   ViewRegistry();
 
   /**
    * Add a category to the registry.
    *
    * @param desc the descriptor to add
    */
   void Add(IViewDescriptorCategoryPtr desc);
 
   /**
    * Add a descriptor to the registry.
    *
    * @param desc the descriptor to add
    */
   void Add(ViewDescriptor::Pointer desc);
 
   /**
    * Add a sticky descriptor to the registry.
    *
    * @param desc the descriptor to add
    */
   void Add(StickyViewDescriptor::Pointer desc);
 
   /**
    * Find a descriptor in the registry.
    */
   IViewDescriptor::Pointer Find(const QString& id) const;
 
   /**
    * Find a category with a given name.
    *
    * @param id the id to search for
    * @return the category or <code>null</code>
    */
   IViewCategory::Pointer FindCategory(const QString& id);
 
   /**
    * Get the list of view categories.
    */
   QList<IViewCategory::Pointer> GetCategories();
 
   /**
    * Get the list of sticky views minus the sticky views which failed the
    * Expressions check.
    */
   QList<IStickyViewDescriptor::Pointer> GetStickyViews() const;
 
   /**
    * Returns the Misc category. This may be <code>null</code> if there are
    * no miscellaneous views.
    *
    * @return the misc category or <code>null</code>
    */
   IViewDescriptorCategoryPtr GetMiscCategory() const;
 
   /**
    * Get an enumeration of view descriptors.
    */
   QList<IViewDescriptor::Pointer> GetViews() const;
 
   /**
    * Adds each view in the registry to a particular category.
    * The view category may be defined in xml.  If not, the view is
    * added to the "misc" category.
    */
   void MapViewsToCategories();
 
   /* (non-Javadoc)
    * @see org.blueberry.core.runtime.dynamicHelpers.IExtensionChangeHandler#addExtension(org.blueberry.core.runtime.dynamicHelpers.IExtensionTracker, org.blueberry.core.runtime.IExtension)
    */
   //void AddExtension(IExtensionTracker tracker, IExtension addedExtension);
 
 };
 
 } // namespace berry
 
 #endif /*BERRYVIEWREGISTRY_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryViewSashContainer.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryViewSashContainer.cpp
index 4e47a3d7c2..3e5f69623c 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryViewSashContainer.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryViewSashContainer.cpp
@@ -1,294 +1,294 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryViewSashContainer.h"
 
 #include "berryPerspective.h"
 #include "berryPerspectiveHelper.h"
 #include "berryLayoutTree.h"
 
 #include "berryWorkbenchConstants.h"
 #include "berryWorkbenchPlugin.h"
 
 #include "berryImageDescriptor.h"
 
 namespace berry
 {
 
 ViewSashContainer::ViewSashContainer(WorkbenchPage* page, void* parent) :
   PartSashContainer("root layout container", page, parent)
 {
 }
 
 ViewSashContainer::Pointer ViewSashContainer::GetRootContainer()
 {
   return ViewSashContainer::Pointer(this);
 }
 
 void* ViewSashContainer::GetControl()
 {
   return this->parent;
 }
 
 bool ViewSashContainer::RestoreState(IMemento::Pointer memento)
 {
   //TODO ViewSashContainer restore state
   //  MultiStatus
   //      result =
   //          new MultiStatus(PlatformUI.PLUGIN_ID, IStatus.OK, WorkbenchMessages.RootLayoutContainer_problemsRestoringPerspective, null);
   //
   bool result = true;
   // Read the info elements.
   QList<IMemento::Pointer> children(memento->GetChildren(WorkbenchConstants::TAG_INFO));
 
   // Create a part ID to part hashtable.
   QHash<QString, LayoutPart::Pointer> mapIDtoPart;
 
   // Loop through the info elements.
-  for (std::size_t i = 0; i < children.size(); i++)
+  for (int i = 0; i < children.size(); i++)
   {
   // Get the info details.
   IMemento::Pointer childMem = children[i];
   QString partID; childMem->GetString(WorkbenchConstants::TAG_PART, partID);
   QString relativeID; childMem->GetString(WorkbenchConstants::TAG_RELATIVE, relativeID);
   int relationship = 0;
   int left = 0, right = 0;
   if (!relativeID.isEmpty())
   {
     childMem->GetInteger(WorkbenchConstants::TAG_RELATIONSHIP, relationship);
 
     childMem->GetInteger(WorkbenchConstants::TAG_RATIO_LEFT, left);
     childMem->GetInteger(WorkbenchConstants::TAG_RATIO_RIGHT, right);
   }
   QString strFolder; childMem->GetString(WorkbenchConstants::TAG_FOLDER, strFolder);
 
   // Create the part.
   LayoutPart::Pointer part;
 
   if (strFolder.isEmpty())
   {
     // this is the editor area
     part = new PartPlaceholder(partID);
   }
   else
   {
     PartStack::Pointer folder(new PartStack(page));
     folder->SetID(partID);
     //result.add(folder->RestoreState(childMem->GetChild(WorkbenchConstants::TAG_FOLDER)));
     result &= folder->RestoreState(childMem->GetChild(WorkbenchConstants::TAG_FOLDER));
     ContainerPlaceholder::Pointer placeholder(new ContainerPlaceholder(partID));
     placeholder->SetRealContainer(folder);
     part = placeholder;
   }
 
   // 1FUN70C: ITPUI:WIN - Shouldn't set Container when not active
   part->SetContainer(ILayoutContainer::Pointer(this));
 
   const int myLeft = left, myRight = right, myRelationship = relationship;
   LayoutPart::Pointer myPart = part;
 
 //  StartupThreading.runWithoutExceptions(new StartupRunnable()
 //    {
 //
 //    public void runWithException() throws Throwable
 //      {
         // Add the part to the layout
         if (relativeID.isEmpty())
         {
           this->Add(myPart);
         }
         else
         {
           LayoutPart::Pointer refPart = mapIDtoPart[relativeID];
           if (refPart)
           {
             this->Add(myPart, myRelationship, myLeft, myRight, refPart);
           }
           else
           {
             WorkbenchPlugin::Log("Unable to find part for ID: " + relativeID);
           }
         }
 //      }}
 //    );
 
     mapIDtoPart[partID] = part;
   }
   return result;
 }
 
 bool ViewSashContainer::SaveState(IMemento::Pointer memento)
 {
   QList<RelationshipInfo> relationships = this->ComputeRelation();
 
   bool result = true;
 //  MultiStatus
 //      result =
 //          new MultiStatus(PlatformUI.PLUGIN_ID, IStatus.OK, WorkbenchMessages.RootLayoutContainer_problemsSavingPerspective, null);
 
   // Loop through the relationship array.
-  for (std::size_t i = 0; i < relationships.size(); ++i)
+  for (int i = 0; i < relationships.size(); ++i)
   {
     // Save the relationship info ..
     //    private LayoutPart part;
     //    private int relationship;
     //    private float ratio;
     //    private LayoutPart relative;
     RelationshipInfo& info = relationships[i];
     IMemento::Pointer childMem = memento->CreateChild(WorkbenchConstants::TAG_INFO);
     childMem->PutString(WorkbenchConstants::TAG_PART, info.part->GetID());
     if (info.relative)
     {
       childMem->PutString(WorkbenchConstants::TAG_RELATIVE,
           info.relative->GetID());
       childMem->PutInteger(WorkbenchConstants::TAG_RELATIONSHIP,
           info.relationship);
       childMem->PutInteger(WorkbenchConstants::TAG_RATIO_LEFT, info.left);
       childMem->PutInteger(WorkbenchConstants::TAG_RATIO_RIGHT, info.right);
     }
 
     // Is this part a folder or a placeholder for one?
     PartStack::Pointer folder(info.part.Cast<PartStack>());
     if (!folder && info.part.Cast<ContainerPlaceholder>())
     {
       LayoutPart::Pointer part = info.part.Cast<ContainerPlaceholder>()->GetRealContainer();
       folder = part.Cast<PartStack>();
     }
 
     // If this is a folder (PartStack) save the contents.
     if (folder)
     {
       childMem->PutString(WorkbenchConstants::TAG_FOLDER, "true");
 
       IMemento::Pointer folderMem(childMem->CreateChild(WorkbenchConstants::TAG_FOLDER));
       //result.add(folder.saveState(folderMem));
       result = folder->SaveState(folderMem);
     }
   }
   return result;
 }
 
 bool ViewSashContainer::IsStackType(ILayoutContainer::Pointer toTest)
 {
   if (toTest.Cast<PartStack> () == 0)
     return false;
 
   return (toTest.Cast<PartStack> ()->GetAppearance()
       != PresentationFactoryUtil::ROLE_EDITOR);
 }
 
 bool ViewSashContainer::IsPaneType(LayoutPart::Pointer toTest)
 {
   if (toTest.Cast<PartPane> () == 0)
     return false;
   return (toTest.Cast<PartPane> ()->GetPartReference().Cast<IViewReference> ()
       != 0);
 }
 
 bool ViewSashContainer::AllowsAdd(LayoutPart::Pointer layoutPart)
 {
   return LayoutPart::AllowsAdd(layoutPart);
 }
 
 void ViewSashContainer::Replace(LayoutPart::Pointer oldChild, LayoutPart::Pointer newChild)
 {
   if (!this->IsChild(oldChild))
   {
     return;
   }
 
   // Nasty hack: ensure that all views end up inside a tab folder.
   // Since the view title is provided by the tab folder, this ensures
   // that views don't get created without a title tab.
   if (newChild.Cast<PartPane>())
   {
     PartStack::Pointer folder(new PartStack(page));
     folder->Add(newChild);
     newChild = folder;
   }
 
   PartSashContainer::Replace(oldChild, newChild);
 }
 
 void* ViewSashContainer::CreateParent(void* parentWidget)
 {
   return parentWidget;
 }
 
 void ViewSashContainer::DisposeParent()
 {
   // do nothing
 }
 
 float ViewSashContainer::GetDockingRatio(Object::Pointer dragged,
     ILayoutContainer::Pointer target)
 {
   if (this->IsStackType(target))
   {
     return PartSashContainer::GetDockingRatio(dragged, target);
   }
   else
   {
     return 0.25f;
   }
 }
 
 PartStack::Pointer ViewSashContainer::CreateStack()
 {
   PartStack::Pointer result(new PartStack(page));
   return result;
 }
 
 void ViewSashContainer::SetVisiblePart(ILayoutContainer::Pointer container,
     PartPane::Pointer visiblePart)
 {
   if (container.Cast<PartStack> () != 0)
   {
     PartStack::Pointer tabFolder = container.Cast<PartStack> ();
 
     tabFolder->SetSelection(visiblePart);
   }
 }
 
 LayoutPart::Pointer ViewSashContainer::GetVisiblePart(
     ILayoutContainer::Pointer container)
 {
   return container.Cast<PartStack> ()->GetSelection();
 }
 
 void ViewSashContainer::DerefPart(LayoutPart::Pointer sourcePart)
 {
   page->GetActivePerspective()->GetPresentation()->DerefPart(sourcePart);
 }
 
 //    void ViewSashContainer::AddChild(const RelationshipInfo& info)
 //    {
 //      LayoutPart child = info.part;
 //
 //      // Nasty hack: ensure that all views end up inside a tab folder.
 //      // Since the view title is provided by the tab folder, this ensures
 //      // that views don't get created without a title tab.
 //      if (child instanceof ViewPane)
 //      {
 //        ViewStack folder = new ViewStack(page);
 //        folder.add(child);
 //        info.part = folder;
 //      }
 //
 //      super.addChild(info);
 //    }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWWinActionBars.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWWinActionBars.cpp
index f882ee2683..cc8da7fc64 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWWinActionBars.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWWinActionBars.cpp
@@ -1,72 +1,72 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #include "berryWWinActionBars.h"
 
 #include "berryWorkbenchWindow.h"
 #include "berryMenuManager.h"
 
 namespace berry {
 
 WWinActionBars::WWinActionBars(WorkbenchWindow* window)
   : window(window)
 {
 }
 
 void WWinActionBars::ClearGlobalActionHandlers()
 {
 }
 
-Action* WWinActionBars::GetGlobalActionHandler(const QString& actionID) const
+Action* WWinActionBars::GetGlobalActionHandler(const QString& /*actionID*/) const
 {
   return 0;
 }
 
 IMenuManager* WWinActionBars::GetMenuManager()
 {
   return window->GetMenuManager();
 }
 
 IServiceLocator* WWinActionBars::GetServiceLocator()
 {
   return window;
 }
 
 IStatusLineManager* WWinActionBars::GetStatusLineManager()
 {
   //TODO StatusLineManager
   //return window->GetStatusLineManager();
   return 0;
 }
 
 IToolBarManager* WWinActionBars::GetToolBarManager()
 {
   //return window->GetToolBarManager();
   //TODO ToolBarManager
   return 0;
 }
 
-void WWinActionBars::SetGlobalActionHandler(const QString& actionID, Action* handler)
+void WWinActionBars::SetGlobalActionHandler(const QString& /*actionID*/, Action* /*handler*/)
 {
 }
 
 void WWinActionBars::UpdateActionBars()
 {
   window->UpdateActionBars();
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWWinPartService.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWWinPartService.cpp
index 7d6fb9e806..1d3492faa9 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWWinPartService.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWWinPartService.cpp
@@ -1,231 +1,231 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryWWinPartService.h"
 
 #include "berryIWorkbenchWindow.h"
 #include "berryWorkbenchPage.h"
 
 namespace berry
 {
 
 struct WWinListener: public IPartListener
 { //, IPageChangedListener {
 
   WWinListener(WWinPartService* wwps) :
     wwps(wwps)
   {
   }
 
   Events::Types GetPartEventTypes() const
   {
     return Events::ALL;
   }
 
-  void PartActivated(IWorkbenchPartReference::Pointer  /*ref*/)
+  void PartActivated(const IWorkbenchPartReference::Pointer&  /*ref*/)
   {
     wwps->UpdateActivePart();
   }
 
-  void PartBroughtToTop(IWorkbenchPartReference::Pointer ref)
+  void PartBroughtToTop(const IWorkbenchPartReference::Pointer& ref)
   {
     wwps->partService.FirePartBroughtToTop(ref);
   }
 
-  void PartClosed(IWorkbenchPartReference::Pointer ref)
+  void PartClosed(const IWorkbenchPartReference::Pointer& ref)
   {
     wwps->partService.FirePartClosed(ref);
   }
 
-  void PartDeactivated(IWorkbenchPartReference::Pointer  /*ref*/)
+  void PartDeactivated(const IWorkbenchPartReference::Pointer& /*ref*/)
   {
     wwps->UpdateActivePart();
   }
 
-  void PartOpened(IWorkbenchPartReference::Pointer ref)
+  void PartOpened(const IWorkbenchPartReference::Pointer& ref)
   {
     wwps->partService.FirePartOpened(ref);
   }
 
-  void PartHidden(IWorkbenchPartReference::Pointer ref)
+  void PartHidden(const IWorkbenchPartReference::Pointer& ref)
   {
     wwps->partService.FirePartHidden(ref);
   }
 
-  void PartVisible(IWorkbenchPartReference::Pointer ref)
+  void PartVisible(const IWorkbenchPartReference::Pointer& ref)
   {
     wwps->partService.FirePartVisible(ref);
   }
 
-  void PartInputChanged(IWorkbenchPartReference::Pointer ref)
+  void PartInputChanged(const IWorkbenchPartReference::Pointer& ref)
   {
     wwps->partService.FirePartInputChanged(ref);
   }
 
   //        void PageChanged(PageChangedEvent::Pointer event) {
   //          partService.firePageChanged(event);
   //        }
 
 private:
   WWinPartService* wwps;
 };
 
 WWinPartService::WWinPartService(IWorkbenchWindow* window) :
   partService("", ""), selectionService(window), activePage(0),
   partListener(new WWinListener(
       this))
 {
 
 }
 
-void WWinPartService::AddPartListener(IPartListener::Pointer l)
+void WWinPartService::AddPartListener(IPartListener* l)
 {
   partService.AddPartListener(l);
 }
 
-void WWinPartService::RemovePartListener(IPartListener::Pointer l)
+void WWinPartService::RemovePartListener(IPartListener* l)
 {
   partService.RemovePartListener(l);
 }
 
 IWorkbenchPart::Pointer WWinPartService::GetActivePart()
 {
   return partService.GetActivePart();
 }
 
 void WWinPartService::UpdateActivePart()
 {
   IWorkbenchPartReference::Pointer activeRef;
   IWorkbenchPart::Pointer activePart;
 
   if (activePage)
   {
     activePart = activePage->GetActivePart();
     activeRef = activePage->GetActivePartReference();
   }
 
   partService.SetActivePart(activeRef);
   selectionService.SetActivePart(activePart);
 }
 
 IWorkbenchPartReference::Pointer WWinPartService::GetActivePartReference()
 {
   return partService.GetActivePartReference();
 }
 
 ISelectionService* WWinPartService::GetSelectionService()
 {
   return &selectionService;
 }
 
 void WWinPartService::PageActivated(SmartPointer<IWorkbenchPage> newPage)
 {
   // Optimize.
   if (newPage == activePage)
   {
     return;
   }
 
   // Fire events in the following order:
 
   // 1. For each open part in the new page, open it and then (if applicable) make it visible
   // 2. Deactivate old active part
   // 3. Activate the new active part
   // 4. For each open part in the old page, make it invisible then close it
 
   // Hook listener on the new page.
   if (newPage)
   {
     QList<IWorkbenchPartReference::Pointer> refs(newPage.Cast<
         WorkbenchPage> ()->GetOpenParts());
 
-    for (std::size_t i = 0; i < refs.size(); i++)
+    for (int i = 0; i < refs.size(); i++)
     {
       IWorkbenchPartReference::Pointer reference = refs[i];
 
       partService.FirePartOpened(reference);
 
       IWorkbenchPart::Pointer part = reference->GetPart(false);
       if (part && newPage->IsPartVisible(part))
       {
         partService.FirePartVisible(reference);
       }
     }
 
     partService.SetActivePart(newPage->GetActivePartReference());
     selectionService.SetActivePart(newPage->GetActivePart());
   }
   else
   {
     partService.SetActivePart(IWorkbenchPartReference::Pointer(0));
     selectionService.SetActivePart(IWorkbenchPart::Pointer(0));
   }
 
   // Unhook listener from the old page.
   Reset();
 
   // Update active page.
   activePage = newPage.GetPointer();
 
   if (newPage)
   {
-    newPage->AddPartListener(partListener);
+    newPage->AddPartListener(partListener.data());
   }
 
 }
 
 void WWinPartService::PageClosed(SmartPointer<IWorkbenchPage> page)
 {
   // Unhook listener from the old page.
   if (page == activePage)
   {
     Reset();
   }
 }
 
 void WWinPartService::PageOpened(SmartPointer<IWorkbenchPage> page)
 {
   PageActivated(page);
 }
 
 void WWinPartService::Reset()
 {
   IWorkbenchPage* tempPage = activePage;
   activePage = 0;
   if (tempPage)
   {
     WorkbenchPage* page = dynamic_cast<WorkbenchPage*>(tempPage);
 
     QList<IWorkbenchPartReference::Pointer> refs(page->GetOpenParts());
 
-    for (std::size_t i = 0; i < refs.size(); i++)
+    for (int i = 0; i < refs.size(); i++)
     {
       IWorkbenchPartReference::Pointer reference = refs[i];
 
       if (page->IsPartVisible(reference))
       {
         partService.FirePartHidden(reference);
       }
 
       partService.FirePartClosed(reference);
     }
 
-    tempPage->RemovePartListener(partListener);
+    tempPage->RemovePartListener(partListener.data());
   }
 
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWWinPartService.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWWinPartService.h
index 31e78e17ad..664a8b0094 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWWinPartService.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWWinPartService.h
@@ -1,111 +1,111 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYWWINPARTSERVICE_H_
 #define BERRYWWINPARTSERVICE_H_
 
 #include "berryIPartService.h"
 
 #include "berryPartService.h"
 #include "berryWindowSelectionService.h"
 
 namespace berry
 {
 
 /**
  * A part service for a workbench window.
  */
 class WWinPartService: public IPartService
 {
 
 private:
 
   friend struct WWinListener;
 
   PartService partService; // (UIListenerLogging.WINDOW_PARTLISTENER_EVENTS, UIListenerLogging.WINDOW_PARTLISTENER2_EVENTS);
 
   WindowSelectionService selectionService;
 
   IWorkbenchPage* activePage;
 
-  IPartListener::Pointer partListener; // = new WWinListener();
+  QScopedPointer<IPartListener> partListener; // = new WWinListener();
 
 public:
 
   /**
    * Creates a new part service for a workbench window.
    */
   WWinPartService(IWorkbenchWindow* window);
 
   /*
    * (non-Javadoc)
    * Method declared on IPartService
    */
-  void AddPartListener(IPartListener::Pointer l);
+  void AddPartListener(IPartListener* l);
 
   /*
    * (non-Javadoc)
    * Method declared on IPartService
    */
-  void RemovePartListener(IPartListener::Pointer l);
+  void RemovePartListener(IPartListener* l);
 
   /*
    * (non-Javadoc)
    * Method declared on IPartService
    */
   IWorkbenchPart::Pointer GetActivePart();
 
   /*
    * (non-Javadoc)
    * Method declared on IPartService
    */
   IWorkbenchPartReference::Pointer GetActivePartReference();
 
   /*
    * Returns the selection service.
    */
   ISelectionService* GetSelectionService();
 
   /*
    * Notifies that a page has been activated.
    */
   void PageActivated(SmartPointer<IWorkbenchPage> newPage);
 
   /*
    * Notifies that a page has been closed
    */
   void PageClosed(SmartPointer<IWorkbenchPage> page);
 
   /*
    * Notifies that a page has been opened.
    */
   void PageOpened(SmartPointer<IWorkbenchPage> page);
 
 private:
 
   void UpdateActivePart();
 
   /*
    * Resets the part service. The active page, part and selection are
    * dereferenced.
    */
   void Reset();
 
 };
 
 }
 
 #endif /* BERRYWWINPARTSERVICE_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWindowPartSelectionTracker.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWindowPartSelectionTracker.cpp
index a0dcc6e29e..7f0eea0c25 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWindowPartSelectionTracker.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWindowPartSelectionTracker.cpp
@@ -1,80 +1,80 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryWindowPartSelectionTracker.h"
 
 #include "berryIWorkbenchWindow.h"
 #include "berryIWorkbenchPage.h"
 
 namespace berry
 {
 
 void WindowPartSelectionTracker::SetWindow(
     IWorkbenchWindow* window)
 {
   fWindow = window;
 }
 
 WindowPartSelectionTracker::WindowPartSelectionTracker(IWorkbenchWindow* window,
     const QString& partId) :
   AbstractPartSelectionTracker(partId), selListener(
       new NullSelectionChangedAdapter<WindowPartSelectionTracker> (this,
           &WindowPartSelectionTracker::FireSelection)), postSelListener(
       new NullSelectionChangedAdapter<WindowPartSelectionTracker> (this,
           &WindowPartSelectionTracker::FirePostSelection))
 {
   SetWindow(window);
   //window.addPageListener(this);
   IWorkbenchPage::Pointer page = window->GetActivePage();
   if (page)
   {
     PageOpened(page);
   }
 }
 
 void WindowPartSelectionTracker::PageActivated(
     SmartPointer<IWorkbenchPage>  /*page*/)
 {
 }
 
 void WindowPartSelectionTracker::PageClosed(SmartPointer<IWorkbenchPage> page)
 {
-  page->RemoveSelectionListener(GetPartId(), selListener);
-  page->RemovePostSelectionListener(GetPartId(), postSelListener);
+  page->RemoveSelectionListener(GetPartId(), selListener.data());
+  page->RemovePostSelectionListener(GetPartId(), postSelListener.data());
 }
 
 void WindowPartSelectionTracker::PageOpened(SmartPointer<IWorkbenchPage> page)
 {
-  page->AddSelectionListener(GetPartId(), selListener);
-  page->AddPostSelectionListener(GetPartId(), postSelListener);
+  page->AddSelectionListener(GetPartId(), selListener.data());
+  page->AddPostSelectionListener(GetPartId(), postSelListener.data());
 }
 
 ISelection::ConstPointer WindowPartSelectionTracker::GetSelection()
 {
   IWorkbenchPage::Pointer page = GetWindow()->GetActivePage();
   if (page)
   {
     return page->GetSelection(GetPartId());
   }
   return ISelection::ConstPointer(0);
 }
 
 SmartPointer<IWorkbenchWindow> WindowPartSelectionTracker::GetWindow()
 {
   return IWorkbenchWindow::Pointer(fWindow);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWindowPartSelectionTracker.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWindowPartSelectionTracker.h
index 66454ba1aa..424031b820 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWindowPartSelectionTracker.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWindowPartSelectionTracker.h
@@ -1,107 +1,107 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYWINDOWPARTSELECTIONTRACKER_H_
 #define BERRYWINDOWPARTSELECTIONTRACKER_H_
 
 #include "berryAbstractPartSelectionTracker.h"
 
 #include "berryINullSelectionListener.h"
 
 namespace berry {
 
 struct IWorkbenchWindow;
 struct IWorkbenchPage;
 
 /**
  * Provides part selection tracking for a part with a specific id
  * in all pages of a specific workbench window. This tracker shields
  * clients from a part opening and closing, and still provides selection
  * notification/information even when the part is not active.
  */
 class WindowPartSelectionTracker : public AbstractPartSelectionTracker {
         // implements IPageListener {
 
 private:
 
     /**
      * The window this selection tracker is working in
      */
     IWorkbenchWindow* fWindow;
 
     /**
      * Part selection listener.
      */
-    INullSelectionListener::Pointer selListener;
+    QScopedPointer<INullSelectionListener> selListener;
 
     /**
      * Part post selection listener
      */
-    INullSelectionListener::Pointer postSelListener;
+    QScopedPointer<INullSelectionListener> postSelListener;
 
     /**
      * Sets the window this tracker is working in.
      *
      * @param window workbench window
      */
     void SetWindow(IWorkbenchWindow* window);
 
 public:
 
     /**
      * Constructs a new selection tracker for the given window and part id.
      *
      * @param window workbench window
      * @param partId part identifier
      */
     WindowPartSelectionTracker(IWorkbenchWindow* window, const QString& partId);
 
     /*
      * @see IPageListener#pageActivated(IWorkbenchPage)
      */
     void PageActivated(SmartPointer<IWorkbenchPage> page);
 
     /*
      * @see IPageListener#pageClosed(IWorkbenchPage)
      */
     void PageClosed(SmartPointer<IWorkbenchPage> page);
 
     /*
      * @see IPageListener#pageOpened(IWorkbenchPage)
      */
     void PageOpened(SmartPointer<IWorkbenchPage> page);
 
     /*
      * @see AbstractPartSelectionTracker#getSelection()
      */
     ISelection::ConstPointer GetSelection();
 
 
 protected:
 
     /**
      * Returns the window this tracker is working in.
      *
      * @return workbench window
      */
     SmartPointer<IWorkbenchWindow> GetWindow();
 
 };
 
 }
 
 #endif /* BERRYWINDOWPARTSELECTIONTRACKER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbench.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbench.cpp
index 21dc93aa25..917ac1395a 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbench.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbench.cpp
@@ -1,1787 +1,1869 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryLog.h"
 
 #include "tweaklets/berryWorkbenchTweaklet.h"
 
 #include "berryWorkbench.h"
 
 #include <berrySafeRunner.h>
 
 #include "berrySaveablesList.h"
 #include "berryViewRegistry.h"
 #include "berryEditorRegistry.h"
 #include "berryServiceLocatorCreator.h"
 #include "berryWorkbenchPage.h"
 #include "berryPerspective.h"
 #include "berryPreferenceConstants.h"
 #include "dialogs/berryMessageDialog.h"
 #include "berryWorkbenchWindow.h"
 #include "berryImageDescriptor.h"
 #include "berryDisplay.h"
 #include "services/berryIServiceFactory.h"
 #include "util/berrySafeRunnable.h"
 
+#include "berryWorkbenchServiceRegistry.h"
 #include "berryWorkbenchPlugin.h"
 #include "berryWorkbenchConstants.h"
 #include "berryWorkbenchMenuService.h"
 #include "berryEvaluationService.h"
 #include "berryCommandService.h"
 #include "berryCommandManager.h"
 #include "berryParameterType.h"
+#include "berrySourceProviderService.h"
+#include "berryWorkbenchLocationService.h"
 
 #include <berryCommandCategory.h>
 #include <berryIHandler.h>
+#include <berryIHandlerService.h>
 #include <berryIPreferencesService.h>
 #include <berryIPreferences.h>
+#include <berryISourceProvider.h>
+#include <berryIServiceScopes.h>
 
 #include <QDir>
+#include <QApplication>
 
 //#include <Poco/Thread.h>
 //#include <Poco/Bugcheck.h>
 #include <Poco/FileStream.h>
 
 namespace berry
 {
 
 Workbench* Workbench::instance = 0;
 WorkbenchTestable::Pointer Workbench::testableObject;
 
 const unsigned int Workbench::VERSION_STRING_COUNT = 1;
 const QString Workbench::VERSION_STRING[Workbench::VERSION_STRING_COUNT] =
 { "1.0" };
 
 const QString Workbench::DEFAULT_WORKBENCH_STATE_FILENAME = "workbench.xml";
 
 class RestoreStateRunnable: public SafeRunnable
 {
 
 private:
 
   Workbench* workbench;
   Poco::File stateFile;
   bool& result;
 
 public:
 
   RestoreStateRunnable(Workbench* workbench, const QString& stateFile,
       bool& result) :
     SafeRunnable(
         "Unable to read workbench state. Workbench UI layout will be reset."),
         workbench(workbench), stateFile(stateFile.toStdString()), result(result)
   {
 
   }
 
   void Run()
   {
     Poco::FileInputStream input(stateFile.path());
     IMemento::Pointer memento = XMLMemento::CreateReadRoot(input);
 
     // Validate known version format
     QString version;
     memento->GetString(WorkbenchConstants::TAG_VERSION, version);
     bool valid = false;
     for (std::size_t i = 0; i < Workbench::VERSION_STRING_COUNT; i++)
     {
       if (Workbench::VERSION_STRING[i] == version)
       {
         valid = true;
         break;
       }
     }
     if (!valid)
     {
       input.close();
       QString msg =
           "Invalid workbench state version. workbench.xml will be deleted";
       MessageDialog::OpenError(Shell::Pointer(0), "Restoring Problems", msg);
       stateFile.remove();
       //          result[0] = new Status(IStatus.ERROR,
       //              WorkbenchPlugin.PI_WORKBENCH,
       //              IWorkbenchConfigurer.RESTORE_CODE_RESET, msg, null);
       result = false;
       return;
     }
 
     //    // Validate compatible version format
     //    // We no longer support the release 1.0 format
     //    if (VERSION_STRING[0].equals(version))
     //    {
     //      reader.close();
     //      QString msg = "The saved user interface layout is in an "
     //          "obsolete format and cannot be preserved. Your projects and files "
     //          "will not be affected. Press OK to convert to the new format. Press "
     //          "Cancel to exit with no changes.";
     //      QList<QString> dlgLabels;
     //      dlgLabels.push_back("Ok");
     //      dlgLabels.push_back("Cancel");
     //      IDialog::Pointer dlg = MessageDialog::CreateDialog(Shell::Pointer(0),
     //          "Cannot Preserve Layout", 0, msg, IDialog::WARNING, dlgLabels, 0);
     //      IDialog::ReturnCode ignoreSavedState = dlg->Open();
     //      // OK is the default
     //      if (ignoreSavedState == IDialog::OK)
     //      {
     //        stateFile.remove();
     //        //            result[0] = new Status(IStatus.WARNING,
     //        //                WorkbenchPlugin.PI_WORKBENCH,
     //        //                IWorkbenchConfigurer.RESTORE_CODE_RESET, msg,
     //        //                null);
     //        result = false;
     //      }
     //      else
     //      {
     //        //            result[0] = new Status(IStatus.WARNING,
     //        //                WorkbenchPlugin.PI_WORKBENCH,
     //        //                IWorkbenchConfigurer.RESTORE_CODE_EXIT, msg,
     //        //                null);
     //        result = false;
     //      }
     //      return;
     //    }
 
     // Restore the saved state
     //final IStatus restoreResult = restoreState(memento);
     /*bool restoreResult =*/ workbench->RestoreState(memento);
     input.close();
     //        if (restoreResult.getSeverity() == IStatus.ERROR) {
     //          StartupThreading
     //              .runWithoutExceptions(new StartupRunnable() {
     //
     //                public void runWithException() throws Throwable {
     //                  StatusManager.getManager().handle(restoreResult, StatusManager.LOG);
     //                }
     //              });
     //
     //        }
   }
 
   void HandleException(const std::exception& e)
   {
     //StartupThreading.runWithoutExceptions(new StartupRunnable() {
 
     //public void runWithException() {
     Handle(e);
     //            QString msg = e.getMessage() == null ? "" : e.getMessage(); //$NON-NLS-1$
     //            result[0] = new Status(IStatus.ERROR,
     //                WorkbenchPlugin.PI_WORKBENCH,
     //                IWorkbenchConfigurer.RESTORE_CODE_RESET, msg, e);
     result = false;
     stateFile.remove();
     //  }});
   }
 
 private:
 
   void Handle(const std::exception& e)
   {
     SafeRunnable::HandleException(e);
   }
 };
 
 int Workbench::CreateAndRunWorkbench(Display* display,
     WorkbenchAdvisor* advisor)
 {
   // create the workbench instance
   Workbench workbench(display, advisor);
   // run the workbench event loop
   int returnCode = workbench.RunUI();
 
   return returnCode;
 }
 
 Display* Workbench::CreateDisplay()
 {
 
   // create the display
   Display* newDisplay = Tweaklets::Get(WorkbenchTweaklet::KEY)->CreateDisplay();
 
   // workaround for 1GEZ9UR and 1GF07HN
   //newDisplay.setWarnings(false);
 
   // Set the priority higher than normal so as to be higher
   // than the JobManager.
   //Poco::Thread::current()->setPriority(Poco::Thread::PRIO_HIGH);
 
   //initializeImages();
 
   return newDisplay;
 }
 
 Workbench::ServiceLocatorOwner::ServiceLocatorOwner(Workbench* wb) :
   workbench(wb)
 {
 
 }
 
 void Workbench::ServiceLocatorOwner::Dispose()
 {
   MessageDialog::OpenInformation(
       Shell::Pointer(0),
       "Restart needed",
       "A required plug-in is no longer available and the Workbench needs to be restarted. You will be prompted to save if there is any unsaved work.");
   workbench->Close(PlatformUI::RETURN_RESTART, true);
 }
 
 Workbench::Workbench(Display* display, WorkbenchAdvisor* advisor)
   : commandManager(0), progressCount(-1)
   , serviceLocatorOwner(new ServiceLocatorOwner(this))
   , largeUpdates(0), introManager(0), isStarting(true), isClosing(false)
 {
   poco_check_ptr(display)
 ;  poco_check_ptr(advisor);
   // the reference count to the one and only workbench instance
   // is increased, so that temporary smart pointer to the workbench
   // do not delete it
   this->Register();
 
   this->display = display;
   this->advisor = advisor;
   Workbench::instance = this;
 
   serviceLocatorCreator.reset(new ServiceLocatorCreator());
   serviceLocatorCreator->Register();
   this->serviceLocator = serviceLocatorCreator->CreateServiceLocator(
         NULL,
-        IServiceFactory::ConstPointer(0),
+        NULL,
         IDisposable::WeakPtr(serviceLocatorOwner)).Cast<ServiceLocator>();
   serviceLocator->RegisterService(serviceLocatorCreator.data());
+
+  workbenchLocationService.reset(
+        new WorkbenchLocationService(IServiceScopes::WORKBENCH_SCOPE, this, NULL, NULL, 0));
+  workbenchLocationService->Register();
+  serviceLocator->RegisterService(workbenchLocationService.data());
+
   returnCode = PlatformUI::RETURN_UNSTARTABLE;
 }
 
 Display* Workbench::GetDisplay()
 {
   return display;
 }
 
 Workbench* Workbench::GetInstance()
 {
   return instance;
 }
 
 WorkbenchTestable::Pointer Workbench::GetWorkbenchTestable()
 {
   if (!testableObject)
   {
     testableObject = new WorkbenchTestable();
   }
   return testableObject;
 }
 
 Workbench::~Workbench()
 {
   this->instance = 0;
   this->UnRegister(false);
 }
 
 Object* Workbench::GetService(const QString& key)
 {
   return serviceLocator->GetService(key);
 }
 
 bool Workbench::HasService(const QString& key) const
 {
   return serviceLocator->HasService(key);
 }
 
 bool Workbench::Init()
 {
+
+//  // setup debug mode if required.
+//  if (WorkbenchPlugin.getDefault().isDebugging()) {
+//    WorkbenchPlugin.DEBUG = true;
+//    ModalContext.setDebugMode(true);
+//  }
+
   bool bail = false;
 
   // create workbench window manager
   //windowManager = new WindowManager();
 
   IIntroRegistry* introRegistry = WorkbenchPlugin::GetDefault()
         ->GetIntroRegistry();
     if (introRegistry->GetIntroCount() > 0) {
       //TODO Product support
       //IProduct product = Platform.getProduct();
       //if (product != null) {
         introDescriptor = introRegistry
             ->GetIntroForProduct("").Cast<IntroDescriptor>(); //product.getId());
       //}
     }
 
   // TODO Correctly order service initialization
   // there needs to be some serious consideration given to
   // the services, and hooking them up in the correct order
   evaluationService.reset(new EvaluationService());
   evaluationService->Register();
 
   //    StartupThreading.runWithoutExceptions(new StartupRunnable() {
   //
   //      public void runWithException() {
   serviceLocator->RegisterService(evaluationService.data());
   //      }
   //    });
 
   // Initialize the activity support.
   //workbenchActivitySupport = new WorkbenchActivitySupport();
   //activityHelper = ActivityPersistanceHelper.getInstance();
 
   this->InitializeDefaultServices();
   //    initializeFonts();
   //    initializeColors();
   //    initializeApplicationColors();
 
   // now that the workbench is sufficiently initialized, let the advisor
   // have a turn.
 
   advisor->InternalBasicInitialize(this->GetWorkbenchConfigurer());
 
+//  StartupThreading.runWithoutExceptions(new StartupRunnable() {
+
+//        public void runWithException() {
+  StartSourceProviders();
+//        }
+//      });
+
+//      StartupThreading.runWithoutExceptions(new StartupRunnable() {
+
+//        public void runWithException() {
+
+//          activateWorkbenchContext();
+
+//        }
+//      });
+
+//      StartupThreading.runWithoutExceptions(new StartupRunnable() {
+
+//        public void runWithException() {
+
+//          createApplicationMenu();
+//        }
+//      });
+
   // attempt to restore a previous workbench state
 
   advisor->PreStartup();
 
   if (!advisor->OpenWindows())
   {
     bail = true;
   }
 
   if (bail)
   return false;
 
   //forceOpenPerspective();
 
   return true;
 }
 
 bool Workbench::RestoreState()
 {
   //return false;
   if (!GetWorkbenchConfigurer()->GetSaveAndRestore())
   {
     //      QString msg = "This application does not save and restore previously saved state.";
     //      return new Status(IStatus.WARNING, WorkbenchPlugin.PI_WORKBENCH,
     //          IWorkbenchConfigurer.RESTORE_CODE_RESET, msg, null);
     return false;
   }
   // Read the workbench state file.
   QString stateFile = GetWorkbenchStateFile();
   // If there is no state file cause one to open.
   if (stateFile.isEmpty() || !QFile::exists(stateFile))
   {
     //      QString msg = "No previously saved state to restore.";
     //      return new Status(IStatus.WARNING, WorkbenchPlugin.PI_WORKBENCH,
     //          IWorkbenchConfigurer.RESTORE_CODE_RESET, msg, null);
     return false;
   }
 
   //    final IStatus result[] = { new Status(IStatus.OK,
   //        WorkbenchPlugin.PI_WORKBENCH, IStatus.OK, "", null) }; //$NON-NLS-1$
   bool result = true;
   ISafeRunnable::Pointer runnable(new RestoreStateRunnable(this, stateFile, result));
   SafeRunner::Run(runnable);
   // ensure at least one window was opened
   //if (result[0].isOK() && windowManager.getWindows().length == 0)
   if (result && windowManager.GetWindowCount() == 0)
   {
     QString msg = "No windows restored.";
     //    result[0] = new Status(IStatus.ERROR, WorkbenchPlugin.PI_WORKBENCH,
     //        IWorkbenchConfigurer.RESTORE_CODE_RESET, msg, null);
     result &= false;
   }
   return result;
 }
 
 bool Workbench::RestoreState(IMemento::Pointer memento)
 {
 
   //    final MultiStatus result = new MultiStatus(PlatformUI.PLUGIN_ID,
   //        IStatus.OK, WorkbenchMessages.Workbench_problemsRestoring, null);
   bool result = true;
 
   const bool showProgress = false;
   //TODO restore state progress
   //    final boolean showProgress = PrefUtil.getAPIPreferenceStore()
   //        .getBoolean(
   //            IWorkbenchPreferenceConstants.SHOW_PROGRESS_ON_STARTUP);
 
   try
   {
     /*
      * Restored windows will be set in the createdWindows field to be
      * used by the openWindowsAfterRestore() method
      */
     if (!showProgress)
     {
       DoRestoreState(memento, result);
     }
     else
     {
       // Retrieve how many plug-ins were loaded while restoring the
       // workbench
       int lastProgressCount = -1;
       memento->GetInteger(WorkbenchConstants::TAG_PROGRESS_COUNT, lastProgressCount);
 
       // If we don't know how many plug-ins were loaded last time,
       // assume we are loading half of the installed plug-ins.
       /*const std::size_t expectedProgressCount =*/
       std::max<std::size_t>(1,
           lastProgressCount == -1 ? WorkbenchPlugin::GetDefault()->GetBundleCount() / 2
           : lastProgressCount);
 
       //TODO restore state progress
       //        RunStartupWithProgress(expectedProgressCount, new Runnable() {
       //          public void Run() {
       //            DoRestoreState(memento, result);
       //          }
       //        });
     }
   }
   catch (...)
   {
     OpenWindowsAfterRestore();
     throw;
   }
 
   OpenWindowsAfterRestore();
   return result;
 }
 
 void Workbench::DoRestoreState(IMemento::Pointer memento, bool& status) // final MultiStatus status)
 
 {
   IMemento::Pointer childMem;
   try
   {
     // UIStats.start(UIStats.RESTORE_WORKBENCH, "MRUList"); //$NON-NLS-1$
     IMemento::Pointer mruMemento = memento
     ->GetChild(WorkbenchConstants::TAG_MRU_LIST);
     if (mruMemento)
     {
       // TODO restore editor history
       //status.add(getEditorHistory().restoreState(mruMemento));
     }
 
     //UIStats.end(UIStats.RESTORE_WORKBENCH, this, "MRUList"); //$NON-NLS-1$
   }
   catch (...)
   {
     //UIStats.end(UIStats.RESTORE_WORKBENCH, this, "MRUList"); //$NON-NLS-1$
     throw;
   }
 
   // Restore advisor state.
   IMemento::Pointer advisorState = memento
   ->GetChild(WorkbenchConstants::TAG_WORKBENCH_ADVISOR);
   if (advisorState)
   {
     //status.add(getAdvisor().restoreState(advisorState));
     status &= GetAdvisor()->RestoreState(advisorState);
   }
 
   // Get the child windows.
   QList<IMemento::Pointer> children = memento
   ->GetChildren(WorkbenchConstants::TAG_WINDOW);
 
   createdWindows.clear();
 
   // Read the workbench windows.
-  for (std::size_t i = 0; i < children.size(); i++)
+  for (int i = 0; i < children.size(); i++)
   {
     childMem = children[i];
     WorkbenchWindow::Pointer newWindow;
 
     //StartupThreading.runWithoutExceptions(new StartupRunnable() {
 
     //  public void runWithException() {
     newWindow = NewWorkbenchWindow();
     newWindow->Create();
     //  }});
     createdWindows.push_back(newWindow);
 
     // allow the application to specify an initial perspective to open
     // @issue temporary workaround for ignoring initial perspective
     // String initialPerspectiveId =
     // getAdvisor().getInitialWindowPerspectiveId();
     // if (initialPerspectiveId != null) {
     // IPerspectiveDescriptor desc =
     // getPerspectiveRegistry().findPerspectiveWithId(initialPerspectiveId);
     // result.merge(newWindow.restoreState(childMem, desc));
     // }
     // add the window so that any work done in newWindow.restoreState
     // that relies on Workbench methods has windows to work with
     windowManager.Add(newWindow);
 
     // now that we've added it to the window manager we need to listen
     // for any exception that might hose us before we get a chance to
     // open it. If one occurs, remove the new window from the manager.
     // Assume that the new window is a phantom for now
     try
     {
       //status.merge(newWindow[0].restoreState(childMem, null));
       status &= newWindow->RestoreState(childMem, IPerspectiveDescriptor::Pointer(0));
       try
       {
         newWindow->FireWindowRestored();
       }
       catch (const WorkbenchException& /*e*/)
       {
         //status.add(e.getStatus());
         status &= false;
       }
       // everything worked so far, don't close now
     }
     catch (...)
     {
       // null the window in newWindowHolder so that it won't be
       // opened later on
       createdWindows[i] = 0;
       //StartupThreading.runWithoutExceptions(new StartupRunnable() {
 
       //  public void runWithException() throws Throwable {
       newWindow->Close();
       //  }});
 
     }
   }
 }
 
 void Workbench::OpenWindowsAfterRestore()
 {
   if (createdWindows.empty())
   {
     return;
   }
   // now open the windows (except the ones that were nulled because we
   // closed them above)
-  for (std::size_t i = 0; i < createdWindows.size(); i++)
+  for (int i = 0; i < createdWindows.size(); i++)
   {
     if (createdWindows[i])
     {
       WorkbenchWindow::Pointer myWindow = createdWindows[i];
       //StartupThreading.runWithoutExceptions(new StartupRunnable() {
 
       //  public void runWithException() throws Throwable {
       try
       {
         myWindow->Open();
       }
       catch (...)
       {
         myWindow->Close();
         throw;
       }
       //  }});
     }
   }
   createdWindows.clear();
 }
 
 void Workbench::InitializeDefaultServices()
 {
 
   //    final IContributionService contributionService = new ContributionService(
   //        getAdvisor());
   //    serviceLocator.registerService(IContributionService.class,
   //        contributionService);
   //
   //    // TODO Correctly order service initialization
   //    // there needs to be some serious consideration given to
   //    // the services, and hooking them up in the correct order
-  //    final IEvaluationService evaluationService =
-  //      (IEvaluationService) serviceLocator.getService(IEvaluationService.class);
-  //
   //
   //
   //    StartupThreading.runWithoutExceptions(new StartupRunnable() {
   //
   //      public void runWithException() {
   saveablesList.reset(new SaveablesList());
   saveablesList->Register();
   serviceLocator->RegisterService(saveablesList.data());
   //      }});
   //
 
   /*
    * Phase 1 of the initialization of commands. When this phase completes,
    * all the services and managers will exist, and be accessible via the
    * getService(Object) method.
    */
   //    StartupThreading.runWithoutExceptions(new StartupRunnable() {
   //
   //      public void runWithException() {
   //        Command.DEBUG_COMMAND_EXECUTION = Policy.DEBUG_COMMANDS;
   commandManager.reset(new CommandManager());
   //      }});
   //
   //    final CommandService [] commandService = new CommandService[1];
   //    StartupThreading.runWithoutExceptions(new StartupRunnable() {
   //
   //      public void runWithException() {
   commandService.reset(new CommandService(commandManager.data()));
   commandService->Register();
   commandService->ReadRegistry();
   serviceLocator->RegisterService(commandService.data());
   //      }});
   //
   //    StartupThreading.runWithoutExceptions(new StartupRunnable() {
   //
   //      public void runWithException() {
   //        ContextManager.DEBUG = Policy.DEBUG_CONTEXTS;
   //        contextManager = new ContextManager();
   //        }});
   //
   //    final IContextService contextService = new ContextService(
   //        contextManager);
   //
   //    StartupThreading.runWithoutExceptions(new StartupRunnable() {
   //
   //      public void runWithException() {
   //        contextService.readRegistry();
   //        }});
   //
   //    serviceLocator.registerService(IContextService.class, contextService);
   //
   //
   //    final IBindingService [] bindingService = new BindingService[1];
   //
   //    StartupThreading.runWithoutExceptions(new StartupRunnable() {
   //
   //      public void runWithException() {
   //        BindingManager.DEBUG = Policy.DEBUG_KEY_BINDINGS;
   //        bindingManager = new BindingManager(contextManager, commandManager);
   //        bindingService[0] = new BindingService(
   //            bindingManager, commandService[0], Workbench.this);
   //
   //      }});
   //
   //    bindingService[0].readRegistryAndPreferences(commandService[0]);
   //    serviceLocator.registerService(IBindingService.class, bindingService[0]);
   //
   //    final CommandImageManager commandImageManager = new CommandImageManager();
   //    final CommandImageService commandImageService = new CommandImageService(
   //        commandImageManager, commandService[0]);
   //    commandImageService.readRegistry();
   //    serviceLocator.registerService(ICommandImageService.class,
   //        commandImageService);
 
-  menuService.reset(new WorkbenchMenuService(serviceLocator.GetPointer()));
+  WorkbenchMenuService* wms = new WorkbenchMenuService(serviceLocator.GetPointer());
+  menuService.reset(wms);
   menuService->Register();
 
   serviceLocator->RegisterService(menuService.data());
   // the service must be registered before it is initialized - its
   // initialization uses the service locator to address a dependency on
   // the menu service
   //StartupThreading.runWithoutExceptions(new StartupRunnable() {
   //      public void runWithException() {
-  // menuService->ReadRegistry();
+  wms->ReadRegistry();
   //      }});
 
-  //    /*
-  //     * Phase 2 of the initialization of commands. The source providers that
-  //     * the workbench provides are creating and registered with the above
-  //     * services. These source providers notify the services when particular
-  //     * pieces of workbench state change.
-  //     */
-  //    final SourceProviderService sourceProviderService = new SourceProviderService(serviceLocator);
-  //    serviceLocator.registerService(ISourceProviderService.class,
-  //        sourceProviderService);
-  //    StartupThreading.runWithoutExceptions(new StartupRunnable() {
-  //
-  //      public void runWithException() {
-  //        // this currently instantiates all players ... sigh
-  //        sourceProviderService.readRegistry();
-  //        ISourceProvider[] sp = sourceProviderService.getSourceProviders();
-  //        for (int i = 0; i < sp.length; i++) {
-  //          evaluationService.addSourceProvider(sp[i]);
-  //          if (!(sp[i] instanceof ActiveContextSourceProvider)) {
-  //            contextService.addSourceProvider(sp[i]);
-  //          }
-  //        }
-  //      }});
-  //
-  //    StartupThreading.runWithoutExceptions(new StartupRunnable() {
-  //
-  //      public void runWithException() {
-  //        // these guys are need to provide the variables they say
-  //        // they source
-  //        actionSetSourceProvider = (ActionSetSourceProvider) sourceProviderService
-  //            .getSourceProvider(ISources.ACTIVE_ACTION_SETS_NAME);
-  //
-  //        FocusControlSourceProvider focusControl = (FocusControlSourceProvider) sourceProviderService
-  //            .getSourceProvider(ISources.ACTIVE_FOCUS_CONTROL_ID_NAME);
-  //        serviceLocator.registerService(IFocusService.class,
-  //            focusControl);
-  //
-  //        menuSourceProvider = (MenuSourceProvider) sourceProviderService
-  //            .getSourceProvider(ISources.ACTIVE_MENU_NAME);
-  //      }});
-  //
-  //    /*
-  //     * Phase 3 of the initialization of commands. This handles the creation
-  //     * of wrappers for legacy APIs. By the time this phase completes, any
-  //     * code trying to access commands through legacy APIs should work.
-  //     */
-  //    final IHandlerService[] handlerService = new IHandlerService[1];
-  //    StartupThreading.runWithoutExceptions(new StartupRunnable() {
-  //
-  //      public void runWithException() {
-  //        handlerService[0] = (IHandlerService) serviceLocator
-  //            .getService(IHandlerService.class);
-  //      }
-  //    });
-  //    workbenchContextSupport = new WorkbenchContextSupport(this,
-  //        contextManager);
-  //    workbenchCommandSupport = new WorkbenchCommandSupport(bindingManager,
-  //        commandManager, contextManager, handlerService[0]);
-  //    initializeCommandResolver();
-  //
-  //    addWindowListener(windowListener);
-  //    bindingManager.addBindingManagerListener(bindingManagerListener);
-  //
-  //    serviceLocator.registerService(ISelectionConversionService.class,
-  //        new SelectionConversionService());
+  // the source providers are now initialized in phase 3, but source
+  // priorities have to be set before handler initialization
+  // StartupThreading.runWithoutExceptions(new StartupRunnable() {
+  // public void runWithException() {
+  InitializeSourcePriorities();
+  // }
+  // });
+
+  /*
+   * Phase 2 of the initialization of commands. This handles the creation
+   * of wrappers for legacy APIs. By the time this phase completes, any
+   * code trying to access commands through legacy APIs should work.
+   */
+  //IHandlerService* handlerService = NULL;
+//      StartupThreading.runWithoutExceptions(new StartupRunnable() {
+
+//        public void runWithException() {
+  /*handlerService = */serviceLocator->GetService<IHandlerService>();
+//        }
+//      });
+//      workbenchContextSupport = new WorkbenchContextSupport(this,
+//          contextManager);
+//      workbenchCommandSupport = new WorkbenchCommandSupport(bindingManager,
+//          commandManager, contextManager, handlerService[0]);
+//      initializeCommandResolver();
+
+//      addWindowListener(windowListener);
+//      bindingManager.addBindingManagerListener(bindingManagerListener);
+
+//      serviceLocator.registerService(ISelectionConversionService.class,
+//          new SelectionConversionService());
 }
 
 int Workbench::RunUI()
 {
 
   // initialize workbench and restore or open one window
   bool initOK = this->Init();
 
   // let the advisor run its start up code
   if (initOK)
   {
     advisor->PostStartup(); // may trigger a close/restart
   }
 
   //TODO start eager plug-ins
   //startPlugins();
 
   //addStartupRegistryListener();
 
   isStarting = false;
 
   BERRY_INFO << "BlueBerry Workbench ready";
 
   this->GetWorkbenchTestable()->Init(Display::GetDefault(), this);
 
   // spin event loop
   return display->RunEventLoop();
 }
 
 QString Workbench::GetDefaultPerspectiveId()
 {
   return this->GetAdvisor()->GetInitialWindowPerspectiveId();
 }
 
 IAdaptable* Workbench::GetDefaultPageInput()
 {
   return this->GetAdvisor()->GetDefaultPageInput();
 }
 
 QString Workbench::GetPresentationId()
 {
   if (factoryID != "")
   {
     return factoryID;
   }
 
   //factoryID = PrefUtil.getAPIPreferenceStore().getString(
   //    IWorkbenchPreferenceConstants.PRESENTATION_FACTORY_ID);
 
   // Workaround for bug 58975 - New preference mechanism does not properly
   // initialize defaults
   // Ensure that the UI plugin has started too.
   factoryID = WorkbenchConstants::DEFAULT_PRESENTATION_ID;
 
   return factoryID;
 }
 
 void Workbench::UpdateTheme()
 {
   WorkbenchPlugin::GetDefault()->GetPresentationFactory()->UpdateTheme();
 }
 
 void Workbench::LargeUpdateStart()
 {
   if (largeUpdates++ == 0)
   {
     // TODO Consider whether these lines still need to be here.
     // workbenchCommandSupport.setProcessing(false);
     // workbenchContextSupport.setProcessing(false);
 
     QList<IWorkbenchWindow::Pointer> windows = this->GetWorkbenchWindows();
-    for (unsigned int i = 0; i < windows.size(); i++)
+    for (int i = 0; i < windows.size(); i++)
     {
       IWorkbenchWindow::Pointer window = windows[i];
       if (window.Cast<WorkbenchWindow>() != 0)
       {
         window.Cast<WorkbenchWindow>()->LargeUpdateStart();
       }
     }
   }
 }
 
 void Workbench::LargeUpdateEnd()
 {
   if (--largeUpdates == 0)
   {
     // TODO Consider whether these lines still need to be here.
     // workbenchCommandSupport.setProcessing(true);
     // workbenchContextSupport.setProcessing(true);
 
     // Perform window-specific blocking.
     QList<IWorkbenchWindow::Pointer> windows = this->GetWorkbenchWindows();
-    for (unsigned int i = 0; i < windows.size(); i++)
+    for (int i = 0; i < windows.size(); i++)
     {
       IWorkbenchWindow::Pointer window = windows[i];
       if (window.Cast<WorkbenchWindow>() != 0)
       {
         window.Cast<WorkbenchWindow>()->LargeUpdateEnd();
       }
     }
   }
 }
 
 void Workbench::OpenFirstTimeWindow()
 {
   try
   {
     IAdaptable* input;
     //StartupThreading.runWithoutExceptions(new StartupRunnable() {
 
     //  public void runWithException() throws Throwable {
     input = this->GetDefaultPageInput();
     //  }});
 
     this->BusyOpenWorkbenchWindow(this->GetPerspectiveRegistry()->GetDefaultPerspective(), input);
   }
   catch (WorkbenchException& e)
   {
     // Don't use the window's shell as the dialog parent,
     // as the window is not open yet (bug 76724).
     //StartupThreading.runWithoutExceptions(new StartupRunnable() {
 
     //  public void runWithException() throws Throwable {
     //    ErrorDialog.openError(null,
     //        WorkbenchMessages.Problems_Opening_Page, e.getMessage(), e
     //            .getStatus());
     //  }});
     BERRY_ERROR << "Error: Problems opening page. " << e.what() << std::endl;
   }
 }
 
 WorkbenchConfigurer::Pointer Workbench::GetWorkbenchConfigurer()
 {
   if (workbenchConfigurer.IsNull())
   {
     workbenchConfigurer = new WorkbenchConfigurer();
   }
   return workbenchConfigurer;
 }
 
 WorkbenchAdvisor* Workbench::GetAdvisor()
 {
   return advisor;
 }
 
 IViewRegistry* Workbench::GetViewRegistry()
 {
   return WorkbenchPlugin::GetDefault()->GetViewRegistry();
 }
 
 IEditorRegistry* Workbench::GetEditorRegistry()
 {
   return WorkbenchPlugin::GetDefault()->GetEditorRegistry();
 }
 
 IPerspectiveRegistry* Workbench::GetPerspectiveRegistry()
 {
   return WorkbenchPlugin::GetDefault()->GetPerspectiveRegistry();
 }
 
 bool Workbench::Close()
 {
   return this->Close(PlatformUI::RETURN_OK, false);
 }
 
 bool Workbench::Close(int returnCode, bool force)
 {
   BERRY_INFO << "Closing workbench...";
   this->returnCode = returnCode;
   bool ret;
   //BusyIndicator.showWhile(null, new Runnable() {
   //  public void run() {
   ret = this->BusyClose(force);
   //  }
   //});
   return ret;
 }
 
 /**
  * Closes the workbench. Assumes that the busy cursor is active.
  *
  * @param force
  *            true if the close is mandatory, and false if the close is
  *            allowed to fail
  * @return true if the close succeeded, and false otherwise
  */
 bool Workbench::BusyClose(bool force)
 {
 
   // notify the advisor of preShutdown and allow it to veto if not forced
   isClosing = advisor->PreShutdown();
   if (!force && !isClosing)
   {
     return false;
   }
 
   // notify regular workbench clients of preShutdown and allow them to
   // veto if not forced
   isClosing = this->FirePreShutdown(force);
   if (!force && !isClosing)
   {
     return false;
   }
 
   // save any open editors if they are dirty
   isClosing = this->SaveAllEditors(!force);
   if (!force && !isClosing)
   {
     return false;
   }
 
   bool closeEditors = !force && false; // false is the default for the not yet implemented preference below
   // && PrefUtil.getAPIPreferenceStore().getBoolean(
   //     IWorkbenchPreferenceConstants.CLOSE_EDITORS_ON_EXIT);
   if (closeEditors)
   {
     // SafeRunner.run(new SafeRunnable() {
     //  public void run() {
     QList<IWorkbenchWindow::Pointer> windows = this->GetWorkbenchWindows();
-    for (unsigned int i = 0; i < windows.size(); i++)
+    for (int i = 0; i < windows.size(); i++)
     {
       IWorkbenchPage::Pointer page = windows[i]->GetActivePage();
       if (page)
       isClosing = isClosing && page->CloseAllEditors(false);
     }
     // }
     //});
     if (!force && !isClosing)
     {
       return false;
     }
   }
 
   if (this->GetWorkbenchConfigurer()->GetSaveAndRestore())
   {
     try
     {
       //    SafeRunner.run(new SafeRunnable() {
       //      public void run() {
       XMLMemento::Pointer mem = RecordWorkbenchState();
       // Save the IMemento to a file.
       SaveMementoToFile(mem);
       //      }
     }
     catch(const ctkException& e)
     {
       //      public void handleException(Throwable e) {
       QString message;
       if (e.what() == 0)
       {
         message = "An error has occurred. See error log for more details. Do you want to exit?";
       }
       else
       {
         message = QString("An error has occurred: ") + e.what() + ". See error log for more details. Do you want to exit?";
       }
 
       if (!MessageDialog::OpenQuestion(Shell::Pointer(0), "Error", message))
       {
         isClosing = false;
       }
     }
     //      }
     //    });
   }
   if (!force && !isClosing)
   {
     return false;
   }
 
   //SafeRunner.run(new SafeRunnable(WorkbenchMessages.ErrorClosing) {
   //  public void run() {
   if (isClosing || force)
   {
     isClosing = windowManager.Close();
   }
   //  }
   //});
 
   if (!force && !isClosing)
   {
     return false;
   }
 
   this->Shutdown();
 
   display->ExitEventLoop(0);
   return true;
 }
 
 QString Workbench::GetWorkbenchStateFile() const
 {
   QString path = WorkbenchPlugin::GetDefault()->GetDataLocation();
   if (path.isNull())
   {
     return QString();
   }
   return QDir::cleanPath(path + "/" + DEFAULT_WORKBENCH_STATE_FILENAME);
 }
 
 /*
  * Save the workbench UI in a persistence file.
  */
 bool Workbench::SaveMementoToFile(XMLMemento::Pointer memento)
 {
   // Save it to a file.
   // XXX: nobody currently checks the return value of this method.
   QString stateFile = GetWorkbenchStateFile();
   if (stateFile.isNull())
   {
     return false;
   }
   //BERRY_INFO << "Saving state to: " << stateFile.path() << std::endl;
   try
   {
     Poco::FileOutputStream stream(stateFile.toStdString());
     memento->Save(stream);
   }
   catch (const Poco::IOException& /*e*/)
   {
     QFile::remove(stateFile);
     MessageDialog::OpenError(Shell::Pointer(0),
         "Saving Problems",
         "Unable to store workbench state.");
     return false;
   }
 
   // Success !
   return true;
 }
 
-IWorkbenchWindow::Pointer Workbench::GetActiveWorkbenchWindow()
+IWorkbenchWindow::Pointer Workbench::GetActiveWorkbenchWindow() const
 {
   // Look for the window that was last known being
   // the active one
   WorkbenchWindow::Pointer win = this->GetActivatedWindow();
   return win;
 }
 
 std::size_t Workbench::GetWorkbenchWindowCount()
 {
   return windowManager.GetWindowCount();
 }
 
 QList<IWorkbenchWindow::Pointer> Workbench::GetWorkbenchWindows()
 {
   QList<Window::Pointer> windows = windowManager.GetWindows();
   QList<IWorkbenchWindow::Pointer> result;
   for (QList<Window::Pointer>::iterator iter = windows.begin();
       iter != windows.end(); ++iter)
   {
     result.push_back(iter->Cast<WorkbenchWindow>());
   }
 
   return result;
 }
 
 IWorkbenchWindow::Pointer Workbench::OpenWorkbenchWindow(
     const QString& perspID, IAdaptable* input)
 {
   // Run op in busy cursor.
   //final Object[] result = new Object[1];
   //BusyIndicator.showWhile(null, new Runnable() {
   //  public void run() {
   //    try {
   return this->BusyOpenWorkbenchWindow(perspID, input);
   //    } catch (WorkbenchException e) {
   //      result[0] = e;
   //    }
   //  }
   //});
 
 }
 
 IWorkbenchWindow::Pointer Workbench::OpenWorkbenchWindow(IAdaptable* input)
 {
   return this->OpenWorkbenchWindow(this->GetPerspectiveRegistry()
       ->GetDefaultPerspective(), input);
 }
 
 IWorkbenchPage::Pointer Workbench::ShowPerspective(
     const QString& perspectiveId, IWorkbenchWindow::Pointer window)
 {
   // If the specified window has the requested perspective open, then the
   // window
   // is given focus and the perspective is shown. The page's input is
   // ignored.
   WorkbenchWindow::Pointer win = window.Cast<WorkbenchWindow> ();
   if (win)
   {
     IWorkbenchPage::Pointer page = win->GetActivePage();
     if (page)
     {
       QList<IPerspectiveDescriptor::Pointer> perspectives(page
           ->GetOpenPerspectives());
-      for (std::size_t i = 0; i < perspectives.size(); i++)
+      for (int i = 0; i < perspectives.size(); i++)
       {
         IPerspectiveDescriptor::Pointer persp = perspectives[i];
         if (perspectiveId == persp->GetId())
         {
           win->MakeVisible();
           page->SetPerspective(persp);
           return page;
         }
       }
     }
   }
 
   // If another window that has the workspace root as input and the
   // requested
   // perpective open and active, then the window is given focus.
   IAdaptable* input = GetDefaultPageInput();
   QList<IWorkbenchWindow::Pointer> windows(GetWorkbenchWindows());
-  for (std::size_t i = 0; i < windows.size(); i++)
+  for (int i = 0; i < windows.size(); i++)
   {
     win = windows[i].Cast<WorkbenchWindow>();
     if (window != win)
     {
       WorkbenchPage::Pointer page = win->GetActivePage().Cast<WorkbenchPage>();
       if (page)
       {
         bool inputSame = false;
         if (input == 0)
         {
           inputSame = (page->GetInput() == 0);
         }
         else
         {
           inputSame = input == page->GetInput();
         }
         if (inputSame)
         {
           Perspective::Pointer persp = page->GetActivePerspective();
           if (persp)
           {
             IPerspectiveDescriptor::Pointer desc = persp->GetDesc();
             if (desc)
             {
               if (perspectiveId == desc->GetId())
               {
                 Shell::Pointer shell = win->GetShell();
                 shell->Open();
                 if (shell->GetMinimized())
                 {
                   shell->SetMinimized(false);
                 }
                 return page;
               }
             }
           }
         }
       }
     }
   }
 
   // Otherwise the requested perspective is opened and shown in the
   // specified
   // window or in a new window depending on the current user preference
   // for opening
   // perspectives, and that window is given focus.
   win = window.Cast<WorkbenchWindow>();
   if (win)
   {
     IPreferencesService* store = WorkbenchPlugin::GetDefault()->GetPreferencesService();
     int mode = store->GetSystemPreferences()->GetInt(PreferenceConstants::OPEN_PERSP_MODE,
                                                      PreferenceConstants::OPM_ACTIVE_PAGE);
     IWorkbenchPage::Pointer page = win->GetActivePage();
     IPerspectiveDescriptor::Pointer persp;
     if (page)
     {
       persp = page->GetPerspective();
     }
 
     // Only open a new window if user preference is set and the window
     // has an active perspective.
     if (PreferenceConstants::OPM_NEW_WINDOW == mode && persp)
     {
       IWorkbenchWindow::Pointer newWindow = OpenWorkbenchWindow(perspectiveId,
           input);
       return newWindow->GetActivePage();
     }
 
     IPerspectiveDescriptor::Pointer desc = GetPerspectiveRegistry()
     ->FindPerspectiveWithId(perspectiveId);
     if (desc == 0)
     {
       throw WorkbenchException(
           "Unable to create perspective \"" + perspectiveId + "\". There is no corresponding perspective extension.");
     }
     win->GetShell()->Open();
     if (page == 0)
     {
       page = win->OpenPage(perspectiveId, input);
     }
     else
     {
       page->SetPerspective(desc);
     }
     return page;
   }
 
   // Just throw an exception....
   throw WorkbenchException("Problems opening perspective \"" +
       perspectiveId + "\"");
 }
 
 IWorkbenchPage::Pointer Workbench::ShowPerspective(
     const QString& /*perspectiveId*/,
     IWorkbenchWindow::Pointer /*window*/,
     IAdaptable* /*input*/)
 {
   return IWorkbenchPage::Pointer(0);
   //    // If the specified window has the requested perspective open and the
   //    // same requested
   //    // input, then the window is given focus and the perspective is shown.
   //    bool inputSameAsWindow = false;
   //    WorkbenchWindow::Pointer win = window.Cast<WorkbenchWindow>();
   //    if (win.IsNotNull()) {
   //      WorkbenchPage::Pointer page = win->GetActiveWorkbenchPage();
   //      if (page.IsNotNull()) {
   //        bool inputSame = false;
   //        if (input == 0) {
   //          inputSame = (page->GetInput() == 0);
   //        } else {
   //          inputSame = input.equals(page.getInput());
   //        }
   //        if (inputSame) {
   //          inputSameAsWindow = true;
   //          IPerspectiveDescriptor perspectives[] = page
   //              .getOpenPerspectives();
   //          for (int i = 0; i < perspectives.length; i++) {
   //            IPerspectiveDescriptor persp = perspectives[i];
   //            if (perspectiveId.equals(persp.getId())) {
   //              win.makeVisible();
   //              page.setPerspective(persp);
   //              return page;
   //            }
   //          }
   //        }
   //      }
   //    }
   //
   //    // If another window has the requested input and the requested
   //    // perpective open and active, then that window is given focus.
   //    IWorkbenchWindow[] windows = getWorkbenchWindows();
   //    for (int i = 0; i < windows.length; i++) {
   //      win = (WorkbenchWindow) windows[i];
   //      if (window != win) {
   //        WorkbenchPage page = win.getActiveWorkbenchPage();
   //        if (page != null) {
   //          boolean inputSame = false;
   //          if (input == null) {
   //            inputSame = (page.getInput() == null);
   //          } else {
   //            inputSame = input.equals(page.getInput());
   //          }
   //          if (inputSame) {
   //            Perspective persp = page.getActivePerspective();
   //            if (persp != null) {
   //              IPerspectiveDescriptor desc = persp.getDesc();
   //              if (desc != null) {
   //                if (perspectiveId.equals(desc.getId())) {
   //                  win.getShell().open();
   //                  return page;
   //                }
   //              }
   //            }
   //          }
   //        }
   //      }
   //    }
   //
   //    // If the specified window has the same requested input but not the
   //    // requested
   //    // perspective, then the window is given focus and the perspective is
   //    // opened and shown
   //    // on condition that the user preference is not to open perspectives in
   //    // a new window.
   //    win = (WorkbenchWindow) window;
   //    if (inputSameAsWindow && win != null) {
   //      IPreferenceStore store = WorkbenchPlugin.getDefault()
   //          .getPreferenceStore();
   //      int mode = store.getInt(IPreferenceConstants.OPEN_PERSP_MODE);
   //
   //      if (IPreferenceConstants.OPM_NEW_WINDOW != mode) {
   //        IWorkbenchPage page = win.getActiveWorkbenchPage();
   //        IPerspectiveDescriptor desc = getPerspectiveRegistry()
   //            .findPerspectiveWithId(perspectiveId);
   //        if (desc == null) {
   //          throw new WorkbenchException(
   //              NLS
   //                  .bind(
   //                      WorkbenchMessages.WorkbenchPage_ErrorCreatingPerspective,
   //                      perspectiveId));
   //        }
   //        win.getShell().open();
   //        if (page == null) {
   //          page = win.openPage(perspectiveId, input);
   //        } else {
   //          page.setPerspective(desc);
   //        }
   //        return page;
   //      }
   //    }
   //
   //    // If the specified window has no active perspective, then open the
   //    // requested perspective and show the specified window.
   //    if (win != null) {
   //      IWorkbenchPage page = win.getActiveWorkbenchPage();
   //      IPerspectiveDescriptor persp = null;
   //      if (page != null) {
   //        persp = page.getPerspective();
   //      }
   //      if (persp == null) {
   //        IPerspectiveDescriptor desc = getPerspectiveRegistry()
   //            .findPerspectiveWithId(perspectiveId);
   //        if (desc == null) {
   //          throw new WorkbenchException(
   //              NLS
   //                  .bind(
   //                      WorkbenchMessages.WorkbenchPage_ErrorCreatingPerspective,
   //                      perspectiveId));
   //        }
   //        win.getShell().open();
   //        if (page == null) {
   //          page = win.openPage(perspectiveId, input);
   //        } else {
   //          page.setPerspective(desc);
   //        }
   //        return page;
   //      }
   //    }
   //
   //    // Otherwise the requested perspective is opened and shown in a new
   //    // window, and the
   //    // window is given focus.
   //    IWorkbenchWindow newWindow = openWorkbenchWindow(perspectiveId, input);
   //    return newWindow.getActivePage();
 }
 
 bool Workbench::SaveAllEditors(bool /*confirm*/)
 {
   return true;
 }
 
 IIntroManager* Workbench::GetIntroManager()
 {
   return GetWorkbenchIntroManager();
 }
 
 WorkbenchIntroManager* Workbench::GetWorkbenchIntroManager()
 {
   if (introManager.isNull())
   {
     introManager.reset(new WorkbenchIntroManager(this));
   }
   return introManager.data();
 }
 
 IntroDescriptor::Pointer Workbench::GetIntroDescriptor() const
 {
   return introDescriptor;
 }
 
 void Workbench::SetIntroDescriptor(IntroDescriptor::Pointer descriptor)
 {
   if (GetIntroManager()->GetIntro())
   {
     GetIntroManager()->CloseIntro(GetIntroManager()->GetIntro());
   }
   introDescriptor = descriptor;
 }
 
 bool Workbench::IsRunning()
 {
   return Tweaklets::Get(WorkbenchTweaklet::KEY)->IsRunning();
 }
 
 bool Workbench::IsStarting()
 {
   return isStarting;
 }
 
 bool Workbench::IsClosing()
 {
   return isClosing;
 }
 
-WorkbenchWindow::Pointer Workbench::GetActivatedWindow()
+WorkbenchWindow::Pointer Workbench::GetActivatedWindow() const
 {
   return activatedWindow;
 }
 
 /*
  * Sets the workbench window which was last known being the active one, or
  * <code> null </code> .
  */
 void Workbench::SetActivatedWindow(WorkbenchWindow::Pointer window)
 {
   activatedWindow = window;
 }
 
 WorkbenchWindow::Pointer Workbench::NewWorkbenchWindow()
 {
   WorkbenchWindow::Pointer wbw(new WorkbenchWindow(this->GetNewWindowNumber()));
   return wbw;
 }
 
 int Workbench::GetNewWindowNumber()
 {
   // Get window list.
   QList<Window::Pointer> windows = windowManager.GetWindows();
   int count = static_cast<int>(windows.size());
 
   // Create an array of booleans (size = window count).
   // Cross off every number found in the window list.
   bool *checkArray = new bool[count];
   for (int nX = 0; nX < count; ++nX)
   {
     if (windows[nX].Cast<WorkbenchWindow> ().IsNotNull())
     {
       WorkbenchWindow::Pointer ww = windows[nX].Cast<WorkbenchWindow> ();
       int index = ww->GetNumber() - 1;
       if (index >= 0 && index < count)
       {
         checkArray[index] = true;
       }
     }
   }
 
   // Return first index which is not used.
   // If no empty index was found then every slot is full.
   // Return next index.
   for (int index = 0; index < count; index++)
   {
     if (!checkArray[index])
     {
       delete[] checkArray;
       return index + 1;
     }
   }
 
   delete[] checkArray;
   return static_cast<int>(count + 1);
 }
 
 IWorkbenchWindow::Pointer Workbench::BusyOpenWorkbenchWindow(
     const QString& perspID, IAdaptable* input)
 {
   // Create a workbench window (becomes active window)
   //final WorkbenchWindow newWindowArray[] = new WorkbenchWindow[1];
   //StartupThreading.runWithWorkbenchExceptions(new StartupRunnable() {
   //  public void runWithException() {
   //    newWindowArray[0] = newWorkbenchWindow();
   WorkbenchWindow::Pointer newWindow = this->NewWorkbenchWindow();
   //  }
   //});
 
   //final WorkbenchWindow newWindow = newWindowArray[0];
 
   //StartupThreading.runWithoutExceptions(new StartupRunnable() {
 
   //  public void runWithException() {
   newWindow->Create(); // must be created before adding to window
   // manager
   //  }
   //});
   windowManager.Add(newWindow);
 
   //final WorkbenchException [] exceptions = new WorkbenchException[1];
   // Create the initial page.
   if (perspID != "")
   {
     //StartupThreading.runWithWorkbenchExceptions(new StartupRunnable() {
 
     try
     {
       newWindow->BusyOpenPage(perspID, input);
     }
     catch (WorkbenchException& e)
     {
       windowManager.Remove(newWindow);
       throw e;
     }
   }
 
   // Open window after opening page, to avoid flicker.
   //StartupThreading.runWithWorkbenchExceptions(new StartupRunnable() {
 
   //  public void runWithException() {
   newWindow->Open();
   //  }
   //});
 
   return newWindow;
 }
 
 bool Workbench::SaveState(IMemento::Pointer memento)
 {
   //  MultiStatus result = new MultiStatus(PlatformUI.PLUGIN_ID, IStatus.OK,
   //      WorkbenchMessages.Workbench_problemsSaving, null);
   bool result = true;
 
   // Save the version number.
   memento->PutString(WorkbenchConstants::TAG_VERSION, VERSION_STRING[0]);
 
   // Save how many plug-ins were loaded while restoring the workbench
   if (progressCount != -1)
   {
     memento->PutInteger(WorkbenchConstants::TAG_PROGRESS_COUNT,
         progressCount);
   }
 
   // Save the advisor state.
   IMemento::Pointer advisorState = memento
   ->CreateChild(WorkbenchConstants::TAG_WORKBENCH_ADVISOR);
   //result.add(getAdvisor().saveState(advisorState));
   result &= GetAdvisor()->SaveState(advisorState);
 
   // Save the workbench windows.
   QList<IWorkbenchWindow::Pointer> windows(GetWorkbenchWindows());
-  for (std::size_t nX = 0; nX < windows.size(); nX++)
+  for (int nX = 0; nX < windows.size(); nX++)
   {
     WorkbenchWindow::Pointer window = windows[nX].Cast<WorkbenchWindow>();
     IMemento::Pointer childMem = memento->CreateChild(WorkbenchConstants::TAG_WINDOW);
     //result.merge(window.saveState(childMem));
     result &= window->SaveState(childMem);
   }
   //  result.add(getEditorHistory().saveState(
   //      memento.createChild(IWorkbenchConstants.TAG_MRU_LIST)));
 
   return result;
 }
 
 XMLMemento::Pointer Workbench::RecordWorkbenchState()
 {
   XMLMemento::Pointer memento = XMLMemento
   ::CreateWriteRoot(WorkbenchConstants::TAG_WORKBENCH);
   //final IStatus status = saveState(memento);
   bool status = SaveState(memento);
   //if (status.getSeverity() != IStatus.OK) {
   if (!status)
   {
     //    // don't use newWindow as parent because it has not yet been opened
     //    // (bug 76724)
     //    StartupThreading.runWithoutExceptions(new StartupRunnable() {
     //
     //      public void runWithException() throws Throwable {
     //        ErrorDialog.openError(null,
     //            WorkbenchMessages.Workbench_problemsSaving,
     //            WorkbenchMessages.Workbench_problemsSavingMsg, status);
     //      }});
 
   }
   return memento;
 }
 
-void Workbench::AddWorkbenchListener(IWorkbenchListener::Pointer listener)
+void Workbench::AddWorkbenchListener(IWorkbenchListener* listener)
 {
   workbenchEvents.AddListener(listener);
 }
 
-void Workbench::RemoveWorkbenchListener(IWorkbenchListener::Pointer listener)
+void Workbench::RemoveWorkbenchListener(IWorkbenchListener* listener)
 {
   workbenchEvents.RemoveListener(listener);
 }
 
 IWorkbenchListener::Events& Workbench::GetWorkbenchEvents()
 {
   return workbenchEvents;
 }
 
-void Workbench::AddWindowListener(IWindowListener::Pointer l)
+void Workbench::AddWindowListener(IWindowListener* l)
 {
   windowEvents.AddListener(l);
 }
 
-void Workbench::RemoveWindowListener(IWindowListener::Pointer l)
+void Workbench::RemoveWindowListener(IWindowListener* l)
 {
   windowEvents.RemoveListener(l);
 }
 
 IWindowListener::Events& Workbench::GetWindowEvents()
 {
   return windowEvents;
 }
 
 bool Workbench::FirePreShutdown(bool forced)
 {
 
   //SafeRunnable.run(new SafeRunnable() {
   //  public void run() {
   typedef IWorkbenchListener::Events::PreShutdownEvent::ListenerList ListenerList;
   const ListenerList& listeners = workbenchEvents.preShutdown.GetListeners();
   for ( ListenerList::const_iterator iter = listeners.begin();
       iter != listeners.end(); ++iter )
   {
     // notify each listener
     if (! (*iter)->Execute(dynamic_cast<IWorkbench*>(this), forced))
     return false;
   }
   //  }
 
   return true;
 }
 
 /**
  * Fire workbench postShutdown event.
  *
  * @since 3.2
  */
 void Workbench::FirePostShutdown()
 {
 
   //  SafeRunnable.run(new SafeRunnable() {
   //    public void run() {
   workbenchEvents.postShutdown(this);
   //    }
 
 }
 
 void Workbench::FireWindowOpened(IWorkbenchWindow::Pointer window)
 {
 
   // SafeRunner.run(new SafeRunnable() {
   //   public void run() {
   windowEvents.windowOpened(window);
   //   }
 
 }
 
 void Workbench::FireWindowClosed(IWorkbenchWindow::Pointer window)
 {
   if (activatedWindow == window)
   {
     // Do not hang onto it so it can be GC'ed
     activatedWindow = 0;
   }
 
   //  SafeRunner.run(new SafeRunnable() {
   //    public void run() {
   windowEvents.windowClosed(window);
   //    }
 
 }
 
 void Workbench::FireWindowActivated(IWorkbenchWindow::Pointer window)
 {
 
   //  SafeRunner.run(new SafeRunnable() {
   //    public void run() {
   windowEvents.windowActivated(window);
   //    }
 
 }
 
 void Workbench::FireWindowDeactivated(IWorkbenchWindow::Pointer window)
 {
 
   //  SafeRunner.run(new SafeRunnable() {
   //    public void run() {
   windowEvents.windowDeactivated(window);
   //    }
 
 }
 
 IWorkbenchWindow::Pointer Workbench::RestoreWorkbenchWindow(IMemento::Pointer memento)
 {
   WorkbenchWindow::Pointer newWindow = this->NewWorkbenchWindow();
   //newWindow.create();
 
   windowManager.Add(newWindow);
 
   // whether the window was opened
   bool opened = false;
 
   try
   {
     newWindow->RestoreState(memento, IPerspectiveDescriptor::Pointer(0));
     newWindow->FireWindowRestored();
     newWindow->Open();
     opened = true;
   }
   catch (...)
   {
     if (!opened)
     {
       newWindow->Close();
     }
   }
 
   return newWindow;
 }
 
 void Workbench::Shutdown()
 {
   // shutdown application-specific portions first
   advisor->PostShutdown();
 
   // notify regular workbench clients of shutdown, and clear the list when
   // done
   this->FirePostShutdown();
   //workbenchListeners.clear();
 
   //cancelEarlyStartup();
 
   // for dynamic UI
   //  Platform.getExtensionRegistry().removeRegistryChangeListener(
   //      extensionEventHandler);
   //  Platform.getExtensionRegistry().removeRegistryChangeListener(
   //      startupRegistryListener);
 
   // ((GrabFocus) Tweaklets.get(GrabFocus.KEY)).dispose();
 
   // Bring down all of the services.
   serviceLocator->Dispose();
 
   // workbenchActivitySupport.dispose();
   // WorkbenchHelpSystem.disposeIfNecessary();
 
   // shutdown the rest of the workbench
   // WorkbenchColors.shutdown();
   // activityHelper.shutdown();
   // uninitializeImages();
   //  if (WorkbenchPlugin.getDefault() != null) {
   //    WorkbenchPlugin.getDefault().reset();
   //  }
   //  WorkbenchThemeManager.getInstance().dispose();
   //  PropertyPageContributorManager.getManager().dispose();
   //  ObjectActionContributorManager.getManager().dispose();
   //  if (tracker != null) {
   //    tracker.close();
   //  }
 
   Tweaklets::Clear();
 }
 
+void Workbench::InitializeSourcePriorities()
+{
+  WorkbenchServiceRegistry::GetRegistry()->InitializeSourcePriorities();
+}
+
+void Workbench::StartSourceProviders()
+{
+  /*
+   * Phase 3 of the initialization of commands. The source providers that
+   * the workbench provides are creating and registered with the above
+   * services. These source providers notify the services when particular
+   * pieces of workbench state change.
+   */
+  IEvaluationService* const evaluationService = serviceLocator->GetService<IEvaluationService>();
+  //IContextService* const contextService = serviceLocator->GetService<IContextService>();
+
+  SourceProviderService* sps = new SourceProviderService(serviceLocator.GetPointer());
+  sourceProviderService.reset(sps);
+  sourceProviderService->Register();
+  serviceLocator->RegisterService<ISourceProviderService>(sourceProviderService.data());
+  struct SafeSourceProviderRunnable : public ISafeRunnable {
+
+    SafeSourceProviderRunnable(SourceProviderService* sps, IEvaluationService* es) : sps(sps), es(es)
+    {}
+
+    void Run() {
+      // this currently instantiates all players ... sigh
+      sps->ReadRegistry();
+      QList<ISourceProvider::Pointer> sp = sps->GetSourceProviders();
+      for (int i = 0; i < sp.size(); i++)
+      {
+        es->AddSourceProvider(sp[i]);
+        //if (!(sp[i] instanceof ActiveContextSourceProvider))
+        //{
+        //  contextService.addSourceProvider(sp[i]);
+        //}
+      }
+    }
+
+    void HandleException(const std::exception& exception)
+    {
+      WorkbenchPlugin::Log("Failed to initialize a source provider", ctkException(QString(exception.what())));
+    }
+
+  private:
+    SourceProviderService* sps;
+    IEvaluationService* es;
+  };
+  ISafeRunnable::Pointer sourceProviderRunnable(
+        new SafeSourceProviderRunnable(sps, evaluationService));
+  SafeRunner::Run(sourceProviderRunnable);
+
+//    SafeRunner.run(new ISafeRunnable() {
+//      public void run() throws Exception {
+//        // these guys are need to provide the variables they say
+//        // they source
+//        actionSetSourceProvider = (ActionSetSourceProvider) sourceProviderService
+//            .getSourceProvider(ISources.ACTIVE_ACTION_SETS_NAME);
+
+//        FocusControlSourceProvider focusControl = (FocusControlSourceProvider) sourceProviderService
+//            .getSourceProvider(ISources.ACTIVE_FOCUS_CONTROL_ID_NAME);
+//        serviceLocator.registerService(IFocusService.class, focusControl);
+
+//        menuSourceProvider = (MenuSourceProvider) sourceProviderService
+//            .getSourceProvider(ISources.ACTIVE_MENU_NAME);
+//      }
+
+//      public void handleException(Throwable exception) {
+//        WorkbenchPlugin.log("Failed to initialize a source provider", exception); //$NON-NLS-1$
+//      }
+//    });
+}
+
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbench.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbench.h
index 4a7a94e510..9f9d2dc5d7 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbench.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbench.h
@@ -1,626 +1,635 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYWORKBENCH_H_
 #define BERRYWORKBENCH_H_
 
 #include "berryIViewPart.h"
 #include "berryIWorkbench.h"
 #include "berryWorkbenchWindow.h"
 #include "berryIWorkbenchPage.h"
 #include "berryIWorkbenchPartReference.h"
 #include "berryXMLMemento.h"
 
 #include "berryPartPane.h"
 #include "berryEditorAreaHelper.h"
 #include "berryWindowManager.h"
 #include "berryWorkbenchConfigurer.h"
 #include "application/berryWorkbenchAdvisor.h"
 #include "berryWorkbenchTestable.h"
 #include "intro/berryIntroDescriptor.h"
 #include "intro/berryWorkbenchIntroManager.h"
 
 #include "berryILayoutContainer.h"
 
 #include "berryServiceLocator.h"
 
 #include <Poco/Exception.h>
 #include <Poco/File.h>
 
 namespace berry {
 
 struct ICommandService;
 struct IEvaluationService;
 struct IMenuService;
 struct IServiceLocatorCreator;
 struct ISaveablesLifecycleListener;
+struct ISourceProviderService;
+struct IWorkbenchLocationService;
 
 class CommandManager;
 class ViewRegistry;
 class EditorRegistry;
 class WorkbenchWindowConfigurer;
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  * The workbench class represents the top of the BlueBerry user interface. Its
  * primary responsibility is the management of workbench windows, dialogs,
  * wizards, and other workbench-related windows.
  * <p>
  * Note that any code that is run during the creation of a workbench instance
  * should not required access to the display.
  */
 class BERRY_UI_QT Workbench : public IWorkbench
 {
 
 public:
 
-  berryObjectMacro(Workbench);
+  berryObjectMacro(Workbench)
 
   friend class RestoreStateRunnable;
 
   /**
    * Creates the workbench and associates it with the the given display and
    * workbench advisor, and runs the workbench UI. This entails processing and
    * dispatching events until the workbench is closed or restarted.
    * <p>
    * This method is intended to be called by <code>PlatformUI</code>. Fails
    * if the workbench UI has already been created.
    * </p>
    * <p>
    * The display passed in must be the default display.
    * </p>
    *
    * @param display
    *            the display to be used for all UI interactions with the
    *            workbench
    * @param advisor
    *            the application-specific advisor that configures and
    *            specializes the workbench
    * @return return code {@link PlatformUI#RETURN_OK RETURN_OK}for normal
    *         exit; {@link PlatformUI#RETURN_RESTART RETURN_RESTART}if the
    *         workbench was terminated with a call to
    *         {@link IWorkbench#restart IWorkbench.restart}; other values
    *         reserved for future use
    */
   static int CreateAndRunWorkbench(Display* display, WorkbenchAdvisor* advisor);
 
   /**
    * Creates the <code>Display</code> to be used by the workbench.
    *
    * @return the display
    */
   static Display* CreateDisplay();
 
   /**
    * Returns the one and only instance of the workbench, if there is one.
    *
    * @return the workbench, or <code>null</code> if the workbench has not
    *         been created, or has been created and already completed
    */
   static Workbench* GetInstance();
 
   virtual ~Workbench();
 
   /*
    * (non-Javadoc)
    *
    * @see org.blueberry.ui.services.IServiceLocator#getService(java.lang.Object)
    */
   Object* GetService(const QString& key);
 
   /*
    * (non-Javadoc)
    *
    * @see org.blueberry.ui.services.IServiceLocator#hasService(java.lang.Object)
    */
   bool HasService(const QString& key) const;
 
   /*
    * Method declared on IWorkbench.
    */
   bool Close();
 
   /**
    * Returns the testable object facade, for use by the test harness.
    *
    * @return the testable object facade
    * @since 3.0
    */
   static WorkbenchTestable::Pointer GetWorkbenchTestable();
 
   /*
    *  Method declared on IWorkbench.
    */
-  void AddWorkbenchListener(IWorkbenchListener::Pointer listener);
+  void AddWorkbenchListener(IWorkbenchListener* listener);
 
   /*
    * Method declared on IWorkbench.
    */
-  void RemoveWorkbenchListener(IWorkbenchListener::Pointer listener);
+  void RemoveWorkbenchListener(IWorkbenchListener* listener);
 
   /*
    * Method declared on IWorkbench.
    */
   IWorkbenchListener::Events& GetWorkbenchEvents();
 
   /*
    * Method declared on IWorkbench.
    */
-  void AddWindowListener(IWindowListener::Pointer l);
+  void AddWindowListener(IWindowListener* l);
 
   /*
    * Method declared on IWorkbench.
    */
-  void RemoveWindowListener(IWindowListener::Pointer l);
+  void RemoveWindowListener(IWindowListener* l);
 
   /*
    * Method declared on IWorkbench.
    */
   IWindowListener::Events& GetWindowEvents();
 
-  IWorkbenchWindow::Pointer GetActiveWorkbenchWindow();
+  IWorkbenchWindow::Pointer GetActiveWorkbenchWindow() const;
 
   IViewRegistry* GetViewRegistry();
   IEditorRegistry* GetEditorRegistry();
   IPerspectiveRegistry* GetPerspectiveRegistry();
 
   std::size_t GetWorkbenchWindowCount();
   QList<IWorkbenchWindow::Pointer> GetWorkbenchWindows();
   IWorkbenchWindow::Pointer OpenWorkbenchWindow(const QString& perspectiveId,
         IAdaptable* input);
   IWorkbenchWindow::Pointer OpenWorkbenchWindow(IAdaptable* input);
 
   IWorkbenchPage::Pointer ShowPerspective(const QString& perspectiveId,
       IWorkbenchWindow::Pointer window);
 
   IWorkbenchPage::Pointer ShowPerspective(const QString& perspectiveId,
         IWorkbenchWindow::Pointer window, IAdaptable* input);
 
   bool SaveAllEditors(bool confirm);
 
   IIntroManager* GetIntroManager();
 
   /**
    * @return the workbench intro manager
    */
   WorkbenchIntroManager* GetWorkbenchIntroManager();
 
   /**
    * @return the intro extension for this workbench.
    */
   IntroDescriptor::Pointer GetIntroDescriptor() const;
 
   /**
    * This method exists as a test hook. This method should <strong>NEVER</strong>
    * be called by clients.
    *
    * @param descriptor
    *            The intro descriptor to use.
    */
   void SetIntroDescriptor(IntroDescriptor::Pointer descriptor);
 
   /**
    * Returns <code>true</code> if the workbench is running,
    * <code>false</code> if it has been terminated.
    *
    * @return <code>true</code> if the workbench is running,
    *         <code>false</code> if it has been terminated.
    */
   bool IsRunning();
 
   /**
    * Returns true if the Workbench is in the process of starting.
    *
    * @return <code>true</code> if the Workbench is starting, but not yet
    *         running the event loop.
    */
   bool IsStarting();
 
   bool IsClosing();
 
   /**
    * Returns the default perspective id, which may be <code>null</code>.
    *
    * @return the default perspective id, or <code>null</code>
    */
   QString GetDefaultPerspectiveId();
 
   /**
    * Returns the default workbench window page input.
    *
    * @return the default window page input or <code>null</code> if none
    */
   IAdaptable* GetDefaultPageInput();
 
   /**
    * Return the presentation ID specified by the preference or the default ID
    * if undefined.
    *
    * @return the presentation ID
    * @see IWorkbenchPreferenceConstants#PRESENTATION_FACTORY_ID
    */
   QString GetPresentationId();
 
   void UpdateTheme();
 
   /**
    * <p>
    * Indicates the start of a large update within the workbench. This is used
    * to disable CPU-intensive, change-sensitive services that were temporarily
    * disabled in the midst of large changes. This method should always be
    * called in tandem with <code>largeUpdateEnd</code>, and the event loop
    * should not be allowed to spin before that method is called.
    * </p>
    * <p>
    * Important: always use with <code>largeUpdateEnd</code>!
    * </p>
    */
   void LargeUpdateStart();
 
   /**
    * <p>
    * Indicates the end of a large update within the workbench. This is used to
    * re-enable services that were temporarily disabled in the midst of large
    * changes. This method should always be called in tandem with
    * <code>largeUpdateStart</code>, and the event loop should not be
    * allowed to spin before this method is called.
    * </p>
    * <p>
    * Important: always protect this call by using <code>finally</code>!
    * </p>
    */
   void LargeUpdateEnd();
 
 
 protected:
 
   friend class PlatformUI;
   friend class WorkbenchConfigurer;
   friend class WorkbenchWindowConfigurer;
   friend class WorkbenchWindow;
   friend struct WorkbenchWindow::ShellActivationListener;
 
   int RunUI();
 
   void OpenFirstTimeWindow();
   IWorkbenchWindow::Pointer RestoreWorkbenchWindow(IMemento::Pointer memento);
 
   bool Init();
 
   /*
    * Restores the workbench UI from the workbench state file (workbench.xml).
    *
    * @return a status object indicating OK if a window was opened,
    * RESTORE_CODE_RESET if no window was opened but one should be, and
    * RESTORE_CODE_EXIT if the workbench should close immediately
    */
   /* package */
   bool RestoreState();
 
   /**
    * Closes the workbench, returning the given return code from the run
    * method. If forced, the workbench is closed no matter what.
    *
    * @param returnCode
    *            {@link PlatformUI#RETURN_OK RETURN_OK}for normal exit;
    *            {@link PlatformUI#RETURN_RESTART RETURN_RESTART}if the
    *            workbench was terminated with a call to
    *            {@link IWorkbench#restart IWorkbench.restart};
    *            {@link PlatformUI#RETURN_EMERGENCY_CLOSE} for an emergency
    *            shutdown
    *            {@link PlatformUI#RETURN_UNSTARTABLE RETURN_UNSTARTABLE}if
    *            the workbench could not be started; other values reserved for
    *            future use
    *
    * @param force
    *            true to force the workbench close, and false for a "soft"
    *            close that can be canceled
    * @return true if the close was successful, and false if the close was
    *         canceled
    */
   /* package */
   bool Close(int returnCode, bool force);
 
   /**
    * Returns the unique object that applications use to configure the
    * workbench.
    * <p>
    * IMPORTANT This method is declared protected to prevent regular
    * plug-ins from downcasting IWorkbench to Workbench and getting hold of the
    * workbench configurer that would allow them to tamper with the workbench.
    * The workbench configurer is available only to the application.
    * </p>
    */
   WorkbenchConfigurer::Pointer GetWorkbenchConfigurer();
 
   /**
    * Returns the workbench advisor that created this workbench.
    * <p>
    * IMPORTANT This method is declared protected to prevent regular
    * plug-ins from downcasting IWorkbench to Workbench and getting hold of the
    * workbench advisor that would allow them to tamper with the workbench. The
    * workbench advisor is internal to the application.
    * </p>
    */
   WorkbenchAdvisor* GetAdvisor();
 
   /*
    * Returns the workbench window which was last known being the active one,
    * or <code> null </code> .
    */
-  SmartPointer<WorkbenchWindow> GetActivatedWindow();
+  SmartPointer<WorkbenchWindow> GetActivatedWindow() const;
 
   /*
    * Sets the workbench window which was last known being the active one, or
    * <code> null </code> .
    */
   void SetActivatedWindow(SmartPointer<WorkbenchWindow> window);
 
   /**
    * Fire workbench preShutdown event, stopping at the first one to veto
    *
    * @param forced
    *            flag indicating whether the shutdown is being forced
    * @return <code>true</code> to allow the workbench to proceed with
    *         shutdown, <code>false</code> to veto a non-forced shutdown
    * @since 3.2
    */
   bool FirePreShutdown(bool forced);
 
   /**
    * Fire workbench postShutdown event.
    *
    * @since 3.2
    */
   void FirePostShutdown();
 
   /**
    * Fire window opened event.
    *
    * @param window
    *            The window which just opened; should not be <code>null</code>.
    */
   void FireWindowOpened(IWorkbenchWindow::Pointer window);
 
   /**
    * Fire window closed event.
    *
    * @param window
    *            The window which just closed; should not be <code>null</code>.
    */
   void FireWindowClosed(IWorkbenchWindow::Pointer window);
 
   /**
    * Fire window activated event.
    *
    * @param window
    *            The window which was just activated; should not be
    *            <code>null</code>.
    */
   void FireWindowActivated(IWorkbenchWindow::Pointer window);
 
   /**
    * Fire window deactivated event.
    *
    * @param window
    *            The window which was just deactivated; should not be
    *            <code>null</code>.
    */
   void FireWindowDeactivated(IWorkbenchWindow::Pointer window);
 
 
 private:
 
   /**
    * Holds onto the only instance of Workbench.
    */
   static Workbench* instance;
 
   /**
    * The testable object facade.
    */
   static WorkbenchTestable::Pointer testableObject;
 
   static const unsigned int VERSION_STRING_COUNT; // = 1;
   static const QString VERSION_STRING[1];
 
   static const QString DEFAULT_WORKBENCH_STATE_FILENAME; // = "workbench.xml";
 
   IWorkbenchListener::Events workbenchEvents;
   IWindowListener::Events windowEvents;
 
   WorkbenchAdvisor* advisor;
   WorkbenchConfigurer::Pointer workbenchConfigurer;
 
   /**
    * The service locator maintained by the workbench. These services are
    * initialized during workbench during the <code>init</code> method.
    */
   ServiceLocator::Pointer serviceLocator;
 
   QScopedPointer<IEvaluationService, QScopedPointerObjectDeleter> evaluationService;
 
   QScopedPointer<ISaveablesLifecycleListener, QScopedPointerObjectDeleter> saveablesList;
 
   /**
    * The single instance of the command manager used by the workbench. This is
    * initialized in <code>Workbench.init(Display)</code> and then never
    * changed. This value will only be <code>null</code> if the
    * initialization call has not yet completed.
    */
   QScopedPointer<CommandManager> commandManager;
 
   QScopedPointer<ICommandService, QScopedPointerObjectDeleter> commandService;
 
   QScopedPointer<IMenuService, QScopedPointerObjectDeleter> menuService;
 
   /**
    * A count of how many plug-ins were loaded while restoring the workbench
    * state. Initially -1 for unknown number.
    */
   int progressCount;
 
   /**
    * A field to hold the workbench windows that have been restored. In the
    * event that not all windows have been restored, this field allows the
    * openWindowsAfterRestore method to open some windows.
    */
   QList<WorkbenchWindow::Pointer> createdWindows;
 
   struct ServiceLocatorOwner : public IDisposable
   {
     ServiceLocatorOwner(Workbench* workbench);
 
     void Dispose();
 
   private:
     Workbench* workbench;
   };
 
   friend struct ServiceLocatorOwner;
 
   IDisposable::Pointer serviceLocatorOwner;
 
   QScopedPointer<IServiceLocatorCreator, QScopedPointerObjectDeleter> serviceLocatorCreator;
+  QScopedPointer<IWorkbenchLocationService, QScopedPointerObjectDeleter> workbenchLocationService;
+
+  QScopedPointer<ISourceProviderService, QScopedPointerObjectDeleter> sourceProviderService;
 
   /**
    * A count of how many large updates are going on. This tracks nesting of
    * requests to disable services during a large update -- similar to the
    * <code>setRedraw</code> functionality on <code>Control</code>. When
    * this value becomes greater than zero, services are disabled. When this
    * value becomes zero, services are enabled. Please see
    * <code>largeUpdateStart()</code> and <code>largeUpdateEnd()</code>.
    */
   int largeUpdates;
 
 
   /**
    * The display used for all UI interactions with this workbench.
    */
   Display* display;
 
   WindowManager windowManager;
   SmartPointer<WorkbenchWindow> activatedWindow;
 
   QScopedPointer<WorkbenchIntroManager> introManager;
 
   /**
    * The descriptor for the intro extension that is valid for this workspace,
    * <code>null</code> if none.
    */
   IntroDescriptor::Pointer introDescriptor;
 
   bool isStarting;
   bool isClosing;
 
   int returnCode;
 
   QString factoryID;
 
   /**
    * Creates a new workbench.
    *
    * @param display
    *            the display to be used for all UI interactions with the
    *            workbench
    * @param advisor
    *            the application-specific advisor that configures and
    *            specializes this workbench instance
    */
   Workbench(Display*, WorkbenchAdvisor* advisor);
 
   /**
    * see IWorkbench#GetDisplay
    */
   Display* GetDisplay();
 
   /*
    * Creates a new workbench window.
    *
    * @return the new workbench window
    */
   SmartPointer<WorkbenchWindow> NewWorkbenchWindow();
 
   void OpenWindowsAfterRestore();
 
   /*
    * Returns the number for a new window. This will be the first number > 0
    * which is not used to identify another window in the workbench.
    */
   int GetNewWindowNumber();
 
   /**
    * Initializes all of the default services for the workbench. For
    * initializing the command-based services, this also parses the registry
    * and hooks up all the required listeners.
    */
   void InitializeDefaultServices();
 
   /**
    * Closes the workbench. Assumes that the busy cursor is active.
    *
    * @param force
    *            true if the close is mandatory, and false if the close is
    *            allowed to fail
    * @return true if the close succeeded, and false otherwise
    */
   bool BusyClose(bool force);
 
   /*
    * Record the workbench UI in a document
    */
   XMLMemento::Pointer RecordWorkbenchState();
 
   /*
    * Restores the state of the previously saved workbench
    */
   bool RestoreState(IMemento::Pointer memento);
 
   void DoRestoreState(IMemento::Pointer memento, bool& result);
 
   /*
    * Saves the current state of the workbench so it can be restored later on
    */
   bool SaveState(IMemento::Pointer memento);
 
   /*
    * Save the workbench UI in a persistence file.
    */
   bool SaveMementoToFile(XMLMemento::Pointer memento);
 
   /*
    * Answer the workbench state file.
    */
   QString GetWorkbenchStateFile() const;
 
   /*
    * Shuts down the application.
    */
   void Shutdown();
 
   /**
    * Opens a new workbench window and page with a specific perspective.
    *
    * Assumes that busy cursor is active.
    */
   IWorkbenchWindow::Pointer BusyOpenWorkbenchWindow(const QString& perspID,
       IAdaptable* input);
+
+  void InitializeSourcePriorities();
+
+  void StartSourceProviders();
 };
 
 } // namespace berry
 
 #endif /*BERRYWORKBENCH_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchLocationService.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchLocationService.cpp
new file mode 100644
index 0000000000..5dbf9b4150
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchLocationService.cpp
@@ -0,0 +1,56 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berryWorkbenchLocationService.h"
+
+namespace berry {
+
+WorkbenchLocationService::WorkbenchLocationService(const QString& serviceScope, IWorkbench* workbench,
+                                                   IWorkbenchWindow* window, IWorkbenchPartSite* partSite,
+                                                   int level)
+  : partSite(partSite)
+  , serviceScope(serviceScope)
+  , workbench(workbench)
+  , window(window)
+  , level(level)
+{
+}
+IWorkbenchPartSite* WorkbenchLocationService::GetPartSite() const
+{
+  return partSite;
+}
+
+QString WorkbenchLocationService::GetServiceScope() const
+{
+  return serviceScope;
+}
+
+IWorkbench* WorkbenchLocationService::GetWorkbench() const
+{
+  return workbench;
+}
+
+IWorkbenchWindow* WorkbenchLocationService::GetWorkbenchWindow() const
+{
+  return window;
+}
+
+int WorkbenchLocationService::GetServiceLevel() const
+{
+  return level;
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchLocationService.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchLocationService.h
new file mode 100644
index 0000000000..0ab05a8a09
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchLocationService.h
@@ -0,0 +1,55 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYWORKBENCHLOCATIONSERVICE_H
+#define BERRYWORKBENCHLOCATIONSERVICE_H
+
+#include "berryIWorkbenchLocationService.h"
+
+namespace berry {
+
+class WorkbenchLocationService : public IWorkbenchLocationService
+{
+
+private:
+
+  IWorkbenchPartSite* const partSite;
+  QString serviceScope;
+  IWorkbench* const workbench;
+  IWorkbenchWindow* const window;
+  int level;
+
+public:
+
+  WorkbenchLocationService(const QString& serviceScope, IWorkbench* workbench,
+                           IWorkbenchWindow* window, IWorkbenchPartSite* partSite,
+                           int level);
+
+  IWorkbenchPartSite* GetPartSite() const;
+
+  QString GetServiceScope() const;
+
+  IWorkbench* GetWorkbench() const;
+
+  IWorkbenchWindow* GetWorkbenchWindow() const;
+
+  int GetServiceLevel() const;
+
+};
+
+}
+
+#endif // BERRYWORKBENCHLOCATIONSERVICE_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchMenuService.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchMenuService.cpp
index f96e9a85db..33911dd535 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchMenuService.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchMenuService.cpp
@@ -1,1062 +1,1060 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #include "berryWorkbenchMenuService.h"
 
 #include <berryIPropertyChangeListener.h>
 #include <berryIServiceLocator.h>
 #include <berryIEvaluationService.h>
 #include <berryIEvaluationReference.h>
 #include <berryIEvaluationContext.h>
 #include <berrySafeRunner.h>
 #include <berryAbstractContributionFactory.h>
 #include <berryAbstractGroupMarker.h>
 #include <berryObjects.h>
 #include <berryMenuUtil.h>
 #include <berryWorkbenchActionConstants.h>
 
 #include "berryAbstractMenuAdditionCacheEntry.h"
+#include "berryAlwaysEnabledExpression.h"
 #include "berryContributionItem.h"
 #include "berryContributionRoot.h"
 #include "berryMenuManager.h"
 #include "berryWorkbenchPlugin.h"
 #include "berryWorkbenchWindow.h"
 
 namespace berry {
 
 const QString WorkbenchMenuService::INDEX_AFTER_ADDITIONS_QK = "after";
 const QString WorkbenchMenuService::INDEX_AFTER_ADDITIONS_QV = "additions";
 const QString WorkbenchMenuService::PROP_VISIBLE = "visible";
 
 
 /**
  * A combined property and activity listener that updates the visibility of
  * contribution items in the new menu system.
  */
 class ContributionItemUpdater : public IPropertyChangeListener //, public IIdentifierListener
 {
 
 private:
 
   const IContributionItem::Pointer item;
   //IIdentifier identifier;
   bool lastExpressionResult;
 
   WorkbenchMenuService* wms;
 
   void UpdateVisibility()
   {
     //bool visible = identifier.IsNotNull() ? (identifier->IsEnabled() && lastExpressionResult)
     //                                      : lastExpressionResult;
     bool visible = lastExpressionResult;
     item->SetVisible(visible);
 
     IContributionManager* parent = 0;
     if (ContributionItem::Pointer ci = item.Cast<ContributionItem>())
     {
       parent = ci->GetParent();
     }
     else if (MenuManager::Pointer mm = item.Cast<MenuManager>())
     {
       parent = mm->GetParent();
     }
     if (parent != 0)
     {
       parent->MarkDirty();
       wms->managersAwaitingUpdates.insert(parent);
     }
   }
 
 public:
 
   ContributionItemUpdater(WorkbenchMenuService* wms, const IContributionItem::Pointer& item) //, IIdentifier identifier)
     : item(item), lastExpressionResult(true), wms(wms)
   {
 //    if (identifier.IsNotNull())
 //    {
 //      this->identifier = identifier;
 //      this->identifier->AddIdentifierListener(this);
 //      UpdateVisibility(); // force initial visibility to fall in line
 //      // with activity enablement
 //    }
   }
 
   /**
    * Dispose of this updater
    */
   ~ContributionItemUpdater()
   {
 //    if (identifier.IsNotNull())
 //      identifier->RemoveIdentifierListener(this);
   }
 
+  using IPropertyChangeListener::PropertyChange;
+
   /*
    * @see IPropertyChangeListener#PropertyChange(PropertyChangeEvent)
    */
-  void PropertyChange(PropertyChangeEvent::Pointer event)
+  void PropertyChange(const PropertyChangeEvent::Pointer& event)
   {
     if (event->GetProperty() == WorkbenchMenuService::PROP_VISIBLE)
     {
       if (event->GetNewValue().IsNotNull())
       {
         lastExpressionResult = event->GetNewValue();
       }
       else
       {
         lastExpressionResult = false;
       }
       UpdateVisibility();
     }
   }
 
   /*
    * @see IIdentifierListener#IdentifierChanged(IdentifierEvent)
    */
 //  void identifierChanged(IdentifierEvent identifierEvent)
 //  {
 //    UpdateVisibility();
 //  }
 
 };
 
 WorkbenchMenuService::ManagerPopulationRecord::ManagerPopulationRecord()
   : wms(0), serviceLocatorToUse(0), recurse(false)
 {
 }
 
 WorkbenchMenuService::ManagerPopulationRecord::
 ManagerPopulationRecord(WorkbenchMenuService* wms, IServiceLocator* serviceLocatorToUse, const QSet<SmartPointer<IEvaluationReference> >& restriction,
                         const QString& uri, bool recurse)
   : wms(wms), serviceLocatorToUse(serviceLocatorToUse), restriction(restriction),
     uri(uri), recurse(recurse)
 {
 }
 
 void WorkbenchMenuService::ManagerPopulationRecord::
 AddFactoryContribution(const SmartPointer<AbstractContributionFactory>& factory,
                        const SmartPointer<ContributionRoot>& ciList)
 {
   // Remove any existing cache info for this factory
   RemoveFactoryContribution(factory);
   // save the new info
   factoryToItems.insert(factory, ciList);
 }
 
 void WorkbenchMenuService::ManagerPopulationRecord::
 RemoveFactoryContribution(const SmartPointer<AbstractContributionFactory>& factory)
 {
   ContributionRoot::Pointer items = factoryToItems.take(factory);
   if (items.IsNotNull())
   {
     wms->ReleaseContributions(items.GetPointer());
   }
 }
 
 SmartPointer<ContributionRoot> WorkbenchMenuService::ManagerPopulationRecord::
 GetContributions(const SmartPointer<AbstractContributionFactory>& factory) const
 {
   if (factoryToItems.contains(factory))
     return factoryToItems[factory];
   return ContributionRoot::Pointer(0);
 }
 
 void WorkbenchMenuService::ManagerPopulationRecord::
 ReleaseContributions()
 {
   foreach (ContributionRoot::Pointer items, factoryToItems.values())
   {
     wms->ReleaseContributions(items.GetPointer());
   }
   factoryToItems.clear();
 }
 
 WorkbenchMenuService::WorkbenchMenuService(IServiceLocator* serviceLocator)
   : evaluationService(0), serviceLocator(serviceLocator)
 {
   //this.menuPersistence = new MenuPersistence(this);
   evaluationService = serviceLocator->GetService<IEvaluationService>();
   evaluationService->AddServiceListener(GetServiceListener());
 //  IWorkbenchLocationService wls = (IWorkbenchLocationService) serviceLocator
 //    .getService(IWorkbenchLocationService.class);
 //  wls.getWorkbench()
 //      .getActivitySupport().getActivityManager()
 //      .addActivityManagerListener(getActivityManagerListener());
 
 //  final IExtensionRegistry registry = Platform.getExtensionRegistry();
 //  registryChangeListener = new IRegistryChangeListener() {
 //    public void registryChanged(final IRegistryChangeEvent event) {
 //      final Display display = PlatformUI.getWorkbench().getDisplay();
 //      if (display.isDisposed()) {
 //        return;
 //      }
 //      display.syncExec(new Runnable() {
 //        public void run() {
 //          handleRegistryChanges(event);
 //        }
 //      });
 //    }
 //  };
 //  registry.addRegistryChangeListener(registryChangeListener);
 }
 
 WorkbenchMenuService::~WorkbenchMenuService()
 {
   this->Dispose();
 }
 
 void WorkbenchMenuService::Dispose()
 {
   //menuPersistence.dispose();
 //  if (registryChangeListener != null)
 //  {
 //    final IExtensionRegistry registry = Platform.getExtensionRegistry();
 //    registry.removeRegistryChangeListener(registryChangeListener);
 //    registryChangeListener = null;
 //  }
   foreach (IEvaluationReference::Pointer ref, evaluationsByItem.values())
   {
     evaluationService->RemoveEvaluationListener(ref);
   }
   evaluationsByItem.clear();
 
   managersAwaitingUpdates.clear();
   evaluationService->RemoveServiceListener(GetServiceListener());
 
 //  if (activityManagerListener != null)
 //  {
 //    IWorkbenchLocationService wls = (IWorkbenchLocationService) serviceLocator
 //        .getService(IWorkbenchLocationService.class);
 //    IWorkbench workbench = wls.getWorkbench();
 //    if (workbench != null)
 //    {
 //      workbench.getActivitySupport().getActivityManager()
 //          .removeActivityManagerListener(activityManagerListener);
 //    }
 //  }
 }
 
-void WorkbenchMenuService::AddSourceProvider(SmartPointer<ISourceProvider> provider)
+void WorkbenchMenuService::AddSourceProvider(const SmartPointer<ISourceProvider>& /*provider*/)
 {
   // no-op
 }
 
 void WorkbenchMenuService::ReadRegistry()
 {
   //menuPersistence.read();
 }
 
-void WorkbenchMenuService::RemoveSourceProvider(SmartPointer<ISourceProvider> provider)
+void WorkbenchMenuService::RemoveSourceProvider(const SmartPointer<ISourceProvider>& /*provider*/)
 {
   // no-op
 }
 
 void WorkbenchMenuService::UpdateManagers()
 {
   QList<IContributionManager*> managers = managersAwaitingUpdates.toList();
   managersAwaitingUpdates.clear();
   foreach (IContributionManager* mgr, managers)
   {
     mgr->Update(true);
 //    if (ToolBarManager* tbMgr = dynamic_cast<ToolBarManager*>(mgr))
 //    {
 //      if (!UpdateToolBar(tbMgr))
 //      {
 //        //UpdateTrim((ToolBarManager) mgr);
 //      }
 //    }
 //    else
     if (MenuManager* mMgr = dynamic_cast<MenuManager*>(mgr))
     {
       IContributionManager* parent = mMgr->GetParent();
       if (parent != 0)
       {
         parent->Update(true);
       }
     }
   }
 }
 
 WorkbenchMenuService::FactoryListType WorkbenchMenuService::GetAdditionsForURI(const QUrl& uri)
 {
   if (uri.isEmpty())
     return FactoryListType();
 
   return uriToFactories[GetIdFromURI(uri)];
 }
 
 void WorkbenchMenuService::AddContributionFactory(const SmartPointer<AbstractContributionFactory>& factory)
 {
   if (factory.IsNull() || factory->GetLocation().isNull())
     return;
 
   QUrl uri(factory->GetLocation());
   QString factoryId = GetIdFromURI(uri);
   FactoryListType& factories = uriToFactories[factoryId];
 
   {
 //    MenuAdditionCacheEntry::Pointer mace = factory.Cast<MenuAdditionCacheEntry>();
 //    if (mace && mace->HasAdditions())
 //    {
 //      factories.push_front(factory);
 //    }
 //    else
     {
       factories.push_back(factory);
     }
   }
 
   // OK, now update any managers that use this uri
   FactoryListType factoryList;
   factoryList.push_back(factory);
   foreach (IContributionManager* mgr, GetManagersFor(factoryId))
   {
     const ManagerPopulationRecord& mpr = populatedManagers[mgr];
     AddContributionsToManager(mpr.serviceLocatorToUse, mpr.restriction,
                               dynamic_cast<ContributionManager*>(mgr), mpr.uri, mpr.recurse, factoryList);
     mgr->Update(true);
   }
 }
 
 void WorkbenchMenuService::RemoveContributionFactory(const SmartPointer<AbstractContributionFactory>& factory)
 {
   if (factory.IsNull() || factory->GetLocation().isNull())
     return;
 
   QUrl uri(factory->GetLocation());
   QString factoryId = GetIdFromURI(uri);
   if (uriToFactories.contains(factoryId))
   {
     FactoryListType& factories = uriToFactories[factoryId];
 //    // Before we remove the top-level cache we recursively
 //    // remove any sub-caches created by this one
 //    if (MenuAdditionCacheEntry::Pointer mace = factory.Cast<MenuAdditionCacheEntry>())
 //    {
 //      QList<AbstractMenuAdditionCacheEntry::Pointer> subCaches = mace->GetSubCaches();
 //      foreach (AbstractMenuAdditionCacheEntry::Pointer amace, subCaches)
 //      {
 //        RemoveContributionFactory(amace);
 //      }
 //    }
     factories.removeAll(factory);
   }
 
   // OK, now update any managers that use this uri
   FactoryListType factoryList;
   factoryList.push_back(factory);
   foreach (IContributionManager* mgr, GetManagersFor(factoryId))
   {
     RemoveContributionsForFactory(mgr, factory);
     mgr->Update(true);
   }
 }
 
 void WorkbenchMenuService::PopulateContributionManager(ContributionManager* mgr, const QString& uri)
 {
   PopulateContributionManager(serviceLocator, QSet<SmartPointer<IEvaluationReference> >(), mgr, uri, true);
 }
 
 void WorkbenchMenuService::PopulateContributionManager(IServiceLocator* serviceLocatorToUse,
                                  const QSet<SmartPointer<IEvaluationReference> >& restriction,
                                  ContributionManager* mgr,
                                  const QString& uri, bool recurse)
 {
   // Track this attempt to populate the menu, remembering all the parameters
   if (!populatedManagers.contains(mgr))
   {
     populatedManagers.insert(mgr, ManagerPopulationRecord(this, serviceLocatorToUse,
                                                           restriction, uri, recurse));
   }
 
   QUrl contributionLocation(uri);
   FactoryListType factories = GetAdditionsForURI(contributionLocation);
   AddContributionsToManager(serviceLocatorToUse, restriction, mgr, uri, recurse, factories);
 }
 
 void WorkbenchMenuService::AddContributionsToManager(IServiceLocator* serviceLocatorToUse,
                                const QSet<SmartPointer<IEvaluationReference> >& restriction,
                                ContributionManager* mgr,
                                const QString& uri, bool recurse,
                                const QList<SmartPointer<AbstractContributionFactory> >& factories)
 {
   QUrl contributionLocation(uri);
 
   QList<AbstractContributionFactory::Pointer> retryList;
   QSet<QString> itemsAdded;
   foreach (AbstractContributionFactory::Pointer cache, factories)
   {
     if (!ProcessAdditions(serviceLocatorToUse, restriction, mgr,
                           cache, itemsAdded))
     {
       retryList.push_back(cache);
     }
   }
 
   // OK, iteratively loop through entries whose URI's could not
   // be resolved until we either run out of entries or the list
   // doesn't change size (indicating that the remaining entries
   // can never be resolved).
   bool done = retryList.isEmpty();
   while (!done)
   {
     // Clone the retry list and clear it
     QList<AbstractContributionFactory::Pointer> curRetry = retryList;
     int retryCount = retryList.size();
     retryList.clear();
 
     // Walk the current list seeing if any entries can now be resolved
     foreach (AbstractContributionFactory::Pointer cache, curRetry)
     {
       if (!ProcessAdditions(serviceLocatorToUse, restriction, mgr,
                             cache, itemsAdded))
       {
         retryList.push_back(cache);
       }
     }
 
     // We're done if the retryList is now empty (everything done) or
     // if the list hasn't changed at all (no hope)
     done = retryList.isEmpty() || (retryList.size() == retryCount);
   }
 
   // Now, recurse through any sub-menus
   foreach (IContributionItem::Pointer curItem, mgr->GetItems())
   {
     if (ContributionManager::Pointer cm = curItem.Cast<ContributionManager>())
     {
       QString id = curItem->GetId();
       if (!id.isEmpty() && (recurse || itemsAdded.contains(id)))
       {
         PopulateContributionManager(serviceLocatorToUse,
                                     restriction, cm.GetPointer(),
                                     contributionLocation.scheme() + ":" + id, true);
       }
     }
 //    else if (IToolBarContributionItem::Pointer tbci = curItem.Cast<IToolBarContributionItem>())
 //    {
 //      if (!(tbci->GetId().isEmpty()) && (recurse || itemsAdded.contains(tbci->GetId())))
 //      {
 //        PopulateContributionManager(serviceLocatorToUse,
 //                                    restriction, dynamic_cast<ContributionManager*>(tbci->GetToolBarManager()),
 //                                    contributionLocation.scheme() + ":" + tbci->GetId(), true);
 //      }
 //    }
   }
 }
 
 SmartPointer<IEvaluationContext> WorkbenchMenuService::GetCurrentState() const
 {
   return evaluationService->GetCurrentState();
 }
 
 void WorkbenchMenuService::RegisterVisibleWhen(const SmartPointer<IContributionItem>& item,
                          const SmartPointer<Expression>& visibleWhen,
-                         const QSet<SmartPointer<IEvaluationReference> >& restriction,
-                         const QString& identifierID)
+                         QSet<SmartPointer<IEvaluationReference> >& /*restriction*/,
+                         const QString& /*identifierID*/)
 {
   if (item.IsNull())
   {
     throw std::invalid_argument("item cannot be null");
   }
   if (visibleWhen.IsNull())
   {
     throw std::invalid_argument("visibleWhen expression cannot be null");
   }
 
   if (evaluationsByItem.contains(item))
   {
     QString id = item->GetId();
     WorkbenchPlugin::Log(QString("item is already registered: ") + (id.isEmpty() ? QString("no id") : id));
     return;
   }
 
   // TODO activity support
 //  IIdentifier identifier = null;
 //  if (identifierID != null) {
 //    identifier = PlatformUI.getWorkbench().getActivitySupport()
 //        .getActivityManager().getIdentifier(identifierID);
 //  }
-//  ContributionItemUpdater listener = new ContributionItemUpdater(item,
-//      identifier);
+//  ContributionItemUpdater* listener =
+//      new ContributionItemUpdater(item, identifier);
 
-//  if (visibleWhen != AlwaysEnabledExpression.INSTANCE)
+//  if (visibleWhen != AlwaysEnabledExpression::INSTANCE)
 //  {
-//    IEvaluationReference ref = evaluationService.addEvaluationListener(
-//        visibleWhen, listener, PROP_VISIBLE);
-//    if (restriction != null)
-//    {
-//      restriction.add(ref);
-//    }
-//    evaluationsByItem.put(item, ref);
+//    IEvaluationReference::Pointer ref = evaluationService->AddEvaluationListener(
+//          visibleWhen, listener, PROP_VISIBLE);
+//    restriction.insert(ref);
+//    evaluationsByItem.insert(item, ref);
 //  }
 //  activityListenersByItem.put(item, listener);
 }
 
 void WorkbenchMenuService::UnregisterVisibleWhen(const SmartPointer<IContributionItem>& item,
-                           const QSet<SmartPointer<IEvaluationReference> >& restriction)
+                                                 QSet<SmartPointer<IEvaluationReference> >& restriction)
 {
   // TODO activity support
 //  ContributionItemUpdater identifierListener = (ContributionItemUpdater) activityListenersByItem
 //      .remove(item);
 //  if (identifierListener != null) {
 //    identifierListener.dispose();
 //  }
 
-//  IEvaluationReference ref = (IEvaluationReference) evaluationsByItem
-//      .remove(item);
-//  if (ref == null) {
-//    return;
-//  }
+  IEvaluationReference::Pointer ref = evaluationsByItem.take(item);
+  if (ref.IsNull())
+  {
+    return;
+  }
 
-//  evaluationService.removeEvaluationListener(ref);
-//  if (restriction !=null) {
-//    restriction.remove(ref);
-//  }
+  evaluationService->RemoveEvaluationListener(ref);
+  restriction.remove(ref);
 }
 
 void WorkbenchMenuService::ReleaseContributions(ContributionManager* mgr)
 {
   if (mgr == 0)
     return;
 
   // Recursively remove any contributions from sub-menus
   foreach (IContributionItem::Pointer item, mgr->GetItems())
   {
     if (ContributionManager::Pointer cm = item.Cast<ContributionManager>())
     {
       ReleaseContributions(cm.GetPointer());
     }
 //    else if (IToolBarContributionItem::Pointer tbci = item.Cast<IToolBarContributionItem>())
 //    {
 //      ReleaseContributions(tbci->GetToolBarManager());
 //    }
   }
 
   // Now remove any cached information
   if (populatedManagers.contains(mgr))
   {
     populatedManagers[mgr].ReleaseContributions();
     populatedManagers.remove(mgr);
   }
   managersAwaitingUpdates.remove(mgr);
 }
 
 //void WorkbenchMenuService::HandleDynamicAdditions(const QList<SmartPointer<IConfigurationElement> >& menuAdditions)
 //{
 //  for (Iterator additionsIter = menuAdditions.iterator(); additionsIter.hasNext();) {
 //    AbstractContributionFactory newFactory = null;
 //    final IConfigurationElement menuAddition = (IConfigurationElement) additionsIter.next();
 //    if (isProgramaticContribution(menuAddition))
 //      newFactory = new ProxyMenuAdditionCacheEntry(
 //          menuAddition
 //              .getAttribute(IWorkbenchRegistryConstants.TAG_LOCATION_URI),
 //          menuAddition.getNamespaceIdentifier(), menuAddition);
 
 //    else
 //      newFactory = new MenuAdditionCacheEntry(
 //          this,
 //          menuAddition,
 //          menuAddition
 //              .getAttribute(IWorkbenchRegistryConstants.TAG_LOCATION_URI),
 //          menuAddition.getNamespaceIdentifier());
 
 //    if (newFactory != null)
 //      addContributionFactory(newFactory);
 //  }
 //}
 
 //void WorkbenchMenuService::HandleDynamicRemovals(const QList<SmartPointer<IConfigurationElement> >& menuRemovals)
 //{
 //  for (Iterator additionsIter = menuRemovals.iterator(); additionsIter.hasNext();) {
 //    IConfigurationElement ceToRemove = (IConfigurationElement) additionsIter.next();
 //    AbstractMenuAdditionCacheEntry factoryToRemove = findFactory(ceToRemove);
 //    removeContributionFactory(factoryToRemove);
 //  }
 //}
 
 //void WorkbenchMenuService::HandleRegistryChanges(const SmartPointer<IRegistryChangeEvent>& event)
 //{
 //  // HACK!! determine if this is an addition or deletion from the first delta
 //  IExtensionDelta[] deltas = event.getExtensionDeltas();
 //  if (deltas.length == 0)
 //    return;
 //  boolean isAddition = deltas[0].getKind() == IExtensionDelta.ADDED;
 
 //  // access all the necessary service persistence handlers
 //  HandlerService handlerSvc = (HandlerService) serviceLocator.getService(IHandlerService.class);
 //  HandlerPersistence handlerPersistence = handlerSvc.getHandlerPersistence();
 
 //  CommandService cmdSvc = (CommandService) serviceLocator.getService(ICommandService.class);
 //  CommandPersistence cmdPersistence = cmdSvc.getCommandPersistence();
 
 //  BindingService bindingSvc = (BindingService) serviceLocator.getService(IBindingService.class);
 //  BindingPersistence bindingPersistence = bindingSvc.getBindingPersistence();
 
 //  boolean needsUpdate = false;
 
 //  // determine order from the type of delta
 //  if (isAddition) {
 //    // additions order: Commands, Handlers, Bindings, Menus
 //    if (cmdPersistence.commandsNeedUpdating(event)) {
 //      cmdPersistence.reRead();
 //      needsUpdate = true;
 //    }
 //    if (handlerPersistence.handlersNeedUpdating(event)) {
 //      handlerPersistence.reRead();
 //      needsUpdate = true;
 //    }
 //    if (bindingPersistence.bindingsNeedUpdating(event)) {
 //      bindingPersistence.reRead();
 //      needsUpdate = true;
 //    }
 //    if (menuPersistence.menusNeedUpdating(event)) {
 //      handleMenuChanges(event);
 //      needsUpdate = true;
 //    }
 //  }
 //  else {
 //    // Removal order: Menus, Bindings, Handlers, Commands
 //    if (menuPersistence.menusNeedUpdating(event)) {
 //      handleMenuChanges(event);
 //      needsUpdate = true;
 //    }
 //    if (bindingPersistence.bindingsNeedUpdating(event)) {
 //      bindingPersistence.reRead();
 //      needsUpdate = true;
 //    }
 //    if (handlerPersistence.handlersNeedUpdating(event)) {
 //      final IExtensionDelta[] handlerDeltas = event.getExtensionDeltas(
 //          PlatformUI.PLUGIN_ID, IWorkbenchRegistryConstants.PL_HANDLERS);
 //      for (int i = 0; i < handlerDeltas.length; i++) {
 //        IConfigurationElement[] ices = handlerDeltas[i].getExtension().getConfigurationElements();
 //        HandlerProxy.updateStaleCEs(ices);
 //      }
 
 //      handlerPersistence.reRead();
 //      needsUpdate = true;
 //    }
 //    if (cmdPersistence.commandsNeedUpdating(event)) {
 //      cmdPersistence.reRead();
 //      needsUpdate = true;
 //    }
 //  }
 
 //  if (needsUpdate) {
 //    ContributionManager[] managers = (ContributionManager[]) populatedManagers
 //        .keySet().toArray(
 //            new ContributionManager[populatedManagers.keySet()
 //                .size()]);
 //    for (int i = 0; i < managers.length; i++) {
 //      ContributionManager mgr = managers[i];
 //      mgr.update(false);
 //    }
 //  }
 //}
 
 //MenuPersistence* WorkbenchMenuService::GetMenuPersistence()
 //{
 //  return menuPersistence;
 //}
 
 void WorkbenchMenuService::PopulateContributionManager(ContributionManager* mgr,
                                  const QString& uri, bool recurse)
 {
   PopulateContributionManager(serviceLocator, QSet<IEvaluationReference::Pointer>(), mgr, uri, recurse);
 }
 
 void WorkbenchMenuService::RemoveContributionsForFactory(IContributionManager* manager,
                                                          const SmartPointer<AbstractContributionFactory>& factory)
 {
   populatedManagers[manager].RemoveFactoryContribution(factory); // automatically cleans its caches
 }
 
 void WorkbenchMenuService::ReleaseContributions(ContributionRoot* items)
 {
   ContributionManager* mgr = items->GetManager();
   foreach(IContributionItem::Pointer item, items->GetItems())
   {
     ReleaseItem(item, items->restriction);
     mgr->Remove(item);
   }
   ReleaseCache(items);
 }
 
 void WorkbenchMenuService::PropertyChange(const PropertyChangeEvent::Pointer& event)
 {
   if (event->GetProperty() == IEvaluationService::PROP_NOTIFYING)
   {
     if (!(event->GetNewValue().Cast<ObjectBool>()->GetValue()))
     {
       // if it's false, the evaluation service has
       // finished with its latest round of updates
       this->UpdateManagers();
     }
   }
 }
 
 //SmartPointer<IActivityManagerListener> WorkbenchMenuService::GetActivityManagerListener()
 //{
 //  if (activityManagerListener == null) {
 //    activityManagerListener = new IActivityManagerListener() {
 
 //      public void activityManagerChanged(
 //          ActivityManagerEvent activityManagerEvent) {
 //        if (activityManagerEvent.haveEnabledActivityIdsChanged()) {
 //          updateManagers(); // called after all identifiers have
 //          // been update - now update the
 //          // managers
 //        }
 
 //      }
 //    };
 //  }
 //  return activityManagerListener;
 //}
 
 IPropertyChangeListener* WorkbenchMenuService::GetServiceListener()
 {
   return this;
 }
 
 //void WorkbenchMenuService::UpdateTrim(ToolBarManager* mgr)
 //{
 //  Control control = mgr.getControl();
 //  if (control == null || control.isDisposed()) {
 //    return;
 //  }
 //  LayoutUtil.resize(control);
 //}
 
-bool WorkbenchMenuService::UpdateToolBar(ToolBarManager* mgr)
+bool WorkbenchMenuService::UpdateToolBar(ToolBarManager* /*mgr*/)
 {
 //  QList<IWorkbenchWindow::Pointer> windows = PlatformUI::GetWorkbench()->GetWorkbenchWindows();
 //  QList<IWorkbenchWindow::Pointer>::iterator wend = windows.end();
 //  for (QList<IWorkbenchWindow::Pointer>::iterator i = windows.begin(); i != wend; ++i)
 //  {
 //    WorkbenchWindow::Pointer window = i->Cast<WorkbenchWindow>();
 //    IToolBarManager* tb = window->GetToolBarManager();
 //    if (tb != 0)
 //    {
 //      foreach (IContributionItem::Pointer item, tb->GetItems())
 //      {
 //        if (ToolBarContributionItem::Pointer tbci = item.Cast<ToolBarContributionItem>())
 //        {
 //          IToolBarManager* tbm = tbci->GetToolBarManager();
 //          if (mgr == tbm)
 //          {
 //            tb->Update(true);
 //            return true;
 //          }
 //        }
 //      }
 //    }
 //  }
   return false;
 }
 
 QString WorkbenchMenuService::GetIdFromURI(const QUrl& uri)
 {
   return uri.scheme() + ":" + uri.path();
 }
 
 QList<IContributionManager*> WorkbenchMenuService::GetManagersFor(const QString& factoryId)
 {
   QList<IContributionManager*> mgrs;
 
   QHashIterator<IContributionManager*,ManagerPopulationRecord> mgrIter(populatedManagers);
   while(mgrIter.hasNext())
   {
     if (factoryId == mgrIter.value().uri)
     {
       mgrs.push_back(mgrIter.key());
     }
   }
 
   return mgrs;
 }
 
 bool WorkbenchMenuService::ProcessAdditions(IServiceLocator* serviceLocatorToUse,
                       const QSet<SmartPointer<IEvaluationReference> >& restriction,
                       ContributionManager* mgr,
                       const AbstractContributionFactory::Pointer& cache,
                       QSet<QString>& itemsAdded)
 {
 
   if (!ProcessFactory(mgr, cache))
     return true;
 
   const int idx = GetInsertionIndex(mgr, cache->GetLocation());
   if (idx == -1)
     return false; // can't process (yet)
 
   struct _SafeRunnable : public ISafeRunnable
   {
     WorkbenchMenuService* wms;
     int insertionIndex;
     IServiceLocator* serviceLocatorToUse;
     QSet<SmartPointer<IEvaluationReference> > restriction;
     ContributionManager* mgr;
     AbstractContributionFactory::Pointer cache;
     QSet<QString>& itemsAdded;
 
     _SafeRunnable(WorkbenchMenuService* wms, int idx, IServiceLocator* serviceLocatorToUse,
                   const QSet<SmartPointer<IEvaluationReference> >& restriction,
                   ContributionManager* mgr, AbstractContributionFactory::Pointer cache,
                   QSet<QString>& itemsAdded)
       : wms(wms), insertionIndex(idx), serviceLocatorToUse(serviceLocatorToUse),
         restriction(restriction), mgr(mgr), cache(cache), itemsAdded(itemsAdded)
     {}
 
     void HandleException(const std::exception&)
     {}
 
     void Run()
     {
       // Get the additions
       ContributionRoot::Pointer ciList(new ContributionRoot(wms, restriction,
                                                             mgr, cache.GetPointer()));
 
       cache->CreateContributionItems(serviceLocatorToUse, ciList);
 
       // If we have any then add them at the correct location
       if (!ciList->GetItems().isEmpty())
       {
         // Cache the items for future cleanup
         ManagerPopulationRecord& mpr = wms->populatedManagers[mgr];
         ContributionRoot::Pointer contributions = mpr.GetContributions(cache);
         if (contributions.IsNotNull())
         {
           // Existing contributions in the mgr will be released.
           // Adjust the insertionIndex
           foreach (IContributionItem::Pointer item, contributions->GetItems())
           {
             if (item == mgr->Find(item->GetId()))
               insertionIndex--;
           }
         }
 
         mpr.AddFactoryContribution(cache, ciList);
 
         foreach (IContributionItem::Pointer ici, ciList->GetItems())
         {
           if ((ici.Cast<ContributionManager>() ||
                //ici.Cast<IToolBarContributionItem> ||
                ici.Cast<AbstractGroupMarker>())
               && !(ici->GetId().isEmpty()))
           {
             IContributionItem::Pointer foundIci = mgr->Find(ici->GetId());
             // really, this is a very specific scenario that
             // allows merging but, if it is a contribution manager that also
             // contains items, then we would be throwing stuff away.
             if (ContributionManager::Pointer cm = foundIci.Cast<ContributionManager>())
             {
               if (cm->GetSize() > 0)
               {
 //                IStatus status = new Status(
 //                    IStatus.WARNING,
 //                    WorkbenchPlugin.PI_WORKBENCH,
 //                    "Menu contribution id collision: "
 //                        + ici.getId());
 //                StatusManager.getManager().handle(status);
                 BERRY_WARN << "Menu contribution id collision: " << ici->GetId().toStdString();
               }
               continue;
             }
 //            else if (IToolBarContributionItem::Pointer tbci = foundIci.Cast<IToolBarContributionItem>())
 //            {
 //              IToolBarManager* toolBarManager = tbci->GetToolBarManager();
 //              if (ContributionManager::Pointer tbcm = dynamic_cast<ContributionManager*>(toolBarManager)
 //                  && tbcm->GetSize() > 0)
 //              {
 ////                IStatus status = new Status(
 ////                    IStatus.WARNING,
 ////                    WorkbenchPlugin.PI_WORKBENCH,
 ////                    "Toolbar contribution id collision: " //$NON-NLS-1$
 ////                        + ici.getId());
 ////                StatusManager.getManager().handle(status);
 //                BERRY_WARN << "Toolbar contribution id collision: " << ici->GetId().toStdString();
 //              }
 //              continue;
 //            }
             else if (foundIci.Cast<AbstractGroupMarker>())
             {
               continue;
             }
           }
           const int oldSize = mgr->GetSize();
           mgr->Insert(insertionIndex, ici);
           if (!ici->GetId().isEmpty())
           {
             itemsAdded.insert(ici->GetId());
           }
           if (mgr->GetSize() > oldSize)
             insertionIndex++;
         }
       }
     }
   };
 
   ISafeRunnable::Pointer run (new _SafeRunnable(this, idx, serviceLocatorToUse, restriction,
                                                 mgr, cache, itemsAdded));
   SafeRunner::Run(run);
 
   return true;
 }
 
 bool WorkbenchMenuService::ProcessFactory(ContributionManager* mgr,
                                           const AbstractContributionFactory::Pointer& factory)
 {
   QUrl uri(factory->GetLocation());
   if (MenuUtil::ANY_POPUP == (uri.scheme() + ':' + uri.path()))
   {
     // its any popup. check whether manager has additions
     if (mgr->IndexOf(WorkbenchActionConstants::MB_ADDITIONS) == -1)
     {
 //      // menu has no additions. Add only if allPopups = true
 //      if (MenuAdditionCacheEntry::Pointer menuEntry = factory.Cast<MenuAdditionCacheEntry>())
 //      {
 //        return menuEntry->ContributeToAllPopups();
 //      }
     }
   }
 
   return true;
 }
 
 void WorkbenchMenuService::ReleaseCache(ContributionRoot* items)
 {
   items->Release();
 }
 
 int WorkbenchMenuService::GetInsertionIndex(ContributionManager* mgr, const QString& location)
 {
   QUrl uri(location);
   QList<QPair<QString,QString> > queryParts = uri.queryItems();
 
   int additionsIndex = -1;
 
   // No Query means 'after=additions' (if there) or
   // the end of the menu
   if (queryParts.isEmpty() || uri.queryItemValue(INDEX_AFTER_ADDITIONS_QK) == INDEX_AFTER_ADDITIONS_QV)
   {
     additionsIndex = mgr->IndexOf(WorkbenchActionConstants::MB_ADDITIONS);
     if (additionsIndex == -1)
       additionsIndex = mgr->GetItems().size();
     else
       ++additionsIndex;
   }
   else
   {
     // Should be in the form "[before|after|endof]=id"
     if (queryParts.size() > 0 && !(queryParts[0].second.isEmpty()))
     {
       QString modifier = queryParts[0].first;
       QString id = queryParts[0].second;
       additionsIndex = mgr->IndexOf(id);
       if (additionsIndex != -1)
       {
         if (MenuUtil::QUERY_BEFORE == modifier)
         {
           // this is OK, the additionsIndex will either be correct
           // or -1 (which is a no-op)
         }
         else if (MenuUtil::QUERY_AFTER == modifier)
         {
           additionsIndex++;
         }
         else if (MenuUtil::QUERY_ENDOF == modifier)
         {
           // OK, this one is exciting
           QList<IContributionItem::Pointer> items = mgr->GetItems();
           for (additionsIndex++; additionsIndex < items.size(); additionsIndex++)
           {
             if (items[additionsIndex]->IsGroupMarker())
             {
               break;
             }
           }
         }
       }
     }
   }
 
   return additionsIndex;
 }
 
-void WorkbenchMenuService::ReleaseItem(const SmartPointer<IContributionItem>& item, const QSet<SmartPointer<IEvaluationReference> >& restriction)
+void WorkbenchMenuService::ReleaseItem(const SmartPointer<IContributionItem>& item, QSet<SmartPointer<IEvaluationReference> >& restriction)
 {
   UnregisterVisibleWhen(item, restriction);
   if (ContributionManager::Pointer cm = item.Cast<ContributionManager>())
   {
     ReleaseContributions(cm.GetPointer());
   }
 //  else if (IToolBarContributionItem::Pointer tbci = item.Cast<IToolBarContributionItem>())
 //  {
 //    ReleaseContributions(dynamic_cast<ContributionManager*>(tbci->GetToolBarManager()));
 //  }
 }
 
 bool WorkbenchMenuService::IsProgramaticContribution(const SmartPointer<IConfigurationElement>& menuAddition) const
 {
   return !menuAddition->GetAttribute(WorkbenchRegistryConstants::ATT_CLASS).isEmpty();
 }
 
 SmartPointer<AbstractMenuAdditionCacheEntry> WorkbenchMenuService::FindFactory(const SmartPointer<IConfigurationElement>& ceToRemove)
 {
   QUrl uri = ceToRemove->GetAttribute(WorkbenchRegistryConstants::TAG_LOCATION_URI);
   FactoryListType factories = GetAdditionsForURI(uri);
   foreach (AbstractContributionFactory::Pointer factory, GetAdditionsForURI(uri))
   {
     if (AbstractMenuAdditionCacheEntry::Pointer mace = factory.Cast<AbstractMenuAdditionCacheEntry>())
     {
       if (mace->GetConfigElement() == ceToRemove)
         return mace;
     }
   }
   return AbstractMenuAdditionCacheEntry::Pointer(0);
 }
 
 //void WorkbenchMenuService::HandleMenuChanges(const SmartPointer<IRegistryChangeEvent>& event)
 //{
 //  final IExtensionDelta[] menuDeltas = event.getExtensionDeltas(
 //      PlatformUI.PLUGIN_ID, IWorkbenchRegistryConstants.PL_MENUS);
 //  final List menuAdditions = new ArrayList();
 //  final List menuRemovals = new ArrayList();
 //  for (int i = 0; i < menuDeltas.length; i++) {
 //    IConfigurationElement[] ices = menuDeltas[i].getExtension().getConfigurationElements();
 
 //    for (int j = 0; j < ices.length; j++) {
 //      if (IWorkbenchRegistryConstants.PL_MENU_CONTRIBUTION.equals(ices[j].getName())) {
 //        if (menuDeltas[i].getKind() == IExtensionDelta.ADDED)
 //          menuAdditions.add(ices[j]);
 //        else
 //          menuRemovals.add(ices[j]);
 //      }
 //    }
 //  }
 
 //  // Handle additions
 //  if (menuAdditions.size() > 0) {
 //    handleDynamicAdditions(menuAdditions);
 //  }
 
 //  // Handle Removals
 //  if (menuRemovals.size() > 0) {
 //    handleDynamicRemovals(menuRemovals);
 //  }
 //}
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchMenuService.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchMenuService.h
index fb665a2da4..1041e6a79f 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchMenuService.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchMenuService.h
@@ -1,326 +1,327 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYWORKBENCHMENUSERVICE_H
 #define BERRYWORKBENCHMENUSERVICE_H
 
 #include "berryInternalMenuService.h"
 
 #include "berryIPropertyChangeListener.h"
 
 #include <QString>
 #include <QSet>
 
 namespace berry {
 
 struct IEvaluationService;
 struct IEvaluationReference;
 struct IContributionManager;
 struct IConfigurationElement;
 struct IRegistryChangeEvent;
 
 class AbstractMenuAdditionCacheEntry;
 class ContributionRoot;
 class ToolBarManager;
 
 /**
  * <p>
  * Provides services related to contributing menu elements to the workbench.
  * </p>
  * <p>
  * This class is only intended for internal use.
  * </p>
  */
 class WorkbenchMenuService : public InternalMenuService, private IPropertyChangeListener
 {
 
 private:
 
   friend class ContributionItemUpdater;
 
   class ManagerPopulationRecord
   {
   public:
 
     WorkbenchMenuService* wms;
     IServiceLocator* serviceLocatorToUse;
     QSet<SmartPointer<IEvaluationReference> > restriction;
     QString uri;
     bool recurse;
 
     QHash<SmartPointer<AbstractContributionFactory>, SmartPointer<ContributionRoot> > factoryToItems;
 
     ManagerPopulationRecord();
 
     ManagerPopulationRecord(WorkbenchMenuService* wms, IServiceLocator* serviceLocatorToUse,
                             const QSet<SmartPointer<IEvaluationReference> >& restriction, const QString& uri, bool recurse);
 
     void AddFactoryContribution(const SmartPointer<AbstractContributionFactory>& factory,
                                 const SmartPointer<ContributionRoot>& ciList);
 
     void RemoveFactoryContribution(const SmartPointer<AbstractContributionFactory>& factory);
 
     SmartPointer<ContributionRoot> GetContributions(const SmartPointer<AbstractContributionFactory>& factory) const;
 
     /**
      * Delegates back to the workbench to remove -all- the contributions
      * associated with this contribution manager
      */
     void ReleaseContributions();
   };
 
   static const QString INDEX_AFTER_ADDITIONS_QK; // = "after";
   static const QString INDEX_AFTER_ADDITIONS_QV; // = "additions";
   static const QString PROP_VISIBLE; // = "visible";
 
   typedef QList<SmartPointer<AbstractContributionFactory> > FactoryListType;
 
   QHash<QUrl,FactoryListType> uriToFactories;
 
   QHash<SmartPointer<IContributionItem>,SmartPointer<IEvaluationReference> > evaluationsByItem;
 
   //QHash activityListenersByItem;
 
   QSet<IContributionManager*> managersAwaitingUpdates;
 
   QHash<IContributionManager*,ManagerPopulationRecord> populatedManagers;
 
   //SmartPointer<IRegistryChangeListener> registryChangeListener;
 
   /**
    * The class providing persistence for this service.
    */
   //MenuPersistence menuPersistence;
 
   /**
    * The central authority for determining which menus are visible within this
    * window.
    */
   IEvaluationService* evaluationService;
 
   /**
    * The service locator into which this service will be inserted.
    */
   IServiceLocator* serviceLocator;
 
   //SmartPointer<IActivityManagerListener> activityManagerListener;
 
 public:
 
   berryObjectMacro(berry::WorkbenchMenuService)
 
   /**
    * Constructs a new instance of <code>MenuService</code> using a menu
    * manager.
    */
   WorkbenchMenuService(IServiceLocator* serviceLocator);
 
   ~WorkbenchMenuService();
 
   void Dispose();
 
-  void AddSourceProvider(SmartPointer<ISourceProvider> provider);
+  void AddSourceProvider(const SmartPointer<ISourceProvider>& provider);
 
   void ReadRegistry();
 
-  void RemoveSourceProvider(SmartPointer<ISourceProvider> provider);
+  void RemoveSourceProvider(const SmartPointer<ISourceProvider>& provider);
 
   void UpdateManagers();
 
   FactoryListType GetAdditionsForURI(const QUrl& uri);
 
   /*
    * @see IMenuService#AddContributionFactory(AbstractContributionFactory)
    */
   void AddContributionFactory(const SmartPointer<AbstractContributionFactory>& factory);
 
   /*
    * @see IMenuService#RemoveContributionFactory(AbstractContributionFactory*)
    */
   void RemoveContributionFactory(const SmartPointer<AbstractContributionFactory> &factory);
 
   /*
    * @see org.eclipse.ui.internal.menus.IMenuService#populateMenu(org.eclipse.jface.action.ContributionManager,
    *      org.eclipse.ui.internal.menus.MenuLocationURI)
    */
   void PopulateContributionManager(ContributionManager* mgr, const QString& uri);
 
   void PopulateContributionManager(IServiceLocator* serviceLocatorToUse,
                                    const QSet<SmartPointer<IEvaluationReference> >& restriction,
                                    ContributionManager* mgr,
                                    const QString& uri, bool recurse);
 
   void AddContributionsToManager(IServiceLocator* serviceLocatorToUse,
                                  const QSet<SmartPointer<IEvaluationReference> >& restriction,
                                  ContributionManager *mgr,
                                  const QString& uri, bool recurse,
                                  const QList<SmartPointer<AbstractContributionFactory> >& factories);
 
   /*
    * @see IMenuService#GetCurrentState()
    */
   SmartPointer<IEvaluationContext> GetCurrentState() const;
 
   /*
    * @see IMenuService#RegisterVisibleWhen(IContributionItem, Expression)
    */
   void RegisterVisibleWhen(const SmartPointer<IContributionItem>& item,
                            const SmartPointer<Expression>& visibleWhen,
-                           const QSet<SmartPointer<IEvaluationReference> >& restriction,
+                           QSet<SmartPointer<IEvaluationReference> >& restriction,
                            const QString& identifierID);
 
   /*
    * @see IMenuService#UnregisterVisibleWhen(IContributionItem)
    */
   void UnregisterVisibleWhen(const SmartPointer<IContributionItem>& item,
-                             const QSet<SmartPointer<IEvaluationReference> >& restriction);
+                             QSet<SmartPointer<IEvaluationReference> >& restriction);
 
   /*
    * @see IMenuService#ReleaseMenu(ContributionManager)
    */
   void ReleaseContributions(ContributionManager* mgr);
 
   /**
    * Process additions to the menus that occur through ExtensionRegistry changes
    * @param menuAdditions The list of new menu addition extensions to process
    */
   //void HandleDynamicAdditions(const QList<SmartPointer<IConfigurationElement> >& menuAdditions);
 
   /**
    * Process additions to the menus that occur through ExtensionRegistry changes
    * @param menuRemovals The list of menu addition extensions to remove
    */
   //void HandleDynamicRemovals(const QList<SmartPointer<IConfigurationElement> >& menuRemovals);
 
   /**
    * @param event
    */
   //void HandleRegistryChanges(const SmartPointer<IRegistryChangeEvent>& event);
 
   /**
    * @return Returns the menuPersistence.
    */
   //MenuPersistence* GetMenuPersistence();
 
   /*
    * @see InternalMenuService#PopulateContributionManager(ContributionManager, QString, bool)
    */
   void PopulateContributionManager(ContributionManager* mgr,
                                    const QString& uri, bool recurse);
 
 protected:
 
   /**
    * Removes all cached info for the given manager/factory tuple. This
    * includes unregistering expressions...
    *
    * @param manager The contribution manager owning the contributions
    * @param factory The factory responsible for the contributions
    */
   void RemoveContributionsForFactory(IContributionManager* manager,
                                      const SmartPointer<AbstractContributionFactory> &factory);
 
   /**
    * @param manager
    */
   void ReleaseContributions(ContributionRoot* items);
 
 private:
 
   //SmartPointer<IActivityManagerListener> GetActivityManagerListener();
 
+  using IPropertyChangeListener::PropertyChange;
   void PropertyChange(const PropertyChangeEvent::Pointer& event);
 
   IPropertyChangeListener* GetServiceListener();
 
   //void UpdateTrim(ToolBarManager* mgr);
 
   bool UpdateToolBar(ToolBarManager* mgr);
 
   /**
    * Construct an 'id' string from the given URI. The resulting 'id' is the
    * part of the URI not containing the query:
    * <p>
    * i.e. [menu | popup | toolbar]:id
    * </p>
    *
    * @param uri
    *            The URI to construct the id from
    * @return The id
    */
   QString GetIdFromURI(const QUrl& uri);
 
   /**
    * Return a list of managers that have already been populated and
    * whose URI matches the given one
    * @param factoryId The factoryId to check for
    * @return The list of interested managers
    */
   QList<IContributionManager *> GetManagersFor(const QString& factoryId);
 
   bool ProcessAdditions(IServiceLocator* serviceLocatorToUse,
                         const QSet<SmartPointer<IEvaluationReference> >& restriction,
                         ContributionManager *mgr,
                         const SmartPointer<AbstractContributionFactory>& cache,
                         QSet<QString> &itemsAdded);
 
   /**
    * Determines whether the factory should be processed for this manager.
    *
    * @param factory
    *            The factory to be added
    * @param mgr
    *            The contribution manager
    * @return <code>true</code> if the factory to be processed,
    *         <code>false</code> otherwise
    */
   bool ProcessFactory(ContributionManager *mgr,
                       const SmartPointer<AbstractContributionFactory>& factory);
 
   /**
    * @param items
    */
   void ReleaseCache(ContributionRoot* items);
 
   int GetInsertionIndex(ContributionManager *mgr, const QString& location);
 
   /**
    * @param item
    */
-  void ReleaseItem(const SmartPointer<IContributionItem>& item, const QSet<SmartPointer<IEvaluationReference> >& restriction);
+  void ReleaseItem(const SmartPointer<IContributionItem>& item, QSet<SmartPointer<IEvaluationReference> >& restriction);
 
   /**
    * Return whether or not this contribution is programmatic (ie: has a class attribute).
    *
    * @param menuAddition
    * @return whether or not this contribution is programamtic
    */
   bool IsProgramaticContribution(const SmartPointer<IConfigurationElement>& menuAddition) const;
 
   /**
    * @param ceToRemove
    * @return
    */
   SmartPointer<AbstractMenuAdditionCacheEntry> FindFactory(const SmartPointer<IConfigurationElement>& ceToRemove);
 
   //void HandleMenuChanges(const SmartPointer<IRegistryChangeEvent>& event);
 
 };
 
 }
 
 #endif // BERRYWORKBENCHMENUSERVICE_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchPage.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchPage.cpp
index 33441d40a0..30823b0e33 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchPage.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchPage.cpp
@@ -1,4115 +1,4113 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryLog.h"
 
 #include "tweaklets/berryGuiWidgetsTweaklet.h"
 #include "tweaklets/berryWorkbenchPageTweaklet.h"
 
 #include "berryWorkbenchPage.h"
 #include "berryPartSite.h"
 #include "berryWorkbenchRegistryConstants.h"
 #include "berryPerspective.h"
 #include "berryLayoutPartSash.h"
 #include "berryWorkbenchPlugin.h"
 #include "berryEditorAreaHelper.h"
 #include "berrySaveablesList.h"
 #include "berryPerspectiveHelper.h"
 #include "berryLayoutTreeNode.h"
 #include "berryWorkbench.h"
 #include "berryWorkbenchConstants.h"
 #include "berryPartService.h"
 #include "berryStickyViewManager.h"
 #include "intro/berryIntroConstants.h"
 #include "intro/berryViewIntroAdapterPart.h"
 
 #include "dialogs/berryMessageDialog.h"
 
 #include "berryWorkbenchWindow.h"
 #include "berryUIException.h"
 #include "berryPlatformUI.h"
 #include "berryPartPane.h"
 #include "berryImageDescriptor.h"
 
 #include <berryPlatform.h>
 
 namespace berry
 {
 
 WorkbenchPage::ActivationOrderPred::ActivationOrderPred(
     WorkbenchPage::ActivationList* al) :
   activationList(al)
 {
 
 }
 
 bool WorkbenchPage::ActivationOrderPred::operator()(
     const IViewReference::Pointer o1, const IViewReference::Pointer o2) const
 {
   WorkbenchPage::ActivationList::PartListIter pos1 = activationList->IndexOf(
       o1.Cast<IWorkbenchPartReference> ());
   WorkbenchPage::ActivationList::PartListIter pos2 = activationList->IndexOf(
       o2.Cast<IWorkbenchPartReference> ());
   return pos1 < pos2;
 }
 
 void WorkbenchPage::PerspectiveList::UpdateActionSets(
     Perspective::Pointer /*oldPersp*/, Perspective::Pointer /*newPersp*/)
 {
   //TODO WorkbenchPage action sets
   //        // Update action sets
   //
   //        IContextService service = (IContextService) window
   //            .getService(IContextService.class);
   //        try {
   //          service.activateContext(ContextAuthority.DEFER_EVENTS);
   //          if (newPersp != 0) {
   //            IActionSetDescriptor[] newAlwaysOn = newPersp
   //                .getAlwaysOnActionSets();
   //            for (int i = 0; i < newAlwaysOn.length; i++) {
   //              IActionSetDescriptor descriptor = newAlwaysOn[i];
   //
   //              actionSets.showAction(descriptor);
   //            }
   //
   //            IActionSetDescriptor[] newAlwaysOff = newPersp
   //                .getAlwaysOffActionSets();
   //            for (int i = 0; i < newAlwaysOff.length; i++) {
   //              IActionSetDescriptor descriptor = newAlwaysOff[i];
   //
   //              actionSets.maskAction(descriptor);
   //            }
   //          }
   //
   //          if (oldPersp != 0) {
   //            IActionSetDescriptor[] newAlwaysOn = oldPersp
   //                .getAlwaysOnActionSets();
   //            for (int i = 0; i < newAlwaysOn.length; i++) {
   //              IActionSetDescriptor descriptor = newAlwaysOn[i];
   //
   //              actionSets.hideAction(descriptor);
   //            }
   //
   //            IActionSetDescriptor[] newAlwaysOff = oldPersp
   //                .getAlwaysOffActionSets();
   //            for (int i = 0; i < newAlwaysOff.length; i++) {
   //              IActionSetDescriptor descriptor = newAlwaysOff[i];
   //
   //              actionSets.unmaskAction(descriptor);
   //            }
   //          }
   //        } finally {
   //          service.activateContext(ContextAuthority.SEND_EVENTS);
   //        }
 }
 
 WorkbenchPage::PerspectiveList::PerspectiveList()
 {
 
 }
 
 void WorkbenchPage::PerspectiveList::Reorder(
     IPerspectiveDescriptor::Pointer perspective, int newLoc)
 {
   PerspectiveListType::iterator oldLocation = openedList.end();
   Perspective::Pointer movedPerspective;
   for (PerspectiveListType::iterator iterator = openedList.begin(); iterator
       != openedList.end(); ++iterator)
   {
     Perspective::Pointer openPerspective = *iterator;
     if (openPerspective->GetDesc() == perspective)
     {
       oldLocation = std::find(openedList.begin(), openedList.end(),
           openPerspective);
       movedPerspective = openPerspective;
     }
   }
 
   PerspectiveListType::iterator newLocation = openedList.begin();
   for (int i = 0; i < newLoc; ++i, ++newLocation)
     ;
   if (oldLocation == newLocation)
   {
     return;
   }
 
   openedList.erase(oldLocation);
   openedList.insert(newLocation, movedPerspective);
 
 }
 
 WorkbenchPage::PerspectiveList::PerspectiveListType WorkbenchPage::PerspectiveList::GetSortedPerspectives()
 {
   return usedList;
 }
 
 bool WorkbenchPage::PerspectiveList::Add(Perspective::Pointer perspective)
 {
   openedList.push_back(perspective);
   usedList.push_front(perspective);
   //It will be moved to top only when activated.
   return true;
 }
 
 WorkbenchPage::PerspectiveList::PerspectiveListType::iterator WorkbenchPage::PerspectiveList::Begin()
 {
   return openedList.begin();
 }
 
 WorkbenchPage::PerspectiveList::PerspectiveListType::iterator WorkbenchPage::PerspectiveList::End()
 {
   return openedList.end();
 }
 
 WorkbenchPage::PerspectiveList::PerspectiveListType WorkbenchPage::PerspectiveList::GetOpenedPerspectives()
 {
   return openedList;
 }
 
 bool WorkbenchPage::PerspectiveList::Remove(Perspective::Pointer perspective)
 {
   if (active == perspective)
   {
     this->UpdateActionSets(active, Perspective::Pointer(0));
     active = 0;
   }
   usedList.removeAll(perspective);
   PerspectiveListType::size_type origSize = openedList.size();
   openedList.removeAll(perspective);
   return openedList.size() != origSize;
 }
 
 void WorkbenchPage::PerspectiveList::Swap(Perspective::Pointer oldPerspective,
     Perspective::Pointer newPerspective)
 {
   PerspectiveListType::iterator oldIter = std::find(openedList.begin(),
       openedList.end(), oldPerspective);
   PerspectiveListType::iterator newIter = std::find(openedList.begin(),
       openedList.end(), newPerspective);
 
   if (oldIter == openedList.end() || newIter == openedList.end())
   {
     return;
   }
 
   std::iter_swap(oldIter, newIter);
 }
 
 bool WorkbenchPage::PerspectiveList::IsEmpty()
 {
   return openedList.empty();
 }
 
 Perspective::Pointer WorkbenchPage::PerspectiveList::GetActive()
 {
   return active;
 }
 
 Perspective::Pointer WorkbenchPage::PerspectiveList::GetNextActive()
 {
   if (active == 0)
   {
     if (usedList.empty())
     {
       return Perspective::Pointer(0);
     }
     else
     {
       return usedList.back();
     }
   }
   else
   {
     if (usedList.size() < 2)
     {
       return Perspective::Pointer(0);
     }
     else
     {
       return *(--usedList.end());
     }
   }
 }
 
 WorkbenchPage::PerspectiveList::PerspectiveListType::size_type WorkbenchPage::PerspectiveList::Size()
 {
   return openedList.size();
 }
 
 void WorkbenchPage::PerspectiveList::SetActive(Perspective::Pointer perspective)
 {
   if (perspective == active)
   {
     return;
   }
 
   this->UpdateActionSets(active, perspective);
   active = perspective;
 
   if (perspective != 0)
   {
     usedList.removeAll(perspective);
     usedList.push_back(perspective);
   }
 }
 
 WorkbenchPage::ActivationList::ActivationList(WorkbenchPage* page) :
   page(page)
 {
 
 }
 
 void WorkbenchPage::ActivationList::SetActive(SmartPointer<IWorkbenchPart> part)
 {
   if (parts.empty())
   {
     return;
   }
   IWorkbenchPartReference::Pointer ref(page->GetReference(part));
   if (ref)
   {
     if (ref == parts.back())
     {
       return;
     }
     parts.erase(std::find(parts.begin(), parts.end(), ref));
     parts.push_back(ref);
   }
 }
 
 void WorkbenchPage::ActivationList::BringToTop(SmartPointer<
     IWorkbenchPartReference> ref)
 {
   ILayoutContainer::Pointer targetContainer(page->GetContainer(ref));
 
   PartListIter newIndex = this->LastIndexOfContainer(targetContainer);
 
   if (newIndex != parts.end() && ref == *newIndex)
   {
     return;
   }
 
   if (newIndex == parts.end())
   {
     parts.push_back(ref);
   }
   else
   {
     PartListType::size_type index = newIndex - parts.begin();
     parts.erase(std::find(parts.begin(), parts.end(), ref));
     PartListIter insertIndex = parts.begin() + index;
     parts.insert(insertIndex, ref);
   }
 }
 
 WorkbenchPage::ActivationList::PartListIter WorkbenchPage::ActivationList::LastIndexOfContainer(
     SmartPointer<ILayoutContainer> container)
 {
   PartListReverseIter i = parts.rbegin();
   while (i != parts.rend())
   {
     IWorkbenchPartReference::Pointer ref(*i);
     ILayoutContainer::Pointer cnt(page->GetContainer(ref));
     if (cnt == container)
     {
       return --i.base();
     }
     ++i;
   }
 
   return parts.end();
 }
 
 void WorkbenchPage::ActivationList::SetActive(SmartPointer<
     IWorkbenchPartReference> ref)
 {
   this->SetActive(ref->GetPart(true));
 }
 
 void WorkbenchPage::ActivationList::Add(
     SmartPointer<IWorkbenchPartReference> ref)
 {
   if (std::find(parts.begin(), parts.end(), ref) != parts.end())
   {
     return;
   }
 
   ref->GetPart(false);
   parts.push_front(ref);
 }
 
 SmartPointer<IWorkbenchPart> WorkbenchPage::ActivationList::GetActive()
 {
   if (parts.empty())
   {
     return IWorkbenchPart::Pointer(0);
   }
   return this->GetActive(parts.end());
 }
 
 SmartPointer<IWorkbenchPart> WorkbenchPage::ActivationList::GetPreviouslyActive()
 {
   if (parts.size() < 2)
   {
     return IWorkbenchPart::Pointer(0);
   }
   return this->GetActive(--parts.end());
 }
 
 SmartPointer<IWorkbenchPartReference> WorkbenchPage::ActivationList::GetActiveReference(
     bool editorsOnly)
 {
   return this->GetActiveReference(parts.end(), editorsOnly);
 }
 
 WorkbenchPage::ActivationList::PartListIter WorkbenchPage::ActivationList::IndexOf(
     SmartPointer<IWorkbenchPart> part)
 {
   IWorkbenchPartReference::Pointer ref(page->GetReference(part));
   if (ref == 0)
   {
     return parts.end();
   }
   return std::find(parts.begin(), parts.end(), ref);
 }
 
 WorkbenchPage::ActivationList::PartListIter WorkbenchPage::ActivationList::IndexOf(
     SmartPointer<IWorkbenchPartReference> ref)
 {
   return std::find(parts.begin(), parts.end(), ref);
 }
 
 bool WorkbenchPage::ActivationList::Remove(
     SmartPointer<IWorkbenchPartReference> ref)
 {
   bool contains = std::find(parts.begin(), parts.end(), ref) != parts.end();
   parts.erase(std::find(parts.begin(), parts.end(), ref));
   return contains;
 }
 
 SmartPointer<IEditorPart> WorkbenchPage::ActivationList::GetTopEditor()
 {
   IEditorReference::Pointer editor =
       this->GetActiveReference(parts.end(), true).Cast<IEditorReference> ();
 
   if (editor == 0)
   {
     return IEditorPart::Pointer(0);
   }
 
   return editor->GetEditor(true);
 }
 
 SmartPointer<IWorkbenchPart> WorkbenchPage::ActivationList::GetActive(
     PartListIter start)
 {
   IWorkbenchPartReference::Pointer ref(this->GetActiveReference(start, false));
 
   if (!ref)
   {
     return IWorkbenchPart::Pointer(0);
   }
 
   return ref->GetPart(true);
 }
 
 SmartPointer<IWorkbenchPartReference> WorkbenchPage::ActivationList::GetActiveReference(
     PartListIter start, bool editorsOnly)
 {
   // First look for parts that aren't obscured by the current zoom state
   IWorkbenchPartReference::Pointer nonObscured = this->GetActiveReference(
       start, editorsOnly, true);
 
   if (nonObscured)
   {
     return nonObscured;
   }
 
   // Now try all the rest of the parts
   return this->GetActiveReference(start, editorsOnly, false);
 }
 
 SmartPointer<IWorkbenchPartReference> WorkbenchPage::ActivationList::GetActiveReference(
     PartListIter start, bool editorsOnly, bool /*skipPartsObscuredByZoom*/)
 {
   QList<IViewReference::Pointer> views = page->GetViewReferences();
   PartListReverseIter i(start);
   while (i != parts.rend())
   {
     WorkbenchPartReference::Pointer ref(i->Cast<WorkbenchPartReference> ());
 
     if (editorsOnly && (ref.Cast<IEditorReference> () == 0))
     {
       ++i;
       continue;
     }
 
     // Skip parts whose containers have disabled auto-focus
     PartPane::Pointer pane(ref->GetPane());
 
     if (pane)
     {
       if (!pane->AllowsAutoFocus())
       {
         ++i;
         continue;
       }
 
       //                    if (skipPartsObscuredByZoom) {
       //                        if (pane.isObscuredByZoom()) {
       //                            continue;
       //                        }
       //                    }
     }
 
     // Skip fastviews (unless overridden)
     if (IViewReference::Pointer viewRef = ref.Cast<IViewReference>())
     {
       //if (ref == getActiveFastView() || !((IViewReference) ref).isFastView()) {
-      for (unsigned int j = 0; j < views.size(); j++)
+      for (int j = 0; j < views.size(); j++)
       {
         if (views[j] == viewRef)
         {
           return viewRef.Cast<IWorkbenchPartReference> ();
         }
       }
       //}
     }
     else
     {
       return ref.Cast<IWorkbenchPartReference> ();
     }
     ++i;
   }
   return IWorkbenchPartReference::Pointer(0);
 }
 
 QList<SmartPointer<IEditorReference> > WorkbenchPage::ActivationList::GetEditors()
 {
   QList<IEditorReference::Pointer> editors;
   for (PartListIter i = parts.begin(); i != parts.end(); ++i)
   {
     if (IEditorReference::Pointer part = i->Cast<IEditorReference>())
     {
       editors.push_back(part);
     }
   }
   return editors;
 }
 
 QList<SmartPointer<IWorkbenchPartReference> > WorkbenchPage::ActivationList::GetParts()
 {
   QList<IViewReference::Pointer> views(page->GetViewReferences());
   QList<IWorkbenchPartReference::Pointer> resultList;
   for (PartListIter iterator = parts.begin(); iterator != parts.end(); ++iterator)
   {
 
     if (IViewReference::Pointer ref = iterator->Cast<IViewReference>())
     {
       //Filter views from other perspectives
-      for (unsigned int i = 0; i < views.size(); i++)
+      for (int i = 0; i < views.size(); i++)
       {
         if (ref == views[i])
         {
           resultList.push_back(ref);
           break;
         }
       }
     }
     else
     {
       resultList.push_back(*iterator);
     }
   }
   return resultList;
 }
 
 void WorkbenchPage::ActionSwitcher::UpdateActivePart(
     IWorkbenchPart::Pointer newPart)
 {
   IWorkbenchPart::Pointer _activePart = this->activePart.Lock();
   IEditorPart::Pointer _topEditor = this->topEditor.Lock();
 
   if (_activePart == newPart)
   {
     return;
   }
 
   bool isNewPartAnEditor = newPart.Cast<IEditorPart> ().IsNotNull();
   if (isNewPartAnEditor)
   {
     QString oldId;
     if (_topEditor)
     {
       oldId = _topEditor->GetSite()->GetId();
     }
     QString newId = newPart->GetSite()->GetId();
 
     // if the active part is an editor and the new editor
     // is the same kind of editor, then we don't have to do
     // anything
     if (activePart == topEditor && newId == oldId)
     {
       activePart = newPart;
       topEditor = newPart.Cast<IEditorPart> ();
       return;
     }
 
     // remove the contributions of the old editor
     // if it is a different kind of editor
     if (oldId != newId)
     {
       this->DeactivateContributions(_topEditor, true);
     }
 
     // if a view was the active part, disable its contributions
     if (_activePart && _activePart != _topEditor)
     {
       this->DeactivateContributions(_activePart, true);
     }
 
     // show (and enable) the contributions of the new editor
     // if it is a different kind of editor or if the
     // old active part was a view
     if (newId != oldId || _activePart != _topEditor)
     {
       this->ActivateContributions(newPart, true);
     }
 
   }
   else if (newPart.IsNull())
   {
     if (_activePart)
     {
       // remove all contributions
       this->DeactivateContributions(_activePart, true);
     }
   }
   else
   {
     // new part is a view
 
     // if old active part is a view, remove all contributions,
     // but if old part is an editor only disable
     if (_activePart)
     {
       this->DeactivateContributions(_activePart,
           _activePart.Cast<IViewPart> ().IsNotNull());
     }
 
     this->ActivateContributions(newPart, true);
   }
 
   //TODO WorkbenchPage action sets
   //  ArrayList newActionSets = 0;
   //  if (isNewPartAnEditor || (activePart == topEditor && newPart == 0))
   //  {
   //    newActionSets = calculateActionSets(newPart, 0);
   //  }
   //  else
   //  {
   //    newActionSets = calculateActionSets(newPart, topEditor);
   //  }
   //
   //  if (!updateActionSets(newActionSets))
   //  {
   //    updateActionBars();
   //  }
 
   if (isNewPartAnEditor)
   {
     topEditor = newPart.Cast<IEditorPart> ();
   }
   else if (activePart == topEditor && newPart.IsNull())
   {
     // since we removed all the contributions, we clear the top
     // editor
     topEditor.Reset();
   }
 
   activePart = newPart;
 }
 
 void WorkbenchPage::ActionSwitcher::UpdateTopEditor(
     IEditorPart::Pointer newEditor)
 {
   if (topEditor.Lock() == newEditor)
   {
     return;
   }
 
   if (activePart == topEditor)
   {
     this->UpdateActivePart(newEditor);
     return;
   }
 
   QString oldId;
   if (!topEditor.Expired())
   {
     oldId = topEditor.Lock()->GetSite()->GetId();
   }
   QString newId;
   if (newEditor.IsNotNull())
   {
     newId = newEditor->GetSite()->GetId();
   }
   if (oldId == newId)
   {
     // we don't have to change anything
     topEditor = newEditor;
     return;
   }
 
   // Remove the contributions of the old editor
   if (!topEditor.Expired())
   {
     this->DeactivateContributions(topEditor.Lock(), true);
   }
 
   // Show (disabled) the contributions of the new editor
   if (newEditor.IsNotNull())
   {
     this->ActivateContributions(newEditor, false);
   }
 
   //  ArrayList newActionSets = calculateActionSets(activePart, newEditor);
   //  if (!updateActionSets(newActionSets))
   //  {
   //    updateActionBars();
   //  }
 
   topEditor = newEditor;
 }
 
 void WorkbenchPage::ActionSwitcher::ActivateContributions(
     IWorkbenchPart::Pointer /*part*/, bool /*enable*/)
 {
   //PartSite::Pointer site = part->GetSite().Cast<PartSite> ();
   //site->ActivateActionBars(enable);
 }
 
 void WorkbenchPage::ActionSwitcher::DeactivateContributions(
     IWorkbenchPart::Pointer /*part*/, bool /*remove*/)
 {
   //PartSite::Pointer site = part->GetSite().Cast<PartSite> ();
   //site->DeactivateActionBars(remove);
 }
 
 IExtensionPoint::Pointer WorkbenchPage::GetPerspectiveExtensionPoint()
 {
   return Platform::GetExtensionRegistry()->GetExtensionPoint(
         PlatformUI::PLUGIN_ID(), WorkbenchRegistryConstants::PL_PERSPECTIVE_EXTENSIONS);
 }
 
 WorkbenchPage::WorkbenchPage(WorkbenchWindow* w, const QString& layoutID,
-    IAdaptable* input)
+                             IAdaptable* input)
 {
   if (layoutID == "")
   {
     throw WorkbenchException("Perspective ID is undefined");
   }
 
   this->Register();
   this->Init(w, layoutID, input, true);
   this->UnRegister(false);
 }
 
 WorkbenchPage::WorkbenchPage(WorkbenchWindow* w, IAdaptable* input)
 {
   this->Register();
   this->Init(w, "", input, false);
   this->UnRegister(false);
 }
 
 void WorkbenchPage::Activate(IWorkbenchPart::Pointer part)
 {
   // Sanity check.
   if (!this->CertifyPart(part))
   {
     return;
   }
 
   if (window->IsClosing())
   {
     return;
   }
 
   //  if (composite!=0 && composite.isVisible() && !((GrabFocus)Tweaklets.get(GrabFocus.KEY)).grabFocusAllowed(part))
   //  {
   //    return;
   //  }
 
   // Activate part.
   //if (window.getActivePage() == this) {
   IWorkbenchPartReference::Pointer ref = this->GetReference(part);
   this->InternalBringToTop(ref);
   this->SetActivePart(part);
 }
 
 void WorkbenchPage::ActivatePart(const IWorkbenchPart::Pointer part)
 {
   //  Platform.run(new SafeRunnable(WorkbenchMessages.WorkbenchPage_ErrorActivatingView)
   //      {
   //      public void WorkbenchPage::run()
   //        {
   if (part.IsNotNull())
   {
     //part.setFocus();
     PartPane::Pointer pane = this->GetPane(part);
     pane->SetFocus();
     PartSite::Pointer site = part->GetSite().Cast<PartSite> ();
     pane->ShowFocus(true);
     //this->UpdateTabList(part);
     //SubActionBars bars = (SubActionBars) site.getActionBars();
     //bars.partChanged(part);
   }
   //        }
   //      }
   //      );
 }
 
-void WorkbenchPage::AddPartListener(IPartListener::Pointer l)
+void WorkbenchPage::AddPartListener(IPartListener* l)
 {
   partList->GetPartService()->AddPartListener(l);
 }
 
-void WorkbenchPage::AddSelectionListener(ISelectionListener::Pointer listener)
+void WorkbenchPage::AddSelectionListener(ISelectionListener* listener)
 {
   selectionService->AddSelectionListener(listener);
 }
 
 void WorkbenchPage::AddSelectionListener(const QString& partId,
-    ISelectionListener::Pointer listener)
+    ISelectionListener* listener)
 {
   selectionService->AddSelectionListener(partId, listener);
 }
 
 void WorkbenchPage::AddPostSelectionListener(
-    ISelectionListener::Pointer listener)
+    ISelectionListener* listener)
 {
   selectionService->AddPostSelectionListener(listener);
 }
 
 void WorkbenchPage::AddPostSelectionListener(const QString& partId,
-    ISelectionListener::Pointer listener)
+    ISelectionListener* listener)
 {
   selectionService->AddPostSelectionListener(partId, listener);
 }
 
 ILayoutContainer::Pointer WorkbenchPage::GetContainer(
     IWorkbenchPart::Pointer part)
 {
   PartPane::Pointer pane = this->GetPane(part);
   if (pane == 0)
   {
     return ILayoutContainer::Pointer(0);
   }
 
   return pane->GetContainer();
 }
 
 ILayoutContainer::Pointer WorkbenchPage::GetContainer(
     IWorkbenchPartReference::Pointer part)
 {
   PartPane::Pointer pane = this->GetPane(part);
   if (pane == 0)
   {
     return ILayoutContainer::Pointer(0);
   }
 
   return pane->GetContainer();
 }
 
 PartPane::Pointer WorkbenchPage::GetPane(IWorkbenchPart::Pointer part)
 {
   if (part.IsNull())
   {
     return PartPane::Pointer(0);
   }
   return this->GetPane(this->GetReference(part));
 }
 
 PartPane::Pointer WorkbenchPage::GetPane(IWorkbenchPartReference::Pointer part)
 {
   if (part.IsNull())
   {
     return PartPane::Pointer(0);
   }
 
   return part.Cast<WorkbenchPartReference> ()->GetPane();
 }
 
 bool WorkbenchPage::InternalBringToTop(IWorkbenchPartReference::Pointer part)
 {
 
   bool broughtToTop = false;
 
   // Move part.
   if (part.Cast<IEditorReference> ().IsNotNull())
   {
     ILayoutContainer::Pointer container = this->GetContainer(part);
     if (container.Cast<PartStack> () != 0)
     {
       PartStack::Pointer stack = container.Cast<PartStack> ();
       PartPane::Pointer newPart = this->GetPane(part);
       if (stack->GetSelection() != newPart)
       {
         stack->SetSelection(newPart);
       }
       broughtToTop = true;
     }
   }
   else if (part.Cast<IViewReference> ().IsNotNull())
   {
     Perspective::Pointer persp = this->GetActivePerspective();
     if (persp != 0)
     {
       broughtToTop = persp->BringToTop(part.Cast<IViewReference> ());
     }
   }
 
   // Ensure that this part is considered the most recently activated part
   // in this stack
   activationList->BringToTop(part);
 
   return broughtToTop;
 }
 
 void WorkbenchPage::BringToTop(IWorkbenchPart::Pointer part)
 {
   // Sanity check.
   Perspective::Pointer persp = this->GetActivePerspective();
   if (persp == 0 || !this->CertifyPart(part))
   {
     return;
   }
 
   //  if (!((GrabFocus)Tweaklets.get(GrabFocus.KEY)).grabFocusAllowed(part))
   //  {
   //    return;
   //  }
 
   //  QString label; // debugging only
   //  if (UIStats.isDebugging(UIStats.BRING_PART_TO_TOP))
   //  {
   //    label = part != 0 ? part.getTitle() : "none"; //$NON-NLS-1$
   //  }
 
   IWorkbenchPartReference::Pointer ref = this->GetReference(part);
   ILayoutContainer::Pointer activeEditorContainer = this->GetContainer(
       this->GetActiveEditor().Cast<IWorkbenchPart> ());
   ILayoutContainer::Pointer activePartContainer = this->GetContainer(
       this->GetActivePart());
   ILayoutContainer::Pointer newPartContainer = this->GetContainer(part);
 
   if (newPartContainer == activePartContainer)
   {
     this->MakeActive(ref);
   }
   else if (newPartContainer == activeEditorContainer)
   {
     if (ref.Cast<IEditorReference> () != 0)
     {
       if (part != 0)
       {
         IWorkbenchPartSite::Pointer site = part->GetSite();
         if (site.Cast<PartSite> () != 0)
         {
           ref = site.Cast<PartSite> ()->GetPane()->GetPartReference();
         }
       }
       this->MakeActiveEditor(ref.Cast<IEditorReference> ());
     }
     else
     {
       this->MakeActiveEditor(IEditorReference::Pointer(0));
     }
   }
   else
   {
     this->InternalBringToTop(ref);
     if (ref != 0)
     {
       partList->FirePartBroughtToTop(ref);
     }
   }
 
 }
 
 void WorkbenchPage::BusyResetPerspective()
 {
 
   ViewIntroAdapterPart::Pointer
       introViewAdapter =
           dynamic_cast<WorkbenchIntroManager*> (GetWorkbenchWindow() ->GetWorkbench()->GetIntroManager())->GetIntroAdapterPart().Cast<
               ViewIntroAdapterPart> ();
   //  PartPane introPane = 0;
   //  boolean introFullScreen = false;
   //  if (introViewAdapter != 0)
   //  {
   //    introPane = ((PartSite) introViewAdapter.getSite()).getPane();
   //    introViewAdapter.setHandleZoomEvents(false);
   //    introFullScreen = introPane.isZoomed();
   //  }
 
   //  //try to prevent intro flicker.
   //  if (introFullScreen)
   //  {
   //    window.getShell().setRedraw(false);
   //  }
 
   //  try
   //  {
 
   //    // Always unzoom
   //    if (isZoomed())
   //    {
   //      zoomOut();
   //    }
 
   // Get the current perspective.
   // This describes the working layout of the page and differs from
   // the original template.
   Perspective::Pointer oldPersp = this->GetActivePerspective();
 
   // Map the current perspective to the original template.
   // If the original template cannot be found then it has been deleted.
   // In that case just return. (PR#1GDSABU).
   IPerspectiveRegistry* reg =
       WorkbenchPlugin::GetDefault() ->GetPerspectiveRegistry();
   PerspectiveDescriptor::Pointer desc = reg->FindPerspectiveWithId(
       oldPersp->GetDesc()->GetId()).Cast<PerspectiveDescriptor> ();
   if (desc == 0)
   {
     desc
         = reg->FindPerspectiveWithId(oldPersp ->GetDesc().Cast<
             PerspectiveDescriptor> ()->GetOriginalId()).Cast<
             PerspectiveDescriptor> ();
   }
   if (desc == 0)
   {
     return;
   }
 
   // Notify listeners that we are doing a reset.
   window->FirePerspectiveChanged(IWorkbenchPage::Pointer(this), desc,
       CHANGE_RESET);
 
   // Create new persp from original template.
   // Suppress the perspectiveOpened and perspectiveClosed events otherwise it looks like two
   // instances of the same perspective are open temporarily (see bug 127470).
   Perspective::Pointer newPersp = this->CreatePerspective(desc, false);
   if (newPersp == 0)
   {
     // We're not going through with the reset, so it is complete.
     window->FirePerspectiveChanged(IWorkbenchPage::Pointer(this), desc,
         CHANGE_RESET_COMPLETE);
     return;
   }
 
   // Update the perspective list and shortcut
   perspList.Swap(oldPersp, newPersp);
 
   // Install new persp.
   this->SetPerspective(newPersp);
 
   // Destroy old persp.
   this->DisposePerspective(oldPersp, false);
 
   // Update the Coolbar layout.
   this->ResetToolBarLayout();
 
   // restore the maximized intro
   if (introViewAdapter)
   {
     try
     {
       // ensure that the intro is visible in the new perspective
       ShowView(IntroConstants::INTRO_VIEW_ID);
       //      if (introFullScreen)
       //      {
       //        toggleZoom(introPane.getPartReference());
       //      }
     } catch (PartInitException& e)
     {
       //TODO IStatus
       WorkbenchPlugin::Log("Could not restore intro", e);
       // WorkbenchPlugin.getStatus(e));
     }
     //      finally
     //      {
     //        // we want the intro back to a normal state before we fire the event
     //        introViewAdapter.setHandleZoomEvents(true);
     //      }
   }
   // Notify listeners that we have completed our reset.
   window->FirePerspectiveChanged(IWorkbenchPage::Pointer(this), desc,
       CHANGE_RESET_COMPLETE);
   //  }
   //  finally
   //  {
   //    // reset the handling of zoom events (possibly for the second time) in case there was
   //    // an exception thrown
   //    if (introViewAdapter != 0)
   //    {
   //      introViewAdapter.setHandleZoomEvents(true);
   //    }
   //
   //    if (introFullScreen)
   //    {
   //      window.getShell().setRedraw(true);
   //    }
   //  }
 }
 
 void WorkbenchPage::RemovePerspective(IPerspectiveDescriptor::Pointer desc)
 {
   Perspective::Pointer newPersp;
   PerspectiveDescriptor::Pointer realDesc = desc.Cast<PerspectiveDescriptor> ();
   newPersp = this->FindPerspective(desc);
   perspList.Remove(newPersp);
 }
 
 void WorkbenchPage::BusySetPerspective(IPerspectiveDescriptor::Pointer desc)
 {
   // Create new layout.
   QString label = desc->GetId(); // debugging only
   Perspective::Pointer newPersp;
   //try
   //{
   //UIStats.start(UIStats.SWITCH_PERSPECTIVE, label);
   PerspectiveDescriptor::Pointer realDesc = desc.Cast<PerspectiveDescriptor> ();
   newPersp = this->FindPerspective(realDesc);
   if (newPersp == 0)
   {
     newPersp = this->CreatePerspective(realDesc, true);
     if (newPersp == 0)
     {
       return;
     }
   }
 
   // Change layout.
   this->SetPerspective(newPersp);
   //  }
   //  catch (std::exception& e)
   //  {
   //    UIStats.end(UIStats.SWITCH_PERSPECTIVE, desc.getId(), label);
   //    throw e;
   //  }
 }
 
 IViewPart::Pointer WorkbenchPage::BusyShowView(const QString& viewID,
     const QString& secondaryID, int mode)
 {
   Perspective::Pointer persp = this->GetActivePerspective();
   if (persp == 0)
   {
     return IViewPart::Pointer(0);
   }
 
   // If this view is already visible just return.
   IViewReference::Pointer ref = persp->FindView(viewID, secondaryID);
   IViewPart::Pointer view;
   if (ref != 0)
   {
     view = ref->GetView(true);
   }
   if (view != 0)
   {
     this->BusyShowView(view, mode);
     return view;
   }
 
   // Show the view.
   view = persp->ShowView(viewID, secondaryID);
   if (view != 0)
   {
     this->BusyShowView(view, mode);
 
     IWorkbenchPartReference::Pointer partReference = this->GetReference(view);
     PartPane::Pointer partPane = this->GetPane(partReference);
     partPane->SetInLayout(true);
 
     IWorkbenchPage::Pointer thisPage(this);
     window->FirePerspectiveChanged(thisPage, GetPerspective(), partReference,
         CHANGE_VIEW_SHOW);
     window->FirePerspectiveChanged(thisPage, GetPerspective(), CHANGE_VIEW_SHOW);
   }
   return view;
 }
 
 void WorkbenchPage::BusyShowView(IViewPart::Pointer part, int mode)
 {
   //  if (!((GrabFocus) Tweaklets.get(GrabFocus.KEY)).grabFocusAllowed(part))
   //  {
   //    return;
   //  }
   if (mode == VIEW_ACTIVATE)
   {
     this->Activate(part);
   }
   else if (mode == VIEW_VISIBLE)
   {
     IWorkbenchPartReference::Pointer ref = this->GetActivePartReference();
     // if there is no active part or it's not a view, bring to top
     if (ref == 0 || ref.Cast<IViewReference> () == 0)
     {
       this->BringToTop(part);
     }
     else
     {
       // otherwise check to see if the we're in the same stack as the active view
       IViewReference::Pointer activeView = ref.Cast<IViewReference> ();
       QList<IViewReference::Pointer> viewStack =
           this->GetViewReferenceStack(part);
-      for (unsigned int i = 0; i < viewStack.size(); i++)
+      for (int i = 0; i < viewStack.size(); i++)
       {
         if (viewStack[i] == activeView)
         {
           return;
         }
       }
       this->BringToTop(part);
     }
   }
 }
 
 bool WorkbenchPage::CertifyPart(IWorkbenchPart::Pointer part)
 {
   //Workaround for bug 22325
   if (part != 0 && part->GetSite().Cast<PartSite> () == 0)
   {
     return false;
   }
 
   if (part.Cast<IEditorPart> () != 0)
   {
     IEditorReference::Pointer ref = this->GetReference(part).Cast<
         IEditorReference> ();
     return ref != 0 && this->GetEditorManager()->ContainsEditor(ref);
   }
   if (part.Cast<IViewPart> () != 0)
   {
     Perspective::Pointer persp = this->GetActivePerspective();
     return persp != 0 && persp->ContainsView(part.Cast<IViewPart> ());
   }
   return false;
 }
 
 bool WorkbenchPage::Close()
 {
   bool ret;
   //BusyIndicator.showWhile(0, new Runnable()
   //    {
   //    public void WorkbenchPage::run()
   //      {
   ret = window->ClosePage(IWorkbenchPage::Pointer(this), true);
   //      }
   //    });
   return ret;
 }
 
 bool WorkbenchPage::CloseAllSavedEditors()
 {
   // get the Saved editors
   QList<IEditorReference::Pointer> editors = this->GetEditorReferences();
   QList<IEditorReference::Pointer> savedEditors;
   for (QList<IEditorReference::Pointer>::iterator iter = editors.begin(); iter
       != editors.end(); ++iter)
   {
     IEditorReference::Pointer editor = *iter;
     if (!editor->IsDirty())
     {
       savedEditors.push_back(editor);
     }
   }
   //there are no unsaved editors
   if (savedEditors.empty())
   {
     return true;
   }
 
   return this->CloseEditors(savedEditors, false);
 }
 
 bool WorkbenchPage::CloseAllEditors(bool save)
 {
   return this->CloseEditors(this->GetEditorReferences(), save);
 }
 
 void WorkbenchPage::UpdateActivePart()
 {
 
   if (this->IsDeferred())
   {
     return;
   }
 
   IWorkbenchPartReference::Pointer oldActivePart =
       partList->GetActivePartReference();
   IWorkbenchPartReference::Pointer oldActiveEditor =
       partList->GetActiveEditorReference();
   IWorkbenchPartReference::Pointer newActivePart;
   IEditorReference::Pointer newActiveEditor;
 
   if (!window->IsClosing())
   {
     // If an editor is active, try to keep an editor active
     if (oldActiveEditor && oldActivePart == oldActiveEditor)
     {
       newActiveEditor = activationList->GetActiveReference(true).Cast<
           IEditorReference> ();
       newActivePart = newActiveEditor;
       if (newActivePart == 0)
       {
         // Only activate a non-editor if there's no editors left
         newActivePart = activationList->GetActiveReference(false);
       }
     }
     else
     {
       // If a non-editor is active, activate whatever was activated most recently
       newActivePart = activationList->GetActiveReference(false);
 
       if (newActivePart.Cast<IEditorReference> () != 0)
       {
         // If that happens to be an editor, make it the active editor as well
         newActiveEditor = newActivePart.Cast<IEditorReference> ();
       }
       else
       {
         // Otherwise, select whatever editor was most recently active
         newActiveEditor = activationList->GetActiveReference(true).Cast<
             IEditorReference> ();
       }
     }
   }
 
   if (oldActiveEditor != newActiveEditor)
   {
     this->MakeActiveEditor(newActiveEditor);
   }
 
   if (newActivePart != oldActivePart)
   {
     this->MakeActive(newActivePart);
   }
 }
 
 void WorkbenchPage::MakeActive(IWorkbenchPartReference::Pointer ref)
 {
   if (ref == 0)
   {
     this->SetActivePart(IWorkbenchPart::Pointer(0));
   }
   else
   {
     IWorkbenchPart::Pointer newActive = ref->GetPart(true);
     if (newActive == 0)
     {
       this->SetActivePart(IWorkbenchPart::Pointer(0));
     }
     else
     {
       this->Activate(newActive);
     }
   }
 }
 
 void WorkbenchPage::MakeActiveEditor(IEditorReference::Pointer ref)
 {
   if (ref == this->GetActiveEditorReference())
   {
     return;
   }
 
   IEditorPart::Pointer part = (ref == 0) ? IEditorPart::Pointer(0)
       : ref->GetEditor(true);
 
   if (part)
   {
     editorMgr->SetVisibleEditor(ref, false);
     //navigationHistory.MarkEditor(part);
   }
 
   actionSwitcher.UpdateTopEditor(part);
 
   if (ref)
   {
     activationList->BringToTop(this->GetReference(part));
   }
 
   partList->SetActiveEditor(ref);
 }
 
 bool WorkbenchPage::CloseEditors(
     const QList<IEditorReference::Pointer>& refArray, bool save)
 {
   if (refArray.empty())
   {
     return true;
   }
 
   IWorkbenchPage::Pointer thisPage(this);
 
   // Check if we're being asked to close any parts that are already closed or cannot
   // be closed at this time
   QList<IEditorReference::Pointer> editorRefs;
   for (QList<IEditorReference::Pointer>::const_iterator iter =
       refArray.begin(); iter != refArray.end(); ++iter)
   {
     IEditorReference::Pointer reference = *iter;
 
     // If we're in the middle of creating this part, this is a programming error. Abort the entire
     // close operation. This usually occurs if someone tries to open a dialog in a method that
     // isn't allowed to do so, and a *syncExec tries to close the part. If this shows up in a log
     // file with a dialog's event loop on the stack, then the code that opened the dialog is usually
     // at fault.
     if (partBeingActivated == reference)
     {
       ctkRuntimeException re(
           "WARNING: Blocked recursive attempt to close part "
               + partBeingActivated->GetId()
               + " while still in the middle of activating it");
       WorkbenchPlugin::Log(re);
       return false;
     }
 
     //    if (reference.Cast<WorkbenchPartReference> () != 0)
     //    {
     //      WorkbenchPartReference::Pointer ref = reference.Cast<WorkbenchPartReference>();
     //
     //      // If we're being asked to close a part that is disposed (ie: already closed),
     //      // skip it and proceed with closing the remaining parts.
     //      if (ref.isDisposed())
     //      {
     //        continue;
     //      }
     //    }
 
     editorRefs.push_back(reference);
   }
 
   // notify the model manager before the close
   QList<IWorkbenchPart::Pointer> partsToClose;
-  for (unsigned int i = 0; i < editorRefs.size(); i++)
+  for (int i = 0; i < editorRefs.size(); i++)
   {
     IWorkbenchPart::Pointer refPart = editorRefs[i]->GetPart(false);
     if (refPart != 0)
     {
       partsToClose.push_back(refPart);
     }
   }
   SaveablesList::Pointer modelManager;
   SaveablesList::PostCloseInfo::Pointer postCloseInfo;
   if (partsToClose.size() > 0)
   {
     modelManager = dynamic_cast<SaveablesList*>(
           this->GetWorkbenchWindow()->GetService<ISaveablesLifecycleListener>());
     // this may prompt for saving and return 0 if the user canceled:
     postCloseInfo = modelManager->PreCloseParts(partsToClose, save,
         this->GetWorkbenchWindow());
     if (postCloseInfo == 0)
     {
       return false;
     }
   }
 
   // Fire pre-removal changes
-  for (unsigned int i = 0; i < editorRefs.size(); i++)
+  for (int i = 0; i < editorRefs.size(); i++)
   {
     IEditorReference::Pointer ref = editorRefs[i];
 
     // Notify interested listeners before the close
     window->FirePerspectiveChanged(thisPage, this->GetPerspective(), ref,
         CHANGE_EDITOR_CLOSE);
 
   }
 
   this->DeferUpdates(true);
   try
   {
     if (modelManager != 0)
     {
       modelManager->PostClose(postCloseInfo);
     }
 
     // Close all editors.
-    for (unsigned int i = 0; i < editorRefs.size(); i++)
+    for (int i = 0; i < editorRefs.size(); i++)
     {
       IEditorReference::Pointer ref = editorRefs[i];
 
       // Remove editor from the presentation
       editorPresentation->CloseEditor(ref);
 
       this->PartRemoved(ref.Cast<WorkbenchPartReference> ());
     }
   } catch (...)
   {
   }
   this->DeferUpdates(false);
 
   // Notify interested listeners after the close
   window->FirePerspectiveChanged(thisPage, this->GetPerspective(),
       CHANGE_EDITOR_CLOSE);
 
   // Return true on success.
   return true;
 }
 
 void WorkbenchPage::DeferUpdates(bool shouldDefer)
 {
   if (shouldDefer)
   {
     if (deferCount == 0)
     {
       this->StartDeferring();
     }
     deferCount++;
   }
   else
   {
     deferCount--;
     if (deferCount == 0)
     {
       this->HandleDeferredEvents();
     }
   }
 }
 
 void WorkbenchPage::StartDeferring()
 {
   //editorPresentation.getLayoutPart().deferUpdates(true);
 }
 
 void WorkbenchPage::HandleDeferredEvents()
 {
   editorPresentation->GetLayoutPart()->DeferUpdates(false);
   this->UpdateActivePart();
   QList<WorkbenchPartReference::Pointer> disposals = pendingDisposals;
   pendingDisposals.clear();
-  for (unsigned int i = 0; i < disposals.size(); i++)
+  for (int i = 0; i < disposals.size(); i++)
   {
     this->DisposePart(disposals[i]);
   }
 
 }
 
 bool WorkbenchPage::IsDeferred()
 {
   return deferCount > 0;
 }
 
 bool WorkbenchPage::CloseEditor(IEditorReference::Pointer editorRef, bool save)
 {
   QList<IEditorReference::Pointer> list;
   list.push_back(editorRef);
   return this->CloseEditors(list, save);
 }
 
 bool WorkbenchPage::CloseEditor(IEditorPart::Pointer editor, bool save)
 {
   IWorkbenchPartReference::Pointer ref = this->GetReference(editor);
   if (ref.Cast<IEditorReference> ().IsNotNull())
   {
     QList<IEditorReference::Pointer> list;
     list.push_back(ref.Cast<IEditorReference> ());
     return this->CloseEditors(list, save);
   }
   return false;
 }
 
 void WorkbenchPage::CloseCurrentPerspective(bool saveParts, bool closePage)
 {
     Perspective::Pointer persp = this->GetActivePerspective();
     if (persp != 0)
     {
       this->ClosePerspective(persp, saveParts, closePage);
     }
 }
 
 void WorkbenchPage::ClosePerspective(IPerspectiveDescriptor::Pointer desc,
     bool saveParts, bool closePage)
 {
   Perspective::Pointer persp = this->FindPerspective(desc);
   if (persp != 0)
   {
     this->ClosePerspective(persp, saveParts, closePage);
   }
 }
 
 void WorkbenchPage::ClosePerspective(Perspective::Pointer persp,
     bool saveParts, bool closePage)
 {
 
   //  // Always unzoom
   //  if (isZoomed())
   //  {
   //    zoomOut();
   //  }
 
   QList<IWorkbenchPart::Pointer> partsToSave;
   QList<IWorkbenchPart::Pointer> viewsToClose;
   // collect views that will go away and views that are dirty
   QList<IViewReference::Pointer> viewReferences =
       persp->GetViewReferences();
-  for (unsigned int i = 0; i < viewReferences.size(); i++)
+  for (int i = 0; i < viewReferences.size(); i++)
   {
     IViewReference::Pointer reference = viewReferences[i];
     if (this->GetViewFactory()->GetReferenceCount(reference) == 1)
     {
       IViewPart::Pointer viewPart = reference->GetView(false);
       if (viewPart != 0)
       {
         viewsToClose.push_back(viewPart);
         if (saveParts && reference->IsDirty())
         {
           partsToSave.push_back(viewPart);
         }
       }
     }
   }
   if (saveParts && perspList.Size() == 1)
   {
     // collect editors that are dirty
     QList<IEditorReference::Pointer> editorReferences =
         this->GetEditorReferences();
     for (QList<IEditorReference::Pointer>::iterator refIter =
         editorReferences.begin(); refIter != editorReferences.end(); ++refIter)
     {
       IEditorReference::Pointer reference = *refIter;
       if (reference->IsDirty())
       {
         IEditorPart::Pointer editorPart = reference->GetEditor(false);
         if (editorPart != 0)
         {
           partsToSave.push_back(editorPart);
         }
       }
     }
   }
   if (saveParts && !partsToSave.empty())
   {
     if (!EditorManager::SaveAll(partsToSave, true, true, false,
         IWorkbenchWindow::Pointer(window)))
     {
       // user canceled
       return;
     }
   }
   // Close all editors on last perspective close
   if (perspList.Size() == 1 && this->GetEditorManager()->GetEditorCount() > 0)
   {
     // Close all editors
     if (!this->CloseAllEditors(false))
     {
       return;
     }
   }
 
   // closeAllEditors already notified the saveables list about the editors.
   SaveablesList::Pointer saveablesList(
         dynamic_cast<SaveablesList*>(
           this->GetWorkbenchWindow()->GetWorkbench()->GetService<ISaveablesLifecycleListener>()));
   // we took care of the saving already, so pass in false (postCloseInfo will be non-0)
   SaveablesList::PostCloseInfo::Pointer postCloseInfo =
       saveablesList->PreCloseParts(viewsToClose, false,
           this->GetWorkbenchWindow());
   saveablesList->PostClose(postCloseInfo);
 
   // Dispose of the perspective
   bool isActive = (perspList.GetActive() == persp);
   if (isActive)
   {
     this->SetPerspective(perspList.GetNextActive());
   }
   this->DisposePerspective(persp, true);
   if (closePage && perspList.Size() == 0)
   {
     this->Close();
   }
 }
 
 void WorkbenchPage::CloseAllPerspectives(bool saveEditors, bool closePage)
 {
 
   if (perspList.IsEmpty())
   {
     return;
   }
 
   //  // Always unzoom
   //  if (isZoomed())
   //  {
   //    zoomOut();
   //  }
 
   if (saveEditors)
   {
     if (!this->SaveAllEditors(true))
     {
       return;
     }
   }
   // Close all editors
   if (!this->CloseAllEditors(false))
   {
     return;
   }
 
   // Deactivate the active perspective and part
   this->SetPerspective(Perspective::Pointer(0));
 
   // Close each perspective in turn
   PerspectiveList oldList = perspList;
   perspList = PerspectiveList();
   for (PerspectiveList::iterator itr = oldList.Begin(); itr != oldList.End(); ++itr)
   {
     this->ClosePerspective(*itr, false, false);
   }
   if (closePage)
   {
     this->Close();
   }
 }
 
 void WorkbenchPage::CreateClientComposite()
 {
   void* parent = window->GetPageComposite();
   //  StartupThreading.runWithoutExceptions(new StartupRunnable()
   //      {
   //
   //      public void WorkbenchPage::runWithException()
   //        {
   composite
       = Tweaklets::Get(WorkbenchPageTweaklet::KEY)->CreateClientComposite(
           parent);
   Tweaklets::Get(GuiWidgetsTweaklet::KEY)->SetVisible(composite, false); // Make visible on activate.
   // force the client composite to be layed out
   //          parent.layout();
   //        }
   //      });
 
 }
 
 Perspective::Pointer WorkbenchPage::CreatePerspective(
     PerspectiveDescriptor::Pointer desc, bool notify)
 {
   QString label = desc->GetId(); // debugging only
   try
   {
     //UIStats.start(UIStats.CREATE_PERSPECTIVE, label);
     WorkbenchPage::Pointer thisPage(this);
     Perspective::Pointer persp(new Perspective(desc, thisPage));
     perspList.Add(persp);
     if (notify)
     {
       window->FirePerspectiveOpened(thisPage, desc);
     }
     //if the perspective is fresh and uncustomzied then it is not dirty
     //no reset will be prompted for
     if (!desc->HasCustomDefinition())
     {
       dirtyPerspectives.erase(desc->GetId());
     }
     return persp;
   } catch (WorkbenchException& /*e*/)
   {
     if (!window->GetWorkbenchImpl()->IsStarting())
     {
       MessageDialog::OpenError(window->GetShell(), "Error",
           "Problems opening perspective \"" + desc->GetId() + "\"");
     }
     return Perspective::Pointer(0);
   }
   //    finally
   //    {
   //      UIStats.end(UIStats.CREATE_PERSPECTIVE, desc.getId(), label);
   //    }
 }
 
 void WorkbenchPage::PartAdded(WorkbenchPartReference::Pointer ref)
 {
   activationList->Add(ref);
   partList->AddPart(ref);
   this->UpdateActivePart();
 }
 
 void WorkbenchPage::PartRemoved(WorkbenchPartReference::Pointer ref)
 {
   activationList->Remove(ref);
   this->DisposePart(ref);
 }
 
 void WorkbenchPage::DisposePart(WorkbenchPartReference::Pointer ref)
 {
   if (this->IsDeferred())
   {
     pendingDisposals.push_back(ref);
   }
   else
   {
     partList->RemovePart(ref);
     ref->Dispose();
   }
 }
 
 void WorkbenchPage::DeactivatePart(IWorkbenchPart::Pointer part)
 {
   if (part.IsNotNull())
   {
     PartSite::Pointer site = part->GetSite().Cast<PartSite> ();
     site->GetPane()->ShowFocus(false);
   }
 }
 
 void WorkbenchPage::DetachView(IViewReference::Pointer ref)
 {
   Perspective::Pointer persp = this->GetActivePerspective();
   if (persp == 0)
   {
     return;
   }
 
   PerspectiveHelper* presentation = persp->GetPresentation();
   presentation->DetachPart(ref);
 }
 
 void WorkbenchPage::AttachView(IViewReference::Pointer ref)
 {
   PerspectiveHelper* presentation = this->GetPerspectivePresentation();
   presentation->AttachPart(ref);
 }
 
 WorkbenchPage::~WorkbenchPage()
 {
   // increment reference count to prevent recursive deletes
   this->Register();
 
   {
     {
 
       this->MakeActiveEditor(IEditorReference::Pointer(0));
       this->MakeActive(IWorkbenchPartReference::Pointer(0));
 
       // Close and dispose the editors.
       this->CloseAllEditors(false);
 
       // Need to make sure model data is cleaned up when the page is
       // disposed. Collect all the views on the page and notify the
       // saveable list of a pre/post close. This will free model data.
       QList<IWorkbenchPartReference::Pointer> partsToClose =
           this->GetOpenParts();
       QList<IWorkbenchPart::Pointer> dirtyParts;
-      for (unsigned int i = 0; i < partsToClose.size(); i++)
+      for (int i = 0; i < partsToClose.size(); i++)
       {
         IWorkbenchPart::Pointer part = partsToClose[i]->GetPart(false);
         if (part != 0 && part.Cast<IViewPart> () != 0)
         {
           dirtyParts.push_back(part);
         }
       }
       SaveablesList::Pointer saveablesList(dynamic_cast<SaveablesList*>(
           this->GetWorkbenchWindow()->GetWorkbench()->GetService<ISaveablesLifecycleListener>()));
       SaveablesList::PostCloseInfo::Pointer postCloseInfo =
           saveablesList->PreCloseParts(dirtyParts, false,
               this->GetWorkbenchWindow());
       saveablesList->PostClose(postCloseInfo);
 
       IWorkbenchPage::Pointer thisPage(this);
       // Get rid of perspectives. This will close the views
       for (PerspectiveList::iterator itr = perspList.Begin(); itr
           != perspList.End(); ++itr)
       {
         Perspective::Pointer perspective = *itr;
         window->FirePerspectiveClosed(thisPage, perspective->GetDesc());
         //perspective->Dispose();
       }
       perspList = PerspectiveList();
 
       // Get rid of editor presentation.
       //editorPresentation->Dispose();
 
       // Get rid of composite.
       //composite.dispose();
 
       //navigationHistory.dispose();
 
       //stickyViewMan.clear();
 
       //  if (tracker != 0)
       //  {
       //    tracker.close();
       //  }
 
       //  // if we're destroying a window in a non-shutdown situation then we should
       //  // clean up the working set we made.
       //  if (!window->GetWorkbench()->IsClosing())
       //  {
       //    if (aggregateWorkingSet != 0)
       //    {
       //      PlatformUI.getWorkbench().getWorkingSetManager().removeWorkingSet(
       //          aggregateWorkingSet);
       //    }
       //  }
     }
 
     partBeingActivated = 0;
     pendingDisposals.clear();
 
     stickyViewMan = 0;
     delete viewFactory;
     delete editorPresentation;
     delete editorMgr;
     delete activationList;
 
     deferredActivePersp = 0;
 
     dirtyPerspectives.clear();
 
     delete selectionService;
     partList.reset();
 
   }
 
   // decrement reference count again, without explicit deletion
   this->UnRegister(false);
 }
 
 void WorkbenchPage::DisposePerspective(Perspective::Pointer persp, bool notify)
 {
   // Get rid of perspective.
   perspList.Remove(persp);
   if (notify)
   {
     IWorkbenchPage::Pointer thisPage(this);
     window->FirePerspectiveClosed(thisPage, persp->GetDesc());
   }
   //persp->Dispose();
 
   stickyViewMan->Remove(persp->GetDesc()->GetId());
 }
 
 Perspective::Pointer WorkbenchPage::FindPerspective(
     IPerspectiveDescriptor::Pointer desc)
 {
   for (PerspectiveList::iterator itr = perspList.Begin(); itr
       != perspList.End(); ++itr)
   {
     Perspective::Pointer mgr = *itr;
     if (desc->GetId() == mgr->GetDesc()->GetId())
     {
       return mgr;
     }
   }
   return Perspective::Pointer(0);
 }
 
 IViewPart::Pointer WorkbenchPage::FindView(const QString& id)
 {
   IViewReference::Pointer ref = this->FindViewReference(id);
   if (ref == 0)
   {
     return IViewPart::Pointer(0);
   }
   return ref->GetView(true);
 }
 
 IViewReference::Pointer WorkbenchPage::FindViewReference(
     const QString& viewId)
 {
   return this->FindViewReference(viewId, "");
 }
 
 IViewReference::Pointer WorkbenchPage::FindViewReference(
     const QString& viewId, const QString& secondaryId)
 {
   Perspective::Pointer persp = this->GetActivePerspective();
   if (persp == 0)
   {
     return IViewReference::Pointer(0);
   }
   return persp->FindView(viewId, secondaryId);
 }
 
 IEditorPart::Pointer WorkbenchPage::GetActiveEditor()
 {
   return partList->GetActiveEditor();
 }
 
 IEditorReference::Pointer WorkbenchPage::GetActiveEditorReference()
 {
   return partList->GetActiveEditorReference();
 }
 
 IWorkbenchPart::Pointer WorkbenchPage::GetActivePart()
 {
   return partList->GetActivePart();
 }
 
 IWorkbenchPartReference::Pointer WorkbenchPage::GetActivePartReference()
 {
   return partList->GetActivePartReference();
 }
 
 Perspective::Pointer WorkbenchPage::GetActivePerspective()
 {
   return perspList.GetActive();
 }
 
 void* WorkbenchPage::GetClientComposite()
 {
   return composite;
 }
 
 EditorManager* WorkbenchPage::GetEditorManager()
 {
   return editorMgr;
 }
 
 PerspectiveHelper* WorkbenchPage::GetPerspectivePresentation()
 {
   if (this->GetActivePerspective() != 0)
   {
     return this->GetActivePerspective()->GetPresentation();
   }
   return 0;
 }
 
 bool WorkbenchPage::HasView(const std::string& perspectiveId, const std::string& viewId)
 {
     PerspectiveList::PerspectiveListType list = perspList.GetSortedPerspectives();
     for ( PerspectiveList::PerspectiveListType::iterator it = list.begin(); it!=list.end(); it++)
     {
         SmartPointer<Perspective> p = *it;
         if ( p->GetDesc()->GetId()==perspectiveId)
         {
             if (p->ContainsView(viewId) )
             {
                 return true;
             }
         }
     }
     return false;
 }
 
 /**
  * Answer the editor presentation.
  */
 EditorAreaHelper* WorkbenchPage::GetEditorPresentation()
 {
   return editorPresentation;
 }
 
 QList<IEditorPart::Pointer> WorkbenchPage::GetEditors()
 {
   QList<IEditorReference::Pointer> refs = this->GetEditorReferences();
   QList<IEditorPart::Pointer> result;
   //Display d = getWorkbenchWindow().getShell().getDisplay();
   //Must be backward compatible.
   //    d.syncExec(new Runnable()
   //        {
   //        public void WorkbenchPage::run()
   //          {
   for (QList<IEditorReference::Pointer>::iterator iter = refs.begin(); iter
       != refs.end(); ++iter)
   {
     IEditorPart::Pointer part = (*iter)->GetEditor(true);
     if (part != 0)
     {
       result.push_back(part);
     }
   }
   //          }
   //        });
   return result;
 }
 
 QList<IEditorPart::Pointer> WorkbenchPage::GetDirtyEditors()
 {
   return this->GetEditorManager()->GetDirtyEditors();
 }
 
 QList<ISaveablePart::Pointer> WorkbenchPage::GetDirtyParts()
 {
   QList<ISaveablePart::Pointer> result;
   QList<IWorkbenchPartReference::Pointer> allParts = this->GetAllParts();
-  for (unsigned int i = 0; i < allParts.size(); i++)
+  for (int i = 0; i < allParts.size(); i++)
   {
     IWorkbenchPartReference::Pointer reference = allParts[i];
 
     IWorkbenchPart::Pointer part = reference->GetPart(false);
     if (part != 0 && part.Cast<ISaveablePart> () != 0)
     {
       ISaveablePart::Pointer saveable = part.Cast<ISaveablePart> ();
       if (saveable->IsDirty())
       {
         result.push_back(saveable);
       }
     }
   }
 
   return result;
 }
 
 IEditorPart::Pointer WorkbenchPage::FindEditor(IEditorInput::Pointer input)
 {
   return this->GetEditorManager()->FindEditor(input);
 }
 
 QList<IEditorReference::Pointer> WorkbenchPage::FindEditors(
     IEditorInput::Pointer input, const QString& editorId, int matchFlags)
 {
   return this->GetEditorManager()->FindEditors(input, editorId, matchFlags);
 }
 
 QList<IEditorReference::Pointer> WorkbenchPage::GetEditorReferences()
 {
   return editorPresentation->GetEditors();
 }
 
 IAdaptable* WorkbenchPage::GetInput()
 {
   return input;
 }
 
 QString WorkbenchPage::GetLabel()
 {
   QString label = "<Unknown label>";
   //    IWorkbenchAdapter adapter = (IWorkbenchAdapter) Util.getAdapter(input,
   //        IWorkbenchAdapter.class);
   //    if (adapter != 0)
   //    {
   //      label = adapter.getLabel(input);
   //    }
   Perspective::Pointer persp = this->GetActivePerspective();
   if (persp != 0)
   {
     label = label + " - " + persp->GetDesc()->GetLabel();
   }
   else if (deferredActivePersp != 0)
   {
     label = label + " - " + deferredActivePersp->GetLabel();
   }
   return label;
 }
 
 IPerspectiveDescriptor::Pointer WorkbenchPage::GetPerspective()
 {
   if (deferredActivePersp != 0)
   {
     return deferredActivePersp;
   }
   Perspective::Pointer persp = this->GetActivePerspective();
   if (persp != 0)
   {
     return persp->GetDesc();
   }
   else
   {
     return IPerspectiveDescriptor::Pointer(0);
   }
 }
 
 ISelection::ConstPointer WorkbenchPage::GetSelection() const
 {
   return selectionService->GetSelection();
 }
 
 ISelection::ConstPointer WorkbenchPage::GetSelection(const QString& partId)
 {
   return selectionService->GetSelection(partId);
 }
 
 //ISelectionService::SelectionEvents& WorkbenchPage::GetSelectionEvents(const QString& partId)
 //{
 //  return selectionService->GetSelectionEvents(partId);
 //}
 
 ViewFactory* WorkbenchPage::GetViewFactory()
 {
   if (viewFactory == 0)
   {
     viewFactory = new ViewFactory(this,
         WorkbenchPlugin::GetDefault()->GetViewRegistry());
   }
   return viewFactory;
 }
 
 QList<IViewReference::Pointer> WorkbenchPage::GetViewReferences()
 {
   Perspective::Pointer persp = this->GetActivePerspective();
   if (persp != 0)
   {
     return persp->GetViewReferences();
   }
   else
   {
     return QList<IViewReference::Pointer>();
   }
 }
 
 QList<IViewPart::Pointer> WorkbenchPage::GetViews()
 {
   return this->GetViews(Perspective::Pointer(0), true);
 }
 
 QList<IViewPart::Pointer> WorkbenchPage::GetViews(
     Perspective::Pointer persp, bool restore)
 {
   if (persp == 0)
   {
     persp = this->GetActivePerspective();
   }
 
   QList<IViewPart::Pointer> parts;
   if (persp != 0)
   {
     QList<IViewReference::Pointer> refs = persp->GetViewReferences();
-    for (unsigned int i = 0; i < refs.size(); i++)
+    for (int i = 0; i < refs.size(); i++)
     {
       IViewPart::Pointer part = refs[i]->GetPart(restore).Cast<IViewPart> ();
       if (part != 0)
       {
         parts.push_back(part);
       }
     }
   }
   return parts;
 }
 
 IWorkbenchWindow::Pointer WorkbenchPage::GetWorkbenchWindow()
 {
   return IWorkbenchWindow::Pointer(window);
 }
 
 void WorkbenchPage::HideView(IViewReference::Pointer ref)
 {
 
   // Sanity check.
   if (ref == 0)
   {
     return;
   }
 
   Perspective::Pointer persp = this->GetActivePerspective();
   if (persp == 0)
   {
     return;
   }
 
   bool promptedForSave = false;
   IViewPart::Pointer view = ref->GetView(false);
   if (view != 0)
   {
 
     if (!this->CertifyPart(view))
     {
       return;
     }
 
     // Confirm.
     if (view.Cast<ISaveablePart> () != 0)
     {
       ISaveablePart::Pointer saveable = view.Cast<ISaveablePart> ();
       if (saveable->IsSaveOnCloseNeeded())
       {
         IWorkbenchWindow::Pointer window =
             view->GetSite()->GetWorkbenchWindow();
         QList<IWorkbenchPart::Pointer> partsToSave;
         partsToSave.push_back(view);
         bool success = EditorManager::SaveAll(partsToSave, true, true, false,
             window);
         if (!success)
         {
           // the user cancelled.
           return;
         }
         promptedForSave = true;
       }
     }
   }
 
   int refCount = this->GetViewFactory()->GetReferenceCount(ref);
   SaveablesList* saveablesList = NULL;
   SaveablesList::PostCloseInfo::Pointer postCloseInfo;
   if (refCount == 1)
   {
     IWorkbenchPart::Pointer actualPart = ref->GetPart(false);
     if (actualPart != 0)
     {
       saveablesList = dynamic_cast<SaveablesList*>(
             actualPart->GetSite()->GetService<ISaveablesLifecycleListener>());
       QList<IWorkbenchPart::Pointer> partsToClose;
       partsToClose.push_back(actualPart);
       postCloseInfo = saveablesList->PreCloseParts(partsToClose,
           !promptedForSave, this->GetWorkbenchWindow());
       if (postCloseInfo == 0)
       {
         // cancel
         return;
       }
     }
   }
 
   IWorkbenchPage::Pointer thisPage(this);
   // Notify interested listeners before the hide
   window->FirePerspectiveChanged(thisPage, persp->GetDesc(), ref,
       CHANGE_VIEW_HIDE);
 
   PartPane::Pointer pane = this->GetPane(ref.Cast<IWorkbenchPartReference> ());
   pane->SetInLayout(false);
 
   this->UpdateActivePart();
 
   if (saveablesList != 0)
   {
     saveablesList->PostClose(postCloseInfo);
   }
 
   // Hide the part.
   persp->HideView(ref);
 
   // Notify interested listeners after the hide
   window->FirePerspectiveChanged(thisPage, this->GetPerspective(),
       CHANGE_VIEW_HIDE);
 }
 
 void WorkbenchPage::RefreshActiveView()
 {
   this->UpdateActivePart();
 }
 
 void WorkbenchPage::HideView(IViewPart::Pointer view)
 {
   this->HideView(this->GetReference(view).Cast<IViewReference> ());
 }
 
 void WorkbenchPage::Init(WorkbenchWindow* w, const QString& layoutID,
     IAdaptable* input, bool openExtras)
 {
   // Save args.
   this->window = w;
   this->input = input;
   this->composite = 0;
   this->viewFactory = 0;
 
   this->activationList = new ActivationList(this);
   this->selectionService = new PageSelectionService(this);
   this->partList.reset(new WorkbenchPagePartList(this->selectionService));
   this->stickyViewMan = new StickyViewManager(this);
 
   //actionSets = new ActionSetManager(w);
 
   deferCount = 0;
 
   // Create presentation.
   this->CreateClientComposite();
   editorPresentation = new EditorAreaHelper(this);
   editorMgr = new EditorManager(WorkbenchWindow::Pointer(window),
       WorkbenchPage::Pointer(this), editorPresentation);
 
   //TODO WorkbenchPage perspective reorder listener?
   //    // add this page as a client to be notified when the UI has re-ordered perspectives
   //    // so that the order can be properly maintained in the receiver.
   //    // E.g. a UI might support drag-and-drop and will need to make this known to ensure
   //    // #saveState and #restoreState do not lose this re-ordering
   //    w.addPerspectiveReorderListener(new IReorderListener()
   //        {
   //        public void WorkbenchPage::reorder(Object perspective, int newLoc)
   //          {
   //            perspList.reorder((IPerspectiveDescriptor)perspective, newLoc);
   //          }
   //        });
 
   if (openExtras)
   {
     this->OpenPerspectiveExtras();
   }
 
   // Get perspective descriptor.
   if (layoutID != "")
   {
     PerspectiveDescriptor::Pointer
         desc =
             WorkbenchPlugin::GetDefault()->GetPerspectiveRegistry()->FindPerspectiveWithId(
                 layoutID).Cast<PerspectiveDescriptor> ();
     if (desc == 0)
     {
       throw WorkbenchException("Unable to create Perspective " + layoutID
           + ". There is no corresponding perspective extension.");
     }
     Perspective::Pointer persp = this->FindPerspective(desc);
     if (persp == 0)
     {
       persp = this->CreatePerspective(desc, true);
     }
     perspList.SetActive(persp);
     window->FirePerspectiveActivated(IWorkbenchPage::Pointer(this), desc);
   }
 
   //  getExtensionTracker() .registerHandler(perspectiveChangeHandler,
   //      ExtensionTracker .createExtensionPointFilter(
   //          getPerspectiveExtensionPoint()));
 }
 
 void WorkbenchPage::OpenPerspectiveExtras()
 {
   //TODO WorkbenchPage perspectice extras
   QString extras = ""; //PrefUtil.getAPIPreferenceStore().getString(
   //    IWorkbenchPreferenceConstants.PERSPECTIVE_BAR_EXTRAS);
   QList<IPerspectiveDescriptor::Pointer> descs;
   foreach (QString id, extras.split(", ", QString::SkipEmptyParts))
   {
     if (id.trimmed().isEmpty()) continue;
     IPerspectiveDescriptor::Pointer desc =
         WorkbenchPlugin::GetDefault()->GetPerspectiveRegistry()->FindPerspectiveWithId(id);
     if (desc != 0)
     {
       descs.push_back(desc);
     }
   }
   // HACK: The perspective switcher currently adds the button for a new perspective to the beginning of the list.
   // So, we process the extra perspectives in reverse order here to have their buttons appear in the order declared.
   for (int i = (int) descs.size(); --i >= 0;)
   {
     PerspectiveDescriptor::Pointer desc =
         descs[i].Cast<PerspectiveDescriptor> ();
     if (this->FindPerspective(desc) == 0)
     {
       this->CreatePerspective(desc, true);
     }
   }
 }
 
 bool WorkbenchPage::IsPartVisible(IWorkbenchPart::Pointer part)
 {
   PartPane::Pointer pane = this->GetPane(part);
   return pane != 0 && pane->GetVisible();
 }
 
 bool WorkbenchPage::IsEditorAreaVisible()
 {
   Perspective::Pointer persp = this->GetActivePerspective();
   if (persp == 0)
   {
     return false;
   }
   return persp->IsEditorAreaVisible();
 }
 
 bool WorkbenchPage::IsFastView(IViewReference::Pointer /*ref*/)
 {
   Perspective::Pointer persp = this->GetActivePerspective();
   if (persp != 0)
   {
     //return persp->IsFastView(ref);
     return false;
   }
   else
   {
     return false;
   }
 }
 
 bool WorkbenchPage::IsCloseable(IViewReference::Pointer ref)
 {
   Perspective::Pointer persp = this->GetActivePerspective();
   if (persp != 0)
   {
     return persp->IsCloseable(ref);
   }
   return false;
 }
 
 bool WorkbenchPage::IsMoveable(IViewReference::Pointer ref)
 {
   Perspective::Pointer persp = this->GetActivePerspective();
   if (persp != 0)
   {
     return persp->IsMoveable(ref);
   }
   return false;
 }
 
 bool WorkbenchPage::IsFixedLayout()
 {
   Perspective::Pointer persp = this->GetActivePerspective();
   if (persp != 0)
   {
     return persp->IsFixedLayout();
   }
   else
   {
     return false;
   }
 }
 
 bool WorkbenchPage::IsSaveNeeded()
 {
   return this->GetEditorManager()->IsSaveAllNeeded();
 }
 
 void WorkbenchPage::OnActivate()
 {
   Tweaklets::Get(GuiWidgetsTweaklet::KEY)->SetVisible(composite, true);
   Perspective::Pointer persp = this->GetActivePerspective();
 
   if (persp != 0)
   {
     persp->OnActivate();
     this->UpdateVisibility(Perspective::Pointer(0), persp);
   }
 }
 
 void WorkbenchPage::OnDeactivate()
 {
   this->MakeActiveEditor(IEditorReference::Pointer(0));
   this->MakeActive(IWorkbenchPartReference::Pointer(0));
   if (this->GetActivePerspective() != 0)
   {
     this->GetActivePerspective()->OnDeactivate();
   }
   Tweaklets::Get(GuiWidgetsTweaklet::KEY)->SetVisible(composite, false);
 }
 
 void WorkbenchPage::ReuseEditor(IReusableEditor::Pointer editor,
     IEditorInput::Pointer input)
 {
 
   // Rather than calling editor.setInput on the editor directly, we do it through the part reference.
   // This case lets us detect badly behaved editors that are not firing a PROP_INPUT event in response
   // to the input change... but if all editors obeyed their API contract, the "else" branch would be
   // sufficient.
   IWorkbenchPartReference::Pointer ref = this->GetReference(editor);
   if (ref.Cast<EditorReference> () != 0)
   {
     EditorReference::Pointer editorRef = ref.Cast<EditorReference> ();
 
     editorRef->SetInput(input);
   }
   else
   {
     editor->SetInput(input);
   }
   //navigationHistory.markEditor(editor);
 }
 
 IEditorPart::Pointer WorkbenchPage::OpenEditor(IEditorInput::Pointer input,
     const QString& editorID)
 {
   return this->OpenEditor(input, editorID, true, MATCH_INPUT);
 }
 
 IEditorPart::Pointer WorkbenchPage::OpenEditor(IEditorInput::Pointer input,
     const QString& editorID, bool activate)
 {
   return this->OpenEditor(input, editorID, activate, MATCH_INPUT);
 }
 
 IEditorPart::Pointer WorkbenchPage::OpenEditor(
     const IEditorInput::Pointer input, const QString& editorID,
     bool activate, int matchFlags)
 {
   return this->OpenEditor(input, editorID, activate, matchFlags,
       IMemento::Pointer(0));
 }
 
 IEditorPart::Pointer WorkbenchPage::OpenEditor(
     const IEditorInput::Pointer input, const QString& editorID,
     bool activate, int matchFlags, IMemento::Pointer editorState)
 {
   if (input == 0 || editorID == "")
   {
     throw Poco::InvalidArgumentException();
   }
 
   //    BusyIndicator.showWhile(window.getWorkbench().getDisplay(),
   //        new Runnable()
   //        {
   //        public void WorkbenchPage::run()
   //          {
   return this->BusyOpenEditor(input, editorID, activate, matchFlags,
       editorState);
 }
 
 IEditorPart::Pointer WorkbenchPage::OpenEditorFromDescriptor(
     IEditorInput::Pointer input, IEditorDescriptor::Pointer editorDescriptor,
     bool activate, IMemento::Pointer editorState)
 {
   if (input == 0 || !(editorDescriptor.Cast<EditorDescriptor> () != 0))
   {
     throw Poco::InvalidArgumentException();
   }
 
   //    BusyIndicator.showWhile(window.getWorkbench().getDisplay(),
   //        new Runnable()
   //        {
   //        public void WorkbenchPage::run()
   //          {
   return this->BusyOpenEditorFromDescriptor(input, editorDescriptor.Cast<
       EditorDescriptor> (), activate, editorState);
 
   //          }
   //        });
 
 }
 
 IEditorPart::Pointer WorkbenchPage::BusyOpenEditor(IEditorInput::Pointer input,
     const QString& editorID, bool activate, int matchFlags,
     IMemento::Pointer editorState)
 {
 
   Workbench* workbench =
       this->GetWorkbenchWindow().Cast<WorkbenchWindow> ()->GetWorkbenchImpl();
   workbench->LargeUpdateStart();
 
   IEditorPart::Pointer result;
   try
   {
     result = this->BusyOpenEditorBatched(input, editorID, activate, matchFlags,
         editorState);
 
   } catch (std::exception& e)
   {
     workbench->LargeUpdateEnd();
     throw e;
   }
 
   workbench->LargeUpdateEnd();
   return result;
 }
 
 IEditorPart::Pointer WorkbenchPage::BusyOpenEditorFromDescriptor(
     IEditorInput::Pointer input, EditorDescriptor::Pointer editorDescriptor,
     bool activate, IMemento::Pointer editorState)
 {
 
   Workbench* workbench =
       this->GetWorkbenchWindow().Cast<WorkbenchWindow> ()->GetWorkbenchImpl();
   workbench->LargeUpdateStart();
 
   IEditorPart::Pointer result;
   try
   {
     result = this->BusyOpenEditorFromDescriptorBatched(input, editorDescriptor,
         activate, editorState);
 
   } catch (std::exception& e)
   {
     workbench->LargeUpdateEnd();
     throw e;
   }
 
   workbench->LargeUpdateEnd();
   return result;
 }
 
 IEditorPart::Pointer WorkbenchPage::BusyOpenEditorBatched(
     IEditorInput::Pointer input, const QString& editorID, bool activate,
     int matchFlags, IMemento::Pointer editorState)
 {
 
   // If an editor already exists for the input, use it.
   IEditorPart::Pointer editor;
   // Reuse an existing open editor, unless we are in "new editor tab management" mode
   editor = this->GetEditorManager()->FindEditor(editorID, input, matchFlags);
   if (editor != 0)
   {
     if (IEditorRegistry::SYSTEM_EXTERNAL_EDITOR_ID == editorID)
     {
       if (editor->IsDirty())
       {
         QList<QString> dlgLabels;
         dlgLabels.push_back("Yes");
         dlgLabels.push_back("No");
         dlgLabels.push_back("Cancel");
         IDialog::Pointer
             dialog =
                 MessageDialog::CreateMessageDialog(
                     this->GetWorkbenchWindow()->GetShell(),
                     "Save",
                     (void*) 0, // accept the default window icon
                     "\"" + input->GetName()
                         + "\" is opened and has unsaved changes. Do you want to save it?",
                     IDialog::QUESTION, dlgLabels, 0);
         int saveFile = dialog->Open();
         if (saveFile == 0)
         {
           //          try
           //          {
           IEditorPart::Pointer editorToSave = editor;
           //              getWorkbenchWindow().run(false, false,
           //                  new IRunnableWithProgress()
           //                  {
           //                  public void WorkbenchPage::run(IProgressMonitor monitor)
           //                    throws InvocationTargetException,
           //                    InterruptedException
           //                    {
           //TODO progress monitor
           editorToSave->DoSave();//monitor);
           //                    }
           //                  });
           // }
           //              catch (InvocationTargetException& e)
           //              {
           //                throw(RuntimeException) e->GetTargetException();
           //              }
           //          catch (InterruptedException& e)
           //          {
           //            return 0;
           //          }
         }
         else if (saveFile == 2)
         {
           return IEditorPart::Pointer(0);
         }
       }
     }
     else
     {
       //          // do the IShowEditorInput notification before showing the editor
       //          // to reduce flicker
       //          if (editor.Cast<IShowEditorInput> () != 0)
       //          {
       //            ((IShowEditorInput) editor).showEditorInput(input);
       //          }
       this->ShowEditor(activate, editor);
       return editor;
     }
   }
 
   // Otherwise, create a new one. This may cause the new editor to
   // become the visible (i.e top) editor.
   IEditorReference::Pointer ref = this->GetEditorManager()->OpenEditor(
       editorID, input, true, editorState);
   if (ref != 0)
   {
     editor = ref->GetEditor(true);
   }
 
   if (editor != 0)
   {
     this->SetEditorAreaVisible(true);
     if (activate)
     {
       this->Activate(editor);
     }
     else
     {
       this->BringToTop(editor);
     }
     IWorkbenchPage::Pointer thisPage(this);
     window->FirePerspectiveChanged(thisPage, this->GetPerspective(), ref,
         CHANGE_EDITOR_OPEN);
     window->FirePerspectiveChanged(thisPage, this->GetPerspective(),
         CHANGE_EDITOR_OPEN);
   }
 
   return editor;
 }
 
 /*
  * Added to fix Bug 178235 [EditorMgmt] DBCS 3.3 - Cannot open file with external program.
  * See openEditorFromDescriptor().
  */
 IEditorPart::Pointer WorkbenchPage::BusyOpenEditorFromDescriptorBatched(
     IEditorInput::Pointer input, EditorDescriptor::Pointer editorDescriptor,
     bool activate, IMemento::Pointer editorState)
 {
 
   IEditorPart::Pointer editor;
   // Create a new one. This may cause the new editor to
   // become the visible (i.e top) editor.
   IEditorReference::Pointer ref;
   ref = this->GetEditorManager()->OpenEditorFromDescriptor(editorDescriptor,
       input, editorState);
   if (ref != 0)
   {
     editor = ref->GetEditor(true);
   }
 
   if (editor != 0)
   {
     this->SetEditorAreaVisible(true);
     if (activate)
     {
 
       this->Activate(editor);
 
     }
     else
     {
       this->BringToTop(editor);
     }
     IWorkbenchPage::Pointer thisPage(this);
     window->FirePerspectiveChanged(thisPage, this->GetPerspective(), ref,
         CHANGE_EDITOR_OPEN);
     window->FirePerspectiveChanged(thisPage, this->GetPerspective(),
         CHANGE_EDITOR_OPEN);
   }
 
   return editor;
 }
 
 void WorkbenchPage::OpenEmptyTab()
 {
   IEditorPart::Pointer editor;
   EditorReference::Pointer ref;
   ref = this->GetEditorManager()->OpenEmptyTab().Cast<EditorReference> ();
   if (ref != 0)
   {
     editor
         = ref->GetEmptyEditor(
             dynamic_cast<EditorRegistry*> (WorkbenchPlugin::GetDefault()->GetEditorRegistry())->FindEditor(
                 EditorRegistry::EMPTY_EDITOR_ID).Cast<EditorDescriptor> ());
   }
 
   if (editor != 0)
   {
     this->SetEditorAreaVisible(true);
     this->Activate(editor);
     IWorkbenchPage::Pointer thisPage(this);
     window->FirePerspectiveChanged(thisPage, this->GetPerspective(), ref,
         CHANGE_EDITOR_OPEN);
     window->FirePerspectiveChanged(thisPage, this->GetPerspective(),
         CHANGE_EDITOR_OPEN);
   }
 }
 
 void WorkbenchPage::ShowEditor(bool activate, IEditorPart::Pointer editor)
 {
   this->SetEditorAreaVisible(true);
   if (activate)
   {
     //zoomOutIfNecessary(editor);
     this->Activate(editor);
   }
   else
   {
     this->BringToTop(editor);
   }
 }
 
 bool WorkbenchPage::IsEditorPinned(IEditorPart::Pointer editor)
 {
   WorkbenchPartReference::Pointer ref = this->GetReference(editor).Cast<
       WorkbenchPartReference> ();
   return ref != 0 && ref->IsPinned();
 }
 
 /**
  * Removes an IPartListener from the part service.
  */
-void WorkbenchPage::RemovePartListener(IPartListener::Pointer l)
+void WorkbenchPage::RemovePartListener(IPartListener* l)
 {
   partList->GetPartService()->RemovePartListener(l);
 }
 
 /**
  * Implements IWorkbenchPage
  *
  * @see org.blueberry.ui.IWorkbenchPage#removePropertyChangeListener(IPropertyChangeListener)
  * @since 2.0
  * @deprecated individual views should store a working set if needed and
  *             register a property change listener directly with the
  *             working set manager to receive notification when the view
  *             working set is removed.
  */
 //    void WorkbenchPage::RemovePropertyChangeListener(IPropertyChangeListener listener) {
 //        propertyChangeListeners.remove(listener);
 //    }
 
 
-void WorkbenchPage::RemoveSelectionListener(
-    ISelectionListener::Pointer listener)
+void WorkbenchPage::RemoveSelectionListener(ISelectionListener* listener)
 {
   selectionService->RemoveSelectionListener(listener);
 }
 
 void WorkbenchPage::RemoveSelectionListener(const QString& partId,
-    ISelectionListener::Pointer listener)
+                                            ISelectionListener* listener)
 {
   selectionService->RemoveSelectionListener(partId, listener);
 }
 
-void WorkbenchPage::RemovePostSelectionListener(
-    ISelectionListener::Pointer listener)
+void WorkbenchPage::RemovePostSelectionListener(ISelectionListener* listener)
 {
   selectionService->RemovePostSelectionListener(listener);
 }
 
 void WorkbenchPage::RemovePostSelectionListener(const QString& partId,
-    ISelectionListener::Pointer listener)
+                                                ISelectionListener* listener)
 {
   selectionService->RemovePostSelectionListener(partId, listener);
 }
 
 void WorkbenchPage::RequestActivation(IWorkbenchPart::Pointer part)
 {
   // Sanity check.
   if (!this->CertifyPart(part))
   {
     return;
   }
 
   // Real work.
   this->SetActivePart(part);
 }
 
 /**
  * Resets the layout for the perspective. The active part in the old layout
  * is activated in the new layout for consistent user context.
  */
 void WorkbenchPage::ResetPerspective()
 {
   // Run op in busy cursor.
   // Use set redraw to eliminate the "flash" that can occur in the
   // coolbar as the perspective is reset.
   //    ICoolBarManager2 mgr = (ICoolBarManager2) window.getCoolBarManager2();
   //    try
   //    {
   //      mgr.getControl2().setRedraw(false);
   //      BusyIndicator.showWhile(0, new Runnable()
   //          {
   //          public void WorkbenchPage::run()
   //            {
   this->BusyResetPerspective();
   //            }
   //          });
   //    }finally
   //    {
   //      mgr.getControl2().setRedraw(true);
   //    }
 }
 
 bool WorkbenchPage::RestoreState(IMemento::Pointer memento,
     const IPerspectiveDescriptor::Pointer activeDescriptor)
 {
   //    StartupThreading.runWithoutExceptions(new StartupRunnable()
   //        {
   //
   //        public void WorkbenchPage::runWithException() throws Throwable
   //          {
   this->DeferUpdates(true);
   //        }});
 
   try
   {
     // Restore working set
     QString pageName;
     memento->GetString(WorkbenchConstants::TAG_LABEL, pageName);
 
     //    String label = 0; // debugging only
     //    if (UIStats.isDebugging(UIStats.RESTORE_WORKBENCH))
     //    {
     //      label = pageName == 0 ? "" : "::" + pageName; //$NON-NLS-1$ //$NON-NLS-2$
     //    }
 
     try
     {
       //UIStats.start(UIStats.RESTORE_WORKBENCH, "WorkbenchPage" + label); //$NON-NLS-1$
       //      MultiStatus result =
       //          new MultiStatus(PlatformUI.PLUGIN_ID, IStatus.OK, NLS.bind(
       //              WorkbenchMessages.WorkbenchPage_unableToRestorePerspective,
       //              pageName), 0);
       bool result = true;
 
       //      String workingSetName = memento .getString(
       //          IWorkbenchConstants.TAG_WORKING_SET);
       //      if (workingSetName != 0)
       //      {
       //        AbstractWorkingSetManager
       //            workingSetManager =
       //                (AbstractWorkingSetManager) getWorkbenchWindow() .getWorkbench().getWorkingSetManager();
       //        setWorkingSet(workingSetManager.getWorkingSet(workingSetName));
       //      }
       //
       //      IMemento workingSetMem = memento .getChild(
       //          IWorkbenchConstants.TAG_WORKING_SETS);
       //      if (workingSetMem != 0)
       //      {
       //        QList<IMemento::Pointer> workingSetChildren =
       //            workingSetMem .getChildren(IWorkbenchConstants.TAG_WORKING_SET);
       //        List workingSetList = new ArrayList(workingSetChildren.length);
       //        for (int i = 0; i < workingSetChildren.length; i++)
       //        {
       //          IWorkingSet
       //              set =
       //                  getWorkbenchWindow().getWorkbench() .getWorkingSetManager().getWorkingSet(
       //                      workingSetChildren[i].getID());
       //          if (set != 0)
       //          {
       //            workingSetList.add(set);
       //          }
       //        }
       //
       //        workingSets = (IWorkingSet[]) workingSetList .toArray(
       //            new IWorkingSet[workingSetList.size()]);
       //      }
       //
       //      aggregateWorkingSetId = memento.getString(ATT_AGGREGATE_WORKING_SET_ID);
       //
       //      IWorkingSet setWithId =
       //          window.getWorkbench().getWorkingSetManager().getWorkingSet(
       //              aggregateWorkingSetId);
       //
       //      // check to see if the set has already been made and assign it if it has
       //      if (setWithId.Cast<AggregateWorkingSet> () != 0)
       //      {
       //        aggregateWorkingSet = (AggregateWorkingSet) setWithId;
       //      }
 
       // Restore editor manager.
       IMemento::Pointer childMem = memento->GetChild(
           WorkbenchConstants::TAG_EDITORS);
       //result.merge(getEditorManager().restoreState(childMem));
       result &= this->GetEditorManager()->RestoreState(childMem);
 
       childMem = memento->GetChild(WorkbenchConstants::TAG_VIEWS);
       if (childMem)
       {
         //result.merge(getViewFactory().restoreState(childMem));
         result &= this->GetViewFactory()->RestoreState(childMem);
       }
 
       // Get persp block.
       childMem = memento->GetChild(WorkbenchConstants::TAG_PERSPECTIVES);
       QString activePartID;
       childMem->GetString(WorkbenchConstants::TAG_ACTIVE_PART, activePartID);
       QString activePartSecondaryID;
       if (!activePartID.isEmpty())
       {
         activePartSecondaryID = ViewFactory::ExtractSecondaryId(activePartID);
         if (!activePartSecondaryID.isEmpty())
         {
           activePartID = ViewFactory::ExtractPrimaryId(activePartID);
         }
       }
       QString activePerspectiveID;
       childMem->GetString(WorkbenchConstants::TAG_ACTIVE_PERSPECTIVE,
           activePerspectiveID);
 
       // Restore perspectives.
       QList<IMemento::Pointer> perspMems(childMem->GetChildren(
           WorkbenchConstants::TAG_PERSPECTIVE));
       Perspective::Pointer activePerspective;
 
       IPerspectiveDescriptor::Pointer validPersp;
-      for (std::size_t i = 0; i < perspMems.size(); i++)
+      for (int i = 0; i < perspMems.size(); i++)
       {
 
         IMemento::Pointer current = perspMems[i];
         //          StartupThreading
         //          .runWithoutExceptions(new StartupRunnable()
         //              {
         //
         //              public void WorkbenchPage::runWithException() throws Throwable
         //                {
         Perspective::Pointer persp(new Perspective(
             PerspectiveDescriptor::Pointer(0), WorkbenchPage::Pointer(this)));
         //result.merge(persp.restoreState(current));
         result &= persp->RestoreState(current);
         IPerspectiveDescriptor::Pointer desc = persp->GetDesc();
         if (desc.IsNotNull())
         {
           validPersp=desc;
         } else
         {
           IPerspectiveDescriptor::Pointer desc = WorkbenchPlugin::GetDefault()->
       GetPerspectiveRegistry()->CreatePerspective("Hallo",validPersp);
         }
         if (desc == activeDescriptor)
         {
           activePerspective = persp;
         }
         else if ((activePerspective == 0) && desc->GetId()
             == activePerspectiveID)
         {
           activePerspective = persp;
         }
         perspList.Add(persp);
         //berry::PlatformUI::GetWorkbench()->GetPerspectiveRegistry()->Add
         window->FirePerspectiveOpened(WorkbenchPage::Pointer(this), desc);
         //                }
         //              });
       }
       bool restoreActivePerspective = false;
       if (!activeDescriptor)
       {
         restoreActivePerspective = true;
 
       }
       else if (activePerspective && activePerspective->GetDesc()
           == activeDescriptor)
       {
         restoreActivePerspective = true;
       }
       else
       {
         restoreActivePerspective = false;
         activePerspective = this->CreatePerspective(activeDescriptor.Cast<
             PerspectiveDescriptor> (), true);
         if (activePerspective == 0)
         {
           //          result .merge(
           //              new Status(IStatus.ERR, PlatformUI.PLUGIN_ID, 0, NLS.bind(
           //                  WorkbenchMessages.Workbench_showPerspectiveError,
           //                  activeDescriptor.getId()), 0));
           result &= false;
         }
       }
 
       perspList.SetActive(activePerspective);
 
       // Make sure we have a valid perspective to work with,
       // otherwise return.
       activePerspective = perspList.GetActive();
       if (activePerspective == 0)
       {
         activePerspective = perspList.GetNextActive();
         perspList.SetActive(activePerspective);
       }
       if (activePerspective && restoreActivePerspective)
       {
         //result.merge(activePerspective.restoreState());
         result &= activePerspective->RestoreState();
       }
 
       if (activePerspective)
       {
         Perspective::Pointer myPerspective = activePerspective;
         QString myActivePartId = activePartID;
         QString mySecondaryId = activePartSecondaryID;
         //          StartupThreading.runWithoutExceptions(new StartupRunnable()
         //              {
         //
         //              public void WorkbenchPage::runWithException() throws Throwable
         //                {
         window->FirePerspectiveActivated(WorkbenchPage::Pointer(this),
             myPerspective->GetDesc());
 
         // Restore active part.
         if (!myActivePartId.isEmpty())
         {
           IWorkbenchPartReference::Pointer ref = myPerspective->FindView(
               myActivePartId, mySecondaryId);
 
           if (ref)
           {
             activationList->SetActive(ref);
           }
         }
         // }});
 
       }
 
       //      childMem = memento->GetChild(WorkbenchConstants::TAG_NAVIGATION_HISTORY);
       //      if (childMem)
       //      {
       //        navigationHistory.restoreState(childMem);
       //      }
       //      else if (GetActiveEditor())
       //      {
       //        navigationHistory.markEditor(getActiveEditor());
       //      }
       //
       // restore sticky view state
       stickyViewMan->Restore(memento);
 
       //      QString blame = activeDescriptor == 0 ? pageName
       //          : activeDescriptor.getId();
       //      UIStats.end(UIStats.RESTORE_WORKBENCH, blame, "WorkbenchPage" + label); //$NON-NLS-1$
 
       //      StartupThreading.runWithoutExceptions(new StartupRunnable()
       //                {
       //                public void WorkbenchPage::runWithException() throws Throwable
       //                  {
       DeferUpdates(false);
       //            }
       //          });
 
       return result;
     } catch (...)
     {
       //      QString blame = activeDescriptor == 0 ? pageName
       //          : activeDescriptor.getId();
       //      UIStats.end(UIStats.RESTORE_WORKBENCH, blame, "WorkbenchPage" + label); //$NON-NLS-1$
       throw ;
     }
   }
   catch (...)
   {
     //      StartupThreading.runWithoutExceptions(new StartupRunnable()
     //                {
     //                public void WorkbenchPage::runWithException() throws Throwable
     //                  {
     DeferUpdates(false);
     //            }
     //          });
 
     throw;
   }
 
 }
 
 bool WorkbenchPage::SaveAllEditors(bool confirm)
 {
   return this->SaveAllEditors(confirm, false);
 }
 
 bool WorkbenchPage::SaveAllEditors(bool confirm, bool addNonPartSources)
 {
   return this->GetEditorManager()->SaveAll(confirm, false, addNonPartSources);
 }
 
 bool WorkbenchPage::SavePart(ISaveablePart::Pointer saveable,
     IWorkbenchPart::Pointer part, bool confirm)
 {
   // Do not certify part do allow editors inside a multipageeditor to
   // call this.
   return this->GetEditorManager()->SavePart(saveable, part, confirm);
 }
 
 bool WorkbenchPage::SaveEditor(IEditorPart::Pointer editor, bool confirm)
 {
   return this->SavePart(editor, editor, confirm);
 }
 
 /**
  * Saves the current perspective.
  */
 void WorkbenchPage::SavePerspective()
 {
   Perspective::Pointer persp = this->GetActivePerspective();
   if (persp == 0)
   {
     return;
   }
 
   //    // Always unzoom.
   //    if (isZoomed())
   //    {
   //      zoomOut();
   //    }
 
   persp->SaveDesc();
 }
 
 /**
  * Saves the perspective.
  */
 void WorkbenchPage::SavePerspectiveAs(IPerspectiveDescriptor::Pointer newDesc)
 {
   Perspective::Pointer persp = this->GetActivePerspective();
   if (persp == 0)
   {
     return;
   }
   IPerspectiveDescriptor::Pointer oldDesc = persp->GetDesc();
 
   //    // Always unzoom.
   //    if (isZoomed())
   //    {
   //      zoomOut();
   //    }
 
   persp->SaveDescAs(newDesc);
   window->FirePerspectiveSavedAs(IWorkbenchPage::Pointer(this), oldDesc, newDesc);
 }
 
 /**
  * Save the state of the page.
  */
 bool WorkbenchPage::SaveState(IMemento::Pointer memento)
 {
   //  // We must unzoom to get correct layout.
   //  if (isZoomed())
   //  {
   //    zoomOut();
   //  }
 
   //  MultiStatus
   //      result =
   //          new MultiStatus(PlatformUI.PLUGIN_ID, IStatus.OK, NLS.bind(
   //              WorkbenchMessages.WorkbenchPage_unableToSavePerspective,
   //              getLabel()), 0);
   bool result = true;
 
   // Save editor manager.
   IMemento::Pointer childMem = memento->CreateChild(WorkbenchConstants::TAG_EDITORS);
   //result.merge(editorMgr.saveState(childMem));
   result &= editorMgr->SaveState(childMem);
 
   childMem = memento->CreateChild(WorkbenchConstants::TAG_VIEWS);
   //result.merge(getViewFactory().saveState(childMem));
   result &= this->GetViewFactory()->SaveState(childMem);
 
   // Create persp block.
   childMem = memento->CreateChild(WorkbenchConstants::TAG_PERSPECTIVES);
   if (this->GetPerspective())
   {
     childMem->PutString(WorkbenchConstants::TAG_ACTIVE_PERSPECTIVE,
         this->GetPerspective()->GetId());
   }
   if (this->GetActivePart() != 0)
   {
     if (this->GetActivePart().Cast<IViewPart> ())
     {
       IViewReference::Pointer ref = this->GetReference(this->GetActivePart()).Cast<IViewReference>();
       if (ref)
       {
         childMem->PutString(WorkbenchConstants::TAG_ACTIVE_PART,
             ViewFactory::GetKey(ref));
       }
     }
     else
     {
       childMem->PutString(WorkbenchConstants::TAG_ACTIVE_PART,
           this->GetActivePart()->GetSite()->GetId());
     }
   }
 
   // Save each perspective in opened order
   for (PerspectiveList::PerspectiveListType::iterator itr = perspList.Begin();
       itr != perspList.End(); ++itr)
   {
     IMemento::Pointer gChildMem = childMem->CreateChild(
         WorkbenchConstants::TAG_PERSPECTIVE);
     //result.merge(persp.saveState(gChildMem));
     result &= (*itr)->SaveState(gChildMem);
   }
   //  // Save working set if set
   //  if (workingSet != 0)
   //  {
   //    memento.putString(IWorkbenchConstants.TAG_WORKING_SET,
   //        workingSet .getName());
   //  }
   //
   //  IMemento workingSetMem = memento .createChild(
   //      IWorkbenchConstants.TAG_WORKING_SETS);
   //  for (int i = 0; i < workingSets.length; i++)
   //  {
   //    workingSetMem.createChild(IWorkbenchConstants.TAG_WORKING_SET,
   //        workingSets[i].getName());
   //  }
   //
   //  if (aggregateWorkingSetId != 0)
   //  {
   //    memento.putString(ATT_AGGREGATE_WORKING_SET_ID, aggregateWorkingSetId);
   //  }
   //
   //  navigationHistory.saveState(memento .createChild(
   //      IWorkbenchConstants.TAG_NAVIGATION_HISTORY));
   //
   // save the sticky activation state
   stickyViewMan->Save(memento);
 
   return result;
 }
 
 QString WorkbenchPage::GetId(IWorkbenchPart::Pointer part)
 {
   return this->GetId(this->GetReference(part));
 }
 
 QString WorkbenchPage::GetId(IWorkbenchPartReference::Pointer ref)
 {
   if (ref == 0)
   {
     return "0"; //$NON-NLS-1$
   }
   return ref->GetId();
 }
 
 void WorkbenchPage::SetActivePart(IWorkbenchPart::Pointer newPart)
 {
   // Optimize it.
   if (this->GetActivePart() == newPart)
   {
     return;
   }
 
   if (partBeingActivated != 0)
   {
     if (partBeingActivated->GetPart(false) != newPart)
     {
       WorkbenchPlugin::Log(ctkRuntimeException(
                              QString("WARNING: Prevented recursive attempt to activate part ")
                              + this->GetId(newPart)
                              + " while still in the middle of activating part " + this->GetId(
                                partBeingActivated)));
     }
     return;
   }
 
   //No need to change the history if the active editor is becoming the
   // active part
   //  String label = 0; // debugging only
   //  if (UIStats.isDebugging(UIStats.ACTIVATE_PART))
   //  {
   //    label = newPart != 0 ? newPart.getTitle() : "none"; //$NON-NLS-1$
   //  }
   try
   {
     IWorkbenchPartReference::Pointer partref = this->GetReference(newPart);
     IWorkbenchPartReference::Pointer realPartRef;
     if (newPart != 0)
     {
       IWorkbenchPartSite::Pointer site = newPart->GetSite();
       if (site.Cast<PartSite> () != 0)
       {
         realPartRef = site.Cast<PartSite> ()->GetPane()->GetPartReference();
       }
     }
 
     partBeingActivated = realPartRef;
 
     //UIStats.start(UIStats.ACTIVATE_PART, label);
     // Notify perspective. It may deactivate fast view.
     Perspective::Pointer persp = this->GetActivePerspective();
     if (persp != 0)
     {
       persp->PartActivated(newPart);
     }
 
     // Deactivate old part
     IWorkbenchPart::Pointer oldPart = this->GetActivePart();
     if (oldPart != 0)
     {
       this->DeactivatePart(oldPart);
     }
 
     // Set active part.
     if (newPart != 0)
     {
       activationList->SetActive(newPart);
       if (newPart.Cast<IEditorPart> () != 0)
       {
         this->MakeActiveEditor(realPartRef.Cast<IEditorReference> ());
       }
     }
     this->ActivatePart(newPart);
 
     actionSwitcher.UpdateActivePart(newPart);
 
     partList->SetActivePart(partref);
   }
   catch (std::exception& e)
   {
     partBeingActivated = 0;
     //    Object blame = newPart == 0 ? (Object) this : newPart;
     //    UIStats.end(UIStats.ACTIVATE_PART, blame, label);
     throw e;
   }
 
   partBeingActivated = 0;
 }
 
 void WorkbenchPage::SetEditorAreaVisible(bool showEditorArea)
 {
   Perspective::Pointer persp = this->GetActivePerspective();
   if (persp == 0)
   {
     return;
   }
   if (showEditorArea == persp->IsEditorAreaVisible())
   {
     return;
   }
   //  // If parts change always update zoom.
   //  if (isZoomed())
   //  {
   //    zoomOut();
   //  }
   // Update editor area visibility.
   IWorkbenchPage::Pointer thisPage(this);
   if (showEditorArea)
   {
     persp->ShowEditorArea();
     window->FirePerspectiveChanged(thisPage, this->GetPerspective(),
         CHANGE_EDITOR_AREA_SHOW);
   }
   else
   {
     persp->HideEditorArea();
     this->UpdateActivePart();
     window->FirePerspectiveChanged(thisPage, this->GetPerspective(),
         CHANGE_EDITOR_AREA_HIDE);
   }
 }
 
 /**
  * Sets the layout of the page. Assumes the new perspective is not 0.
  * Keeps the active part if possible. Updates the window menubar and
  * toolbar if necessary.
  */
 void WorkbenchPage::SetPerspective(Perspective::Pointer newPersp)
 {
   // Don't do anything if already active layout
   Perspective::Pointer oldPersp = this->GetActivePerspective();
   if (oldPersp == newPersp)
   {
     return;
   }
 
   window->LargeUpdateStart();
   std::exception exc;
   bool exceptionOccured = false;
   try
   {
     IWorkbenchPage::Pointer thisPage(this);
     if (oldPersp != 0)
     {
       // fire the pre-deactivate
       window->FirePerspectivePreDeactivate(thisPage, oldPersp->GetDesc());
     }
 
     if (newPersp != 0)
     {
       bool status = newPersp->RestoreState();
       if (!status)
       {
         QString title = "Restoring problems";
         QString msg = "Unable to read workbench state.";
         MessageDialog::OpenError(this->GetWorkbenchWindow()->GetShell(), title,
             msg);
       }
     }
 
     // Deactivate the old layout
     if (oldPersp != 0)
     {
       oldPersp->OnDeactivate();
 
       // Notify listeners of deactivation
       window->FirePerspectiveDeactivated(thisPage, oldPersp->GetDesc());
     }
 
     // Activate the new layout
     perspList.SetActive(newPersp);
     if (newPersp != 0)
     {
       newPersp->OnActivate();
 
       // Notify listeners of activation
       window->FirePerspectiveActivated(thisPage, newPersp->GetDesc());
     }
 
     this->UpdateVisibility(oldPersp, newPersp);
 
     // Update the window
     //TODO action sets
     //window->UpdateActionSets();
 
     // Update sticky views
     stickyViewMan->Update(oldPersp, newPersp);
 
   }
   catch (std::exception& e)
   {
     exc = e;
     exceptionOccured = true;
   }
 
   window->LargeUpdateEnd();
   if (newPersp == 0)
   {
     return;
   }
   IPerspectiveDescriptor::Pointer desc = newPersp->GetDesc();
   if (desc == 0)
   {
     return;
   }
   if (dirtyPerspectives.erase(desc->GetId()))
   {
     this->SuggestReset();
   }
 
   if (exceptionOccured)
   throw exc;
 }
 
 void WorkbenchPage::UpdateVisibility(Perspective::Pointer oldPersp,
     Perspective::Pointer newPersp)
 {
 
   // Flag all parts in the old perspective
   QList<IViewReference::Pointer> oldRefs;
   if (oldPersp != 0)
   {
     oldRefs = oldPersp->GetViewReferences();
-    for (unsigned int i = 0; i < oldRefs.size(); i++)
+    for (int i = 0; i < oldRefs.size(); i++)
     {
       PartPane::Pointer pane =
       oldRefs[i].Cast<WorkbenchPartReference> ()->GetPane();
       pane->SetInLayout(false);
     }
   }
 
   PerspectiveHelper* pres = 0;
   // Make parts in the new perspective visible
   if (newPersp != 0)
   {
     pres = newPersp->GetPresentation();
     QList<IViewReference::Pointer> newRefs =
     newPersp->GetViewReferences();
-    for (unsigned int i = 0; i < newRefs.size(); i++)
+    for (int i = 0; i < newRefs.size(); i++)
     {
       WorkbenchPartReference::Pointer ref = newRefs[i].Cast<
       WorkbenchPartReference> ();
       PartPane::Pointer pane = ref->GetPane();
       if (pres->IsPartVisible(ref))
       {
         activationList->BringToTop(ref);
       }
 
       pane->SetInLayout(true);
     }
   }
 
   this->UpdateActivePart();
 
   // Hide any parts in the old perspective that are no longer visible
-  for (unsigned int i = 0; i < oldRefs.size(); i++)
+  for (int i = 0; i < oldRefs.size(); i++)
   {
     WorkbenchPartReference::Pointer ref = oldRefs[i].Cast<
     WorkbenchPartReference> ();
 
     PartPane::Pointer pane = ref->GetPane();
     if (pres == 0 || !pres->IsPartVisible(ref))
     {
       pane->SetVisible(false);
     }
   }
 }
 
 /**
  * Sets the perspective.
  *
  * @param desc
  *            identifies the new perspective.
  */
 void WorkbenchPage::SetPerspective(IPerspectiveDescriptor::Pointer desc)
 {
   if (this->GetPerspective() == desc)
   {
     return;
   }
   //  // Going from multiple to single rows can make the coolbar
   //  // and its adjacent views appear jumpy as perspectives are
   //  // switched. Turn off redraw to help with this.
   //  ICoolBarManager2 mgr = (ICoolBarManager2) window.getCoolBarManager2();
   std::exception exc;
   bool exceptionOccured = false;
   try
   {
     //mgr.getControl2().setRedraw(false);
     //getClientComposite().setRedraw(false);
 
     // Run op in busy cursor.
     //    BusyIndicator.showWhile(0, new Runnable()
     //        {
     //        public void WorkbenchPage::run()
     //          {
     this->BusySetPerspective(desc);
     //          }
     //        });
   }
   catch (std::exception& e)
   {
     exc = e;
     exceptionOccured = true;
   }
 
   //  getClientComposite().setRedraw(true);
   //  mgr.getControl2().setRedraw(true);
   IWorkbenchPart::Pointer part = this->GetActivePart();
   if (part != 0)
   {
     part->SetFocus();
   }
 
   if (exceptionOccured)
   throw exc;
 }
 
 PartService* WorkbenchPage::GetPartService()
 {
   return dynamic_cast<PartService*> (partList->GetPartService());
 }
 
 void WorkbenchPage::ResetToolBarLayout()
 {
   //  ICoolBarManager2 mgr = (ICoolBarManager2) window.getCoolBarManager2();
   //  mgr.resetItemOrder();
 }
 
 IViewPart::Pointer WorkbenchPage::ShowView(const QString& viewID)
 {
   return this->ShowView(viewID, "", VIEW_ACTIVATE);
 }
 
 IViewPart::Pointer WorkbenchPage::ShowView(const QString& viewID,
     const QString& secondaryID, int mode)
 {
 
   if (secondaryID != "")
   {
     if (secondaryID.size() == 0 || secondaryID.indexOf(ViewFactory::ID_SEP) != -1)
     {
       throw ctkInvalidArgumentException(
           "Illegal secondary id (cannot be empty or contain a colon)");
     }
   }
   if (!this->CertifyMode(mode))
   {
     throw ctkInvalidArgumentException("Illegal view mode");
   }
 
   // Run op in busy cursor.
 
   //    BusyIndicator.showWhile(0, new Runnable()
   //        {
   //        public void WorkbenchPage::run()
   //          {
   //  try
   //  {
   return this->BusyShowView(viewID, secondaryID, mode);
   //  } catch (PartInitException& e)
   //  {
   //    result = e;
   //  }
   //          }
   //        });
 
 }
 
 bool WorkbenchPage::CertifyMode(int mode)
 {
   if (mode == VIEW_ACTIVATE || mode == VIEW_VISIBLE || mode == VIEW_CREATE)
   return true;
 
   return false;
 }
 
 QList<IEditorReference::Pointer> WorkbenchPage::GetSortedEditors()
 {
   return activationList->GetEditors();
 }
 
 QList<IPerspectiveDescriptor::Pointer> WorkbenchPage::GetOpenPerspectives()
 {
   QList<Perspective::Pointer> opened = perspList.GetOpenedPerspectives();
   QList<IPerspectiveDescriptor::Pointer> result;
   for (QList<Perspective::Pointer>::iterator iter = opened.begin(); iter
       != opened.end(); ++iter)
   {
     result.push_back((*iter)->GetDesc());
   }
   return result;
 }
 
 QList<Perspective::Pointer> WorkbenchPage::GetOpenInternalPerspectives()
 {
   return perspList.GetOpenedPerspectives();
 }
 
 Perspective::Pointer WorkbenchPage::GetFirstPerspectiveWithView(
     IViewPart::Pointer part)
 {
   QListIterator<Perspective::Pointer> iter(perspList.GetSortedPerspectives());
   iter.toBack();
   while(iter.hasPrevious())
   {
     Perspective::Pointer p = iter.previous();
     if (p->ContainsView(part))
     {
       return p;
     }
   };
   // we should never get here
   return Perspective::Pointer(0);
 }
 
 QList<IPerspectiveDescriptor::Pointer> WorkbenchPage::GetSortedPerspectives()
 {
   QList<Perspective::Pointer> sortedArray =
   perspList.GetSortedPerspectives();
   QList<IPerspectiveDescriptor::Pointer> result;
   for (QList<Perspective::Pointer>::iterator iter = sortedArray.begin();
       iter != sortedArray.end(); ++iter)
   {
     result.push_back((*iter)->GetDesc());
   }
   return result;
 }
 
 QList<IWorkbenchPartReference::Pointer> WorkbenchPage::GetSortedParts()
 {
   //return partList->GetParts(this->GetViewReferences());
   return activationList->GetParts();
 }
 
 IWorkbenchPartReference::Pointer WorkbenchPage::GetReference(
     IWorkbenchPart::Pointer part)
 {
   if (part == 0)
   {
     return IWorkbenchPartReference::Pointer(0);
   }
   IWorkbenchPartSite::Pointer site = part->GetSite();
   if (site.Cast<PartSite> () == 0)
   {
     return IWorkbenchPartReference::Pointer(0);
   }
   PartSite::Pointer partSite = site.Cast<PartSite> ();
   PartPane::Pointer pane = partSite->GetPane();
 
   return partSite->GetPartReference();
 }
 
 // for dynamic UI
 void WorkbenchPage::AddPerspective(Perspective::Pointer persp)
 {
   perspList.Add(persp);
   IWorkbenchPage::Pointer thisPage(this);
   window->FirePerspectiveOpened(thisPage, persp->GetDesc());
 }
 
 QList<IViewReference::Pointer> WorkbenchPage::GetViewReferenceStack(
     IViewPart::Pointer part)
 {
   // Sanity check.
   Perspective::Pointer persp = this->GetActivePerspective();
   if (persp == 0 || !this->CertifyPart(part))
   {
     return QList<IViewReference::Pointer>();
   }
 
   ILayoutContainer::Pointer container =
   part->GetSite().Cast<PartSite> ()->GetPane()->GetContainer();
   if (container.Cast<PartStack> () != 0)
   {
     PartStack::Pointer folder = container.Cast<PartStack> ();
     QList<IViewReference::Pointer> list;
     ILayoutContainer::ChildrenType children = folder->GetChildren();
     for (ILayoutContainer::ChildrenType::iterator childIter =
         children.begin(); childIter != children.end(); ++childIter)
     {
       LayoutPart::Pointer stackablePart = *childIter;
       if (stackablePart.Cast<PartPane> () != 0)
       {
         IViewReference::Pointer view =
         stackablePart.Cast<PartPane> ()->GetPartReference().Cast<
         IViewReference> ();
         if (view != 0)
         {
           list.push_back(view);
         }
       }
     }
 
     // sort the list by activation order (most recently activated first)
     std::sort(list.begin(), list.end(), ActivationOrderPred(activationList));
 
     return list;
   }
 
   QList<IViewReference::Pointer> result;
   result.push_back(this->GetReference(part).Cast<IViewReference> ());
   return result;
 }
 
 QList<IViewPart::Pointer> WorkbenchPage::GetViewStack(
     IViewPart::Pointer part)
 {
   QList<IViewReference::Pointer> refStack = this->GetViewReferenceStack(
       part);
 
   QList<IViewPart::Pointer> result;
 
-  for (unsigned int i = 0; i < refStack.size(); i++)
+  for (int i = 0; i < refStack.size(); i++)
   {
     IViewPart::Pointer next = refStack[i]->GetView(false);
     if (next != 0)
     {
       result.push_back(next);
     }
   }
 
   return result;
 }
 
 void WorkbenchPage::ResizeView(IViewPart::Pointer part, int width, int height)
 {
   SashInfo sashInfo;
   PartPane::Pointer pane = part->GetSite().Cast<PartSite> ()->GetPane();
   ILayoutContainer::Pointer container = pane->GetContainer();
   LayoutTree::Pointer tree =
   this->GetPerspectivePresentation()->GetLayout()->GetLayoutTree()->Find(
       container.Cast<PartStack> ());
 
   // retrieve our layout sashes from the layout tree
   this->FindSashParts(tree, pane->FindSashes(), sashInfo);
 
   // first set the width
   int deltaWidth = width - pane->GetBounds().width;
   if (sashInfo.right != 0)
   {
     Rectangle rightBounds = sashInfo.rightNode->GetBounds();
     // set the new ratio
     sashInfo.right->SetRatio(static_cast<float>((deltaWidth + sashInfo.right->GetBounds().x)
             - rightBounds.x) / rightBounds.width);
     // complete the resize
     sashInfo.rightNode->SetBounds(rightBounds);
   }
   else if (sashInfo.left != 0)
   {
     Rectangle leftBounds = sashInfo.leftNode->GetBounds();
     // set the ratio
     sashInfo.left->SetRatio(static_cast<float>((sashInfo.left->GetBounds().x - deltaWidth)
             - leftBounds.x) / leftBounds.width);
     // complete the resize
     sashInfo.leftNode->SetBounds(sashInfo.leftNode->GetBounds());
   }
 
   // next set the height
   int deltaHeight = height - pane->GetBounds().height;
   if (sashInfo.bottom != 0)
   {
     Rectangle bottomBounds = sashInfo.bottomNode->GetBounds();
     // set the new ratio
     sashInfo.bottom->SetRatio(static_cast<float>((deltaHeight + sashInfo.bottom->GetBounds().y)
             - bottomBounds.y) / bottomBounds.height);
     // complete the resize
     sashInfo.bottomNode->SetBounds(bottomBounds);
   }
   else if (sashInfo.top != 0)
   {
     Rectangle topBounds = sashInfo.topNode->GetBounds();
     // set the ratio
     sashInfo.top->SetRatio(static_cast<float>((sashInfo.top->GetBounds().y - deltaHeight)
             - topBounds.y) / topBounds.height);
     // complete the resize
     sashInfo.topNode->SetBounds(topBounds);
   }
 
 }
 
 void WorkbenchPage::FindSashParts(LayoutTree::Pointer tree,
     const PartPane::Sashes& sashes, SashInfo& info)
 {
   LayoutTree::Pointer parent(tree->GetParent());
   if (parent == 0)
   {
     return;
   }
 
   if (parent->part.Cast<LayoutPartSash> () != 0)
   {
     // get the layout part sash from this tree node
     LayoutPartSash::Pointer sash = parent->part.Cast<LayoutPartSash> ();
     // make sure it has a sash control
     void* control = sash->GetControl();
     if (control != 0)
     {
       // check for a vertical sash
       if (sash->IsVertical())
       {
         if (sashes.left == control)
         {
           info.left = sash;
           info.leftNode = parent->FindSash(sash);
         }
         else if (sashes.right == control)
         {
           info.right = sash;
           info.rightNode = parent->FindSash(sash);
         }
       }
       // check for a horizontal sash
 
       else
       {
         if (sashes.top == control)
         {
           info.top = sash;
           info.topNode = parent->FindSash(sash);
         }
         else if (sashes.bottom == control)
         {
           info.bottom = sash;
           info.bottomNode = parent->FindSash(sash);
         }
       }
     }
   }
   // recursive call to continue up the tree
   this->FindSashParts(parent, sashes, info);
 }
 
 QList<IWorkbenchPartReference::Pointer> WorkbenchPage::GetAllParts()
 {
   QList<IViewReference::Pointer> views = viewFactory->GetViews();
   QList<IEditorReference::Pointer> editors = this->GetEditorReferences();
 
   QList<IWorkbenchPartReference::Pointer> result;
 
-  for (unsigned int i = 0; i < views.size(); i++)
+  for (int i = 0; i < views.size(); i++)
   {
     result.push_back(views[i]);
   }
 
   for (QList<IEditorReference::Pointer>::iterator iter = editors.begin(); iter
       != editors.end(); ++iter)
   {
     result.push_back(*iter);
   }
 
   return result;
 }
 
 QList<IWorkbenchPartReference::Pointer> WorkbenchPage::GetOpenParts()
 {
   QList<IWorkbenchPartReference::Pointer> refs = this->GetAllParts();
   QList<IWorkbenchPartReference::Pointer> result;
 
-  for (unsigned int i = 0; i < refs.size(); i++)
+  for (int i = 0; i < refs.size(); i++)
   {
     IWorkbenchPartReference::Pointer reference = refs[i];
 
     IWorkbenchPart::Pointer part = reference->GetPart(false);
     if (part != 0)
     {
       result.push_back(reference);
     }
   }
 
   return result;
 }
 
 void WorkbenchPage::TestInvariants()
 {
   Perspective::Pointer persp = this->GetActivePerspective();
 
   if (persp != 0)
   {
 
     persp->TestInvariants();
 
     // When we have widgets, ensure that there is no situation where the editor area is visible
     // and the perspective doesn't want an editor area.
     if (this->GetClientComposite()
         && editorPresentation->GetLayoutPart()->IsVisible())
     {
       poco_assert(persp->IsEditorAreaVisible());
     }
   }
 
 }
 
 /* (non-Javadoc)
  * @see org.blueberry.ui.IWorkbenchPage#getExtensionTracker()
  */
 //  IExtensionTracker WorkbenchPage::GetExtensionTracker()
 //  {
 //    if (tracker == 0)
 //    {
 //      tracker = new UIExtensionTracker(getWorkbenchWindow().getWorkbench().getDisplay());
 //    }
 //    return tracker;
 //  }
 
 /*
  * (non-Javadoc)
  *
  * @see org.blueberry.ui.IWorkbenchPage#getPerspectiveShortcuts()
  */
 QList<QString> WorkbenchPage::GetPerspectiveShortcuts()
 {
   Perspective::Pointer persp = this->GetActivePerspective();
   if (persp == 0)
   {
     return QList<QString>();
   }
   return persp->GetPerspectiveShortcuts();
 }
 
 QList<QString> WorkbenchPage::GetShowViewShortcuts()
 {
   Perspective::Pointer persp = this->GetActivePerspective();
   if (persp == 0)
   {
     return QList<QString>();
   }
   return persp->GetShowViewShortcuts();
 }
 
 void WorkbenchPage::SuggestReset()
 {
   IWorkbench* workbench = this->GetWorkbenchWindow()->GetWorkbench();
   //    workbench.getDisplay().asyncExec(new Runnable()
   //        {
   //        public void WorkbenchPage::run()
   //          {
   Shell::Pointer parentShell;
 
   IWorkbenchWindow::Pointer window = workbench->GetActiveWorkbenchWindow();
   if (window == 0)
   {
     if (workbench->GetWorkbenchWindowCount() == 0)
     {
       return;
     }
     window = workbench->GetWorkbenchWindows()[0];
   }
 
   parentShell = window->GetShell();
 
   if (MessageDialog::OpenQuestion(parentShell,
           "Reset Perspective?",
           "Changes to installed plug-ins have affected this perspective. Would you like to reset this perspective to accept these changes?"))
   {
     IWorkbenchPage::Pointer page = window->GetActivePage();
     if (page == 0)
     {
       return;
     }
     page->ResetPerspective();
   }
   //          }
   //        });
 
 }
 
 bool WorkbenchPage::IsPartVisible(
     IWorkbenchPartReference::Pointer reference)
 {
   IWorkbenchPart::Pointer part = reference->GetPart(false);
   // Can't be visible if it isn't created yet
   if (part == 0)
   {
     return false;
   }
 
   return this->IsPartVisible(part);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchPage.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchPage.h
index 3ce241690c..49acf631b0 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchPage.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchPage.h
@@ -1,1813 +1,1813 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYWORKBENCHPAGE_H_
 #define BERRYWORKBENCHPAGE_H_
 
 #include <berryIAdaptable.h>
 
 #include "berryIWorkbenchPage.h"
 #include "berryIWorkbenchPartReference.h"
 #include "berryIReusableEditor.h"
 
 #include "berryILayoutContainer.h"
 #include "berryIStickyViewManager.h"
 #include "berryWorkbenchPagePartList.h"
 #include "berryWorkbenchPartReference.h"
 #include "berryPageSelectionService.h"
 #include "berryEditorManager.h"
 #include "berryViewFactory.h"
 
 #include "berryPartPane.h"
 
 #include <list>
 
 namespace berry
 {
 
 struct IExtensionPoint;
 
 //class PartPane;
 //class PartPane::Sashes;
 class EditorAreaHelper;
 class WorkbenchWindow;
 class Perspective;
 class PerspectiveHelper;
 class PerspectiveDescriptor;
 class LayoutPartSash;
 class LayoutTree;
 class LayoutTreeNode;
 class PartService;
 
 /**
  * \ingroup org_blueberry_ui_internal
  *
  * A collection of views and editors in a workbench.
  */
 class BERRY_UI_QT WorkbenchPage: public IWorkbenchPage
 {
 
 public:
   berryObjectMacro(WorkbenchPage);
 
 protected:
 
   //TODO Weakpointer
   WorkbenchWindow* window;
 
   friend class ViewFactory;
   friend class WorkbenchWindow;
   friend class EditorAreaHelper;
   friend class WWinPartService;
 
 private:
 
   /**
    * Manages editor contributions and action set part associations.
    */
   class ActionSwitcher
   {
   private:
     IWorkbenchPart::WeakPtr activePart;
 
     IEditorPart::WeakPtr topEditor;
 
     /**
      * Updates the contributions given the new part as the active part.
      *
      * @param newPart
      *            the new active part, may be <code>null</code>
      */
   public:
     void UpdateActivePart(IWorkbenchPart::Pointer newPart);
 
     /**
      * Updates the contributions given the new part as the topEditor.
      *
      * @param newEditor
      *            the new top editor, may be <code>null</code>
      */
   public:
     void UpdateTopEditor(IEditorPart::Pointer newEditor);
 
     /**
      * Activates the contributions of the given part. If <code>enable</code>
      * is <code>true</code> the contributions are visible and enabled,
      * otherwise they are disabled.
      *
      * @param part
      *            the part whose contributions are to be activated
      * @param enable
      *            <code>true</code> the contributions are to be enabled,
      *            not just visible.
      */
   private:
     void ActivateContributions(IWorkbenchPart::Pointer part, bool enable);
 
     /**
      * Deactivates the contributions of the given part. If <code>remove</code>
      * is <code>true</code> the contributions are removed, otherwise they
      * are disabled.
      *
      * @param part
      *            the part whose contributions are to be deactivated
      * @param remove
      *            <code>true</code> the contributions are to be removed,
      *            not just disabled.
      */
   private:
     void DeactivateContributions(IWorkbenchPart::Pointer part, bool remove);
 
   };
 
   class ActivationList
   {
 
   public:
 
     //List of parts in the activation order (oldest first)
     typedef std::deque<IWorkbenchPartReference::Pointer> PartListType;
     typedef std::deque<IWorkbenchPartReference::Pointer>::iterator PartListIter;
     typedef std::deque<IWorkbenchPartReference::Pointer>::reverse_iterator PartListReverseIter;
 
   private:
 
     PartListType parts;
 
     WorkbenchPage* page;
 
   public:
 
     ActivationList(WorkbenchPage* page);
 
     /*
      * Add/Move the active part to end of the list;
      */
     void SetActive(SmartPointer<IWorkbenchPart> part);
 
     /*
      * Ensures that the given part appears AFTER any other part in the same
      * container.
      */
     void BringToTop(SmartPointer<IWorkbenchPartReference> ref);
 
     /*
      * Returns the last (most recent) iterator (index) of the given container in the activation list, or returns
      * end() if the given container does not appear in the activation list.
      */
     PartListIter LastIndexOfContainer(SmartPointer<ILayoutContainer> container);
 
     /*
      * Add/Move the active part to end of the list;
      */
     void SetActive(SmartPointer<IWorkbenchPartReference> ref);
 
     /*
      * Add the active part to the beginning of the list.
      */
     void Add(SmartPointer<IWorkbenchPartReference> ref);
 
     /*
      * Return the active part. Filter fast views.
      */
     SmartPointer<IWorkbenchPart> GetActive();
 
     /*
      * Return the previously active part. Filter fast views.
      */
     SmartPointer<IWorkbenchPart> GetPreviouslyActive();
 
     SmartPointer<IWorkbenchPartReference> GetActiveReference(bool editorsOnly);
 
     /*
      * Retuns the index of the part within the activation list. The higher
      * the index, the more recently it was used.
      */
     PartListIter IndexOf(SmartPointer<IWorkbenchPart> part);
 
     /*
      * Returns the index of the part reference within the activation list.
      * The higher the index, the more recent it was used.
      */
     PartListIter IndexOf(SmartPointer<IWorkbenchPartReference> ref);
 
     /*
      * Remove a part from the list
      */
     bool Remove(SmartPointer<IWorkbenchPartReference> ref);
 
     /*
      * Returns the topmost editor on the stack, or null if none.
      */
     SmartPointer<IEditorPart> GetTopEditor();
 
     /*
      * Returns the editors in activation order (oldest first).
      */
     QList<SmartPointer<IEditorReference> > GetEditors();
 
     /*
      * Return a list with all parts (editors and views).
      */
     QList<SmartPointer<IWorkbenchPartReference> > GetParts();
 
   private:
 
     SmartPointer<IWorkbenchPart> GetActive(PartListIter start);
 
     SmartPointer<IWorkbenchPartReference> GetActiveReference(PartListIter start, bool editorsOnly);
 
     /*
      * Find a part in the list starting from the end and filter
      * and views from other perspectives. Will filter fast views
      * unless 'includeActiveFastViews' is true;
      */
     SmartPointer<IWorkbenchPartReference> GetActiveReference(PartListIter start, bool editorsOnly, bool skipPartsObscuredByZoom);
 
   };
 
   /**
    * Helper class to keep track of all opened perspective. Both the opened
    * and used order is kept.
    */
   struct PerspectiveList
   {
 
   public:
     typedef QList<SmartPointer<Perspective> > PerspectiveListType;
     typedef PerspectiveListType::iterator iterator;
 
   private:
 
     /**
      * List of perspectives in the order they were opened;
      */
     PerspectiveListType openedList;
 
     /**
      * List of perspectives in the order they were used. Last element is
      * the most recently used, and first element is the least recently
      * used.
      */
     PerspectiveListType usedList;
 
     /**
      * The perspective explicitly set as being the active one
      */
     SmartPointer<Perspective> active;
 
     void UpdateActionSets(SmartPointer<Perspective> oldPersp,
         SmartPointer<Perspective> newPersp);
 
   public:
 
     /**
      * Creates an empty instance of the perspective list
      */
     PerspectiveList();
 
     /**
      * Update the order of the perspectives in the opened list
      *
      * @param perspective
      * @param newLoc
      */
     void Reorder(IPerspectiveDescriptor::Pointer perspective, int newLoc);
 
     /**
      * Return all perspectives in the order they were activated.
      *
      * @return an array of perspectives sorted by activation order, least
      *         recently activated perspective last.
      */
     PerspectiveListType GetSortedPerspectives();
 
     /**
      * Adds a perspective to the list. No check is done for a duplicate when
      * adding.
      * @param perspective the perspective to add
      * @return boolean <code>true</code> if the perspective was added
      */
     bool Add(SmartPointer<Perspective> perspective);
 
     /**
      * Returns an iterator on the perspective list in the order they were
      * opened.
      */
     PerspectiveListType::iterator Begin();
 
     PerspectiveListType::iterator End();
 
     /**
      * Returns an array with all opened perspectives
      */
     PerspectiveListType GetOpenedPerspectives();
 
     /**
      * Removes a perspective from the list.
      */
     bool Remove(SmartPointer<Perspective> perspective);
 
     /**
      * Swap the opened order of old perspective with the new perspective.
      */
     void Swap(SmartPointer<Perspective> oldPerspective,
         SmartPointer<Perspective> newPerspective);
 
     /**
      * Returns whether the list contains any perspectives
      */
     bool IsEmpty();
 
     /**
      * Returns the most recently used perspective in the list.
      */
     SmartPointer<Perspective> GetActive();
 
     /**
      * Returns the next most recently used perspective in the list.
      */
     SmartPointer<Perspective> GetNextActive();
 
     /**
      * Returns the number of perspectives opened
      */
     PerspectiveListType::size_type Size();
 
     /**
      * Marks the specified perspective as the most recently used one in the
      * list.
      */
     void SetActive(SmartPointer<Perspective> perspective);
 
   };
 
   IAdaptable* input;
 
   void* composite;
 
   //Could be delete. This information is in the active part list;
   ActivationList* activationList;
 
   EditorManager* editorMgr;
 
   EditorAreaHelper* editorPresentation;
 
   //ListenerList propertyChangeListeners = new ListenerList();
 
   PageSelectionService* selectionService;
 
   QScopedPointer<WorkbenchPagePartList> partList; // = new WorkbenchPagePartList(selectionService);
 
   //IActionBars actionBars;
 
   ViewFactory* viewFactory;
 
   PerspectiveList perspList;
 
   SmartPointer<PerspectiveDescriptor> deferredActivePersp;
 
   //NavigationHistory navigationHistory = new NavigationHistory(this);
 
   IStickyViewManager::Pointer stickyViewMan;
 
   /**
    * Returns true if perspective with given id contains view with given id
    */
   bool HasView(const std::string& perspectiveId, const std::string& viewId);
 
   /**
    * If we're in the process of activating a part, this points to the new part.
    * Otherwise, this is null.
    */
   IWorkbenchPartReference::Pointer partBeingActivated;
 
   /**
    * Contains a list of perspectives that may be dirty due to plugin
    * installation and removal.
    */
   std::set<QString> dirtyPerspectives;
 
   ActionSwitcher actionSwitcher;
 
   //IExtensionTracker tracker;
 
   // Deferral count... delays disposing parts and sending certain events if nonzero
   int deferCount;
   // Parts waiting to be disposed
   QList<WorkbenchPartReference::Pointer> pendingDisposals;
 
   SmartPointer<IExtensionPoint> GetPerspectiveExtensionPoint();
 
 public:
 
   /**
    * Constructs a new page with a given perspective and input.
    *
    * @param w
    *            the parent window
    * @param layoutID
    *            must not be <code>null</code>
    * @param input
    *            the page input
    * @throws WorkbenchException
    *             on null layout id
    */
   WorkbenchPage(WorkbenchWindow* w, const QString& layoutID,
       IAdaptable* input);
 
   /**
    * Constructs a page. <code>restoreState(IMemento)</code> should be
    * called to restore this page from data stored in a persistance file.
    *
    * @param w
    *            the parent window
    * @param input
    *            the page input
    * @throws WorkbenchException
    */
   WorkbenchPage(WorkbenchWindow* w, IAdaptable* input);
 
   ~WorkbenchPage();
 
   /**
    * Activates a part. The part will be brought to the front and given focus.
    *
    * @param part
    *            the part to activate
    */
   void Activate(IWorkbenchPart::Pointer part);
 
   /**
    * Activates a part. The part is given focus, the pane is hilighted.
    */
 private:
   void ActivatePart(const IWorkbenchPart::Pointer part);
 
   /**
    * Adds an IPartListener to the part service.
    */
 public:
-  void AddPartListener(IPartListener::Pointer l);
+  void AddPartListener(IPartListener* l);
 
   /*
    * (non-Javadoc) Method declared on ISelectionListener.
    */
 public:
-  void AddSelectionListener(ISelectionListener::Pointer listener);
+  void AddSelectionListener(ISelectionListener* listener);
 
   /*
    * (non-Javadoc) Method declared on ISelectionListener.
    */
 public:
   void AddSelectionListener(const QString& partId,
-      ISelectionListener::Pointer listener);
+      ISelectionListener* listener);
 
   /*
    * (non-Javadoc) Method declared on ISelectionListener.
    */
 public:
-  void AddPostSelectionListener(ISelectionListener::Pointer listener);
+  void AddPostSelectionListener(ISelectionListener* listener);
 
   /*
    * (non-Javadoc) Method declared on ISelectionListener.
    */
 public:
   void AddPostSelectionListener(const QString& partId,
-      ISelectionListener::Pointer listener);
+      ISelectionListener* listener);
 
 private:
   ILayoutContainer::Pointer GetContainer(IWorkbenchPart::Pointer part);
 
 private:
   ILayoutContainer::Pointer GetContainer(IWorkbenchPartReference::Pointer part);
 
 private:
   SmartPointer<PartPane> GetPane(IWorkbenchPart::Pointer part);
 
 private:
   SmartPointer<PartPane> GetPane(IWorkbenchPartReference::Pointer part);
 
   /**
    * Brings a part to the front of its stack. Does not update the active part or
    * active editor. This should only be called if the caller knows that the part
    * is not in the same stack as the active part or active editor, or if the caller
    * is prepared to update activation after the call.
    *
    * @param part
    */
 private:
   bool InternalBringToTop(IWorkbenchPartReference::Pointer part);
 
   /**
    * Moves a part forward in the Z order of a perspective so it is visible.
    * If the part is in the same stack as the active part, the new part is
    * activated.
    *
    * @param part
    *            the part to bring to move forward
    */
 public:
   void BringToTop(IWorkbenchPart::Pointer part);
 
   /**
    * Resets the layout for the perspective. The active part in the old layout
    * is activated in the new layout for consistent user context.
    *
    * Assumes the busy cursor is active.
    */
 private:
   void BusyResetPerspective();
 
   /**
    * Implements <code>setPerspective</code>.
    *
    * Assumes that busy cursor is active.
    *
    * @param desc
    *            identifies the new perspective.
    */
 private:
   void BusySetPerspective(IPerspectiveDescriptor::Pointer desc);
 
   /**
    * Removes the perspective which match the given description.
    *
    * @param desc
    *            identifies the perspective to be removed.
    */
 public:
   void RemovePerspective(IPerspectiveDescriptor::Pointer desc);
 
   /**
    * Shows a view.
    *
    * Assumes that a busy cursor is active.
    */
 protected:
   IViewPart::Pointer BusyShowView(const QString& viewID,
       const QString& secondaryID, int mode);
 
   /*
    * Performs showing of the view in the given mode.
    */
 private:
   void BusyShowView(IViewPart::Pointer part, int mode);
 
   /**
    * Returns whether a part exists in the current page.
    */
 private:
   bool CertifyPart(IWorkbenchPart::Pointer part);
 
   /**
    * Closes the perspective.
    */
 public:
   bool Close();
 
   /**
    * See IWorkbenchPage
    */
 public:
   bool CloseAllSavedEditors();
 
   /**
    * See IWorkbenchPage
    */
 public:
   bool CloseAllEditors(bool save);
 
 private:
   void UpdateActivePart();
 
   /**
    * Makes the given part active. Brings it in front if necessary. Permits null
    * (indicating that no part should be active).
    *
    * @since 3.1
    *
    * @param ref new active part (or null)
    */
 private:
   void MakeActive(IWorkbenchPartReference::Pointer ref);
 
   /**
    * Makes the given editor active. Brings it to front if necessary. Permits <code>null</code>
    * (indicating that no editor is active).
    *
    * @since 3.1
    *
    * @param ref the editor to make active, or <code>null</code> for no active editor
    */
 private:
   void MakeActiveEditor(IEditorReference::Pointer ref);
 
   /**
    * See IWorkbenchPage
    */
 public:
   bool CloseEditors(const QList<IEditorReference::Pointer>& refArray,
       bool save);
 
   /**
    * Enables or disables listener notifications. This is used to delay listener notifications until the
    * end of a public method.
    *
    * @param shouldDefer
    */
 private:
   void DeferUpdates(bool shouldDefer);
 
 private:
   void StartDeferring();
 
 private:
   void HandleDeferredEvents();
 
 private:
   bool IsDeferred();
 
   /**
    * See IWorkbenchPage#closeEditor
    */
 public:
   bool CloseEditor(IEditorReference::Pointer editorRef, bool save);
 
   /**
    * See IWorkbenchPage#closeEditor
    */
 public:
   bool CloseEditor(IEditorPart::Pointer editor, bool save);
 
   /**
    * Closes current perspective. If last perspective, then entire page
    * is closed.
    *
    * @param saveParts
    *            whether the page's parts should be saved if closed
    * @param closePage
    *            whether the page itself should be closed if last perspective
    */
 public:
   void CloseCurrentPerspective(bool saveParts, bool closePage);
 
   /**
    * @see IWorkbenchPage#closePerspective(IPerspectiveDescriptor, boolean, boolean)
    */
 public:
   void ClosePerspective(IPerspectiveDescriptor::Pointer desc, bool saveParts,
       bool closePage);
 
   /**
    * Closes the specified perspective. If last perspective, then entire page
    * is closed.
    *
    * @param persp
    *            the perspective to be closed
    * @param saveParts
    *            whether the parts that are being closed should be saved
    *            (editors if last perspective, views if not shown in other
    *            parspectives)
    */
   /* package */
 protected:
   void ClosePerspective(SmartPointer<Perspective> persp, bool saveParts,
       bool closePage);
 
   /**
    * @see IWorkbenchPage#closeAllPerspectives(boolean, boolean)
    */
 public:
   void CloseAllPerspectives(bool saveEditors, bool closePage);
 
   /**
    * Creates the client composite.
    */
 private:
   void CreateClientComposite();
 
   /**
    * Creates a new view set. Return null on failure.
    *
    * @param desc the perspective descriptor
    * @param notify whether to fire a perspective opened event
    */
 private:
   SmartPointer<Perspective> CreatePerspective(SmartPointer<PerspectiveDescriptor> desc,
       bool notify);
 
   /**
    * This is called by child objects after a part has been added to the page.
    * The page will in turn notify its listeners.
    */
   /* package */
 protected:
   void PartAdded(WorkbenchPartReference::Pointer ref);
 
   /**
    * This is called by child objects after a part has been added to the page.
    * The part will be queued for disposal after all listeners have been notified
    */
   /* package */
 protected:
   void PartRemoved(WorkbenchPartReference::Pointer ref);
 
 private:
   void DisposePart(WorkbenchPartReference::Pointer ref);
 
   /**
    * Deactivates a part. The pane is unhilighted.
    */
 private:
   void DeactivatePart(IWorkbenchPart::Pointer part);
 
   /**
    * Detaches a view from the WorkbenchWindow.
    */
 public:
   void DetachView(IViewReference::Pointer ref);
 
   /**
    * Removes a detachedwindow.
    */
 public:
   void AttachView(IViewReference::Pointer ref);
 
   /**
    * Dispose a perspective.
    *
    * @param persp the perspective descriptor
    * @param notify whether to fire a perspective closed event
    */
 private:
   void DisposePerspective(SmartPointer<Perspective> persp, bool notify);
 
   /**
    * Returns the first view manager with given ID.
    */
 public:
   SmartPointer<Perspective> FindPerspective(IPerspectiveDescriptor::Pointer desc);
 
   /**
    * See IWorkbenchPage@findView.
    */
 public:
   IViewPart::Pointer FindView(const QString& id);
 
   /*
    * (non-Javadoc)
    *
    * @see org.blueberry.ui.IWorkbenchPage
    */
 public:
   IViewReference::Pointer FindViewReference(const QString& viewId);
 
   /*
    * (non-Javadoc)
    *
    * @see org.blueberry.ui.IWorkbenchPage
    */
 public:
   IViewReference::Pointer FindViewReference(const QString& viewId,
       const QString& secondaryId);
 
   /**
    * Notify property change listeners about a property change.
    *
    * @param changeId
    *            the change id
    * @param oldValue
    *            old property value
    * @param newValue
    *            new property value
    */
   //private: void FirePropertyChange(String changeId, Object oldValue,
   //            Object newValue) {
   //
   //        UIListenerLogging.logPagePropertyChanged(this, changeId, oldValue, newValue);
   //
   //        Object[] listeners = propertyChangeListeners.getListeners();
   //        PropertyChangeEvent event = new PropertyChangeEvent(this, changeId,
   //                oldValue, newValue);
   //
   //        for (int i = 0; i < listeners.length; i++) {
   //            ((IPropertyChangeListener) listeners[i]).propertyChange(event);
   //        }
   //    }
 
 
   /**
    * @see IWorkbenchPage
    */
 public:
   IEditorPart::Pointer GetActiveEditor();
 
   /**
    * Returns the reference for the active editor, or <code>null</code>
    * if there is no active editor.
    *
    * @return the active editor reference or <code>null</code>
    */
 public:
   IEditorReference::Pointer GetActiveEditorReference();
 
   /*
    * (non-Javadoc) Method declared on IPartService
    */
 public:
   IWorkbenchPart::Pointer GetActivePart();
 
   /*
    * (non-Javadoc) Method declared on IPartService
    */
 public:
   IWorkbenchPartReference::Pointer GetActivePartReference();
 
   /**
    * Returns the active perspective for the page, <code>null</code> if
    * none.
    */
 public:
   SmartPointer<Perspective> GetActivePerspective();
 
   /**
    * Returns the client composite.
    */
 public:
   void* GetClientComposite();
 
   //  for dynamic UI - change access from private to protected
   // for testing purposes only, changed from protected to public
   /**
    * Answer the editor manager for this window.
    */
 public:
   EditorManager* GetEditorManager();
 
   /**
    * Answer the perspective presentation.
    */
 public:
   PerspectiveHelper* GetPerspectivePresentation();
 
   /**
    * Answer the editor presentation.
    */
 public:
   EditorAreaHelper* GetEditorPresentation();
 
   /**
    * Allow access to the part service for this page ... used internally to
    * propogate certain types of events to the page part listeners.
    * @return the part service for this page.
    */
 public: PartService* GetPartService();
 
   /**
    * See IWorkbenchPage.
    */
 public:
   QList<IEditorPart::Pointer> GetEditors();
 
 public:
   QList<IEditorPart::Pointer> GetDirtyEditors();
 
 public:
   QList<ISaveablePart::Pointer> GetDirtyParts();
 
   /**
    * See IWorkbenchPage.
    */
 public:
   IEditorPart::Pointer FindEditor(IEditorInput::Pointer input);
 
   /**
    * See IWorkbenchPage.
    */
 public:
   QList<IEditorReference::Pointer> FindEditors(
       IEditorInput::Pointer input, const QString& editorId, int matchFlags);
 
   /**
    * See IWorkbenchPage.
    */
 public:
   QList<IEditorReference::Pointer> GetEditorReferences();
 
   /**
    * @see IWorkbenchPage
    */
 public:
   IAdaptable* GetInput();
 
   /**
    * Returns the page label. This is a combination of the page input and
    * active perspective.
    */
 public:
   QString GetLabel();
 
   /**
    * Returns the perspective.
    */
 public:
   IPerspectiveDescriptor::Pointer GetPerspective();
 
   /*
    * (non-Javadoc) Method declared on ISelectionService
    */
 public:
   ISelection::ConstPointer GetSelection() const;
 
   /*
    * (non-Javadoc) Method declared on ISelectionService
    */
 public:
   ISelection::ConstPointer GetSelection(const QString& partId);
 
 //public:
 //  SelectionEvents& GetSelectionEvents(const QString& partId = "");
 
   /*
    * Returns the view factory.
    */
 public:
   ViewFactory* GetViewFactory();
 
   /**
    * See IWorkbenchPage.
    */
 public:
   QList<IViewReference::Pointer> GetViewReferences();
 
   /**
    * See IWorkbenchPage.
    */
 public:
   QList<IViewPart::Pointer> GetViews();
 
   /**
    * Returns all view parts in the specified perspective
    *
    * @param persp the perspective
    * @return an array of view parts
    * @since 3.1
    */
   /*package*/
 protected:
   QList<IViewPart::Pointer> GetViews(SmartPointer<Perspective> persp,
       bool restore);
 
   /**
    * See IWorkbenchPage.
    */
 public:
   IWorkbenchWindow::Pointer GetWorkbenchWindow();
 
   /*
    * (non-Javadoc)
    *
    * @see org.blueberry.ui.IWorkbenchPage#hideView(org.blueberry.ui.IViewReference)
    */
 public:
   void HideView(IViewReference::Pointer ref);
 
   /* package */
 protected:
   void RefreshActiveView();
 
   /**
    * See IPerspective
    */
 public:
   void HideView(IViewPart::Pointer view);
 
   /**
    * Initialize the page.
    *
    * @param w
    *            the parent window
    * @param layoutID
    *            may be <code>null</code> if restoring from file
    * @param input
    *            the page input
    * @param openExtras
    *            whether to process the perspective extras preference
    */
 private:
   void Init(WorkbenchWindow* w, const QString& layoutID,
       IAdaptable* input, bool openExtras);
 
   /**
    * Opens the perspectives specified in the PERSPECTIVE_BAR_EXTRAS preference (see bug 84226).
    */
 public:
   void OpenPerspectiveExtras();
 
   /**
    * See IWorkbenchPage.
    */
 public:
   bool IsPartVisible(IWorkbenchPart::Pointer part);
 
   /**
    * See IWorkbenchPage.
    */
 public:
   bool IsEditorAreaVisible();
 
   /**
    * Returns whether the view is fast.
    */
 public:
   bool IsFastView(IViewReference::Pointer ref);
 
   /**
    * Return whether the view is closeable or not.
    *
    * @param ref the view reference to check.  Must not be <code>null</code>.
    * @return true if the part is closeable.
    * @since 3.1.1
    */
 public:
   bool IsCloseable(IViewReference::Pointer ref);
 
   /**
    * Return whether the view is moveable or not.
    *
    * @param ref the view reference to check.  Must not be <code>null</code>.
    * @return true if the part is moveable.
    * @since 3.1.1
    */
 public:
   bool IsMoveable(IViewReference::Pointer ref);
 
   /**
    * Returns whether the layout of the active
    * perspective is fixed.
    */
 public:
   bool IsFixedLayout();
 
   /**
    * Return true if the perspective has a dirty editor.
    */
 protected:
   bool IsSaveNeeded();
 
   /**
    * This method is called when the page is activated.
    */
 protected:
   void OnActivate();
 
   /**
    * This method is called when the page is deactivated.
    */
 protected:
   void OnDeactivate();
 
   /**
    * See IWorkbenchPage.
    */
 public:
   void
   ReuseEditor(IReusableEditor::Pointer editor, IEditorInput::Pointer input);
 
   /**
    * See IWorkbenchPage.
    */
 public:
   IEditorPart::Pointer OpenEditor(IEditorInput::Pointer input,
       const QString& editorID);
 
   /**
    * See IWorkbenchPage.
    */
 public:
   IEditorPart::Pointer OpenEditor(IEditorInput::Pointer input,
       const QString& editorID, bool activate);
 
   /**
    * See IWorkbenchPage.
    */
 public:
   IEditorPart::Pointer OpenEditor(IEditorInput::Pointer input,
       const QString& editorID, bool activate, int matchFlags);
 
   /**
    * This is not public API but for use internally.  editorState can be <code>null</code>.
    */
 public:
   IEditorPart::Pointer OpenEditor(IEditorInput::Pointer input,
       const QString& editorID, bool activate, int matchFlags,
       IMemento::Pointer editorState);
 
   /*
    * Added to fix Bug 178235 [EditorMgmt] DBCS 3.3 - Cannot open file with external program.
    * Opens a new editor using the given input and descriptor. (Normally, editors are opened using
    * an editor ID and an input.)
    */
 public:
   IEditorPart::Pointer OpenEditorFromDescriptor(IEditorInput::Pointer input,
       IEditorDescriptor::Pointer editorDescriptor, bool activate,
       IMemento::Pointer editorState);
 
   /**
    * @see #openEditor(IEditorInput, String, boolean, int)
    */
 private:
   IEditorPart::Pointer BusyOpenEditor(IEditorInput::Pointer input,
       const QString& editorID, bool activate, int matchFlags,
       IMemento::Pointer editorState);
 
   /*
    * Added to fix Bug 178235 [EditorMgmt] DBCS 3.3 - Cannot open file with external program.
    * See openEditorFromDescriptor().
    */
 private:
   IEditorPart::Pointer BusyOpenEditorFromDescriptor(
       IEditorInput::Pointer input,
       EditorDescriptor::Pointer editorDescriptor, bool activate,
       IMemento::Pointer editorState);
 
   /**
    * Do not call this method.  Use <code>busyOpenEditor</code>.
    *
    * @see IWorkbenchPage#openEditor(IEditorInput, String, boolean)
    */
 protected:
   IEditorPart::Pointer BusyOpenEditorBatched(IEditorInput::Pointer input,
       const QString& editorID, bool activate, int matchFlags,
       IMemento::Pointer editorState);
 
   /*
    * Added to fix Bug 178235 [EditorMgmt] DBCS 3.3 - Cannot open file with external program.
    * See openEditorFromDescriptor().
    */
 private:
   IEditorPart::Pointer BusyOpenEditorFromDescriptorBatched(
       IEditorInput::Pointer input, EditorDescriptor::Pointer editorDescriptor,
       bool activate, IMemento::Pointer editorState);
 
 public:
   void OpenEmptyTab();
 
 protected:
   void ShowEditor(bool activate, IEditorPart::Pointer editor);
 
   /**
    * See IWorkbenchPage.
    */
 public:
   bool IsEditorPinned(IEditorPart::Pointer editor);
 
   /**
    * Removes an IPartListener from the part service.
    */
 public:
-  void RemovePartListener(IPartListener::Pointer l);
+  void RemovePartListener(IPartListener* l);
 
   /*
    * (non-Javadoc) Method declared on ISelectionListener.
    */
 public:
-  void RemoveSelectionListener(ISelectionListener::Pointer listener);
+  void RemoveSelectionListener(ISelectionListener* listener);
 
   /*
    * (non-Javadoc) Method declared on ISelectionListener.
    */
 public:
   void RemoveSelectionListener(const QString& partId,
-      ISelectionListener::Pointer listener);
+                               ISelectionListener* listener);
 
   /*
    * (non-Javadoc) Method declared on ISelectionListener.
    */
 public:
-  void RemovePostSelectionListener(ISelectionListener::Pointer listener);
+  void RemovePostSelectionListener(ISelectionListener* listener);
 
   /*
    * (non-Javadoc) Method declared on ISelectionListener.
    */
 public:
   void RemovePostSelectionListener(const QString& partId,
-      ISelectionListener::Pointer listener);
+                                   ISelectionListener* listener);
 
   /**
    * This method is called when a part is activated by clicking within it. In
    * response, the part, the pane, and all of its actions will be activated.
    *
    * In the current design this method is invoked by the part pane when the
    * pane, the part, or any children gain focus.
    */
 public:
   void RequestActivation(IWorkbenchPart::Pointer part);
 
   /**
    * Resets the layout for the perspective. The active part in the old layout
    * is activated in the new layout for consistent user context.
    */
 public:
   void ResetPerspective();
 
   /**
    * Restore this page from the memento and ensure that the active
    * perspective is equals the active descriptor otherwise create a new
    * perspective for that descriptor. If activeDescriptor is null active the
    * old perspective.
    */
 public:
   /*IStatus*/bool RestoreState(IMemento::Pointer memento,
       IPerspectiveDescriptor::Pointer activeDescriptor);
 
   /**
    * See IWorkbenchPage
    */
 public:
   bool SaveAllEditors(bool confirm);
 
   /**
    * @param confirm
    * @param addNonPartSources true if saveables from non-part sources should be saved too
    * @return false if the user cancelled
    *
    */
 public:
   bool SaveAllEditors(bool confirm, bool addNonPartSources);
 
   /*
    * Saves the workbench part.
    */
 protected:
   bool SavePart(ISaveablePart::Pointer saveable, IWorkbenchPart::Pointer part,
       bool confirm);
 
   /**
    * Saves an editors in the workbench. If <code>confirm</code> is <code>true</code>
    * the user is prompted to confirm the command.
    *
    * @param confirm
    *            if user confirmation should be sought
    * @return <code>true</code> if the command succeeded, or <code>false</code>
    *         if the user cancels the command
    */
 public:
   bool SaveEditor(IEditorPart::Pointer editor, bool confirm);
 
   /**
    * Saves the current perspective.
    */
 public:
   void SavePerspective();
 
   /**
    * Saves the perspective.
    */
 public:
   void SavePerspectiveAs(IPerspectiveDescriptor::Pointer newDesc);
 
   /**
    * Save the state of the page.
    */
 public:
   /*IStatus*/bool SaveState(IMemento::Pointer memento);
 
 private:
   QString GetId(IWorkbenchPart::Pointer part);
 
 private:
   QString GetId(IWorkbenchPartReference::Pointer ref);
 
   /**
    * Sets the active part.
    */
 private:
   void SetActivePart(IWorkbenchPart::Pointer newPart);
 
   /**
    * See IWorkbenchPage.
    */
 public:
   void SetEditorAreaVisible(bool showEditorArea);
 
   /**
    * Sets the layout of the page. Assumes the new perspective is not null.
    * Keeps the active part if possible. Updates the window menubar and
    * toolbar if necessary.
    */
 private:
   void SetPerspective(SmartPointer<Perspective> newPersp);
 
   /*
    * Update visibility state of all views.
    */
 private:
   void UpdateVisibility(SmartPointer<Perspective> oldPersp,
       SmartPointer<Perspective> newPersp);
 
   /**
    * Sets the perspective.
    *
    * @param desc
    *            identifies the new perspective.
    */
 public:
   void SetPerspective(IPerspectiveDescriptor::Pointer desc);
 
   /**
    * Restore the toolbar layout for the active perspective.
    */
 protected:
   void ResetToolBarLayout();
 
   /**
    * See IWorkbenchPage.
    */
 public:
   IViewPart::Pointer ShowView(const QString& viewID);
 
   /*
    * (non-Javadoc)
    *
    * @see org.blueberry.ui.IWorkbenchPage#showView(java.lang.String,
    *      java.lang.String, int)
    */
 public:
   IViewPart::Pointer ShowView(const QString& viewID,
       const QString& secondaryID, int mode);
 
   /**
    * @param mode the mode to test
    * @return whether the mode is recognized
    * @since 3.0
    */
 private:
   bool CertifyMode(int mode);
 
   /*
    * Returns the editors in activation order (oldest first).
    */
 public:
   QList<IEditorReference::Pointer> GetSortedEditors();
 
   /**
    * @see IWorkbenchPage#getOpenPerspectives()
    */
 public:
   QList<IPerspectiveDescriptor::Pointer> GetOpenPerspectives();
 
   /**
    * Return all open Perspective objects.
    *
    * @return all open Perspective objects
    * @since 3.1
    */
   /*package*/
 protected:
   QList<SmartPointer<Perspective> > GetOpenInternalPerspectives();
 
   /**
    * Checks perspectives in the order they were activiated
    * for the specfied part.  The first sorted perspective
    * that contains the specified part is returned.
    *
    * @param part specified part to search for
    * @return the first sorted perspespective containing the part
    * @since 3.1
    */
   /*package*/
 protected:
   SmartPointer<Perspective> GetFirstPerspectiveWithView(IViewPart::Pointer part);
 
   /**
    * Returns the perspectives in activation order (oldest first).
    */
 public:
   QList<IPerspectiveDescriptor::Pointer> GetSortedPerspectives();
 
   /*
    * Returns the parts in activation order (oldest first).
    */
 public:
   QList<IWorkbenchPartReference::Pointer> GetSortedParts();
 
   /**
    * Returns the reference to the given part, or <code>null</code> if it has no reference
    * (i.e. it is not a top-level part in this workbench page).
    *
    * @param part the part
    * @return the part's reference or <code>null</code> if the given part does not belong
    * to this workbench page
    */
 public:
   IWorkbenchPartReference::Pointer GetReference(IWorkbenchPart::Pointer part);
 
   //  private: class ActivationList {
   //        //List of parts in the activation order (oldest first)
   //        List parts = new ArrayList();
   //
   //        /*
   //         * Add/Move the active part to end of the list;
   //         */
   //        void setActive(IWorkbenchPart part) {
   //            if (parts.size() <= 0) {
   //        return;
   //      }
   //      IWorkbenchPartReference ref = getReference(part);
   //      if (ref != null) {
   //        if (ref == parts.get(parts.size() - 1)) {
   //          return;
   //        }
   //        parts.remove(ref);
   //        parts.add(ref);
   //      }
   //        }
   //
   //        /*
   //     * Ensures that the given part appears AFTER any other part in the same
   //     * container.
   //     */
   //        void bringToTop(IWorkbenchPartReference ref) {
   //            ILayoutContainer targetContainer = getContainer(ref);
   //
   //            int newIndex = lastIndexOfContainer(targetContainer);
   //
   //            //New index can be -1 if there is no last index
   //            if (newIndex >= 0 && ref == parts.get(newIndex))
   //        return;
   //
   //            parts.remove(ref);
   //            if(newIndex >= 0)
   //              parts.add(newIndex, ref);
   //            else
   //              parts.add(ref);
   //        }
   //
   //        /*
   //         * Returns the last (most recent) index of the given container in the activation list, or returns
   //         * -1 if the given container does not appear in the activation list.
   //         */
   //        int lastIndexOfContainer(ILayoutContainer container) {
   //            for (int i = parts.size() - 1; i >= 0; i--) {
   //                IWorkbenchPartReference ref = (IWorkbenchPartReference)parts.get(i);
   //
   //                ILayoutContainer cnt = getContainer(ref);
   //                if (cnt == container) {
   //                    return i;
   //                }
   //            }
   //
   //            return -1;
   //        }
   //
   //        /*
   //         * Add/Move the active part to end of the list;
   //         */
   //        void setActive(IWorkbenchPartReference ref) {
   //            setActive(ref.getPart(true));
   //        }
   //
   //        /*
   //         * Add the active part to the beginning of the list.
   //         */
   //        void add(IWorkbenchPartReference ref) {
   //            if (parts.indexOf(ref) >= 0) {
   //        return;
   //      }
   //
   //            IWorkbenchPart part = ref.getPart(false);
   //            if (part != null) {
   //                PartPane pane = ((PartSite) part.getSite()).getPane();
   //                if (pane instanceof MultiEditorInnerPane) {
   //                    MultiEditorInnerPane innerPane = (MultiEditorInnerPane) pane;
   //                    add(innerPane.getParentPane().getPartReference());
   //                    return;
   //                }
   //            }
   //            parts.add(0, ref);
   //        }
   //
   //        /*
   //         * Return the active part. Filter fast views.
   //         */
   //        IWorkbenchPart getActive() {
   //            if (parts.isEmpty()) {
   //        return null;
   //      }
   //            return getActive(parts.size() - 1);
   //        }
   //
   //        /*
   //         * Return the previously active part. Filter fast views.
   //         */
   //        IWorkbenchPart getPreviouslyActive() {
   //            if (parts.size() < 2) {
   //        return null;
   //      }
   //            return getActive(parts.size() - 2);
   //        }
   //
   //  private: IWorkbenchPart getActive(int start) {
   //            IWorkbenchPartReference ref = getActiveReference(start, false);
   //
   //            if (ref == null) {
   //                return null;
   //            }
   //
   //            return ref.getPart(true);
   //        }
   //
   //  public: IWorkbenchPartReference getActiveReference(boolean editorsOnly) {
   //            return getActiveReference(parts.size() - 1, editorsOnly);
   //        }
   //
   //  private: IWorkbenchPartReference getActiveReference(int start, boolean editorsOnly) {
   //            // First look for parts that aren't obscured by the current zoom state
   //            IWorkbenchPartReference nonObscured = getActiveReference(start, editorsOnly, true);
   //
   //            if (nonObscured != null) {
   //                return nonObscured;
   //            }
   //
   //            // Now try all the rest of the parts
   //            return getActiveReference(start, editorsOnly, false);
   //        }
   //
   //        /*
   //         * Find a part in the list starting from the end and filter
   //         * and views from other perspectives. Will filter fast views
   //         * unless 'includeActiveFastViews' is true;
   //         */
   //  private: IWorkbenchPartReference getActiveReference(int start, boolean editorsOnly, boolean skipPartsObscuredByZoom) {
   //            IWorkbenchPartReference[] views = getViewReferences();
   //            for (int i = start; i >= 0; i--) {
   //                WorkbenchPartReference ref = (WorkbenchPartReference) parts
   //                        .get(i);
   //
   //                if (editorsOnly && !(ref instanceof IEditorReference)) {
   //                    continue;
   //                }
   //
   //                // Skip parts whose containers have disabled auto-focus
   //                PartPane pane = ref.getPane();
   //
   //                if (pane != null) {
   //                    if (!pane.allowsAutoFocus()) {
   //                        continue;
   //                    }
   //
   //                    if (skipPartsObscuredByZoom) {
   //                        if (pane.isObscuredByZoom()) {
   //                            continue;
   //                        }
   //                    }
   //                }
   //
   //                // Skip fastviews (unless overridden)
   //                if (ref instanceof IViewReference) {
   //                    if (ref == getActiveFastView() || !((IViewReference) ref).isFastView()) {
   //                        for (int j = 0; j < views.length; j++) {
   //                            if (views[j] == ref) {
   //                                return ref;
   //                            }
   //                        }
   //                    }
   //                } else {
   //                    return ref;
   //                }
   //            }
   //            return null;
   //        }
   //
   //        /*
   //         * Retuns the index of the part within the activation list. The higher
   //         * the index, the more recently it was used.
   //         */
   //        int indexOf(IWorkbenchPart part) {
   //          IWorkbenchPartReference ref = getReference(part);
   //          if (ref == null) {
   //            return -1;
   //          }
   //            return parts.indexOf(ref);
   //        }
   //
   //        /*
   //         * Returns the index of the part reference within the activation list.
   //         * The higher the index, the more recent it was used.
   //         */
   //        int indexOf(IWorkbenchPartReference ref) {
   //            return parts.indexOf(ref);
   //        }
   //
   //        /*
   //         * Remove a part from the list
   //         */
   //        boolean remove(IWorkbenchPartReference ref) {
   //            return parts.remove(ref);
   //        }
   //
   //        /*
   //         * Returns the editors in activation order (oldest first).
   //         */
   //  private: IEditorReference[] getEditors() {
   //            ArrayList editors = new ArrayList(parts.size());
   //            for (Iterator i = parts.iterator(); i.hasNext();) {
   //                IWorkbenchPartReference part = (IWorkbenchPartReference) i
   //                        .next();
   //                if (part instanceof IEditorReference) {
   //                    editors.add(part);
   //                }
   //            }
   //            return (IEditorReference[]) editors
   //                    .toArray(new IEditorReference[editors.size()]);
   //        }
   //
   //        /*
   //         * Return a list with all parts (editors and views).
   //         */
   //        private: IWorkbenchPartReference[] getParts() {
   //            IWorkbenchPartReference[] views = getViewReferences();
   //            ArrayList resultList = new ArrayList(parts.size());
   //            for (Iterator iterator = parts.iterator(); iterator.hasNext();) {
   //                IWorkbenchPartReference ref = (IWorkbenchPartReference) iterator
   //                        .next();
   //                if (ref instanceof IViewReference) {
   //                    //Filter views from other perspectives
   //                    for (int i = 0; i < views.length; i++) {
   //                        if (views[i] == ref) {
   //                            resultList.add(ref);
   //                            break;
   //                        }
   //                    }
   //                } else {
   //                    resultList.add(ref);
   //                }
   //            }
   //            IWorkbenchPartReference[] result = new IWorkbenchPartReference[resultList
   //                    .size()];
   //            return (IWorkbenchPartReference[]) resultList.toArray(result);
   //        }
   //
   //        /*
   //         * Returns the topmost editor on the stack, or null if none.
   //         */
   //        IEditorPart getTopEditor() {
   //            IEditorReference editor = (IEditorReference)getActiveReference(parts.size() - 1, true);
   //
   //            if (editor == null) {
   //                return null;
   //            }
   //
   //            return editor.getEditor(true);
   //        }
   //    };
 
 
   // for dynamic UI
 protected:
   void AddPerspective(SmartPointer<Perspective> persp);
 
   /**
    * Find the stack of view references stacked with this view part.
    *
    * @param part
    *            the part
    * @return the stack of references
    * @since 3.0
    */
 private:
   QList<IViewReference::Pointer> GetViewReferenceStack(
       IViewPart::Pointer part);
 
   /*
    * (non-Javadoc)
    *
    * @see org.blueberry.ui.IWorkbenchPage#getViewStack(org.blueberry.ui.IViewPart)
    */
 public:
   QList<IViewPart::Pointer> GetViewStack(IViewPart::Pointer part);
 
   /**
    * Allow for programmatically resizing a part.
    * <p>
    * <em>EXPERIMENTAL</em>
    * </p>
    * <p>
    * Known limitations:
    * <ul>
    * <li>currently applies only to views</li>
    * <li>has no effect when view is zoomed</li>
    * </ul>
    */
 public:
   void ResizeView(IViewPart::Pointer part, int width, int height);
 
 private:
 
   struct ActivationOrderPred : std::binary_function<IViewReference::Pointer,
   IViewReference::Pointer, bool>
   {
     ActivationOrderPred(ActivationList* partList);
 
     ActivationList* activationList;
 
     bool operator()(const IViewReference::Pointer o1, const IViewReference::Pointer o2) const;
   };
 
   // provides sash information for the given pane
   struct SashInfo
   {
 
     SmartPointer<LayoutPartSash> right;
 
     SmartPointer<LayoutPartSash> left;
 
     SmartPointer<LayoutPartSash> top;
 
     SmartPointer<LayoutPartSash> bottom;
 
     SmartPointer<LayoutTreeNode> rightNode;
 
     SmartPointer<LayoutTreeNode> leftNode;
 
     SmartPointer<LayoutTreeNode> topNode;
 
     SmartPointer<LayoutTreeNode> bottomNode;
   };
 
   void FindSashParts(SmartPointer<LayoutTree> tree, const PartPane::Sashes& sashes,
       SashInfo& info);
 
   /**
    * Returns all parts that are owned by this page
    *
    * @return
    */
 protected:
   QList<IWorkbenchPartReference::Pointer> GetAllParts();
 
   /**
    * Returns all open parts that are owned by this page (that is, all parts
    * for which a part opened event would have been sent -- these would be
    * activated parts whose controls have already been created.
    */
 protected:
   QList<IWorkbenchPartReference::Pointer> GetOpenParts();
 
   /**
    * Sanity-checks the objects in this page. Throws an Assertation exception
    * if an object's internal state is invalid. ONLY INTENDED FOR USE IN THE
    * UI TEST SUITES.
    */
 public:
   void TestInvariants();
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.IWorkbenchPage#getExtensionTracker()
    */
   //public: IExtensionTracker GetExtensionTracker();
 
   /*
    * (non-Javadoc)
    *
    * @see org.blueberry.ui.IWorkbenchPage#getPerspectiveShortcuts()
    */
 public:
   QList<QString> GetPerspectiveShortcuts();
 
   /*
    * (non-Javadoc)
    *
    * @see org.blueberry.ui.IWorkbenchPage#getShowViewShortcuts()
    */
 public:
   QList<QString> GetShowViewShortcuts();
 
   /**
    * @since 3.1
    */
 private:
   void SuggestReset();
 
 public:
   bool IsPartVisible(IWorkbenchPartReference::Pointer reference);
 
 };
 
 }
 #endif /*BERRYWORKBENCHPAGE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchPartReference.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchPartReference.cpp
index 41ee1ba2fa..49549508ca 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchPartReference.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchPartReference.cpp
@@ -1,717 +1,717 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryWorkbenchPartReference.h"
 
 #include <berryPlatformException.h>
 #include <berryObjects.h>
 
 #include "berryWorkbenchPlugin.h"
 #include "berryUtil.h"
 #include "berryPartPane.h"
 #include "berryIWorkbenchPartSite.h"
 #include "berryIEditorPart.h"
 #include "berryIWorkbenchPartConstants.h"
 #include "berryImageDescriptor.h"
 
 namespace berry
 {
 
 int WorkbenchPartReference::STATE_LAZY = 0;
 int WorkbenchPartReference::STATE_CREATION_IN_PROGRESS = 1;
 int WorkbenchPartReference::STATE_CREATED = 2;
 int WorkbenchPartReference::STATE_DISPOSED = 3;
 
 WorkbenchPartReference::PropertyChangeListener::PropertyChangeListener(
     WorkbenchPartReference* ref) :
   partRef(ref)
 {
 
 }
 void WorkbenchPartReference::PropertyChangeListener::PropertyChange(
-    PropertyChangeEvent::Pointer event)
+    const PropertyChangeEvent::Pointer& event)
 {
   if (event->GetProperty() == IWorkbenchPartConstants::INTEGER_PROPERTY)
   {
     partRef->PropertyChanged(event->GetSource(), event->GetNewValue().Cast<ObjectInt>()->GetValue());
   }
   else
   {
     partRef->PropertyChanged(event);
   }
 }
 
 WorkbenchPartReference::WorkbenchPartReference()
   : state(STATE_LAZY)
   , pinned(false)
   , image(0)
   , propertyChangeListener(new PropertyChangeListener(this))
 {
 }
 
 WorkbenchPartReference::~WorkbenchPartReference()
 {
   this->Register();
   part = 0;
   pane = 0;
   this->UnRegister(false);
 }
 
 bool WorkbenchPartReference::IsDisposed() const
 {
   return state == STATE_DISPOSED;
 }
 
 void WorkbenchPartReference::CheckReference()
 {
   if (state == STATE_DISPOSED)
   {
     throw Poco::RuntimeException("Error: IWorkbenchPartReference disposed"); //$NON-NLS-1$
   }
 }
 
 /**
  * Calling this with deferEvents(true) will queue all property change events until a subsequent
  * call to deferEvents(false). This should be used at the beginning of a batch of related changes
  * to prevent duplicate property change events from being sent.
  *
  * @param shouldQueue
  */
 //void WorkbenchPartReference::DeferEvents(bool shouldQueue) {
 //        queueEvents = shouldQueue;
 //
 //        if (queueEvents == false) {
 //          // do not use nextSetBit, to allow compilation against JCL Foundation (bug 80053)
 //          for (int i = 0, n = queuedEvents.size(); i < n; ++i) {
 //            if (queuedEvents.get(i)) {
 //              firePropertyChange(i);
 //              queuedEvents.clear(i);
 //            }
 //            }
 //        }
 //    }
 
 void WorkbenchPartReference::SetPartName(const QString& newPartName)
 {
   if (partName == newPartName)
   {
     return;
   }
 
   partName = newPartName;
   this->FirePropertyChange(IWorkbenchPartConstants::PROP_PART_NAME);
 }
 
 void WorkbenchPartReference::SetContentDescription(
     const QString& newContentDescription)
 {
   if (contentDescription == newContentDescription)
   {
     return;
   }
 
   contentDescription = newContentDescription;
   this->FirePropertyChange(IWorkbenchPartConstants::PROP_CONTENT_DESCRIPTION);
 }
 
 void WorkbenchPartReference::SetImageDescriptor(
     ImageDescriptor::Pointer descriptor)
 {
   if (imageDescriptor == descriptor)
   {
     return;
   }
 
   void* oldImage = image;
   ImageDescriptor::Pointer oldDescriptor = imageDescriptor;
   image = 0;
   imageDescriptor = descriptor;
 
   // Don't queue events triggered by image changes. We'll dispose the image
   // immediately after firing the event, so we need to fire it right away.
   this->ImmediateFirePropertyChange(IWorkbenchPartConstants::PROP_TITLE);
   if (queueEvents)
   {
     // If there's a PROP_TITLE event queued, remove it from the queue because
     // we've just fired it.
     queuedEvents.remove(IWorkbenchPartConstants::PROP_TITLE);
   }
 
   // If we had allocated the old image, deallocate it now (AFTER we fire the property change
   // -- listeners may need to clean up references to the old image)
   if (oldImage && oldDescriptor)
   {
     //JFaceResources.getResources().destroy(oldDescriptor);
     oldDescriptor->DestroyImage(oldImage);
   }
 }
 
 void WorkbenchPartReference::SetToolTip(const QString& newToolTip)
 {
   if (tooltip == newToolTip)
   {
     return;
   }
 
   tooltip = newToolTip;
   this->FirePropertyChange(IWorkbenchPartConstants::PROP_TITLE);
 }
 
-void WorkbenchPartReference::PropertyChanged(Object::Pointer  /*source*/, int propId)
+void WorkbenchPartReference::PropertyChanged(const Object::Pointer& /*source*/, int propId)
 {
 
   // We handle these properties directly (some of them may be transformed
   // before firing events to workbench listeners)
   if (propId == IWorkbenchPartConstants::PROP_CONTENT_DESCRIPTION || propId
       == IWorkbenchPartConstants::PROP_PART_NAME || propId
       == IWorkbenchPartConstants::PROP_TITLE)
   {
 
     this->RefreshFromPart();
   }
   else
   {
     // Any other properties are just reported to listeners verbatim
     this->FirePropertyChange(propId);
   }
 
   // Let the model manager know as well
   //  if (propId == IWorkbenchPartConstants::PROP_DIRTY) {
   //    IWorkbenchPart actualPart = getPart(false);
   //    if (actualPart != null) {
   //  SaveablesList modelManager = (SaveablesList) actualPart.getSite().getService(ISaveablesLifecycleListener.class);
   //      modelManager.dirtyChanged(actualPart);
   //    }
   //  }
 }
 
-void WorkbenchPartReference::PropertyChanged(PropertyChangeEvent::Pointer event)
+void WorkbenchPartReference::PropertyChanged(const PropertyChangeEvent::Pointer& event)
 {
   this->FirePropertyChange(event);
 }
 
 /**
  * Refreshes all cached values with the values from the real part
  */
 void WorkbenchPartReference::RefreshFromPart()
 {
   this->DeferEvents(true);
 
   SetPartName(ComputePartName());
   SetContentDescription(ComputeContentDescription());
   SetToolTip(GetRawToolTip());
   //SetImageDescriptor(ComputeImageDescriptor());
 
   this->DeferEvents(false);
 }
 
 ImageDescriptor::Pointer WorkbenchPartReference::ComputeImageDescriptor()
 {
   if (part)
   {
     return ImageDescriptor::CreateFromImage(part->GetTitleImage());
   }
   return defaultImageDescriptor;
 }
 
 void WorkbenchPartReference::Init(const QString& id,
     const QString& tooltip, ImageDescriptor::Pointer desc,
     const QString& paneName, const QString& contentDescription)
 {
 
   this->id = id;
   this->tooltip = tooltip;
   this->partName = paneName;
   this->contentDescription = contentDescription;
   this->defaultImageDescriptor = desc;
   this->imageDescriptor = this->ComputeImageDescriptor();
 }
 
 /**
  * @see IWorkbenchPart
  */
 void WorkbenchPartReference::AddPropertyListener(IPropertyChangeListener *listener)
 {
   propChangeEvents.AddListener(listener);
 }
 
 /**
  * @see IWorkbenchPart
  */
 void WorkbenchPartReference::RemovePropertyListener(IPropertyChangeListener *listener)
 {
   propChangeEvents.RemoveListener(listener);
 }
 
 QString WorkbenchPartReference::GetId() const
 {
   if (!part.IsNull())
   {
     IWorkbenchPartSite::Pointer site = part->GetSite();
     if (!site.IsNull())
     {
       return site->GetId();
     }
   }
   return id;
 }
 
 QString WorkbenchPartReference::GetTitleToolTip() const
 {
   return tooltip;
 }
 
 QString WorkbenchPartReference::GetRawToolTip() const
 {
   return part->GetTitleToolTip();
 }
 
 /**
  * Returns the pane name for the part
  *
  * @return the pane name for the part
  */
 QString WorkbenchPartReference::GetPartName() const
 {
   return partName;
 }
 
 /**
  * Gets the part name directly from the associated workbench part,
  * or the empty string if none.
  *
  * @return
  */
 QString WorkbenchPartReference::GetRawPartName() const
 {
   return part->GetPartName();
 
 }
 
 QString WorkbenchPartReference::ComputePartName() const
 {
   return this->GetRawPartName();
 }
 
 /**
  * Returns the content description for this part.
  *
  * @return the pane name for the part
  */
 QString WorkbenchPartReference::GetContentDescription() const
 {
   return contentDescription;
 }
 
 /**
  * Computes a new content description for the part. Subclasses may override to change the
  * default behavior
  *
  * @return the new content description for the part
  */
 QString WorkbenchPartReference::ComputeContentDescription() const
 {
   return this->GetRawContentDescription();
 }
 
 /**
  * Returns the content description as set directly by the part, or the empty string if none
  *
  * @return the unmodified content description from the part (or the empty string if none)
  */
 QString WorkbenchPartReference::GetRawContentDescription() const
 {
   return part->GetContentDescription();
 
 }
 
 bool WorkbenchPartReference::IsDirty() const
 {
   if (part.Cast<IEditorPart> ().IsNull())
   {
     return false;
   }
   return part.Cast<IEditorPart> ()->IsDirty();
 }
 
 void* WorkbenchPartReference::GetTitleImage()
 {
   if (this->IsDisposed())
   {
     //return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_DEF_VIEW);
     return 0;
   }
 
   if (!image && imageDescriptor)
   {
     //image = JFaceResources.getResources().createImageWithDefault(imageDescriptor);
     image = imageDescriptor->CreateImage();
   }
   return image;
 }
 
 ImageDescriptor::Pointer WorkbenchPartReference::GetTitleImageDescriptor() const
 {
   if (this->IsDisposed())
   {
     //return PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_DEF_VIEW);
     return ImageDescriptor::Pointer(0);
   }
 
   return imageDescriptor;
 }
 
 void WorkbenchPartReference::FireVisibilityChange()
 {
   this->FirePropertyChange(IWorkbenchPartConstants::PROP_VISIBLE);
 }
 
 //    /* package */ void fireZoomChange() {
 //        fireInternalPropertyChange(INTERNAL_PROPERTY_ZOOMED);
 //    }
 
 bool WorkbenchPartReference::GetVisible()
 {
   if (this->IsDisposed())
   {
     return false;
   }
   return this->GetPane()->GetVisible();
 }
 
 void WorkbenchPartReference::SetVisible(bool isVisible)
 {
   if (this->IsDisposed())
   {
     return;
   }
   this->GetPane()->SetVisible(isVisible);
 }
 
 void WorkbenchPartReference::DeferEvents(bool shouldQueue)
 {
   queueEvents = shouldQueue;
 
   if (queueEvents == false)
   {
     QSet<int>::iterator iter = queuedEvents.begin();
     while (iter != queuedEvents.end())
     {
       this->FirePropertyChange(*iter);
       queuedEvents.erase(iter++);
     }
   }
 }
 
 void WorkbenchPartReference::FirePropertyChange(int id)
 {
 
   if (queueEvents)
   {
     queuedEvents.insert(id);
     return;
   }
 
   this->ImmediateFirePropertyChange(id);
 }
 
 void WorkbenchPartReference::ImmediateFirePropertyChange(int id)
 {
   //UIListenerLogging.logPartReferencePropertyChange(this, id);
   ObjectInt::Pointer value(new ObjectInt(id));
   Object::Pointer source(this);
   PropertyChangeEvent::Pointer
       event(
           new PropertyChangeEvent(source, IWorkbenchPartConstants::INTEGER_PROPERTY, value, value));
   propChangeEvents.propertyChange(event);
 }
 
 IWorkbenchPart::Pointer WorkbenchPartReference::GetPart(bool restore)
 {
   if (this->IsDisposed())
   {
     return IWorkbenchPart::Pointer(0);
   }
 
   if (part.IsNull() && restore)
   {
 
     if (state == STATE_CREATION_IN_PROGRESS)
     {
       //                IStatus result = WorkbenchPlugin.getStatus(
       //                        new PartInitException(NLS.bind("Warning: Detected recursive attempt by part {0} to create itself (this is probably, but not necessarily, a bug)",  //$NON-NLS-1$
       //                                getId())));
       WorkbenchPlugin::Log("Warning: Detected recursive attempt by part "
           + GetId()
           + " to create itself (this is probably, but not necessarily, a bug)");
       return IWorkbenchPart::Pointer(0);
     }
 
     try
     {
       state = STATE_CREATION_IN_PROGRESS;
 
       IWorkbenchPart::Pointer newPart = this->CreatePart();
       if (!newPart.IsNull())
       {
         part = newPart;
         // Add a dispose listener to the part. This dispose listener does nothing but log an exception
         // if the part's widgets get disposed unexpectedly. The workbench part reference is the only
         // object that should dispose this control, and it will remove the listener before it does so.
         //this->GetPane().getControl().addDisposeListener(prematureDisposeListener);
         part->AddPropertyListener(propertyChangeListener.data());
 
         this->RefreshFromPart();
 
         this->FirePropertyChange(IWorkbenchPartConstants::PROP_OPENED);
 
         //ISizeProvider sizeProvider = (ISizeProvider) Util.getAdapter(part, ISizeProvider.class);
         //if (sizeProvider != null) {
         // If this part has a preferred size, indicate that the preferred size may have changed at this point
         if (this->GetSizeFlags(true) != 0 || this->GetSizeFlags(false) != 0)
         {
           this->FirePropertyChange(IWorkbenchPartConstants::PROP_PREFERRED_SIZE);
         }
         //}
       }
 
       state = STATE_CREATED;
     } catch (Poco::Exception& e)
     {
       state = STATE_CREATED;
       std::cerr << e.displayText() << std::flush;
       throw e;
     } catch (std::exception& e)
     {
       state = STATE_CREATED;
       throw e;
     }
   }
 
   return part;
 }
 
 /**
  * Returns the part pane for this part reference. Does not return null. Should not be called
  * if the reference has been disposed.
  *
  * TODO: clean up all code that has any possibility of calling this on a disposed reference
  * and make this method throw an exception if anyone else attempts to do so.
  *
  * @return
  */
 PartPane::Pointer WorkbenchPartReference::GetPane()
 {
 
   // Note: we should never call this if the reference has already been disposed, since it
   // may cause a PartPane to be created and leaked.
   if (pane.IsNull())
   {
     pane = this->CreatePane();
   }
   return pane;
 }
 
 void WorkbenchPartReference::Dispose()
 {
 
   if (this->IsDisposed())
   {
     return;
   }
 
   // Store the current title, tooltip, etc. so that anyone that they can be returned to
   // anyone that held on to the disposed reference.
   partName = GetPartName();
   contentDescription = GetContentDescription();
   tooltip = GetTitleToolTip();
 
   if (state == STATE_CREATION_IN_PROGRESS)
   {
     //            IStatus result = WorkbenchPlugin.getStatus(
     //                    new PartInitException(NLS.bind("Warning: Blocked recursive attempt by part {0} to dispose itself during creation",  //$NON-NLS-1$
     //                            getId())));
     WorkbenchPlugin::Log("Warning: Blocked recursive attempt by part" + GetId()
         + " to dispose itself during creation");
     return;
   }
 
   // Disposing the pane disposes the part's widgets. The part's widgets need to be disposed before the part itself.
   //  if (pane != 0) {
   //      // Remove the dispose listener since this is the correct place for the widgets to get disposed
   //      Control targetControl = getPane().getControl();
   //      if (targetControl != null) {
   //          targetControl.removeDisposeListener(prematureDisposeListener);
   //      }
   //      pane->Dispose();
   //  }
 
   this->DoDisposePart();
 
   if (!pane.IsNull())
   {
     //pane.removeContributions();
   }
 
   //clearListenerList(internalPropChangeListeners);
   //clearListenerList(partChangeListeners);
   void* oldImage = image;
   ImageDescriptor::Pointer oldDescriptor = imageDescriptor;
   image = 0;
 
   state = STATE_DISPOSED;
   imageDescriptor = ImageDescriptor::GetMissingImageDescriptor();
   defaultImageDescriptor = ImageDescriptor::GetMissingImageDescriptor();
   this->ImmediateFirePropertyChange(IWorkbenchPartConstants::PROP_TITLE);
   //clearListenerList(propChangeListeners);
 
   if (oldImage)
   {
     //JFaceResources.getResources().destroy(oldDescriptor);
     oldDescriptor->DestroyImage(oldImage);
   }
 
   pane = 0;
 }
 
 void WorkbenchPartReference::DoDisposePart()
 {
   if (part)
   {
     //this->FireInternalPropertyChange(INTERNAL_PROPERTY_CLOSED);
     this->FirePropertyChange(IWorkbenchPartConstants::PROP_CLOSED);
     // Don't let exceptions in client code bring us down. Log them and continue.
     try
     {
       part->RemovePropertyListener(propertyChangeListener.data());
 //      if (part instanceof IWorkbenchPart3)
 //      {
 //        ((IWorkbenchPart3) part).removePartPropertyListener(
 //            partPropertyChangeListener);
 //      }
 //      part->Dispose();
       part = 0;
     }
     catch (const ctkRuntimeException& e)
     {
       WorkbenchPlugin::Log(e);
     }
     catch (const std::exception& e)
     {
       QString msg("Exception in WorkbenchPartReference::DoDisposePart: ");
       msg.append(e.what());
       WorkbenchPlugin::Log(msg);
     }
     part = 0;
   }
 }
 
 /**
  * Clears all of the listeners in a listener list. TODO Bug 117519 Remove
  * this method when fixed.
  *
  * @param list
  *            The list to be clear; must not be <code>null</code>.
  */
 //private: void clearListenerList(const ListenerList list) {
 //    final Object[] listeners = list.getListeners();
 //    for (int i = 0; i < listeners.length; i++) {
 //      list.remove(listeners[i]);
 //    }
 //  }
 
 
 void WorkbenchPartReference::SetPinned(bool newPinned)
 {
   if (IsDisposed())
   {
     return;
   }
 
   if (newPinned == pinned)
   {
     return;
   }
 
   pinned = newPinned;
 
   //SetImageDescriptor(computeImageDescriptor());
 
   this->FirePropertyChange(IWorkbenchPartConstants::PROP_PINNED);
 }
 
 bool WorkbenchPartReference::IsPinned() const
 {
   return pinned;
 }
 
 QString WorkbenchPartReference::GetPartProperty(const QString& key) const
 {
   if (part != 0)
   {
     return part->GetPartProperty(key);
   }
   else
   {
     QHash<QString, QString>::const_iterator itr =
         propertyCache.find(key);
     if (itr == propertyCache.end())
       return QString();
     return itr.value();
   }
 }
 
 void WorkbenchPartReference::FirePropertyChange(
-    PropertyChangeEvent::Pointer event)
+    const PropertyChangeEvent::Pointer& event)
 {
   propChangeEvents.propertyChange(event);
 }
 
 void WorkbenchPartReference::CreatePartProperties(
     IWorkbenchPart::Pointer workbenchPart)
 {
   for (QHash<QString, QString>::iterator iter =
       propertyCache.begin(); iter != propertyCache.end(); ++iter)
   {
     workbenchPart->SetPartProperty(iter.key(), iter.value());
   }
 }
 
 int WorkbenchPartReference::ComputePreferredSize(bool width,
     int availableParallel, int availablePerpendicular, int preferredResult)
 {
   ISizeProvider* sizeProvider = Util::GetAdapter<ISizeProvider>(part);
   if (sizeProvider)
   {
     return sizeProvider->ComputePreferredSize(width, availableParallel,
         availablePerpendicular, preferredResult);
   }
 
   return preferredResult;
 }
 
 int WorkbenchPartReference::GetSizeFlags(bool width)
 {
   ISizeProvider* sizeProvider = Util::GetAdapter<ISizeProvider>(part);
   if (sizeProvider)
   {
     return sizeProvider->GetSizeFlags(width);
   }
 
   return 0;
 }
 
 } // namespace berry
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchPartReference.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchPartReference.h
index b1e0a00bc9..354a200757 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchPartReference.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchPartReference.h
@@ -1,301 +1,304 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYWORKBENCHPARTREFERENCE_H_
 #define BERRYWORKBENCHPARTREFERENCE_H_
 
 #include <berryMessage.h>
 
 #include "berryISizeProvider.h"
 #include "berryIWorkbenchPartReference.h"
 #include "berryIWorkbenchPart.h"
 
 #include "berryImageDescriptor.h"
 
 namespace berry {
 
 class PartPane;
 
 /**
  * \ingroup org_blueberry_ui_internal
  *
  */
 class BERRY_UI_QT WorkbenchPartReference : virtual public IWorkbenchPartReference, public ISizeProvider {
 
 public:
 
   berryObjectMacro(WorkbenchPartReference)
 
 
     // State constants //////////////////////////////
 
     /**
      * State constant indicating that the part is not created yet
      */
 public: static int STATE_LAZY; // = 0
 
     /**
      * State constant indicating that the part is in the process of being created
      */
 public: static int STATE_CREATION_IN_PROGRESS; // = 1
 
     /**
      * State constant indicating that the part has been created
      */
 public: static int STATE_CREATED; // = 2
 
     /**
      * State constant indicating that the reference has been disposed (the reference shouldn't be
      * used anymore)
      */
 public: static int STATE_DISPOSED; // = 3
 
     /**
      * Current state of the reference. Used to detect recursive creation errors, disposed
      * references, etc.
      */
 private: int state;
 
 protected: IWorkbenchPart::Pointer part;
 
 protected: SmartPointer<PartPane> pane;
 
 private: QString id;
 
 private: bool pinned;
 
 private: QString tooltip;
 
 /**
  * Stores the current Image for this part reference. Lazily created. Null if not allocated.
  */
 private: void* image;
 
 private: SmartPointer<ImageDescriptor> defaultImageDescriptor;
 
     /**
      * Stores the current image descriptor for the part.
      */
 private: SmartPointer<ImageDescriptor> imageDescriptor;
 
     /**
      * API listener list
      */
 private: IPropertyChangeListener::Events propChangeEvents;
 
 //private: ListenerList partChangeListeners = new ListenerList();
 
 private: QString partName;
 
 private: QString contentDescription;
 
 protected: QHash<QString, QString> propertyCache;
 
     /**
      * Used to remember which events have been queued.
      */
 private: QSet<int> queuedEvents;
 
 private: bool queueEvents;
 
 //private: static DisposeListener prematureDisposeListener = new DisposeListener() {
 //        public void widgetDisposed(DisposeEvent e) {
 //            WorkbenchPlugin.log(new RuntimeException("Widget disposed too early!")); //$NON-NLS-1$
 //        }
 //    };
 
-private: struct PropertyChangeListener : public IPropertyChangeListener
-   {
-  PropertyChangeListener(WorkbenchPartReference* ref);
-     void PropertyChange(PropertyChangeEvent::Pointer event);
+private:
 
-   private: WorkbenchPartReference* partRef;
-    };
+  struct PropertyChangeListener : public IPropertyChangeListener
+  {
+    PropertyChangeListener(WorkbenchPartReference* ref);
+    using IPropertyChangeListener::PropertyChange;
+    void PropertyChange(const PropertyChangeEvent::Pointer& event);
+
+  private: WorkbenchPartReference* partRef;
+  };
 
 private: QScopedPointer<IPropertyChangeListener> propertyChangeListener;
 
 /**
  * Calling this with deferEvents(true) will queue all property change events until a subsequent
  * call to deferEvents(false). This should be used at the beginning of a batch of related changes
  * to prevent duplicate property change events from being sent.
  *
  * @param shouldQueue
  */
 private: void DeferEvents(bool shouldQueue);
 
 public: WorkbenchPartReference();
 
 public: ~WorkbenchPartReference();
 
 public: virtual bool IsDisposed() const;
 
 protected: virtual void CheckReference();
 
     /**
      * Calling this with deferEvents(true) will queue all property change events until a subsequent
      * call to deferEvents(false). This should be used at the beginning of a batch of related changes
      * to prevent duplicate property change events from being sent.
      *
      * @param shouldQueue
      */
 //private: virtual void DeferEvents(bool shouldQueue);
 
 protected: virtual void SetPartName(const QString& newPartName);
 
 protected: virtual void SetContentDescription(const QString& newContentDescription);
 
 protected: virtual void SetImageDescriptor(SmartPointer<ImageDescriptor> descriptor);
 
 protected: virtual void SetToolTip(const QString& newToolTip);
 
-protected: virtual void PropertyChanged(Object::Pointer source, int propId);
+protected: virtual void PropertyChanged(const Object::Pointer& source, int propId);
 
-protected: virtual void PropertyChanged(PropertyChangeEvent::Pointer event);
+protected: virtual void PropertyChanged(const PropertyChangeEvent::Pointer& event);
 
     /**
      * Refreshes all cached values with the values from the real part
      */
 protected: virtual void RefreshFromPart();
 
 protected: virtual SmartPointer<ImageDescriptor> ComputeImageDescriptor();
 
 public: virtual void Init(const QString& id, const QString& tooltip,
             SmartPointer<ImageDescriptor> desc, const QString& paneName, const QString& contentDescription);
 
 
     /**
      * @see IWorkbenchPart
      */
 public: virtual void AddPropertyListener(IPropertyChangeListener* listener);
 
     /**
      * @see IWorkbenchPart
      */
 public: virtual void RemovePropertyListener(IPropertyChangeListener* listener);
 
 public: QString GetId() const;
 
 public: virtual QString GetTitleToolTip() const;
 
 protected: QString GetRawToolTip() const;
 
     /**
      * Returns the pane name for the part
      *
      * @return the pane name for the part
      */
 public: virtual QString GetPartName() const;
 
     /**
      * Gets the part name directly from the associated workbench part,
      * or the empty string if none.
      *
      * @return
      */
 protected: QString GetRawPartName() const;
 
 protected: virtual QString ComputePartName() const;
 
     /**
      * Returns the content description for this part.
      *
      * @return the pane name for the part
      */
 public: virtual QString GetContentDescription() const;
 
     /**
      * Computes a new content description for the part. Subclasses may override to change the
      * default behavior
      *
      * @return the new content description for the part
      */
 protected: virtual QString ComputeContentDescription() const;
 
     /**
      * Returns the content description as set directly by the part, or the empty string if none
      *
      * @return the unmodified content description from the part (or the empty string if none)
      */
 protected: QString GetRawContentDescription() const;
 
 public: virtual bool IsDirty() const;
 
 public: virtual void* GetTitleImage();
 
 public: virtual SmartPointer<ImageDescriptor> GetTitleImageDescriptor() const;
 
 public: virtual void FireVisibilityChange();
 
 //    /* package */ virtual void fireZoomChange();
 
 public: virtual bool GetVisible();
 
 public: virtual void SetVisible(bool isVisible);
 
 protected: virtual void FirePropertyChange(int id);
 
 private: void ImmediateFirePropertyChange(int id);
 
 public: IWorkbenchPart::Pointer GetPart(bool restore);
 
 protected: virtual IWorkbenchPart::Pointer CreatePart() = 0;
 
 protected: virtual SmartPointer<PartPane> CreatePane() = 0;
 
     /**
      * Returns the part pane for this part reference. Does not return null.
      *
      * @return
      */
 public: SmartPointer<PartPane> GetPane();
 
 public: void Dispose();
 
   /**
    * Clears all of the listeners in a listener list. TODO Bug 117519 Remove
    * this method when fixed.
    *
    * @param list
    *            The list to be clear; must not be <code>null</code>.
    */
 //private: void clearListenerList(const ListenerList list);
 
 
 public: virtual void SetPinned(bool newPinned);
 
 public: virtual bool IsPinned() const;
 
 protected: void DoDisposePart();
 
 /* (non-Javadoc)
  * @see org.blueberry.ui.IWorkbenchPartReference#getPartProperty(java.lang.String)
  */
 public: virtual QString GetPartProperty(const QString& key) const;
 
-protected: virtual void FirePropertyChange(PropertyChangeEvent::Pointer event);
+protected: virtual void FirePropertyChange(const PropertyChangeEvent::Pointer& event);
 
 protected: virtual void CreatePartProperties(IWorkbenchPart::Pointer workbenchPart);
 
 public: int ComputePreferredSize(bool width, int availableParallel,
             int availablePerpendicular, int preferredResult);
 
 public: int GetSizeFlags(bool width);
 
 };
 
 } // namespace berry
 
 #endif /*BERRYWORKBENCHPARTREFERENCE_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchPlugin.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchPlugin.cpp
index 3d65709bf3..20f4cc01af 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchPlugin.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchPlugin.cpp
@@ -1,394 +1,398 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryLog.h"
 
 #include "berryWorkbenchPlugin.h"
 
 #include "berryWorkbenchRegistryConstants.h"
 #include "berryWorkbench.h"
 #include "berryPlatform.h"
 
 #include "intro/berryEditorIntroAdapterPart.h"
 #include "defaultpresentation/berryQtWorkbenchPresentationFactory.h"
 
 #include "berryQtStyleManager.h"
 
 #include "berryQtDnDTweaklet.h"
 #include "berryQtImageTweaklet.h"
 #include "berryQtMessageDialogTweaklet.h"
 #include "berryQtWorkbenchTweaklet.h"
 #include "berryQtWorkbenchPageTweaklet.h"
 #include "berryQtWidgetsTweaklet.h"
 #include "berryQtStylePreferencePage.h"
 #include "berryStatusUtil.h"
+#include "berryHandlerServiceFactory.h"
+#include "berryMenuServiceFactory.h"
+#include "berryCommandServiceFactory.h"
+#include "berryWorkbenchSourceProvider.h"
+#include "berryObjectString.h"
+#include "berryObjects.h"
+
+#include "berryShowViewHandler.h"
 
 #include "berryIQtStyleManager.h"
 #include "berryImageDescriptor.h"
 #include "berryIContributor.h"
 #include "berryILog.h"
 
 #include "berryIExtension.h"
 
 #include <QDebug>
 
 namespace berry
 {
 
 bool WorkbenchPlugin::DEBUG = false;
 
 char WorkbenchPlugin::PREFERENCE_PAGE_CATEGORY_SEPARATOR = '/';
 
 WorkbenchPlugin* WorkbenchPlugin::inst = 0;
 
 WorkbenchPlugin::WorkbenchPlugin()
  : AbstractUICTKPlugin()
 {
   inst = this;
   presentationFactory = 0;
   editorRegistry = 0;
   viewRegistry = 0;
   perspRegistry = 0;
   introRegistry = 0;
 }
 
 WorkbenchPlugin::~WorkbenchPlugin()
 {
   delete presentationFactory;
   delete editorRegistry;
   delete viewRegistry;
   delete perspRegistry;
   delete introRegistry;
 
   inst = 0;
 }
 
 bool WorkbenchPlugin::HasExecutableExtension(
     const IConfigurationElement::Pointer& element, const QString& extensionName)
 {
   if (!element->GetAttribute(extensionName).isNull()) return true;
 
   QString elementText = element->GetValue();
   if (!elementText.isEmpty()) return true;
 
   QList<IConfigurationElement::Pointer> children(element->GetChildren(extensionName));
   if (children.size() == 1)
   {
     if (!(children[0]->GetAttribute(WorkbenchRegistryConstants::ATT_CLASS).isNull()))
       return true;
   }
   return false;
 }
 
 bool WorkbenchPlugin::IsBundleLoadedForExecutableExtension(
     const IConfigurationElement::Pointer& element, const QString& extensionName)
 {
   QSharedPointer<ctkPlugin> plugin = WorkbenchPlugin::GetBundleForExecutableExtension(element, extensionName);
 
   if (plugin.isNull())
     return true;
   return plugin->getState() == ctkPlugin::ACTIVE;
 }
 
 QSharedPointer<ctkPlugin> WorkbenchPlugin::GetBundleForExecutableExtension(
     const IConfigurationElement::Pointer& element, const QString& extensionName)
 {
   // this code is derived heavily from
   // ConfigurationElement.createExecutableExtension.
   QString prop;
   QString executable;
   QString contributorName;
   int i = 0;
 
   if (!extensionName.isNull())
     prop = element->GetAttribute(extensionName);
   else
   {
     // property not specified, try as element value
     prop = element->GetValue();
     if (!prop.isNull())
     {
       prop = prop.trimmed();
       if (prop.isEmpty())
         prop = QString();
     }
   }
 
   if (prop.isNull())
   {
     // property not defined, try as a child element
     QList<IConfigurationElement::Pointer> exec(element->GetChildren(extensionName));
     if (!exec.isEmpty())
       contributorName = exec[0]->GetAttribute("plugin");
   }
   else
   {
     // simple property or element value, parse it into its components
     i = prop.indexOf(':');
     if (i != -1)
       executable = prop.left(i).trimmed();
     else
       executable = prop;
 
     i = executable.indexOf('/');
     if (i != -1)
       contributorName = executable.left(i).trimmed();
   }
 
   if (contributorName.isNull())
     contributorName = element->GetContributor()->GetName();
 
   return Platform::GetPlugin(contributorName);
 }
 
 WorkbenchPlugin* WorkbenchPlugin::GetDefault()
 {
   return inst;
 }
 
 std::size_t WorkbenchPlugin::GetBundleCount()
 {
   // TODO BundleContext GetBundles
   //return bundleContext->GetBundles().size();
   return 0;
 }
 
 
 //    ImageRegistry createImageRegistry() {
 //        return WorkbenchImages.getImageRegistry();
 //    }
 
 
 IPerspectiveRegistry* WorkbenchPlugin::GetPerspectiveRegistry() {
   if (perspRegistry == 0) {
     perspRegistry = new PerspectiveRegistry();
 
   // the load methods can touch on WorkbenchImages if an image is
   // missing so we need to wrap the call in
   // a startup block for the case where a custom descriptor exists on
   // startup that does not have an image
   // associated with it. See bug 196352.
   //StartupThreading.runWithoutExceptions(new StartupRunnable() {
   //  public void runWithException() throws Throwable {
       perspRegistry->Load();
   //  }
   //});
 
   }
   return perspRegistry;
 }
 
 
 //    PreferenceManager getPreferenceManager() {
 //        if (preferenceManager == null) {
 //            preferenceManager = new WorkbenchPreferenceManager(
 //                    PREFERENCE_PAGE_CATEGORY_SEPARATOR);
 //
 //            //Get the pages from the registry
 //            PreferencePageRegistryReader registryReader = new PreferencePageRegistryReader(
 //                    getWorkbench());
 //            registryReader
 //                    .loadFromRegistry(Platform.getExtensionRegistry());
 //            preferenceManager.addPages(registryReader.getTopLevelNodes());
 //
 //        }
 //        return preferenceManager;
 //    }
 
 
 //    ISharedImages getSharedImages() {
 //        if (sharedImages == null) {
 //      sharedImages = new SharedImages();
 //    }
 //        return sharedImages;
 //    }
 
 IIntroRegistry* WorkbenchPlugin::GetIntroRegistry()
 {
   if (introRegistry == 0)
   {
     introRegistry = new IntroRegistry();
   }
   return introRegistry;
 }
 
 IViewRegistry* WorkbenchPlugin::GetViewRegistry()
 {
   if (!viewRegistry)
     viewRegistry = new ViewRegistry();
 
   return viewRegistry;
 }
 
 IEditorRegistry* WorkbenchPlugin::GetEditorRegistry()
 {
   if (!editorRegistry)
     editorRegistry = new EditorRegistry();
 
   return editorRegistry;
 }
 
 IPresentationFactory* WorkbenchPlugin::GetPresentationFactory() {
   if (presentationFactory != 0) return presentationFactory;
 
   QString targetID = Workbench::GetInstance()->GetPresentationId();
   presentationFactory = this->CreateExtension<IPresentationFactory>(
           WorkbenchRegistryConstants::PL_PRESENTATION_FACTORIES,
           "factory", targetID);
   if (presentationFactory == 0)
     WorkbenchPlugin::Log("Error creating presentation factory: " +
         targetID + " -- class is not an IPresentationFactory");
 
   return presentationFactory;
 }
 
 void WorkbenchPlugin::Log(const QString& message)
 {
   BERRY_INFO << "LOG: " << message << std::endl;
   //inst->GetLog().log(message);
 }
 
 void WorkbenchPlugin::Log(const ctkException &exc)
 {
-  BERRY_INFO << "LOG: " << exc.what() << std::endl;
+  QString str;
+  QDebug dbg(&str);
+  dbg << exc.printStackTrace();
+  BERRY_INFO << "LOG: " << str << std::endl;
   //inst->GetLog().log(exc);
 }
 
 
 void WorkbenchPlugin::Log(const QString& message, const ctkException &t)
 {
   PlatformException exc(message, t);
   WorkbenchPlugin::Log(exc);
 }
 
 void WorkbenchPlugin::Log(const QString& clazz,
                           const QString& methodName, const ctkException &t)
 {
   QString msg = QString("Exception in ") + clazz + "." + methodName + ": "
       + t.what();
 
   WorkbenchPlugin::Log(msg, t);
 }
 
 void WorkbenchPlugin::Log(const QString& message, const SmartPointer<IStatus>& status)
 {
   //1FTUHE0: ITPCORE:ALL - API - Status & logging - loss of semantic info
 
   if (!message.isEmpty())
   {
     GetDefault()->GetLog()->Log(StatusUtil::NewStatus(IStatus::ERROR_TYPE, message, BERRY_STATUS_LOC));
   }
 
   GetDefault()->GetLog()->Log(status);
 }
 
 void WorkbenchPlugin::Log(const SmartPointer<IStatus>& status)
 {
   GetDefault()->GetLog()->Log(status);
 }
 
 void WorkbenchPlugin::start(ctkPluginContext* context)
 {
   //context.addBundleListener(getBundleListener());
   AbstractUICTKPlugin::start(context);
   bundleContext = context;
 
   BERRY_REGISTER_EXTENSION_CLASS(EditorIntroAdapterPart, context)
 
   BERRY_REGISTER_EXTENSION_CLASS(QtDnDTweaklet, context)
   BERRY_REGISTER_EXTENSION_CLASS(QtImageTweaklet, context)
   BERRY_REGISTER_EXTENSION_CLASS(QtMessageDialogTweaklet, context)
   BERRY_REGISTER_EXTENSION_CLASS(QtWidgetsTweaklet, context)
   BERRY_REGISTER_EXTENSION_CLASS(QtWorkbenchTweaklet, context)
   BERRY_REGISTER_EXTENSION_CLASS(QtWorkbenchPageTweaklet, context)
   BERRY_REGISTER_EXTENSION_CLASS(QtWorkbenchPresentationFactory, context)
 
   BERRY_REGISTER_EXTENSION_CLASS(QtStylePreferencePage, context)
 
+  BERRY_REGISTER_EXTENSION_CLASS(HandlerServiceFactory, context)
+  BERRY_REGISTER_EXTENSION_CLASS(MenuServiceFactory, context)
+  BERRY_REGISTER_EXTENSION_CLASS(CommandServiceFactory, context)
+
+  BERRY_REGISTER_EXTENSION_CLASS(WorkbenchSourceProvider, context)
+
+  BERRY_REGISTER_EXTENSION_CLASS(ShowViewHandler, context)
+
   styleManager.reset(new QtStyleManager());
   context->registerService<berry::IQtStyleManager>(styleManager.data());
 
-  qDebug() << Platform::GetExtensionRegistry()->GetNamespaces();
-  QList<IExtension::Pointer> exs = Platform::GetExtensionRegistry()->GetExtensions("org.blueberry.ui.qt");
-  foreach(IExtension::Pointer ex, exs)
-  {
-    qDebug() << "org.blueberry.ui.qt extension: label" << ex->GetLabel();
-    qDebug() << "org.blueberry.ui.qt extension: unique id" << ex->GetUniqueIdentifier();
-  }
-  IExtensionPoint::Pointer xp = Platform::GetExtensionRegistry()->GetExtensionPoint("org.blueberry.ui.commands");
-  exs = xp->GetExtensions();
-  foreach(IExtension::Pointer ex, exs)
-  {
-    qDebug() << "org.blueberry.ui.commands extension:" << ex->GetUniqueIdentifier();
-    qDebug() << "\tcommand id:" << ex->GetConfigurationElements().front()->GetAttribute("id");
-  }
-
   // The UI plugin needs to be initialized so that it can install the callback in PrefUtil,
   // which needs to be done as early as possible, before the workbench
   // accesses any API preferences.
 //  Bundle uiBundle = Platform.getBundle(PlatformUI.PLUGIN_ID);
 //  try
 //  {
 //    // Attempt to load the activator of the ui bundle.  This will force lazy start
 //    // of the ui bundle.  Using the bundle activator class here because it is a
 //    // class that needs to be loaded anyway so it should not cause extra classes
 //    // to be loaded.
 //    if(uiBundle != null)
 //    uiBundle.loadClass(UI_BUNDLE_ACTIVATOR);
 //  }
 //  catch (ClassNotFoundException e)
 //  {
 //    WorkbenchPlugin.log("Unable to load UI activator", e); //$NON-NLS-1$
 //  }
   /*
    * DO NOT RUN ANY OTHER CODE AFTER THIS LINE.  If you do, then you are
    * likely to cause a deadlock in class loader code.  Please see Bug 86450
    * for more information.
    */
 
 }
 
 //const QList<IBundle::Pointer> WorkbenchPlugin::GetBundles()
 //{
 //  return bundleContext.IsNull() ? QList<IBundle::Pointer>() : bundleContext->GetBundles();
 //}
 
 ctkPluginContext* WorkbenchPlugin::GetPluginContext()
 {
   return bundleContext;
 }
 
 void WorkbenchPlugin::stop(ctkPluginContext* context)
 {
   AbstractUICTKPlugin::stop(context);
 
   styleManager.reset();
 
   delete perspRegistry;
   // avoid possible crash, see bug #18399
   perspRegistry = 0;
 }
 
 QString WorkbenchPlugin::GetDataLocation() const
 {
   QFileInfo fileInfo = bundleContext->getDataFile("");
   if (!fileInfo.isWritable()) return QString();
   return fileInfo.absoluteFilePath();
 }
 
 }
 
 Q_EXPORT_PLUGIN2(org_blueberry_ui_qt, berry::WorkbenchPlugin)
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchPlugin.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchPlugin.h
index 7b7e9d85ea..f0e5af7d13 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchPlugin.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchPlugin.h
@@ -1,498 +1,498 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYWORKBENCHPLUGIN_H_
 #define BERRYWORKBENCHPLUGIN_H_
 
 #include <Poco/Path.h>
 
 #include <berryIExtensionPoint.h>
 #include <berryIExtensionRegistry.h>
 #include <berryPlatform.h>
 #include <berryCoreException.h>
 
 #include "berryAbstractUICTKPlugin.h"
 #include "berryPlatformUI.h"
 #include "presentations/berryIPresentationFactory.h"
 
 
 #include "berryViewRegistry.h"
 #include "berryEditorRegistry.h"
 #include "berryPerspectiveRegistry.h"
 #include "intro/berryIntroRegistry.h"
 
 namespace berry {
 
-struct QtStyleManager;
+class QtStyleManager;
 
 /**
  * \ingroup org_blueberry_ui_internal
  *
  * This class represents the TOP of the workbench UI world
  * A plugin class is effectively an application wrapper
  * for a plugin & its classes. This class should be thought
  * of as the workbench UI's application class.
  *
  * This class is responsible for tracking various registries
  * font, preference, graphics, dialog store.
  *
  * This class is explicitly referenced by the
  * workbench plugin's  "plugin.xml" and places it
  * into the UI start extension point of the main
  * overall application harness
  *
  * When is this class started?
  *      When the Application
  *      calls createExecutableExtension to create an executable
  *      instance of our workbench class.
  */
 class WorkbenchPlugin : public AbstractUICTKPlugin
 {
 
   Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
   Q_PLUGIN_METADATA(IID "org_blueberry_ui")
 #endif
   Q_INTERFACES(ctkPluginActivator)
 
 private:
 
   //static const QString UI_BUNDLE_ACTIVATOR = "org.blueberry.ui.internal.UIPlugin"; //$NON-NLS-1$
 
   // Default instance of the receiver
   static WorkbenchPlugin* inst;
 
   // The presentation factory
   IPresentationFactory* presentationFactory;
 
   // Manager that maps resources to descriptors of editors to use
   EditorRegistry* editorRegistry;
 
   // The context within which this plugin was started.
   ctkPluginContext* bundleContext;
 
   // Other data.
   //WorkbenchPreferenceManager preferenceManager;
 
   ViewRegistry* viewRegistry;
 
   PerspectiveRegistry* perspRegistry;
 
   IntroRegistry* introRegistry;
 
   //SharedImages sharedImages;
 
   QScopedPointer<QtStyleManager> styleManager;
 
 
 public:
 
   /**
    * Global workbench ui plugin flag. Only workbench implementation is allowed to use this flag
    * All other plugins, examples, or test cases must *not* use this flag.
    */
   static bool DEBUG;
 
   /**
    * The character used to separate preference page category ids
    */
   static char PREFERENCE_PAGE_CATEGORY_SEPARATOR;
 
 
   /**
    * Create an instance of the WorkbenchPlugin. The workbench plugin is
    * effectively the "application" for the workbench UI. The entire UI
    * operates as a good plugin citizen.
    */
   WorkbenchPlugin();
 
   ~WorkbenchPlugin();
 
 
   /**
    * Creates an extension.  If the extension plugin has not
    * been loaded a busy cursor will be activated during the duration of
    * the load.
    *
    * @param element the config element defining the extension
    * @param classAttribute the name of the attribute carrying the class
    * @return the extension object
    * @throws CoreException if the extension cannot be created
    */
 
 //    template<class E>
 //    static E* CreateExtension(IConfigurationElement::ConstPointer element,
 //            const QString& classAttribute) {
 //        try {
 //            // If plugin has been loaded create extension.
 //            // Otherwise, show busy cursor then create extension.
 //            if (BundleUtility.isActivated(element.getDeclaringExtension()
 //                    .getNamespace())) {
 //                return element.createExecutableExtension(classAttribute);
 //            }
 //            final Object[] ret = new Object[1];
 //            final CoreException[] exc = new CoreException[1];
 //            BusyIndicator.showWhile(null, new Runnable() {
 //                public void run() {
 //                    try {
 //                        ret[0] = element
 //                                .createExecutableExtension(classAttribute);
 //                    } catch (CoreException e) {
 //                        exc[0] = e;
 //                    }
 //                }
 //            });
 //            if (exc[0] != null) {
 //        throw exc[0];
 //      }
 //            return ret[0];
 //
 //        } catch (CoreException core) {
 //            throw core;
 //        } catch (Exception e) {
 //            throw new CoreException(new Status(IStatus.ERR, PI_WORKBENCH,
 //                    IStatus.ERR, WorkbenchMessages.WorkbenchPlugin_extension,e));
 //        }
 //    }
 
   /**
    * Answers whether the provided element either has an attribute with the
    * given name or a child element with the given name with an attribute
    * called class.
    *
    * @param element
    *            the element to test
    * @param extensionName
    *            the name of the extension to test for
    * @return whether or not the extension is declared
    */
   static bool HasExecutableExtension(const IConfigurationElement::Pointer& element,
                                      const QString& extensionName);
 
   /**
    * Checks to see if the provided element has the syntax for an executable
    * extension with a given name that resides in a bundle that is already
    * active. Determining the bundle happens in one of two ways:<br/>
    * <ul>
    * <li>The element has an attribute with the specified name or element text
    * in the form <code>bundle.id/class.name[:optional attributes]</code></li>
    * <li>The element has a child element with the specified name that has a
    * <code>plugin</code> attribute</li>
    * </ul>
    *
    * @param element
    *            the element to test
    * @param extensionName
    *            the name of the extension to test for
    * @return whether or not the bundle expressed by the above criteria is
    *         active. If the bundle cannot be determined then the state of the
    *         bundle that declared the element is returned.
    */
   static bool IsBundleLoadedForExecutableExtension(
       const IConfigurationElement::Pointer& element, const QString& extensionName);
 
   /**
    * Returns the bundle that contains the class referenced by an executable
    * extension. Determining the bundle happens in one of two ways:<br/>
    * <ul>
    * <li>The element has an attribute with the specified name or element text
    * in the form <code>bundle.id/class.name[:optional attributes]</code></li>
    * <li>The element has a child element with the specified name that has a
    * <code>plugin</code> attribute</li>
    * </ul>
    *
    * @param element
    *            the element to test
    * @param extensionName
    *            the name of the extension to test for
    * @return the bundle referenced by the extension. If that bundle cannot be
    *         determined the bundle that declared the element is returned. Note
    *         that this may be <code>null</code>.
    */
   static QSharedPointer<ctkPlugin> GetBundleForExecutableExtension(
       const IConfigurationElement::Pointer& element, const QString& extensionName);
 
 
   /**
    * Return the default instance of the receiver. This represents the runtime plugin.
    * @return WorkbenchPlugin
    * @see AbstractUICTKPlugin for the typical implementation pattern for plugin classes.
    */
   static WorkbenchPlugin* GetDefault();
 
   std::size_t GetBundleCount();
 
   /**
    * Answer the manager that maps resource types to a the
    * description of the editor to use
    * @return IEditorRegistry the editor registry used
    * by this plug-in.
    */
   IEditorRegistry* GetEditorRegistry();
 
   /**
    * Returns the presentation factory with the given id, or <code>null</code> if not found.
    * @param targetID The id of the presentation factory to use.
    * @return IPresentationFactory or <code>null</code>
    * if not factory matches that id.
    */
   IPresentationFactory* GetPresentationFactory();
 
 
 protected:
 
   /*
    * Returns the image registry for this plugin.
    *
    * Where are the images? The images (typically gifs) are found in the same
    * plugins directory.
    *
    * @see ImageRegistry
    *
    * Note: The workbench uses the standard JFace ImageRegistry to track its
    * images. In addition the class WorkbenchGraphicResources provides
    * convenience access to the graphics resources and fast field access for
    * some of the commonly used graphical images.
    */
   //ImageRegistry createImageRegistry();
 
 
 
 private:
 
   /**
    * Looks up the configuration element with the given id on the given extension point
    * and instantiates the class specified by the class attributes.
    *
    * @param extensionPointId the extension point id (simple id)
    * @param elementName the name of the configuration element, or <code>null</code>
    *   to match any element
    * @param targetID the target id
    * @return the instantiated extension object, or <code>null</code> if not found
    */
   template<class C>
   C* CreateExtension(const QString& extensionPointId, const QString& elementName,
                      const QString& targetID)
   {
     IExtensionPoint::Pointer extensionPoint = Platform::GetExtensionRegistry()
         ->GetExtensionPoint(PlatformUI::PLUGIN_ID() + "." + extensionPointId);
     if (extensionPoint == 0)
     {
       WorkbenchPlugin::Log("Unable to find extension. Extension point: " +
                            extensionPointId + " not found");
       return 0;
     }
 
     // Loop through the config elements.
     IConfigurationElement::Pointer targetElement(0);
     QList<IConfigurationElement::Pointer> elements(
           Platform::GetExtensionRegistry()->GetConfigurationElementsFor(PlatformUI::PLUGIN_ID() + "." + extensionPointId));
-    for (unsigned int j = 0; j < elements.size(); j++)
+    for (int j = 0; j < elements.size(); j++)
     {
       if (elementName == "" || elementName == elements[j]->GetName())
       {
         QString strID = elements[j]->GetAttribute("id");
         if (targetID == strID)
         {
             targetElement = elements[j];
             break;
         }
       }
     }
     if (targetElement.IsNull())
     {
       // log it since we cannot safely display a dialog.
       WorkbenchPlugin::Log("Unable to find extension: " + targetID
                            + " in extension point: " + extensionPointId);
       return 0;
     }
 
     // Create the extension.
     try
     {
       return targetElement->CreateExecutableExtension<C>("class");
     }
-    catch (const CoreException& e)
+    catch (const CoreException& /*e*/)
     {
       // log it since we cannot safely display a dialog.
       WorkbenchPlugin::Log("Unable to create extension: " + targetID
                            + " in extension point: " + extensionPointId);
     }
     return 0;
   }
 
 
 public:
 
   /**
    * Return the perspective registry.
    * @return IPerspectiveRegistry. The registry for the receiver.
    */
   IPerspectiveRegistry* GetPerspectiveRegistry();
 
 
   /**
    * Returns the introduction registry.
    *
    * @return the introduction registry.
    */
   IIntroRegistry* GetIntroRegistry();
 
   /*
    * Get the preference manager.
    * @return PreferenceManager the preference manager for
    * the receiver.
    */
   //PreferenceManager getPreferenceManager();
 
   /*
    * Returns the shared images for the workbench.
    *
    * @return the shared image manager
    */
   //ISharedImages getSharedImages();
 
 
 
   /**
    * Answer the view registry.
    * @return IViewRegistry the view registry for the
    * receiver.
    */
   IViewRegistry* GetViewRegistry();
 
 
   /**
    * Logs the given message to the platform log.
    *
    * If you have an exception in hand, call log(String, Throwable) instead.
    *
    * If you have a status object in hand call log(String, IStatus) instead.
    *
    * This convenience method is for internal use by the Workbench only and
    * must not be called outside the Workbench.
    *
    * @param message
    *            A high level UI message describing when the problem happened.
    */
   static void Log(const QString &message);
 
   /**
    * Log the throwable.
    * @param t
    */
   static void Log(const ctkException& exc);
 
 
   /**
    * Logs the given message and throwable to the platform log.
    *
    * If you have a status object in hand call log(String, IStatus) instead.
    *
    * This convenience method is for internal use by the Workbench only and
    * must not be called outside the Workbench.
    *
    * @param message
    *            A high level UI message describing when the problem happened.
    * @param t
    *            The throwable from where the problem actually occurred.
    */
   static void Log(const QString &message, const ctkException& t);
 
   /**
    * Logs the given throwable to the platform log, indicating the class and
    * method from where it is being logged (this is not necessarily where it
    * occurred).
    *
    * This convenience method is for internal use by the Workbench only and
    * must not be called outside the Workbench.
    *
    * @param clazz
    *            The calling class.
    * @param methodName
    *            The calling method name.
    * @param t
    *            The throwable from where the problem actually occurred.
    */
   static void Log(const QString &clazz, const QString &methodName, const ctkException& t);
 
   /**
    * Logs the given message and status to the platform log.
    *
    * This convenience method is for internal use by the Workbench only and
    * must not be called outside the Workbench.
    *
    * @param message
    *            A high level UI message describing when the problem happened.
    *            May be <code>null</code>.
    * @param status
    *            The status describing the problem. Must not be null.
    */
   static void Log(const QString& message, const SmartPointer<IStatus>& status);
 
   /**
    * Log the status to the default log.
    * @param status
    */
   static void Log(const SmartPointer<IStatus>& status);
 
   /*
    *  (non-Javadoc)
    * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
    */
   void start(ctkPluginContext* context);
 
 
   /*
    * Return an array of all bundles contained in this workbench.
    *
    * @return an array of bundles in the workbench or an empty array if none
    */
   //const QList<IBundle::Pointer> GetBundles();
 
   /**
    * Returns the bundle context associated with the workbench plug-in.
    *
    * @return the bundle context
    */
   ctkPluginContext* GetPluginContext();
 
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.plugin.AbstractUICTKPlugin#stop(org.osgi.framework.BundleContext)
    */
   void stop(ctkPluginContext* context);
 
 
   /**
    * FOR INTERNAL WORKBENCH USE ONLY.
    *
    * Returns the path to a location in the file system that can be used
    * to persist/restore state between workbench invocations.
    * If the location did not exist prior to this call it will  be created.
    * Returns <code>null</code> if no such location is available.
    *
    * @return path to a location in the file system where this plug-in can
    * persist data between sessions, or <code>null</code> if no such
    * location is available.
    */
   QString GetDataLocation() const;
 
 };
 
 }
 
 #endif /*BERRYWORKBENCHPLUGIN_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchServiceRegistry.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchServiceRegistry.cpp
index 6bfc1e91f2..3ec1b0c9f8 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchServiceRegistry.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchServiceRegistry.cpp
@@ -1,262 +1,270 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryLog.h"
 
 #include "berryWorkbenchServiceRegistry.h"
 
 #include "berryISources.h"
 #include "berryISourceProvider.h"
 #include "berryPlatformUI.h"
 #include "berryImageDescriptor.h"
 
 #include "services/berryIServiceFactory.h"
 
 #include "berryServiceLocator.h"
 #include "berryWorkbenchPlugin.h"
 #include "berryWorkbenchRegistryConstants.h"
 #include "berrySourcePriorityNameMapping.h"
+#include "berryAbstractSourceProvider.h"
+#include "berryStatus.h"
+#include "berryPlatformUI.h"
 
 namespace berry
 {
 
 const QString WorkbenchServiceRegistry::WORKBENCH_LEVEL = "workbench";
 
 const QString WorkbenchServiceRegistry::EXT_ID_SERVICES =
     "org.blueberry.ui.services"; //$NON-NLS-1$
 
-WorkbenchServiceRegistry* WorkbenchServiceRegistry::registry = 0;
-
 const IServiceLocator::Pointer WorkbenchServiceRegistry::GLOBAL_PARENT =
     IServiceLocator::Pointer(new GlobalParentLocator());
 
 QStringList WorkbenchServiceRegistry::SupportedLevels()
 {
   struct _Levels {
     QStringList levels;
     _Levels()
     {
       levels << ISources::ACTIVE_CONTEXT_NAME()
              << ISources::ACTIVE_SHELL_NAME()
              << ISources::ACTIVE_WORKBENCH_WINDOW_NAME()
              << ISources::ACTIVE_EDITOR_ID_NAME()
              << ISources::ACTIVE_PART_ID_NAME()
              << ISources::ACTIVE_SITE_NAME();
     }
   };
   static _Levels _levels;
 
   return _levels.levels;
 }
 
 WorkbenchServiceRegistry::WorkbenchServiceRegistry()
 {
 //  PlatformUI::GetWorkbench().getExtensionTracker().registerHandler(this,
 //      ExtensionTracker .createExtensionPointFilter(getExtensionPoint()));
 }
 
 WorkbenchServiceRegistry::ServiceFactoryHandle::ServiceFactoryHandle(
-    IServiceFactory::ConstPointer _factory)
+    const IServiceFactory* _factory)
 : factory(_factory)
 {
 
 }
 
 WorkbenchServiceRegistry::ServiceFactoryHandle::Pointer WorkbenchServiceRegistry::LoadFromRegistry(
     const QString& key)
 {
   ServiceFactoryHandle::Pointer result;
   const QList<IConfigurationElement::Pointer> serviceFactories =
       this->GetExtensionPoint()->GetConfigurationElements();
   try
   {
     bool done = false;
-    for (unsigned int i = 0; i < serviceFactories.size() && !done; i++)
+    for (int i = 0; i < serviceFactories.size() && !done; i++)
     {
       QList<IConfigurationElement::Pointer> serviceNameElements =
           serviceFactories[i]->GetChildren(
               WorkbenchRegistryConstants::TAG_SERVICE);
-      for (unsigned int j = 0; j < serviceNameElements.size() && !done; j++)
+      for (int j = 0; j < serviceNameElements.size() && !done; j++)
       {
         QString serviceName = serviceNameElements[j]->GetAttribute(
               WorkbenchRegistryConstants::ATTR_SERVICE_CLASS);
         if (key == serviceName)
         {
           done = true;
         }
       }
       if (done)
       {
-        IServiceFactory::Pointer f(
-                serviceFactories[i]->CreateExecutableExtension<IServiceFactory>(
-                    WorkbenchRegistryConstants::ATTR_FACTORY_CLASS));
-        if (f.IsNull())
-        {
-          // support legacy BlueBerry extensions
-          f = serviceFactories[i]->CreateExecutableExtension<IServiceFactory>(
-                WorkbenchRegistryConstants::ATTR_FACTORY_CLASS);
-        }
+        IServiceFactory* f = serviceFactories[i]->CreateExecutableExtension<IServiceFactory>(
+              WorkbenchRegistryConstants::ATTR_FACTORY_CLASS);
         ServiceFactoryHandle::Pointer handle(new ServiceFactoryHandle(f));
 //        PlatformUI.getWorkbench().getExtensionTracker().registerObject(
 //            serviceFactories[i].getDeclaringExtension(), handle,
 //            IExtensionTracker.REF_WEAK);
 
         QList<QString> serviceNames;
-        for (unsigned int j = 0; j < serviceNameElements.size(); j++)
+        for (int j = 0; j < serviceNameElements.size(); j++)
         {
           QString serviceName = serviceNameElements[j]->GetAttribute(
                 WorkbenchRegistryConstants::ATTR_SERVICE_CLASS);
           if (factories.find(serviceName) != factories.end())
           {
             WorkbenchPlugin::Log("Factory already exists for "  + serviceName);
           }
           else
           {
             factories.insert(serviceName, handle);
             serviceNames.push_back(serviceName);
           }
         }
         handle->serviceNames = serviceNames;
         result = handle;
       }
     }
   } catch (const CoreException& e)
   {
     //StatusManager.getManager().handle(e.getStatus());
     BERRY_ERROR << "CoreException: " << e.what() << std::endl;
   }
   return result;
 }
 
 IExtensionPoint::Pointer WorkbenchServiceRegistry::GetExtensionPoint() const
 {
   IExtensionRegistry* reg = Platform::GetExtensionRegistry();
   return reg->GetExtensionPoint(EXT_ID_SERVICES);
 }
 
 void WorkbenchServiceRegistry::ProcessVariables(
     const QList<IConfigurationElement::Pointer>& children) const
 {
-  for (unsigned int i = 0; i < children.size(); i++)
+  for (int i = 0; i < children.size(); i++)
   {
     QString name = children[i]->GetAttribute(WorkbenchRegistryConstants::ATT_NAME);
     if (name.isEmpty())
     {
       continue;
     }
     QString level = children[i]->GetAttribute(WorkbenchRegistryConstants::ATT_PRIORITY_LEVEL);
     if (level.isEmpty())
     {
       level = WORKBENCH_LEVEL;
     }
     else
     {
       bool found = false;
       QStringList supportedLevels = this->SupportedLevels();
       for (int j = 0; j < supportedLevels.size() && !found; j++)
       {
         if (supportedLevels[j] == level)
         {
           found = true;
         }
       }
       if (!found)
       {
         level = WORKBENCH_LEVEL;
       }
     }
     int existingPriority = SourcePriorityNameMapping::GetMapping(level);
     int newPriority = existingPriority << 1;
     SourcePriorityNameMapping::AddMapping(name, newPriority);
   }
 }
 
 Object* WorkbenchServiceRegistry::GlobalParentLocator::GetService(
     const QString& /*api*/)
 {
   return NULL;
 }
 
 bool WorkbenchServiceRegistry::GlobalParentLocator::HasService(
     const QString& /*api*/) const
 {
   return false;
 }
 
 WorkbenchServiceRegistry* WorkbenchServiceRegistry::GetRegistry()
 {
-  if (registry == 0)
-  {
-    registry = new WorkbenchServiceRegistry();
-  }
-  return registry;
+  static WorkbenchServiceRegistry registry;
+  return &registry;
 }
 
-Object* WorkbenchServiceRegistry::GetService(const QString& key,
+Object::Pointer WorkbenchServiceRegistry::GetService(const QString& key,
     IServiceLocator* parentLocator, ServiceLocator* locator)
 {
-  ServiceFactoryHandle::Pointer handle(factories[key]);
+  ServiceFactoryHandle::Pointer handle = factories.value(key);
   if (!handle)
   {
     handle = this->LoadFromRegistry(key);
   }
   if (handle)
   {
-    Object* result(handle->factory->Create(key, parentLocator, locator));
+    Object::Pointer result(handle->factory->Create(key, parentLocator, locator));
     if (result)
     {
       //handle->serviceLocators.insert(locator, new Object());
       return result;
     }
   }
-  return NULL;
+  return Object::Pointer(0);
 }
 
-QList<ISourceProvider::Pointer> WorkbenchServiceRegistry::GetSourceProviders() const
+QList<AbstractSourceProvider::Pointer> WorkbenchServiceRegistry::GetSourceProviders() const
 {
-  QList<ISourceProvider::Pointer> providers;
+  QList<AbstractSourceProvider::Pointer> providers;
   IExtensionPoint::Pointer ep = this->GetExtensionPoint();
-  QList<IConfigurationElement::Pointer> elements =
-      ep->GetConfigurationElements();
-  for (unsigned int i = 0; i < elements.size(); i++)
+  QList<IConfigurationElement::Pointer> elements = ep->GetConfigurationElements();
+  for (int i = 0; i < elements.size(); i++)
   {
-    if (elements[i]->GetName() ==
-        WorkbenchRegistryConstants::TAG_SOURCE_PROVIDER)
+    if (elements[i]->GetName() == WorkbenchRegistryConstants::TAG_SOURCE_PROVIDER)
     {
       try
       {
-        ISourceProvider::Pointer provider(elements[i]->CreateExecutableExtension<ISourceProvider>(
-            WorkbenchRegistryConstants::ATTR_PROVIDER));
-        if (provider.IsNull())
+        ISourceProvider* sourceProvider(elements[i]->CreateExecutableExtension<ISourceProvider>(
+                                          WorkbenchRegistryConstants::ATTR_PROVIDER));
+        if (AbstractSourceProvider* asp = dynamic_cast<AbstractSourceProvider*>(sourceProvider))
+        {
+          providers.push_back(AbstractSourceProvider::Pointer(asp));
+        }
+        else
         {
-          // support legacy BlueBerry extensions
-          provider = elements[i]->CreateExecutableExtension<ISourceProvider>(
-                WorkbenchRegistryConstants::ATTR_PROVIDER);
+          const QString attributeName = elements[i]->GetAttribute(WorkbenchRegistryConstants::ATTR_PROVIDER);
+          const QString message = "Source Provider '" + attributeName +
+              "' should extend AbstractSourceProvider";
+          const IStatus::Pointer status(new Status(IStatus::ERROR_TYPE,
+                                                   PlatformUI::PLUGIN_ID(), message, BERRY_STATUS_LOC));
+          WorkbenchPlugin::Log(status);
+          continue;
         }
-        providers.push_back(provider);
-        this->ProcessVariables(elements[i]->GetChildren(
-            WorkbenchRegistryConstants::TAG_VARIABLE));
-      } catch (CoreException& e)
+      }
+      catch (const CoreException& e)
       {
         //StatusManager.getManager().handle(e.getStatus());
         BERRY_ERROR << "CoreException: " << e.what() << std::endl;
       }
     }
   }
   return providers;
 }
 
+void WorkbenchServiceRegistry::InitializeSourcePriorities()
+{
+  IExtensionPoint::Pointer ep = GetExtensionPoint();
+  QList<IConfigurationElement::Pointer> elements = ep->GetConfigurationElements();
+  for (int i = 0; i < elements.size(); i++)
+  {
+    if (elements[i]->GetName() == WorkbenchRegistryConstants::TAG_SOURCE_PROVIDER)
+    {
+      ProcessVariables(elements[i]->GetChildren(WorkbenchRegistryConstants::TAG_VARIABLE));
+    }
+  }
+}
+
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchServiceRegistry.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchServiceRegistry.h
index eee2211aad..89d656bc81 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchServiceRegistry.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchServiceRegistry.h
@@ -1,145 +1,146 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYWORKBENCHSERVICEREGISTRY_H_
 #define BERRYWORKBENCHSERVICEREGISTRY_H_
 
 #include "services/berryIServiceLocator.h"
 
 #include <vector>
 #include <map>
 
 namespace berry
 {
 
 struct ISourceProvider;
 struct IServiceFactory;
 struct IExtensionPoint;
 struct IConfigurationElement;
 class ServiceLocator;
+class AbstractSourceProvider;
 
 /**
  * This class will create a service from the matching factory. If the factory
  * doesn't exist, it will try and load it from the registry.
  *
  * @since 3.4
  */
 class WorkbenchServiceRegistry
 { // implements IExtensionChangeHandler {
 
 private:
 
   /**
    *
    */
   static const QString WORKBENCH_LEVEL; // = "workbench"; //$NON-NLS-1$
 
   static const QString EXT_ID_SERVICES; // = "org.blueberry.ui.services"; //$NON-NLS-1$
 
-  static WorkbenchServiceRegistry* registry; // = 0;
-
   WorkbenchServiceRegistry();
 
   struct ServiceFactoryHandle : public Object
   {
     berryObjectMacro(ServiceFactoryHandle);
 
-    SmartPointer<const IServiceFactory> factory;
+    QScopedPointer<const IServiceFactory> factory;
     // TODO used in removeExtension to react to bundles being unloaded
     //WeakHashMap serviceLocators = new WeakHashMap();
     QList<QString> serviceNames;
 
-    ServiceFactoryHandle(SmartPointer<const IServiceFactory> factory);
+    ServiceFactoryHandle(const IServiceFactory* factory);
   };
 
   QHash<QString, ServiceFactoryHandle::Pointer> factories;
 
   ServiceFactoryHandle::Pointer LoadFromRegistry(const QString& key);
 
   SmartPointer<IExtensionPoint> GetExtensionPoint() const;
 
   static QStringList SupportedLevels();
 
   void ProcessVariables(
       const QList<SmartPointer<IConfigurationElement> >& children) const;
 
   struct GlobalParentLocator: public IServiceLocator
   {
     Object* GetService(const QString& api);
     bool HasService(const QString& api) const;
   };
 
 public:
 
   static WorkbenchServiceRegistry* GetRegistry();
 
   /**
    * Used as the global service locator's parent.
    */
   static const IServiceLocator::Pointer GLOBAL_PARENT; // = new GlobalParentLocator();
 
-  Object* GetService(const QString& key,
-                     IServiceLocator* parentLocator, ServiceLocator* locator);
+  Object::Pointer GetService(const QString& key,
+                             IServiceLocator* parentLocator, ServiceLocator* locator);
+
+  QList<SmartPointer<AbstractSourceProvider> > GetSourceProviders() const;
 
-  QList<SmartPointer<ISourceProvider> > GetSourceProviders() const;
+  void InitializeSourcePriorities();
 
   //  void addExtension(IExtensionTracker tracker, IExtension extension) {
   //    // we don't need to react to adds because we are not caching the extensions we find -
   //    // next time a service is requested, we will look at all extensions again in
   //    // loadFromRegistry
   //  }
 
   //  void removeExtension(IExtension extension, Object[] objects) {
   //    for (int i = 0; i < objects.length; i++) {
   //      Object object = objects[i];
   //      if (object instanceof ServiceFactoryHandle) {
   //        ServiceFactoryHandle handle = (ServiceFactoryHandle) object;
   //        Set locatorSet = handle.serviceLocators.keySet();
   //        ServiceLocator[] locators = (ServiceLocator[]) locatorSet.toArray(new ServiceLocator[locatorSet.size()]);
   //        Arrays.sort(locators, new Comparator(){
   //          public int compare(Object o1, Object o2) {
   //            ServiceLocator loc1 = (ServiceLocator) o1;
   //            ServiceLocator loc2 = (ServiceLocator) o2;
   //            int l1 = ((IWorkbenchLocationService) loc1
   //                .getService(IWorkbenchLocationService.class))
   //                .getServiceLevel();
   //            int l2 = ((IWorkbenchLocationService) loc2
   //                .getService(IWorkbenchLocationService.class))
   //                .getServiceLevel();
   //            return l1 < l2 ? -1 : (l1 > l2 ? 1 : 0);
   //          }
   //        });
   //        for (int j = 0; j < locators.length; j++) {
   //          ServiceLocator serviceLocator = locators[j];
   //          if (!serviceLocator.isDisposed()) {
   //            serviceLocator.unregisterServices(handle.serviceNames);
   //          }
   //        }
   //        handle.factory = null;
   //        for (int j = 0; j < handle.serviceNames.length; j++) {
   //          String serviceName = handle.serviceNames[j];
   //          if (factories.get(serviceName) == handle) {
   //            factories.remove(serviceName);
   //          }
   //        }
   //      }
   //    }
   //  }
 };
 
 }
 
 #endif /* BERRYWORKBENCHSERVICEREGISTRY_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchSourceProvider.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchSourceProvider.cpp
new file mode 100644
index 0000000000..fe2b9078a6
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchSourceProvider.cpp
@@ -0,0 +1,890 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berryWorkbenchSourceProvider.h"
+
+#include "berryIContextService.h"
+#include "berryIEditorSite.h"
+#include "berryIEvaluationContext.h"
+#include "berryIPartService.h"
+#include "berryISelectionService.h"
+#include "berryIShowInSource.h"
+#include "berryISources.h"
+#include "berryIWorkbench.h"
+#include "berryIWorkbenchLocationService.h"
+#include "berryIWorkbenchPartConstants.h"
+
+#include "berryDetachedWindow.h"
+#include "berryDisplay.h"
+#include "berryObjectString.h"
+#include "berryObjects.h"
+#include "berryShowInContext.h"
+#include "berryUiUtil.h"
+#include "berryWorkbench.h"
+#include "berryWorkbenchWindow.h"
+
+#include <QApplication>
+#include <QWidget>
+
+namespace berry {
+
+const QList<QString> WorkbenchSourceProvider::PROVIDED_SOURCE_NAMES = QList<QString>()
+    << ISources::ACTIVE_CURRENT_SELECTION_NAME()
+    << ISources::ACTIVE_EDITOR_ID_NAME()
+    << ISources::ACTIVE_EDITOR_NAME()
+    << ISources::ACTIVE_PART_ID_NAME()
+    << ISources::ACTIVE_PART_NAME()
+    << ISources::ACTIVE_SITE_NAME()
+    << ISources::SHOW_IN_SELECTION()
+    << ISources::SHOW_IN_INPUT()
+    << ISources::ACTIVE_SHELL_NAME()
+    << ISources::ACTIVE_WORKBENCH_WINDOW_NAME()
+    << ISources::ACTIVE_WORKBENCH_WINDOW_SHELL_NAME()
+    << ISources::ACTIVE_WORKBENCH_WINDOW_IS_TOOLBAR_VISIBLE_NAME()
+    << ISources::ACTIVE_WORKBENCH_WINDOW_IS_PERSPECTIVEBAR_VISIBLE_NAME()
+    << ISources::ACTIVE_WORKBENCH_WINDOW_IS_STATUS_LINE_VISIBLE_NAME()
+    << ISources::ACTIVE_WORKBENCH_WINDOW_ACTIVE_PERSPECTIVE_NAME();
+
+WorkbenchSourceProvider::WorkbenchSourceProvider()
+  : workbench(NULL)
+  , lastActiveEditor(NULL)
+  , lastActivePart(NULL)
+  , lastActivePartSite(NULL)
+  , lastShowInInput(NULL)
+  , lastEditorInput(NULL)
+  , display(NULL)
+  , lastActiveShell(NULL)
+  , lastActiveWorkbenchWindowShell(NULL)
+{
+}
+
+
+void WorkbenchSourceProvider::Initialize(IServiceLocator* locator)
+{
+  AbstractSourceProvider::Initialize(locator);
+//    this.locator = locator;
+  IWorkbenchLocationService* wls = locator->GetService<IWorkbenchLocationService>();
+  workbench = wls->GetWorkbench();
+  workbench->AddWindowListener(this);
+  lastWindow = workbench->GetActiveWorkbenchWindow();
+  display = workbench->GetDisplay();
+  qApp->installEventFilter(this);
+}
+
+WorkbenchSourceProvider::~WorkbenchSourceProvider()
+{
+  if (!lastWindow.Expired())
+  {
+    lastWindow.Lock()->GetSelectionService()->RemoveSelectionListener(this);
+  }
+  workbench->RemoveWindowListener(this);
+  qApp->removeEventFilter(this);
+  HookListener(const_cast<WorkbenchWindow*>(lastActiveWorkbenchWindow.Lock().GetPointer()), NULL);
+  lastActiveWorkbenchWindow.Reset();
+  lastActiveWorkbenchWindowShell = NULL;
+  lastActiveShell = NULL;
+  lastWindow.Reset();
+}
+
+QList<QString> WorkbenchSourceProvider::GetProvidedSourceNames() const
+{
+  return PROVIDED_SOURCE_NAMES;
+}
+
+ISourceProvider::StateMapType WorkbenchSourceProvider::GetCurrentState() const
+{
+  ISourceProvider::StateMapType currentState;
+
+  UpdateActiveShell(currentState);
+  UpdateActivePart(currentState);
+  UpdateSelection(currentState);
+
+  return currentState;
+}
+
+void WorkbenchSourceProvider::SelectionChanged(const SmartPointer<IWorkbenchPart>& /*part*/,
+                                               const SmartPointer<const ISelection>& newSelection)
+{
+
+  if (selection == newSelection)
+    return; // we have already handled the change
+
+  selection = newSelection;
+
+  LogDebuggingInfo(QString("Selection changed to ") + (selection ? selection->ToString() : QString("NULL")));
+
+  FireSourceChanged(ISources::ACTIVE_CURRENT_SELECTION(),
+                    ISources::ACTIVE_CURRENT_SELECTION_NAME(), selection);
+}
+
+int WorkbenchSourceProvider::UpdateSelection(ISourceProvider::StateMapType& currentState) const
+{
+  int sources = 0;
+  currentState.insert(ISources::ACTIVE_CURRENT_SELECTION_NAME(),
+                      IEvaluationContext::UNDEFINED_VARIABLE);
+  Object::ConstPointer object = currentState.value(ISources::ACTIVE_PART_NAME());
+  if (IWorkbenchPart::ConstPointer part = object.Cast<const IWorkbenchPart>())
+  {
+    if (part->GetSite().IsNotNull() && part->GetSite()->GetSelectionProvider().IsNotNull())
+    {
+      sources = ISources::ACTIVE_CURRENT_SELECTION();
+      ISelection::ConstPointer currentSelection = part->GetSite()
+          ->GetSelectionProvider()->GetSelection();
+      currentState.insert(ISources::ACTIVE_CURRENT_SELECTION_NAME(), currentSelection);
+    }
+  }
+  return sources;
+}
+
+void WorkbenchSourceProvider::UpdateWindows(IWorkbenchWindow* newWindow)
+{
+  if (lastWindow == newWindow)
+  {
+    return;
+  }
+
+  ISelection::ConstPointer selection;
+  if (!lastWindow.Expired())
+  {
+    lastWindow.Lock()->GetSelectionService()->RemoveSelectionListener(this);
+  }
+  if (newWindow != NULL)
+  {
+    newWindow->GetSelectionService()->AddSelectionListener(this);
+    selection = newWindow->GetSelectionService()->GetSelection();
+  }
+  SelectionChanged(IWorkbenchPart::Pointer(0), selection);
+  lastWindow = IWorkbenchWindow::Pointer(newWindow);
+}
+
+void WorkbenchSourceProvider::PartActivated(const SmartPointer<IWorkbenchPartReference>& )
+{
+  CheckActivePart();
+}
+
+void WorkbenchSourceProvider::PartBroughtToTop(const SmartPointer<IWorkbenchPartReference>& )
+{
+  CheckActivePart();
+}
+
+void WorkbenchSourceProvider::PartClosed(const SmartPointer<IWorkbenchPartReference>& )
+{
+  CheckActivePart();
+}
+
+void WorkbenchSourceProvider::PartDeactivated(const SmartPointer<IWorkbenchPartReference>& )
+{
+  CheckActivePart();
+}
+
+void WorkbenchSourceProvider::PartOpened(const SmartPointer<IWorkbenchPartReference>& )
+{
+  CheckActivePart();
+}
+
+void WorkbenchSourceProvider::WindowActivated(const SmartPointer<IWorkbenchWindow>& )
+{
+  CheckActivePart();
+}
+
+void WorkbenchSourceProvider::WindowClosed(const SmartPointer<IWorkbenchWindow>& window)
+{
+  if (window.IsNotNull())
+  {
+    window->GetPartService()->RemovePartListener(this);
+  }
+  CheckActivePart();
+}
+
+void WorkbenchSourceProvider::WindowDeactivated(const SmartPointer<IWorkbenchWindow>& )
+{
+  CheckActivePart();
+}
+
+void WorkbenchSourceProvider::WindowOpened(const SmartPointer<IWorkbenchWindow>& window)
+{
+  if (window.IsNotNull())
+  {
+    window->GetPartService()->AddPartListener(this);
+  }
+}
+
+void WorkbenchSourceProvider::HandleCheck(const SmartPointer<const Shell>& s)
+{
+  if (s != lastActiveShell)
+  {
+    lastActiveShell = s.GetPointer();
+    CheckActivePart();
+    IWorkbenchWindow* window = NULL;
+    if (s.IsNotNull())
+    {
+      if (s->GetData().Cast<WorkbenchWindow>())
+      {
+        window = s->GetData().Cast<IWorkbenchWindow>().GetPointer();
+      }
+      else if (DetachedWindow::Pointer dw = s->GetData().Cast<DetachedWindow>())
+      {
+        window = dw->GetWorkbenchPage()->GetWorkbenchWindow().GetPointer();
+      }
+    }
+    UpdateWindows(window);
+  }
+}
+
+void WorkbenchSourceProvider::CheckActivePart()
+{
+  CheckActivePart(false);
+}
+
+void WorkbenchSourceProvider::CheckActivePart(bool updateShowInSelection)
+{
+  ISourceProvider::StateMapType currentState;
+  UpdateActivePart(currentState, updateShowInSelection);
+
+  int sources = 0;
+
+  // Figure out what was changed.
+  const Object::ConstPointer newActivePart = currentState.value(ISources::ACTIVE_PART_NAME());
+  if (newActivePart != lastActivePart)
+  {
+    sources |= ISources::ACTIVE_PART();
+    if (newActivePart != IEvaluationContext::UNDEFINED_VARIABLE)
+    {
+      lastActivePart = newActivePart.Cast<const IWorkbenchPart>().GetPointer();
+    }
+    else
+    {
+      lastActivePart = NULL;
+    }
+  }
+  const Object::ConstPointer newActivePartId = currentState.value(ISources::ACTIVE_PART_ID_NAME());
+  if (lastActivePartId != newActivePartId)
+  {
+    sources |= ISources::ACTIVE_PART_ID();
+    if (newActivePartId != IEvaluationContext::UNDEFINED_VARIABLE)
+    {
+      lastActivePartId = newActivePartId.Cast<const ObjectString>();
+    }
+    else
+    {
+      lastActivePartId = NULL;
+    }
+  }
+  const Object::ConstPointer newActivePartSite = currentState.value(ISources::ACTIVE_SITE_NAME());
+  if (newActivePartSite != lastActivePartSite)
+  {
+    sources |= ISources::ACTIVE_SITE();
+    if (newActivePartSite != IEvaluationContext::UNDEFINED_VARIABLE)
+    {
+      lastActivePartSite = newActivePartSite.Cast<const IWorkbenchPartSite>().GetPointer();
+    }
+    else
+    {
+      lastActivePartSite = NULL;
+    }
+  }
+  const Object::ConstPointer newShowInInput = currentState.value(ISources::SHOW_IN_INPUT());
+  if (newShowInInput != lastShowInInput)
+  {
+    sources |= ISources::ACTIVE_SITE();
+    lastShowInInput = newShowInInput.GetPointer();
+  }
+  if (currentState.value(ISources::SHOW_IN_SELECTION()) != IEvaluationContext::UNDEFINED_VARIABLE)
+  {
+    sources |= ISources::ACTIVE_SITE();
+  }
+  Object::ConstPointer newActiveEditor = currentState.value(ISources::ACTIVE_EDITOR_NAME());
+  if (newActiveEditor != lastActiveEditor)
+  {
+    sources |= ISources::ACTIVE_EDITOR();
+    newActiveEditor = (newActiveEditor == IEvaluationContext::UNDEFINED_VARIABLE ? Object::ConstPointer(0)
+                                                                                 : newActiveEditor);
+    HookListener(const_cast<IEditorPart*>(lastActiveEditor), const_cast<IEditorPart*>(newActiveEditor.Cast<const IEditorPart>().GetPointer()));
+    lastActiveEditor = newActiveEditor.Cast<const IEditorPart>().GetPointer();
+  }
+  const Object::ConstPointer newEditorInput = currentState.value(ISources::ACTIVE_EDITOR_INPUT_NAME());
+  if (newEditorInput != lastEditorInput)
+  {
+    sources |= ISources::ACTIVE_EDITOR();
+    if (newEditorInput != IEvaluationContext::UNDEFINED_VARIABLE)
+    {
+      lastEditorInput = newEditorInput.Cast<const IEditorInput>().GetPointer();
+    }
+    else
+    {
+      lastEditorInput = NULL;
+    }
+  }
+  const Object::ConstPointer newActiveEditorId = currentState.value(ISources::ACTIVE_EDITOR_ID_NAME());
+  if (newActiveEditorId != lastActiveEditorId)
+  {
+    sources |= ISources::ACTIVE_EDITOR_ID();
+    if (newActiveEditorId != IEvaluationContext::UNDEFINED_VARIABLE)
+    {
+      lastActiveEditorId = newActiveEditorId.Cast<const ObjectString>();
+    }
+    else
+    {
+      lastActiveEditorId = NULL;
+    }
+  }
+
+  // Fire the event, if something has changed.
+  if (sources != 0)
+  {
+    if (DEBUG)
+    {
+      if ((sources & ISources::ACTIVE_PART()) != 0)
+      {
+        LogDebuggingInfo("Active part changed to " + (lastActivePart ? lastActivePart->ToString() : QString("NULL")));
+      }
+      if ((sources & ISources::ACTIVE_PART_ID()) != 0)
+      {
+        LogDebuggingInfo("Active part id changed to " + (lastActivePartId ? lastActivePartId->ToString() : QString("NULL")));
+      }
+      if ((sources & ISources::ACTIVE_SITE()) != 0)
+      {
+        LogDebuggingInfo("Active site changed to " + (lastActivePartSite ? lastActivePartSite->ToString() : QString("NULL")));
+      }
+      if ((sources & ISources::ACTIVE_EDITOR()) != 0)
+      {
+        LogDebuggingInfo("Active editor changed to " + (lastActiveEditor ? lastActiveEditor->ToString() : QString("NULL")));
+      }
+      if ((sources & ISources::ACTIVE_EDITOR_ID()) != 0)
+      {
+        LogDebuggingInfo("Active editor id changed to " + (lastActiveEditorId ? lastActiveEditorId->ToString() : QString("NULL")));
+      }
+    }
+    sources |= UpdateSelection(currentState);
+    FireSourceChanged(sources, currentState);
+  }
+}
+
+SmartPointer<IShowInSource> WorkbenchSourceProvider::GetShowInSource(const SmartPointer<IWorkbenchPart>& sourcePart) const
+{
+  IShowInSource::Pointer result(UiUtil::GetAdapter<IShowInSource>(sourcePart.GetPointer()));
+  return result;
+}
+
+SmartPointer<ShowInContext> WorkbenchSourceProvider::GetContext(const SmartPointer<IWorkbenchPart>& sourcePart) const
+{
+  IShowInSource::Pointer source = GetShowInSource(sourcePart);
+  if (source.IsNotNull())
+  {
+    ShowInContext::Pointer context = source->GetShowInContext();
+    if (context.IsNotNull())
+    {
+      return context;
+    }
+  }
+  else if (IEditorPart::Pointer editorPart = sourcePart.Cast<IEditorPart>())
+  {
+    Object::Pointer input = editorPart->GetEditorInput();
+    ISelectionProvider::Pointer sp = sourcePart->GetSite()->GetSelectionProvider();
+    ISelection::ConstPointer sel = sp.IsNull() ? ISelection::ConstPointer(0) : sp->GetSelection();
+    ShowInContext::Pointer context(new ShowInContext(input, sel));
+    return context;
+  }
+  return ShowInContext::Pointer(0);
+}
+
+IWorkbenchWindow* WorkbenchSourceProvider::GetActiveWindow() const
+{
+//  IContextService* const contextService = workbench->GetService<IContextService>();
+//  if (contextService != NULL)
+//  {
+//    const int shellType = contextService->GetShellType(qApp->activeWindow());
+//    if (shellType != IContextService::TYPE_DIALOG)
+//    {
+//      return workbench->GetActiveWorkbenchWindow().GetPointer();
+//    }
+//  }
+  if (qApp->activeWindow() != qApp->activeModalWidget())
+  {
+    return workbench->GetActiveWorkbenchWindow().GetPointer();
+  }
+  return NULL;
+}
+
+void WorkbenchSourceProvider::UpdateActivePart(ISourceProvider::StateMapType& currentState) const
+{
+  UpdateActivePart(currentState, false);
+}
+
+void WorkbenchSourceProvider::UpdateActivePart(ISourceProvider::StateMapType& currentState, bool updateShowInSelection) const
+{
+  currentState.insert(ISources::ACTIVE_SITE_NAME(), IEvaluationContext::UNDEFINED_VARIABLE);
+  currentState.insert(ISources::ACTIVE_PART_NAME(), IEvaluationContext::UNDEFINED_VARIABLE);
+  currentState.insert(ISources::ACTIVE_PART_ID_NAME(), IEvaluationContext::UNDEFINED_VARIABLE);
+  currentState.insert(ISources::ACTIVE_EDITOR_NAME(), IEvaluationContext::UNDEFINED_VARIABLE);
+  currentState.insert(ISources::ACTIVE_EDITOR_ID_NAME(), IEvaluationContext::UNDEFINED_VARIABLE);
+  currentState.insert(ISources::SHOW_IN_INPUT(), IEvaluationContext::UNDEFINED_VARIABLE);
+  currentState.insert(ISources::SHOW_IN_SELECTION(), IEvaluationContext::UNDEFINED_VARIABLE);
+
+  IWorkbenchWindow* const activeWorkbenchWindow = GetActiveWindow();
+  if (activeWorkbenchWindow != NULL)
+  {
+    const IWorkbenchPage::Pointer activeWorkbenchPage = activeWorkbenchWindow->GetActivePage();
+    if (activeWorkbenchPage.IsNotNull())
+    {
+      // Check the active workbench part.
+      const IWorkbenchPart::Pointer newActivePart = activeWorkbenchPage->GetActivePart();
+      currentState.insert(ISources::ACTIVE_PART_NAME(), newActivePart);
+      if (newActivePart.IsNotNull())
+      {
+        const IWorkbenchPartSite::Pointer activeWorkbenchPartSite = newActivePart->GetSite();
+        currentState.insert(ISources::ACTIVE_SITE_NAME(), activeWorkbenchPartSite);
+        if (activeWorkbenchPartSite.IsNotNull())
+        {
+          const Object::Pointer newActivePartId(new ObjectString(activeWorkbenchPartSite->GetId()));
+          currentState.insert(ISources::ACTIVE_PART_ID_NAME(), newActivePartId);
+        }
+        ShowInContext::Pointer context = GetContext(newActivePart);
+        if (context.IsNotNull())
+        {
+          const Object::Pointer input = context->GetInput();
+          if (input.IsNotNull())
+          {
+            currentState.insert(ISources::SHOW_IN_INPUT(), input);
+          }
+          if (updateShowInSelection)
+          {
+            const ISelection::ConstPointer selection = context->GetSelection();
+            if (selection.IsNotNull())
+            {
+              currentState.insert(ISources::SHOW_IN_SELECTION(), selection);
+            }
+          }
+        }
+      }
+
+      // Check the active editor part.
+      const IEditorPart::Pointer newActiveEditor = activeWorkbenchPage->GetActiveEditor();
+      currentState.insert(ISources::ACTIVE_EDITOR_NAME(), newActiveEditor);
+      if (newActiveEditor.IsNotNull())
+      {
+        currentState.insert(ISources::ACTIVE_EDITOR_INPUT_NAME(),
+                            newActiveEditor->GetEditorInput());
+        const IEditorSite::Pointer activeEditorSite = newActiveEditor->GetEditorSite();
+        if (activeEditorSite.IsNotNull())
+        {
+          const Object::Pointer newActiveEditorId(new ObjectString(activeEditorSite->GetId()));
+          currentState.insert(ISources::ACTIVE_EDITOR_ID_NAME(), newActiveEditorId);
+        }
+      }
+    }
+  }
+
+}
+
+/**
+ * The listener to individual window properties.
+ */
+void WorkbenchSourceProvider::PropertyChange(const SmartPointer<PropertyChangeEvent>& event)
+{
+    if (WorkbenchWindow::PROP_TOOLBAR_VISIBLE == event->GetProperty())
+    {
+      const Object::Pointer newValue = event->GetNewValue();
+      if (newValue.IsNull() || !(newValue.Cast<ObjectBool>()))
+        return;
+      if (lastToolbarVisibility != newValue)
+      {
+        FireSourceChanged(
+              ISources::ACTIVE_WORKBENCH_WINDOW_SUBORDINATE(),
+              ISources::ACTIVE_WORKBENCH_WINDOW_IS_TOOLBAR_VISIBLE_NAME(),
+              newValue);
+        lastToolbarVisibility = newValue.Cast<ObjectBool>();
+      }
+    }
+    else if (WorkbenchWindow::PROP_PERSPECTIVEBAR_VISIBLE == event->GetProperty())
+    {
+      const Object::Pointer newValue = event->GetNewValue();
+      if (newValue.IsNull() || !(newValue.Cast<ObjectBool>()))
+        return;
+      if (lastPerspectiveBarVisibility != newValue)
+      {
+        FireSourceChanged(
+              ISources::ACTIVE_WORKBENCH_WINDOW_SUBORDINATE(),
+              ISources::ACTIVE_WORKBENCH_WINDOW_IS_PERSPECTIVEBAR_VISIBLE_NAME(),
+              newValue);
+        lastPerspectiveBarVisibility = newValue.Cast<ObjectBool>();
+      }
+    }
+    else if (WorkbenchWindow::PROP_STATUS_LINE_VISIBLE == event->GetProperty())
+    {
+      const Object::Pointer newValue = event->GetNewValue();
+      if (newValue.IsNull() || !(newValue.Cast<ObjectBool>()))
+        return;
+      if (lastStatusLineVisibility != newValue)
+      {
+        FireSourceChanged(
+              ISources::ACTIVE_WORKBENCH_WINDOW_SUBORDINATE(),
+              ISources::ACTIVE_WORKBENCH_WINDOW_IS_STATUS_LINE_VISIBLE_NAME(),
+              newValue);
+        lastStatusLineVisibility = newValue.Cast<ObjectBool>();
+      }
+    }
+    else
+    {
+      IPropertyChangeListener::PropertyChange(event);
+    }
+  }
+
+void WorkbenchSourceProvider::PerspectiveActivated(const SmartPointer<IWorkbenchPage>& /*page*/,
+                          const SmartPointer<IPerspectiveDescriptor>& perspective)
+{
+  QString id = perspective.IsNull() ? QString() : perspective->GetId();
+  if (lastPerspectiveId.IsNotNull() && *lastPerspectiveId == id)
+  {
+    return;
+  }
+
+  Object::Pointer newValue(new ObjectString(id));
+  FireSourceChanged(ISources::ACTIVE_WORKBENCH_WINDOW_SUBORDINATE(),
+                    ISources::ACTIVE_WORKBENCH_WINDOW_ACTIVE_PERSPECTIVE_NAME(),
+                    newValue);
+
+  lastPerspectiveId = new ObjectString(id);
+}
+
+void WorkbenchSourceProvider::PerspectiveChanged(const SmartPointer<IWorkbenchPage>& /*page*/,
+                        const SmartPointer<IPerspectiveDescriptor>& /*perspective*/,
+                        const QString& /*changeId*/)
+{
+}
+
+void WorkbenchSourceProvider::PropertyChange(const Object::Pointer& source, int propId)
+{
+  if (propId == IWorkbenchPartConstants::PROP_INPUT)
+  {
+    HandleInputChanged(source.Cast<IEditorPart>());
+  }
+}
+
+bool WorkbenchSourceProvider::eventFilter(QObject* /*obj*/, QEvent *event)
+{
+  if (event->type() == QEvent::WindowActivate)
+    HandleShellEvent();
+  return false;
+}
+
+void WorkbenchSourceProvider::HandleShellEvent()
+{
+//  if (!(event.widget instanceof Shell))
+//  {
+//    if (DEBUG)
+//    {
+//      logDebuggingInfo("WSP: passOnEvent: " + event.widget); //$NON-NLS-1$
+//    }
+//    return;
+//  }
+
+  LogDebuggingInfo("\tWSP:lastActiveShell: " +
+                   (lastActiveShell ? lastActiveShell->ToString() : QString("NULL")));
+  LogDebuggingInfo("\tWSP:lastActiveWorkbenchWindowShell: " +
+                   (lastActiveWorkbenchWindowShell ? lastActiveWorkbenchWindowShell->ToString() : QString("NULL")));
+
+  const ISourceProvider::StateMapType currentState = GetCurrentState();
+  const Shell::ConstPointer newActiveShell = currentState.value(ISources::ACTIVE_SHELL_NAME()).Cast<const Shell>();
+  const WorkbenchWindow::ConstPointer newActiveWorkbenchWindow = currentState.value(ISources::ACTIVE_WORKBENCH_WINDOW_NAME()).Cast<const WorkbenchWindow>();
+  const Shell::ConstPointer newActiveWorkbenchWindowShell = currentState.value(ISources::ACTIVE_WORKBENCH_WINDOW_SHELL_NAME()).Cast<const Shell>();
+
+  // dont update the coolbar/perspective bar visibility unless we're
+  // processing a workbench window change
+  const ObjectBool::ConstPointer newToolbarVisibility(
+        newActiveWorkbenchWindow.IsNull() ? lastToolbarVisibility.GetPointer()
+                                          : (newActiveWorkbenchWindow->GetToolBarVisible() ?
+                                               new ObjectBool(true) : new ObjectBool(false)));
+  const ObjectBool::ConstPointer newPerspectiveBarVisibility(
+        newActiveWorkbenchWindow.IsNull() ? lastPerspectiveBarVisibility.GetPointer()
+                                          : (newActiveWorkbenchWindow->GetPerspectiveBarVisible() ?
+                                               new ObjectBool(true) : new ObjectBool(false)));
+  const ObjectBool::ConstPointer newStatusLineVis(
+        newActiveWorkbenchWindow.IsNull() ? lastStatusLineVisibility.GetPointer()
+                                          : (newActiveWorkbenchWindow->GetStatusLineVisible() ?
+                                               new ObjectBool(true) : new ObjectBool(false)));
+
+  ObjectString::ConstPointer perspectiveId = lastPerspectiveId;
+  if (newActiveWorkbenchWindow.IsNotNull())
+  {
+    IWorkbenchPage::Pointer activePage = newActiveWorkbenchWindow->GetActivePage();
+    if (activePage.IsNotNull())
+    {
+      IPerspectiveDescriptor::Pointer perspective = activePage->GetPerspective();
+      if (perspective.IsNotNull())
+      {
+        perspectiveId = new ObjectString(perspective->GetId());
+      }
+    }
+  }
+
+  // Figure out which variables have changed.
+  const bool shellChanged = newActiveShell != lastActiveShell;
+  const bool windowChanged = newActiveWorkbenchWindowShell != lastActiveWorkbenchWindowShell;
+  const bool toolbarChanged = newToolbarVisibility != lastToolbarVisibility;
+  const bool statusLineChanged = newStatusLineVis != lastStatusLineVisibility;
+
+  const bool perspectiveBarChanged = newPerspectiveBarVisibility != lastPerspectiveBarVisibility;
+  const bool perspectiveIdChanged = lastPerspectiveId != perspectiveId;
+  // Fire an event for those sources that have changed.
+  if (shellChanged && windowChanged)
+  {
+    ISourceProvider::StateMapType sourceValuesByName;
+    sourceValuesByName.insert(ISources::ACTIVE_SHELL_NAME(), newActiveShell);
+    sourceValuesByName.insert(ISources::ACTIVE_WORKBENCH_WINDOW_NAME(), newActiveWorkbenchWindow);
+    sourceValuesByName.insert(ISources::ACTIVE_WORKBENCH_WINDOW_SHELL_NAME(), newActiveWorkbenchWindowShell);
+    int sourceFlags = ISources::ACTIVE_SHELL() | ISources::ACTIVE_WORKBENCH_WINDOW();
+
+    if (toolbarChanged)
+    {
+      sourceValuesByName.insert(ISources::ACTIVE_WORKBENCH_WINDOW_IS_TOOLBAR_VISIBLE_NAME(),
+                                newToolbarVisibility);
+      sourceFlags |= ISources::ACTIVE_WORKBENCH_WINDOW_SUBORDINATE();
+    }
+    if (statusLineChanged)
+    {
+      sourceValuesByName.insert(ISources::ACTIVE_WORKBENCH_WINDOW_IS_STATUS_LINE_VISIBLE_NAME(),
+                                newStatusLineVis);
+      sourceFlags |= ISources::ACTIVE_WORKBENCH_WINDOW_SUBORDINATE();
+    }
+    if (perspectiveBarChanged)
+    {
+      sourceValuesByName.insert(ISources::ACTIVE_WORKBENCH_WINDOW_IS_PERSPECTIVEBAR_VISIBLE_NAME(),
+                                newPerspectiveBarVisibility);
+      sourceFlags |= ISources::ACTIVE_WORKBENCH_WINDOW_SUBORDINATE();
+    }
+    if (perspectiveIdChanged)
+    {
+      sourceValuesByName.insert(ISources::ACTIVE_WORKBENCH_WINDOW_ACTIVE_PERSPECTIVE_NAME(),
+                                perspectiveId);
+      sourceFlags |= ISources::ACTIVE_WORKBENCH_WINDOW_SUBORDINATE();
+    }
+
+    if (DEBUG)
+    {
+      LogDebuggingInfo("Active shell changed to " + (newActiveShell ? newActiveShell->ToString() : QString("NULL")));
+      LogDebuggingInfo("Active workbench window changed to " + (newActiveWorkbenchWindow ?  newActiveWorkbenchWindow->ToString() : QString("NULL")));
+      LogDebuggingInfo("Active workbench window shell changed to " + (newActiveWorkbenchWindowShell ? newActiveWorkbenchWindowShell->ToString() : QString("NULL")));
+      LogDebuggingInfo("Active workbench window coolbar visibility " + (newToolbarVisibility ? newToolbarVisibility->ToString() : QString("NULL")));
+      LogDebuggingInfo("Active workbench window perspective bar visibility " + (newPerspectiveBarVisibility ? newPerspectiveBarVisibility->ToString() : QString("NULL")));
+      LogDebuggingInfo("Active workbench window status line visibility " + (newStatusLineVis ? newStatusLineVis->ToString() : QString("NULL")));
+    }
+
+    FireSourceChanged(sourceFlags, sourceValuesByName);
+    HookListener(const_cast<WorkbenchWindow*>(lastActiveWorkbenchWindow.Lock().GetPointer()),
+                 const_cast<WorkbenchWindow*>(newActiveWorkbenchWindow.GetPointer()));
+
+  }
+  else if (shellChanged)
+  {
+    LogDebuggingInfo("Active shell changed to " + (newActiveShell ? newActiveShell->ToString() : QString("NULL")));
+    FireSourceChanged(ISources::ACTIVE_SHELL(), ISources::ACTIVE_SHELL_NAME(), newActiveShell);
+  }
+  else if (windowChanged)
+  {
+    ISourceProvider::StateMapType sourceValuesByName;
+    sourceValuesByName.insert(ISources::ACTIVE_WORKBENCH_WINDOW_NAME(),
+                              newActiveWorkbenchWindow);
+    sourceValuesByName.insert(ISources::ACTIVE_WORKBENCH_WINDOW_SHELL_NAME(),
+                              newActiveWorkbenchWindowShell);
+
+    int sourceFlags = ISources::ACTIVE_SHELL() | ISources::ACTIVE_WORKBENCH_WINDOW();
+
+    if (toolbarChanged)
+    {
+      sourceValuesByName.insert(ISources::ACTIVE_WORKBENCH_WINDOW_IS_TOOLBAR_VISIBLE_NAME(),
+                                newToolbarVisibility);
+      sourceFlags |= ISources::ACTIVE_WORKBENCH_WINDOW_SUBORDINATE();
+    }
+    if (statusLineChanged)
+    {
+      sourceValuesByName.insert(ISources::ACTIVE_WORKBENCH_WINDOW_IS_STATUS_LINE_VISIBLE_NAME(),
+                                newStatusLineVis);
+      sourceFlags |= ISources::ACTIVE_WORKBENCH_WINDOW_SUBORDINATE();
+    }
+    if (perspectiveBarChanged)
+    {
+      sourceValuesByName.insert(ISources::ACTIVE_WORKBENCH_WINDOW_IS_PERSPECTIVEBAR_VISIBLE_NAME(),
+                                newPerspectiveBarVisibility);
+      sourceFlags |= ISources::ACTIVE_WORKBENCH_WINDOW_SUBORDINATE();
+    }
+    if (perspectiveIdChanged)
+    {
+      sourceValuesByName.insert(ISources::ACTIVE_WORKBENCH_WINDOW_ACTIVE_PERSPECTIVE_NAME(),
+                                perspectiveId);
+      sourceFlags |= ISources::ACTIVE_WORKBENCH_WINDOW_SUBORDINATE();
+    }
+
+    if (DEBUG)
+    {
+      LogDebuggingInfo("Active workbench window changed to "  + (newActiveWorkbenchWindow ? newActiveWorkbenchWindow->ToString() : QString("NULL")));
+      LogDebuggingInfo("Active workbench window shell changed to " + (newActiveWorkbenchWindowShell ? newActiveWorkbenchWindowShell->ToString() : QString("NULL")));
+      LogDebuggingInfo("Active workbench window coolbar visibility " + (newToolbarVisibility ? newToolbarVisibility->ToString() : QString("NULL")));
+      LogDebuggingInfo("Active workbench window perspective bar visibility " + (newPerspectiveBarVisibility ? newPerspectiveBarVisibility->ToString() : QString("NULL")));
+      LogDebuggingInfo("Active workbench window status line visibility " + (newStatusLineVis ? newStatusLineVis->ToString() : QString("NULL")));
+    }
+
+    FireSourceChanged(sourceFlags, sourceValuesByName);
+    HookListener(const_cast<WorkbenchWindow*>(lastActiveWorkbenchWindow.Lock().GetPointer()),
+                 const_cast<WorkbenchWindow*>(newActiveWorkbenchWindow.GetPointer()));
+  }
+
+  if (shellChanged || windowChanged)
+  {
+    CheckOtherSources(newActiveShell);
+  }
+
+  // Update the member variables.
+  lastActiveShell = newActiveShell.GetPointer();
+  lastActiveWorkbenchWindowShell = newActiveWorkbenchWindowShell.GetPointer();
+  lastActiveWorkbenchWindow = newActiveWorkbenchWindow;
+  lastToolbarVisibility = newToolbarVisibility;
+  lastStatusLineVisibility = newStatusLineVis;
+  lastPerspectiveBarVisibility = newPerspectiveBarVisibility;
+  lastPerspectiveId = perspectiveId;
+}
+
+void WorkbenchSourceProvider::CheckOtherSources(const SmartPointer<const Shell>& s)
+{
+  HandleCheck(s);
+}
+
+void WorkbenchSourceProvider::HandleInputChanged(const SmartPointer<IEditorPart>& editor)
+{
+  IEditorInput::Pointer newInput = editor->GetEditorInput();
+  if (newInput != lastEditorInput)
+  {
+    FireSourceChanged(ISources::ACTIVE_EDITOR(),
+                      ISources::ACTIVE_EDITOR_INPUT_NAME(),
+                      newInput.IsNull() ? IEvaluationContext::UNDEFINED_VARIABLE : Object::ConstPointer(newInput));
+    lastEditorInput = newInput.GetPointer();
+  }
+}
+
+void WorkbenchSourceProvider::HookListener(WorkbenchWindow* lastActiveWorkbenchWindow,
+                  WorkbenchWindow* newActiveWorkbenchWindow)
+{
+  if (lastActiveWorkbenchWindow != NULL)
+  {
+    lastActiveWorkbenchWindow->RemovePropertyChangeListener(this);
+    lastActiveWorkbenchWindow->RemovePerspectiveListener(this);
+  }
+
+  if (newActiveWorkbenchWindow != NULL)
+  {
+    newActiveWorkbenchWindow->AddPropertyChangeListener(this);
+    newActiveWorkbenchWindow->AddPerspectiveListener(this);
+  }
+}
+
+void WorkbenchSourceProvider::HookListener(IEditorPart* lastActiveEditor,
+                                           IEditorPart* newActiveEditor)
+{
+  if (lastActiveEditor != NULL)
+  {
+    lastActiveEditor->RemovePropertyListener(this);
+  }
+  if (newActiveEditor != NULL)
+  {
+    newActiveEditor->AddPropertyListener(this);
+  }
+}
+
+void WorkbenchSourceProvider::UpdateActiveShell(ISourceProvider::StateMapType& currentState) const
+{
+  QVariant windowShell;
+  QWidget* activeWindow = qApp->activeWindow();
+  if (activeWindow)
+  {
+    windowShell = activeWindow->property("shell");
+  }
+  Shell::Pointer newActiveShell(windowShell.isValid() ? windowShell.value<Shell*>() : NULL);
+  currentState.insert(ISources::ACTIVE_SHELL_NAME(), newActiveShell);
+
+  /*
+   * We will fallback to the workbench window, but only if a dialog is not
+   * open.
+   */
+//  IContextService* const contextService = workbench->GetService<IContextService>();
+//  const int shellType = contextService->GetShellType(newActiveShell);
+//  if (shellType == IContextService::TYPE_DIALOG)
+//    return;
+  if (activeWindow == qApp->activeModalWidget()) return;
+
+  const WorkbenchWindow::ConstPointer newActiveWorkbenchWindow =
+      workbench->GetActiveWorkbenchWindow().Cast<WorkbenchWindow>();
+  Shell::Pointer newActiveWorkbenchWindowShell;
+  if (newActiveWorkbenchWindow.IsNotNull())
+  {
+    newActiveWorkbenchWindowShell = newActiveWorkbenchWindow->GetShell();
+  }
+  currentState.insert(ISources::ACTIVE_WORKBENCH_WINDOW_NAME(),
+                      newActiveWorkbenchWindow);
+  currentState.insert(ISources::ACTIVE_WORKBENCH_WINDOW_SHELL_NAME(),
+                      newActiveWorkbenchWindowShell);
+
+  const ObjectBool::ConstPointer newToolbarVisibility(
+        newActiveWorkbenchWindow.IsNull() ? lastToolbarVisibility.GetPointer()
+                                          : (newActiveWorkbenchWindow->GetToolBarVisible() ?
+                                               new ObjectBool(true) : new ObjectBool(false)));
+  const ObjectBool::ConstPointer newPerspectiveBarVisibility(
+        newActiveWorkbenchWindow.IsNull() ? lastPerspectiveBarVisibility.GetPointer()
+                                          : (newActiveWorkbenchWindow->GetPerspectiveBarVisible() ?
+                                               new ObjectBool(true) : new ObjectBool(false)));
+  const ObjectBool::ConstPointer newStatusLineVis(
+        newActiveWorkbenchWindow.IsNull() ? lastStatusLineVisibility.GetPointer()
+                                          : (newActiveWorkbenchWindow->GetStatusLineVisible() ?
+                                               new ObjectBool(true) : new ObjectBool(false)));
+
+  ObjectString::ConstPointer perspectiveId = lastPerspectiveId;
+  if (newActiveWorkbenchWindow.IsNotNull())
+  {
+    const IWorkbenchPage::Pointer activePage = newActiveWorkbenchWindow->GetActivePage();
+    if (activePage.IsNotNull())
+    {
+      const IPerspectiveDescriptor::Pointer perspective = activePage->GetPerspective();
+      if (perspective.IsNotNull())
+      {
+        perspectiveId = new ObjectString(perspective->GetId());
+      }
+    }
+  }
+
+  currentState.insert(ISources::ACTIVE_WORKBENCH_WINDOW_IS_TOOLBAR_VISIBLE_NAME(),
+                      newToolbarVisibility);
+
+  currentState.insert(ISources::ACTIVE_WORKBENCH_WINDOW_IS_PERSPECTIVEBAR_VISIBLE_NAME(),
+                      newPerspectiveBarVisibility);
+  currentState.insert(ISources::ACTIVE_WORKBENCH_WINDOW_IS_STATUS_LINE_VISIBLE_NAME(),
+                      newStatusLineVis);
+
+  currentState.insert(ISources::ACTIVE_WORKBENCH_WINDOW_ACTIVE_PERSPECTIVE_NAME(),
+                      perspectiveId);
+
+}
+
+IPartListener::Events::Types WorkbenchSourceProvider::GetPartEventTypes() const
+{
+  return IPartListener::Events::ACTIVATED | IPartListener::Events::BROUGHT_TO_TOP |
+      IPartListener::Events::CLOSED | IPartListener::Events::DEACTIVATED | IPartListener::Events::OPENED;
+}
+
+IPerspectiveListener::Events::Types WorkbenchSourceProvider::GetPerspectiveEventTypes() const
+{
+  return IPerspectiveListener::Events::ACTIVATED | IPerspectiveListener::Events::CHANGED;
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchSourceProvider.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchSourceProvider.h
new file mode 100644
index 0000000000..0236e2df17
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchSourceProvider.h
@@ -0,0 +1,243 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYWORKBENCHSOURCEPROVIDER_H
+#define BERRYWORKBENCHSOURCEPROVIDER_H
+
+#include "berryAbstractSourceProvider.h"
+#include "berryINullSelectionListener.h"
+#include "berryIPartListener.h"
+#include "berryIWindowListener.h"
+#include "berryIPropertyChangeListener.h"
+#include "berryIPerspectiveListener.h"
+#include "berryIShellListener.h"
+
+namespace berry {
+
+struct IEditorPart;
+struct IEditorInput;
+struct IShowInSource;
+
+class Display;
+class ObjectBool;
+class ObjectString;
+class ShowInContext;
+class WorkbenchWindow;
+
+class WorkbenchSourceProvider : public QObject, public AbstractSourceProvider,
+    private INullSelectionListener, private IPartListener, private IWindowListener,
+    private IPropertyChangeListener, private IPerspectiveListener
+{
+  Q_OBJECT
+  Q_INTERFACES(berry::ISourceProvider)
+
+private:
+
+  /**
+   * The names of the sources supported by this source provider.
+   */
+  static const QList<QString> PROVIDED_SOURCE_NAMES;
+
+  IWorkbench* workbench;
+  WeakPointer<IWorkbenchWindow> lastWindow;
+//  private IServiceLocator locator;
+
+  // Selection SourceProvider
+
+  SmartPointer<const ISelection> selection;
+
+public:
+
+  berryObjectMacro(berry::WorkbenchSourceProvider)
+
+  WorkbenchSourceProvider();
+
+  void Initialize(IServiceLocator* locator);
+
+  ~WorkbenchSourceProvider();
+
+  QList<QString> GetProvidedSourceNames() const;
+
+  ISourceProvider::StateMapType GetCurrentState() const;
+
+private:
+
+  void SelectionChanged(const SmartPointer<IWorkbenchPart>& part,
+                        const SmartPointer<const ISelection>& newSelection);
+
+  int UpdateSelection(ISourceProvider::StateMapType& currentState) const;
+
+  void UpdateWindows(IWorkbenchWindow* newWindow);
+
+  // Active Part SourceProvider
+
+  /**
+   * The last active editor part seen as active by this provider. This value
+   * may be <code>null</code> if there is no currently active editor.
+   */
+  const IEditorPart* lastActiveEditor;
+
+  /**
+   * The last active editor id seen as active by this provider. This value may
+   * be <code>null</code> if there is no currently active editor.
+   */
+  SmartPointer<const ObjectString> lastActiveEditorId;
+
+  /**
+   * The last active part seen as active by this provider. This value may be
+   * <code>null</code> if there is no currently active part.
+   */
+  const IWorkbenchPart* lastActivePart;
+
+  /**
+   * The last active part id seen as active by this provider. This value may
+   * be <code>null</code> if there is no currently active part.
+   */
+  SmartPointer<const ObjectString> lastActivePartId;
+
+  /**
+   * The last active part site seen by this provider. This value may be
+   * <code>null</code> if there is no currently active site.
+   */
+  const IWorkbenchPartSite* lastActivePartSite;
+
+  const Object* lastShowInInput;
+
+  void PartActivated(const SmartPointer<IWorkbenchPartReference>& part);
+  void PartBroughtToTop(const SmartPointer<IWorkbenchPartReference>& part);
+  void PartClosed(const SmartPointer<IWorkbenchPartReference>& part);
+  void PartDeactivated(const SmartPointer<IWorkbenchPartReference>& part);
+  void PartOpened(const SmartPointer<IWorkbenchPartReference>& part);
+
+  void WindowActivated(const SmartPointer<IWorkbenchWindow>& window);
+  void WindowClosed(const SmartPointer<IWorkbenchWindow>& window);
+  void WindowDeactivated(const SmartPointer<IWorkbenchWindow>& window);
+  void WindowOpened(const SmartPointer<IWorkbenchWindow>& window);
+
+  const IEditorInput* lastEditorInput;
+
+  void HandleCheck(const SmartPointer<const Shell>& s);
+
+  void CheckActivePart();
+
+  void CheckActivePart(bool updateShowInSelection);
+
+  SmartPointer<IShowInSource> GetShowInSource(const SmartPointer<IWorkbenchPart>& sourcePart) const;
+
+  SmartPointer<ShowInContext> GetContext(const SmartPointer<IWorkbenchPart>& sourcePart) const;
+
+  IWorkbenchWindow* GetActiveWindow() const;
+
+  void UpdateActivePart(ISourceProvider::StateMapType& currentState) const;
+
+  void UpdateActivePart(ISourceProvider::StateMapType& currentState, bool updateShowInSelection) const;
+
+  // Active Part SourceProvider
+
+  /**
+   * The display on which this provider is working.
+   */
+  Display* display;
+
+  /**
+   * The last shell seen as active by this provider. This value may be
+   * <code>null</code> if the last call to
+   * <code>Display.getActiveShell()</code> returned <code>null</code>.
+   */
+  const Shell* lastActiveShell;
+
+  /**
+   * The last workbench window shell seen as active by this provider. This
+   * value may be <code>null</code> if the last call to
+   * <code>workbench.getActiveWorkbenchWindow()</code> returned
+   * <code>null</code>.
+   */
+  const Shell* lastActiveWorkbenchWindowShell;
+
+  /**
+   * The last workbench window seen as active by this provider. This value may
+   * be null if the last call to
+   * <code>workbench.getActiveWorkbenchWindow()</code> returned
+   * <code>null</code>.
+   */
+  WeakPointer<const WorkbenchWindow> lastActiveWorkbenchWindow;
+
+  /**
+   * The result of the last visibility check on the toolbar of the last active
+   * workbench window.
+   */
+  SmartPointer<const ObjectBool> lastToolbarVisibility;
+
+  /**
+   * The result of the last visibility check on the perspective bar of the
+   * last active workbench window.
+   */
+  SmartPointer<const ObjectBool> lastPerspectiveBarVisibility;
+
+  /**
+   * The result of the last visibility check on the status line for the last
+   * workbench window.
+   */
+  SmartPointer<const ObjectBool> lastStatusLineVisibility;
+
+  /**
+   * The last perspective id that was provided by this source.
+   */
+  SmartPointer<const ObjectString> lastPerspectiveId;
+
+  /**
+   * The listener to individual window properties.
+   */
+  void PropertyChange(const SmartPointer<PropertyChangeEvent>& event);
+  void PropertyChange(const Object::Pointer& source, int propId);
+
+  void PerspectiveActivated(const SmartPointer<IWorkbenchPage>& page,
+                            const SmartPointer<IPerspectiveDescriptor>& perspective);
+
+  using IPerspectiveListener::PerspectiveChanged;
+  void PerspectiveChanged(const SmartPointer<IWorkbenchPage>& page,
+                          const SmartPointer<IPerspectiveDescriptor>& perspective,
+                          const QString& changeId);
+
+  bool eventFilter(QObject *obj, QEvent *event);
+
+  /**
+   * The listener to shell activations on the display.
+   * Notifies all listeners that the source has changed.
+   */
+  void HandleShellEvent();
+
+  void CheckOtherSources(const SmartPointer<const Shell>& s);
+
+  void HandleInputChanged(const SmartPointer<IEditorPart>& editor);
+
+  void HookListener(WorkbenchWindow* lastActiveWorkbenchWindow,
+                    WorkbenchWindow* newActiveWorkbenchWindow);
+
+  void HookListener(IEditorPart* lastActiveEditor,
+                    IEditorPart* newActiveEditor);
+
+  void UpdateActiveShell(ISourceProvider::StateMapType& currentState) const;
+
+  IPartListener::Events::Types GetPartEventTypes() const;
+
+  IPerspectiveListener::Events::Types GetPerspectiveEventTypes() const;
+
+};
+
+}
+
+#endif // BERRYWORKBENCHSOURCEPROVIDER_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchWindow.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchWindow.cpp
index 7033af87b9..9d9636899c 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchWindow.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchWindow.cpp
@@ -1,1896 +1,1964 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "tweaklets/berryGuiWidgetsTweaklet.h"
 #include "tweaklets/berryWorkbenchTweaklet.h"
 
 #include "berryWorkbenchWindow.h"
 
 #include "berryIWorkbenchPage.h"
 #include "berryIPerspectiveDescriptor.h"
 #include "berryUIException.h"
 #include "berryConstants.h"
 #include "berryIMenuService.h"
 #include "berryMenuUtil.h"
 
 #include "intro/berryIntroConstants.h"
 #include "berryWorkbenchPlugin.h"
 #include "berryWorkbenchPage.h"
 #include "berryWorkbench.h"
 #include "berryWorkbenchConstants.h"
 #include "berryPartSite.h"
 #include "berryIServiceLocatorCreator.h"
 #include "berryMenuManager.h"
 #include "berryQtControlWidget.h"
 #include "berryQtPerspectiveSwitcher.h"
 #include "berryWWinActionBars.h"
+#include "berryWorkbenchLocationService.h"
 
-#include "services/berryIServiceFactory.h"
+#include "berryIServiceFactory.h"
+#include "berryIServiceScopes.h"
+#include "berryIEvaluationReference.h"
 
 #include "berryPlatformUI.h"
 
 #include "berryDebugUtil.h"
 
 #include <QMainWindow>
 #include <QHBoxLayout>
 #include <QMenuBar>
 
 namespace berry
 {
 
-const ActionBarAdvisor::FillFlags WorkbenchWindow::FILL_ALL_ACTION_BARS =
-    ActionBarAdvisor::FILL_MENU_BAR | ActionBarAdvisor::FILL_TOOL_BAR
-        | ActionBarAdvisor::FILL_STATUS_LINE;
+const QString WorkbenchWindow::PROP_TOOLBAR_VISIBLE = "toolbarVisible";
+const QString WorkbenchWindow::PROP_PERSPECTIVEBAR_VISIBLE = "perspectiveBarVisible";
+const QString WorkbenchWindow::PROP_STATUS_LINE_VISIBLE = "statusLineVisible";
 
-WorkbenchWindow::WorkbenchWindow(int number) :
-  Window(Shell::Pointer(0)), pageComposite(0), windowAdvisor(0),
-      actionBarAdvisor(0), number(number), largeUpdates(0), closing(false),
-      shellActivated(false), updateDisabled(true), emptyWindowContentsCreated(
-          false), emptyWindowContents(0), asMaximizedState(false), partService(
-          this), serviceLocatorOwner(
-          new ServiceLocatorOwner(this))
+const ActionBarAdvisor::FillFlags WorkbenchWindow::FILL_ALL_ACTION_BARS =
+    ActionBarAdvisor::FILL_MENU_BAR | ActionBarAdvisor::FILL_TOOL_BAR |
+    ActionBarAdvisor::FILL_STATUS_LINE;
+
+WorkbenchWindow::WorkbenchWindow(int number)
+  : Window(Shell::Pointer(0))
+  , pageComposite(0)
+  , windowAdvisor(0)
+  , actionBarAdvisor(0)
+  , number(number)
+  , largeUpdates(0)
+  , closing(false)
+  , shellActivated(false)
+  , updateDisabled(true)
+  , toolBarVisible(true)
+  , perspectiveBarVisible(true)
+  , statusLineVisible(true)
+  , emptyWindowContentsCreated(false)
+  , emptyWindowContents(0)
+  , asMaximizedState(false)
+  , partService(this)
+  , serviceLocatorOwner(new ServiceLocatorOwner(this))
 {
   this->Register(); // increase the reference count to avoid deleting
   // this object when temporary smart pointers
   // go out of scope
 
   // Make sure there is a workbench. This call will throw
   // an exception if workbench not created yet.
   IWorkbench* workbench = PlatformUI::GetWorkbench();
   IServiceLocatorCreator* slc = workbench->GetService<IServiceLocatorCreator>();
 
   this->serviceLocator = slc->CreateServiceLocator(
         workbench,
-        IServiceFactory::ConstPointer(0),
+        nullptr,
         IDisposable::WeakPtr(serviceLocatorOwner)).Cast<ServiceLocator>();
 
-  //  initializeDefaultServices();
+  InitializeDefaultServices();
 
   // Add contribution managers that are exposed to other plugins.
   this->AddMenuBar();
   //addCoolBar(SWT.NONE);  // style is unused
   //addStatusLine();
 
   this->FireWindowOpening();
 
   // Fill the action bars
   this->FillActionBars(FILL_ALL_ACTION_BARS);
 
   this->UnRegister(false); // decrease reference count and avoid deleting
   // the window
 }
 
 WorkbenchWindow::~WorkbenchWindow()
 {
   //BERRY_INFO << "WorkbenchWindow::~WorkbenchWindow()";
 }
 
 Object* WorkbenchWindow::GetService(const QString& key)
 {
   return serviceLocator->GetService(key);
 }
 
 bool WorkbenchWindow::HasService(const QString& key) const
 {
   return serviceLocator->HasService(key);
 }
 
-Shell::Pointer WorkbenchWindow::GetShell()
+Shell::Pointer WorkbenchWindow::GetShell() const
 {
   return Window::GetShell();
 }
 
 bool WorkbenchWindow::ClosePage(IWorkbenchPage::Pointer in, bool save)
 {
   // Validate the input.
   if (!pageList.Contains(in))
   {
     return false;
   }
   WorkbenchPage::Pointer oldPage = in.Cast<WorkbenchPage> ();
 
   // Save old perspective.
   if (save && oldPage->IsSaveNeeded())
   {
     if (!oldPage->SaveAllEditors(true))
     {
       return false;
     }
   }
 
   // If old page is activate deactivate.
   bool oldIsActive = (oldPage == this->GetActivePage());
   if (oldIsActive)
   {
     this->SetActivePage(IWorkbenchPage::Pointer(0));
   }
 
   // Close old page.
   pageList.Remove(oldPage);
   partService.PageClosed(oldPage);
   //this->FirePageClosed(oldPage);
   //oldPage->Dispose();
 
   // Activate new page.
   if (oldIsActive)
   {
     IWorkbenchPage::Pointer newPage = pageList.GetNextActive();
     if (newPage != 0)
     {
       this->SetActivePage(newPage);
     }
   }
   if (!closing && pageList.IsEmpty())
   {
     this->ShowEmptyWindowContents();
   }
   return true;
 }
 
-void WorkbenchWindow::AddPerspectiveListener(IPerspectiveListener::Pointer l)
+void WorkbenchWindow::AddPerspectiveListener(IPerspectiveListener* l)
 {
   perspectiveEvents.AddListener(l);
 }
 
-void WorkbenchWindow::RemovePerspectiveListener(IPerspectiveListener::Pointer l)
+void WorkbenchWindow::RemovePerspectiveListener(IPerspectiveListener* l)
 {
   perspectiveEvents.RemoveListener(l);
 }
 
 IPerspectiveListener::Events& WorkbenchWindow::GetPerspectiveEvents()
 {
   return perspectiveEvents;
 }
 
 void WorkbenchWindow::FireWindowOpening()
 {
   // let the application do further configuration
   this->GetWindowAdvisor()->PreWindowOpen();
 }
 
 void WorkbenchWindow::FireWindowRestored()
 {
   //StartupThreading.runWithWorkbenchExceptions(new StartupRunnable() {
   //  public void runWithException() throws Throwable {
   this->GetWindowAdvisor()->PostWindowRestore();
   //  }
   //});
 }
 
 void WorkbenchWindow::FireWindowCreated()
 {
   this->GetWindowAdvisor()->PostWindowCreate();
 }
 
 void WorkbenchWindow::FireWindowOpened()
 {
   this->GetWorkbenchImpl()->FireWindowOpened(IWorkbenchWindow::Pointer(this));
   this->GetWindowAdvisor()->PostWindowOpen();
 }
 
 bool WorkbenchWindow::FireWindowShellClosing()
 {
   return this->GetWindowAdvisor()->PreWindowShellClose();
 }
 
 void WorkbenchWindow::FireWindowClosed()
 {
   // let the application do further deconfiguration
   this->GetWindowAdvisor()->PostWindowClose();
   this->GetWorkbenchImpl()->FireWindowClosed(IWorkbenchWindow::Pointer(this));
 }
 
 ///**
 // * Fires page activated
 // */
 //void WorkbenchWindow::FirePageActivated(IWorkbenchPage::Pointer page) {
 ////  String label = null; // debugging only
 ////  if (UIStats.isDebugging(UIStats.NOTIFY_PAGE_LISTENERS)) {
 ////    label = "activated " + page.getLabel(); //$NON-NLS-1$
 ////  }
 ////  try {
 ////    UIStats.start(UIStats.NOTIFY_PAGE_LISTENERS, label);
 ////    UIListenerLogging.logPageEvent(this, page,
 ////        UIListenerLogging.WPE_PAGE_ACTIVATED);
 //    pageEvents.FirePageActivated(page);
 //    partService.pageActivated(page);
 ////  } finally {
 ////    UIStats.end(UIStats.NOTIFY_PAGE_LISTENERS, page.getLabel(), label);
 ////  }
 //}
 //
 ///**
 // * Fires page closed
 // */
 //void WorkbenchWindow::FirePageClosed(IWorkbenchPage::Pointer page) {
 //  String label = null; // debugging only
 //  if (UIStats.isDebugging(UIStats.NOTIFY_PAGE_LISTENERS)) {
 //    label = "closed " + page.getLabel(); //$NON-NLS-1$
 //  }
 //  try {
 //    UIStats.start(UIStats.NOTIFY_PAGE_LISTENERS, label);
 //    UIListenerLogging.logPageEvent(this, page,
 //        UIListenerLogging.WPE_PAGE_CLOSED);
 //    pageListeners.firePageClosed(page);
 //    partService.pageClosed(page);
 //  } finally {
 //    UIStats.end(UIStats.NOTIFY_PAGE_LISTENERS, page.getLabel(), label);
 //  }
 //
 //}
 //
 ///**
 // * Fires page opened
 // */
 //void WorkbenchWindow::FirePageOpened(IWorkbenchPage::Pointer page) {
 //  String label = null; // debugging only
 //  if (UIStats.isDebugging(UIStats.NOTIFY_PAGE_LISTENERS)) {
 //    label = "opened " + page.getLabel(); //$NON-NLS-1$
 //  }
 //  try {
 //    UIStats.start(UIStats.NOTIFY_PAGE_LISTENERS, label);
 //    UIListenerLogging.logPageEvent(this, page,
 //        UIListenerLogging.WPE_PAGE_OPENED);
 //    pageListeners.firePageOpened(page);
 //    partService.pageOpened(page);
 //  } finally {
 //    UIStats.end(UIStats.NOTIFY_PAGE_LISTENERS, page.getLabel(), label);
 //  }
 //}
 
 void WorkbenchWindow::FirePerspectiveActivated(IWorkbenchPage::Pointer page,
     IPerspectiveDescriptor::Pointer perspective)
 {
   //  UIListenerLogging.logPerspectiveEvent(this, page, perspective,
   //      UIListenerLogging.PLE_PERSP_ACTIVATED);
   perspectiveEvents.perspectiveActivated(page, perspective);
 }
 
 void WorkbenchWindow::FirePerspectivePreDeactivate(
     IWorkbenchPage::Pointer page, IPerspectiveDescriptor::Pointer perspective)
 {
   //  UIListenerLogging.logPerspectiveEvent(this, page, perspective,
   //      UIListenerLogging.PLE_PERSP_PRE_DEACTIVATE);
   perspectiveEvents.perspectivePreDeactivate(page, perspective);
 }
 
 void WorkbenchWindow::FirePerspectiveDeactivated(IWorkbenchPage::Pointer page,
     IPerspectiveDescriptor::Pointer perspective)
 {
   //  UIListenerLogging.logPerspectiveEvent(this, page, perspective,
   //      UIListenerLogging.PLE_PERSP_DEACTIVATED);
   perspectiveEvents.perspectiveDeactivated(page, perspective);
 }
 
 void WorkbenchWindow::FirePerspectiveChanged(IWorkbenchPage::Pointer page,
     IPerspectiveDescriptor::Pointer perspective, const QString& changeId)
 {
   // Some callers call this even when there is no active perspective.
   // Just ignore this case.
   if (perspective != 0)
   {
     //    UIListenerLogging.logPerspectiveChangedEvent(this, page,
     //        perspective, null, changeId);
     perspectiveEvents.perspectiveChanged(page, perspective, changeId);
   }
 }
 
 void WorkbenchWindow::FirePerspectiveChanged(IWorkbenchPage::Pointer page,
     IPerspectiveDescriptor::Pointer perspective,
     IWorkbenchPartReference::Pointer partRef, const QString& changeId)
 {
   // Some callers call this even when there is no active perspective.
   // Just ignore this case.
   if (perspective != 0)
   {
     //    UIListenerLogging.logPerspectiveChangedEvent(this, page,
     //        perspective, partRef, changeId);
     perspectiveEvents.perspectivePartChanged(page, perspective, partRef,
         changeId);
   }
 }
 
 void WorkbenchWindow::FirePerspectiveClosed(IWorkbenchPage::Pointer page,
     IPerspectiveDescriptor::Pointer perspective)
 {
   //  UIListenerLogging.logPerspectiveEvent(this, page, perspective,
   //      UIListenerLogging.PLE_PERSP_CLOSED);
   perspectiveEvents.perspectiveClosed(page, perspective);
 }
 
 void WorkbenchWindow::FirePerspectiveOpened(IWorkbenchPage::Pointer page,
     IPerspectiveDescriptor::Pointer perspective)
 {
   //  UIListenerLogging.logPerspectiveEvent(this, page, perspective,
   //      UIListenerLogging.PLE_PERSP_OPENED);
   perspectiveEvents.perspectiveOpened(page, perspective);
 }
 
 void WorkbenchWindow::FirePerspectiveSavedAs(IWorkbenchPage::Pointer page,
     IPerspectiveDescriptor::Pointer oldPerspective,
     IPerspectiveDescriptor::Pointer newPerspective)
 {
   //  UIListenerLogging.logPerspectiveSavedAs(this, page, oldPerspective,
   //      newPerspective);
   perspectiveEvents.perspectiveSavedAs(page, oldPerspective, newPerspective);
 }
 
 void WorkbenchWindow::FillActionBars(ActionBarAdvisor::FillFlags flags)
 {
   //  Workbench workbench = getWorkbenchImpl();
   //  workbench.largeUpdateStart();
   //try {
   this->GetActionBarAdvisor()->FillActionBars(flags);
 
   IMenuService* menuService = serviceLocator->GetService<IMenuService>();
   menuService->PopulateContributionManager(dynamic_cast<ContributionManager*>(GetActionBars()->GetMenuManager()),
                                            MenuUtil::MAIN_MENU);
-  //    ICoolBarManager coolbar = getActionBars().getCoolBarManager();
+//  ICoolBarManager coolbar = getActionBars().getCoolBarManager();
 //  if (coolbar != null)
 //  {
-  //      menuService.populateContributionManager(
-  //          (ContributionManager) coolbar,
-  //          MenuUtil.MAIN_TOOLBAR);
-  //    }
-  //  } finally {
-  //    workbench.largeUpdateEnd();
-  //  }
+//    menuService.populateContributionManager(
+//          (ContributionManager) coolbar,
+//          MenuUtil.MAIN_TOOLBAR);
+//  }
+
+//    } finally {
+//      workbench.largeUpdateEnd();
+//    }
 }
 
 Point WorkbenchWindow::GetInitialSize()
 {
   return this->GetWindowConfigurer()->GetInitialSize();
 }
 
 bool WorkbenchWindow::Close()
 {
   //BERRY_INFO << "WorkbenchWindow::Close()";
 
   if (controlResizeListener)
   {
     Tweaklets::Get(GuiWidgetsTweaklet::KEY)->RemoveControlListener(GetShell()->GetControl(), controlResizeListener);
   }
 
   bool ret = false;
   //BusyIndicator.showWhile(null, new Runnable() {
   //      public void run() {
   ret = this->BusyClose();
   //      }
   //    });
 
   if (!ret && controlResizeListener)
   {
     Tweaklets::Get(GuiWidgetsTweaklet::KEY)->AddControlListener(GetShell()->GetControl(), controlResizeListener);
   }
 
   return ret;
 }
 
 bool WorkbenchWindow::BusyClose()
 {
   // Whether the window was actually closed or not
   bool windowClosed = false;
 
   // Setup internal flags to indicate window is in
   // progress of closing and no update should be done.
   closing = true;
   updateDisabled = true;
 
   try
   {
     // Only do the check if it is OK to close if we are not closing
     // via the workbench as the workbench will check this itself.
     Workbench* workbench = this->GetWorkbenchImpl();
     std::size_t count = workbench->GetWorkbenchWindowCount();
 
     // also check for starting - if the first window dies on startup
     // then we'll need to open a default window.
     if (!workbench->IsStarting() && !workbench->IsClosing() && count <= 1
         && workbench->GetWorkbenchConfigurer() ->GetExitOnLastWindowClose())
     {
       windowClosed = workbench->Close();
     }
     else
     {
       if (this->OkToClose())
       {
         windowClosed = this->HardClose();
       }
     }
   } catch (std::exception& exc)
   {
     if (!windowClosed)
     {
       // Reset the internal flags if window was not closed.
       closing = false;
       updateDisabled = false;
     }
 
     throw exc;
   }
 
   //    if (windowClosed && tracker != null) {
   //      tracker.close();
   //    }
 
   return windowClosed;
 }
 
 void WorkbenchWindow::MakeVisible()
 {
   Shell::Pointer shell = GetShell();
   if (shell)
   {
     // see bug 96700 and bug 4414 for a discussion on the use of open()
     // here
     shell->Open();
   }
 }
 
 bool WorkbenchWindow::OkToClose()
 {
   // Save all of the editors.
   if (!this->GetWorkbenchImpl()->IsClosing())
   {
     if (!this->SaveAllPages(true))
     {
       return false;
     }
   }
   return true;
 }
 
 bool WorkbenchWindow::SaveAllPages(bool bConfirm)
 {
   bool bRet = true;
   PageList::iterator itr = pageList.Begin();
   while (bRet && itr != pageList.End())
   {
     bRet = (*itr)->SaveAllEditors(bConfirm);
     ++itr;
   }
   return bRet;
 }
 
 bool WorkbenchWindow::HardClose()
 {
   std::exception exc;
   bool exceptionOccured = false;
 
   try
   {
     // Clear the action sets, fix for bug 27416.
     //getActionPresentation().clearActionSets();
 
     // Remove the handler submissions. Bug 64024.
     /*
      final IWorkbench workbench = getWorkbench();
      final IHandlerService handlerService = (IHandlerService) workbench.getService(IHandlerService.class);
      handlerService.deactivateHandlers(handlerActivations);
      final Iterator activationItr = handlerActivations.iterator();
      while (activationItr.hasNext()) {
      final IHandlerActivation activation = (IHandlerActivation) activationItr
      .next();
      activation.getHandler().dispose();
      }
      handlerActivations.clear();
      globalActionHandlersByCommandId.clear();
      */
 
     // Remove the enabled submissions. Bug 64024.
     /*
      final IContextService contextService = (IContextService) workbench.getService(IContextService.class);
      contextService.unregisterShell(getShell());
      */
 
     this->CloseAllPages();
 
     this->FireWindowClosed();
 
     // time to wipe out our populate
     /*
      IMenuService menuService = (IMenuService) workbench
      .getService(IMenuService.class);
      menuService
      .releaseContributions(((ContributionManager) getActionBars()
      .getMenuManager()));
      ICoolBarManager coolbar = getActionBars().getCoolBarManager();
      if (coolbar != null) {
      menuService
      .releaseContributions(((ContributionManager) coolbar));
      }
      */
 
     //getActionBarAdvisor().dispose();
     //getWindowAdvisor().dispose();
     //detachedWindowShells.dispose();
     delete windowAdvisor;
     windowAdvisor = 0;
 
     // Null out the progress region. Bug 64024.
     //progressRegion = null;
 
     // Remove drop targets
     /*
      DragUtil.removeDragTarget(null, trimDropTarget);
      DragUtil.removeDragTarget(getShell(), trimDropTarget);
      trimDropTarget = null;
 
      if (trimMgr2 != null) {
      trimMgr2.dispose();
      trimMgr2 = null;
      }
 
      if (trimContributionMgr != null) {
      trimContributionMgr.dispose();
      trimContributionMgr = null;
      }
      */
   } catch (std::exception& e)
   {
     exc = e;
     exceptionOccured = true;
   }
 
   bool result = Window::Close();
   // Bring down all of the services ... after the window goes away
   serviceLocator->Dispose();
   //menuRestrictions.clear();
 
   if (exceptionOccured)
     throw exc;
 
   return result;
 }
 
 void WorkbenchWindow::CloseAllPages()
 {
   // Deactivate active page.
   this->SetActivePage(IWorkbenchPage::Pointer(0));
 
   // Clone and deref all so that calls to getPages() returns
   // empty list (if called by pageClosed event handlers)
   PageList oldList = pageList;
   pageList.Clear();
 
   // Close all.
   for (PageList::iterator itr = oldList.Begin(); itr != oldList.End(); ++itr)
   {
     partService.PageClosed(*itr);
     //(*itr)->FirePageClosed(page);
     //page.dispose();
   }
   if (!closing)
   {
     this->ShowEmptyWindowContents();
   }
 }
 
 WWinActionBars* WorkbenchWindow::GetActionBars()
 {
   if (actionBars.IsNull())
   {
     actionBars = new WWinActionBars(this);
   }
   return actionBars.GetPointer();
 }
 
 void WorkbenchWindow::SetPerspectiveExcludeList(std::vector<std::string> v)
 {
     perspectiveExcludeList = v;
 }
 
 std::vector<std::string> WorkbenchWindow::GetPerspectiveExcludeList()
 {
     return perspectiveExcludeList;
 }
 
 void WorkbenchWindow::SetViewExcludeList(std::vector<std::string> v)
 {
     viewExcludeList = v;
 }
 
 std::vector<std::string> WorkbenchWindow::GetViewExcludeList()
 {
     return viewExcludeList;
 }
 
 IWorkbenchPage::Pointer WorkbenchWindow::GetPage(int i)
 {
     std::list<IWorkbenchPage::Pointer> pages = pageList.GetPages();
     std::list<IWorkbenchPage::Pointer>::iterator it;
     int j=-1;
     for (it = pages.begin(); it!=pages.end(); it++)
     {
         j++;
         if (j==i)
             break;
     }
     if (j==i)
         return *it;
 
     return IWorkbenchPage::Pointer();
 }
-IWorkbenchPage::Pointer WorkbenchWindow::GetActivePage()
+
+IWorkbenchPage::Pointer WorkbenchWindow::GetActivePage() const
 {
   return pageList.GetActive();
 }
 
 IWorkbench* WorkbenchWindow::GetWorkbench()
 {
   return PlatformUI::GetWorkbench();
 }
 
 IPartService* WorkbenchWindow::GetPartService()
 {
   return &partService;
 }
 
 ISelectionService* WorkbenchWindow::GetSelectionService()
 {
   return partService.GetSelectionService();
 }
 
+bool WorkbenchWindow::GetToolBarVisible() const
+{
+  return GetWindowConfigurer()->GetShowToolBar() && toolBarVisible;
+}
+
+bool WorkbenchWindow::GetPerspectiveBarVisible() const
+{
+  return GetWindowConfigurer()->GetShowPerspectiveBar() && perspectiveBarVisible;
+}
+
+bool WorkbenchWindow::GetStatusLineVisible() const
+{
+  return GetWindowConfigurer()->GetShowStatusLine() && statusLineVisible;
+}
+
+void WorkbenchWindow::AddPropertyChangeListener(IPropertyChangeListener *listener)
+{
+  genericPropertyListeners.AddListener(listener);
+}
+
+void WorkbenchWindow::RemovePropertyChangeListener(IPropertyChangeListener *listener)
+{
+  genericPropertyListeners.RemoveListener(listener);
+}
+
 bool WorkbenchWindow::IsClosing()
 {
   return closing || this->GetWorkbenchImpl()->IsClosing();
 }
 
 int WorkbenchWindow::Open()
 {
   if (pageList.IsEmpty())
   {
     this->ShowEmptyWindowContents();
   }
 
   this->FireWindowCreated();
   this->GetWindowAdvisor()->OpenIntro();
 
   int result = Window::Open();
 
   // It's time for a layout ... to insure that if TrimLayout
   // is in play, it updates all of the trim it's responsible
   // for. We have to do this before updating in order to get
   // the PerspectiveBar management correct...see defect 137334
   //getShell().layout();
 
   this->FireWindowOpened();
   //  if (perspectiveSwitcher != null) {
   //    perspectiveSwitcher.updatePerspectiveBar();
   //    perspectiveSwitcher.updateBarParent();
   //  }
 
   return result;
 }
 
 void* WorkbenchWindow::GetPageComposite()
 {
   return pageComposite;
 }
 
 QWidget *WorkbenchWindow::CreatePageComposite(QWidget *parent)
 {
   QtControlWidget* pageArea = new QtControlWidget(parent, 0);
   pageArea->setObjectName("Page Composite");
   new QHBoxLayout(pageArea);
   if (qobject_cast<QMainWindow*> (parent) != 0)
     qobject_cast<QMainWindow*> (parent)->setCentralWidget(pageArea);
   else
     parent->layout()->addWidget(pageArea);
 
   // we have to enable visibility to get a proper layout (see bug #1654)
   pageArea->setVisible(true);
   parent->setVisible(true);
 
   pageComposite = pageArea;
   return pageArea;
 }
 
 void* WorkbenchWindow::CreateContents(Shell::Pointer parent)
 {
   // we know from Window.create that the parent is a Shell.
   this->GetWindowAdvisor()->CreateWindowContents(parent);
   // the page composite must be set by createWindowContents
   poco_assert(pageComposite != 0)
 ; // "createWindowContents must call configurer.createPageComposite"); //$NON-NLS-1$
   return pageComposite;
 }
 
 void WorkbenchWindow::CreateDefaultContents(Shell::Pointer shell)
 {
   QMainWindow* mainWindow = qobject_cast<QMainWindow*>(shell->GetControl());
 
   if (GetWindowConfigurer()->GetShowMenuBar() && mainWindow)
   {
     QMenuBar* menuBar = GetMenuBarManager()->CreateMenuBar(mainWindow);
     mainWindow->setMenuBar(menuBar);
   }
 
   if (GetWindowConfigurer()->GetShowPerspectiveBar() && mainWindow)
   {
     mainWindow->addToolBar(new QtPerspectiveSwitcher(IWorkbenchWindow::Pointer(this)));
   }
 
   // Create the client composite area (where page content goes).
   CreatePageComposite(shell->GetControl());
 }
 
-void WorkbenchWindow::CreateTrimWidgets(SmartPointer<Shell> shell)
+void WorkbenchWindow::CreateTrimWidgets(SmartPointer<Shell> /*shell*/)
 {
   // do nothing -- trim widgets are created in CreateDefaultContents
 }
 
 bool WorkbenchWindow::UnableToRestorePage(IMemento::Pointer pageMem)
 {
   QString pageName;
   pageMem->GetString(WorkbenchConstants::TAG_LABEL, pageName);
 
   //  return new Status(IStatus.ERROR, PlatformUI.PLUGIN_ID, 0, NLS.bind(
   //      WorkbenchMessages.WorkbenchWindow_unableToRestorePerspective,
   //      pageName), null);
   WorkbenchPlugin::Log("Unable to restore perspective: " + pageName);
   return false;
 }
 
 bool WorkbenchWindow::RestoreState(IMemento::Pointer memento,
     IPerspectiveDescriptor::Pointer activeDescriptor)
 {
   //TODO WorkbenchWindow restore state
   poco_assert(GetShell());
 
   //  final MultiStatus result = new MultiStatus(PlatformUI.PLUGIN_ID, IStatus.OK,
   //      WorkbenchMessages.WorkbenchWindow_problemsRestoringWindow, null);
   bool result = true;
 
   // Restore the window advisor state.
   IMemento::Pointer windowAdvisorState = memento
   ->GetChild(WorkbenchConstants::TAG_WORKBENCH_WINDOW_ADVISOR);
   if (windowAdvisorState)
   {
     //result.add(getWindowAdvisor().restoreState(windowAdvisorState));
     result &= GetWindowAdvisor()->RestoreState(windowAdvisorState);
   }
 
   // Restore actionbar advisor state.
   IMemento::Pointer actionBarAdvisorState = memento
   ->GetChild(WorkbenchConstants::TAG_ACTION_BAR_ADVISOR);
   if (actionBarAdvisorState)
   {
     //    result.add(getActionBarAdvisor()
     //        .restoreState(actionBarAdvisorState));
     result &= GetActionBarAdvisor()
     ->RestoreState(actionBarAdvisorState);
   }
 
   // Read window's bounds and state.
   Rectangle displayBounds;
   //  StartupThreading.runWithoutExceptions(new StartupRunnable() {
   //
   //    public void runWithException() {
   displayBounds = Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetScreenSize();
   //displayBounds = GetShell()->GetDisplay()->GetBounds();
 
   //    }});
   Rectangle shellBounds;
 
   //  final IMemento fastViewMem = memento
   //      .getChild(IWorkbenchConstants.TAG_FAST_VIEW_DATA);
   //  if (fastViewMem != null) {
   //    if (fastViewBar != null) {
   //      StartupThreading.runWithoutExceptions(new StartupRunnable() {
   //
   //        public void runWithException() {
   //          fastViewBar.restoreState(fastViewMem);
   //        }});
   //
   //    }
   //  }
 
   memento->GetInteger(WorkbenchConstants::TAG_X, shellBounds.x);
   memento->GetInteger(WorkbenchConstants::TAG_Y, shellBounds.y);
   memento->GetInteger(WorkbenchConstants::TAG_WIDTH, shellBounds.width);
   memento->GetInteger(WorkbenchConstants::TAG_HEIGHT, shellBounds.height);
   if (!shellBounds.IsEmpty())
   {
     //    StartupThreading.runWithoutExceptions(new StartupRunnable() {
     //
     //      public void runWithException() {
     if (!shellBounds.Intersects(displayBounds))
     {
       Rectangle clientArea(Tweaklets::Get(GuiWidgetsTweaklet::KEY)->GetAvailableScreenSize());
       shellBounds.x = clientArea.x;
       shellBounds.y = clientArea.y;
     }
     GetShell()->SetBounds(shellBounds);
     //      }});
   }
   QString maximized; memento->GetString(WorkbenchConstants::TAG_MAXIMIZED, maximized);
   if (maximized == "true")
   {
     //    StartupThreading.runWithoutExceptions(new StartupRunnable() {
     //
     //      public void runWithException() {
     GetShell()->SetMaximized(true);
     //      }});
 
   }
   QString minimized; memento->GetString(WorkbenchConstants::TAG_MINIMIZED, minimized);
   if (minimized == "true")
   {
     // getShell().setMinimized(true);
   }
 
   //  // restore the width of the perspective bar
   //  if (perspectiveSwitcher != null) {
   //    perspectiveSwitcher.restoreState(memento);
   //  }
 
   //  // Restore the cool bar order by creating all the tool bar contribution
   //  // items
   //  // This needs to be done before pages are created to ensure proper
   //  // canonical creation
   //  // of cool items
   //  final ICoolBarManager2 coolBarMgr = (ICoolBarManager2) getCoolBarManager2();
   //      if (coolBarMgr != null) {
   //    IMemento coolBarMem = memento
   //        .getChild(IWorkbenchConstants.TAG_COOLBAR_LAYOUT);
   //    if (coolBarMem != null) {
   //      // Check if the layout is locked
   //      final Integer lockedInt = coolBarMem
   //          .getInteger(IWorkbenchConstants.TAG_LOCKED);
   //      StartupThreading.runWithoutExceptions(new StartupRunnable(){
   //
   //        public void runWithException() {
   //          if ((lockedInt != null) && (lockedInt.intValue() == 1)) {
   //            coolBarMgr.setLockLayout(true);
   //          } else {
   //            coolBarMgr.setLockLayout(false);
   //          }
   //        }});
   //
   //      // The new layout of the cool bar manager
   //      ArrayList coolBarLayout = new ArrayList();
   //      // Traverse through all the cool item in the memento
   //      IMemento contributionMems[] = coolBarMem
   //          .getChildren(IWorkbenchConstants.TAG_COOLITEM);
   //      for (int i = 0; i < contributionMems.length; i++) {
   //        IMemento contributionMem = contributionMems[i];
   //        String type = contributionMem
   //            .getString(IWorkbenchConstants.TAG_ITEM_TYPE);
   //        if (type == null) {
   //          // Do not recognize that type
   //          continue;
   //        }
   //        String id = contributionMem
   //            .getString(IWorkbenchConstants.TAG_ID);
   //
   //        // Prevent duplicate items from being read back in.
   //        IContributionItem existingItem = coolBarMgr.find(id);
   //        if ((id != null) && (existingItem != null)) {
   //          if (Policy.DEBUG_TOOLBAR_DISPOSAL) {
   //            System.out
   //                .println("Not loading duplicate cool bar item: " + id); //$NON-NLS-1$
   //          }
   //          coolBarLayout.add(existingItem);
   //          continue;
   //        }
   //        IContributionItem newItem = null;
   //        if (type.equals(IWorkbenchConstants.TAG_TYPE_SEPARATOR)) {
   //          if (id != null) {
   //            newItem = new Separator(id);
   //          } else {
   //            newItem = new Separator();
   //          }
   //        } else if (id != null) {
   //          if (type
   //              .equals(IWorkbenchConstants.TAG_TYPE_GROUPMARKER)) {
   //            newItem = new GroupMarker(id);
   //
   //          } else if (type
   //              .equals(IWorkbenchConstants.TAG_TYPE_TOOLBARCONTRIBUTION)
   //              || type
   //                  .equals(IWorkbenchConstants.TAG_TYPE_PLACEHOLDER)) {
   //
   //            // Get Width and height
   //            Integer width = contributionMem
   //                .getInteger(IWorkbenchConstants.TAG_ITEM_X);
   //            Integer height = contributionMem
   //                .getInteger(IWorkbenchConstants.TAG_ITEM_Y);
   //            // Look for the object in the current cool bar
   //            // manager
   //            IContributionItem oldItem = coolBarMgr.find(id);
   //            // If a tool bar contribution item already exists
   //            // for this id then use the old object
   //            if (oldItem != null) {
   //              newItem = oldItem;
   //            } else {
   //              IActionBarPresentationFactory actionBarPresentation = getActionBarPresentationFactory();
   //              newItem = actionBarPresentation.createToolBarContributionItem(
   //                  actionBarPresentation.createToolBarManager(), id);
   //              if (type
   //                  .equals(IWorkbenchConstants.TAG_TYPE_PLACEHOLDER)) {
   //                IToolBarContributionItem newToolBarItem = (IToolBarContributionItem) newItem;
   //                if (height != null) {
   //                  newToolBarItem.setCurrentHeight(height
   //                      .intValue());
   //                }
   //                if (width != null) {
   //                  newToolBarItem.setCurrentWidth(width
   //                      .intValue());
   //                }
   //                newItem = new PlaceholderContributionItem(
   //                    newToolBarItem);
   //              }
   //              // make it invisible by default
   //              newItem.setVisible(false);
   //              // Need to add the item to the cool bar manager
   //              // so that its canonical order can be preserved
   //              IContributionItem refItem = findAlphabeticalOrder(
   //                  IWorkbenchActionConstants.MB_ADDITIONS,
   //                  id, coolBarMgr);
   //              if (refItem != null) {
   //                coolBarMgr.insertAfter(refItem.getId(),
   //                    newItem);
   //              } else {
   //                coolBarMgr.add(newItem);
   //              }
   //            }
   //            // Set the current height and width
   //            if ((width != null)
   //                && (newItem instanceof IToolBarContributionItem)) {
   //              ((IToolBarContributionItem) newItem)
   //                  .setCurrentWidth(width.intValue());
   //            }
   //            if ((height != null)
   //                && (newItem instanceof IToolBarContributionItem)) {
   //              ((IToolBarContributionItem) newItem)
   //                  .setCurrentHeight(height.intValue());
   //            }
   //          }
   //        }
   //        // Add new item into cool bar manager
   //        if (newItem != null) {
   //          coolBarLayout.add(newItem);
   //          newItem.setParent(coolBarMgr);
   //          coolBarMgr.markDirty();
   //        }
   //      }
   //
   //      // We need to check if we have everything we need in the layout.
   //      boolean newlyAddedItems = false;
   //      IContributionItem[] existingItems = coolBarMgr.getItems();
   //      for (int i = 0; i < existingItems.length && !newlyAddedItems; i++) {
   //        IContributionItem existingItem = existingItems[i];
   //
   //        /*
   //         * This line shouldn't be necessary, but is here for
   //         * robustness.
   //         */
   //        if (existingItem == null) {
   //          continue;
   //        }
   //
   //        boolean found = false;
   //        Iterator layoutItemItr = coolBarLayout.iterator();
   //        while (layoutItemItr.hasNext()) {
   //          IContributionItem layoutItem = (IContributionItem) layoutItemItr
   //              .next();
   //          if ((layoutItem != null)
   //              && (layoutItem.equals(existingItem))) {
   //            found = true;
   //            break;
   //          }
   //        }
   //
   //        if (!found) {
   //          if (existingItem != null) {
   //            newlyAddedItems = true;
   //          }
   //        }
   //      }
   //
   //      // Set the cool bar layout to the given layout.
   //      if (!newlyAddedItems) {
   //        final IContributionItem[] itemsToSet = new IContributionItem[coolBarLayout
   //            .size()];
   //        coolBarLayout.toArray(itemsToSet);
   //        StartupThreading
   //            .runWithoutExceptions(new StartupRunnable() {
   //
   //              public void runWithException() {
   //                coolBarMgr.setItems(itemsToSet);
   //              }
   //            });
   //      }
   //
   //    } else {
   //      // For older workbenchs
   //      coolBarMem = memento
   //          .getChild(IWorkbenchConstants.TAG_TOOLBAR_LAYOUT);
   //      if (coolBarMem != null) {
   //        // Restore an older layout
   //        restoreOldCoolBar(coolBarMem);
   //      }
   //    }
   //  }
 
   // Recreate each page in the window.
   IWorkbenchPage::Pointer newActivePage;
   QList<IMemento::Pointer> pageArray = memento
   ->GetChildren(WorkbenchConstants::TAG_PAGE);
-  for (std::size_t i = 0; i < pageArray.size(); i++)
+  for (int i = 0; i < pageArray.size(); i++)
   {
     IMemento::Pointer pageMem = pageArray[i];
     QString strFocus; pageMem->GetString(WorkbenchConstants::TAG_FOCUS, strFocus);
     if (strFocus.isEmpty())
     {
       continue;
     }
 
     // Get the input factory.
     IAdaptable* input = 0;
     IMemento::Pointer inputMem = pageMem->GetChild(WorkbenchConstants::TAG_INPUT);
     if (inputMem)
     {
       QString factoryID; inputMem->GetString(WorkbenchConstants::TAG_FACTORY_ID, factoryID);
       if (factoryID.isEmpty())
       {
         WorkbenchPlugin
         ::Log("Unable to restore page - no input factory ID.");
         //result.add(unableToRestorePage(pageMem));
         result &= UnableToRestorePage(pageMem);
         continue;
       }
       //      try {
       //        UIStats.start(UIStats.RESTORE_WORKBENCH,
       //            "WorkbenchPageFactory"); //$NON-NLS-1$
       //        StartupThreading
       //            .runWithoutExceptions(new StartupRunnable() {
       //
       //              public void runWithException() throws Throwable {
       //                IElementFactory factory = PlatformUI
       //                    .getWorkbench().getElementFactory(
       //                        factoryID);
       //                if (factory == null) {
       //                  WorkbenchPlugin
       //                      .log("Unable to restore page - cannot instantiate input factory: " + factoryID); //$NON-NLS-1$
       //                  result
       //                      .add(unableToRestorePage(pageMem));
       //                  return;
       //                }
       //
       //                // Get the input element.
       //                input[0] = factory.createElement(inputMem);
       //              }
       //            });
       //
       //        if (input[0] == null) {
       //          WorkbenchPlugin
       //              .log("Unable to restore page - cannot instantiate input element: " + factoryID); //$NON-NLS-1$
       //          result.add(unableToRestorePage(pageMem));
       //          continue;
       //        }
       //      } finally {
       //        UIStats.end(UIStats.RESTORE_WORKBENCH, factoryID,
       //            "WorkbenchPageFactory"); //$NON-NLS-1$
       //      }
     }
     // Open the perspective.
     IAdaptable* finalInput = input;
     WorkbenchPage::Pointer newPage;
     try
     {
       //      StartupThreading.runWithWorkbenchExceptions(new StartupRunnable(){
       //
       //        public void runWithException() throws WorkbenchException {
       newPage = new WorkbenchPage(this, finalInput);
       //        }});
 
       //result.add(newPage[0].restoreState(pageMem, activeDescriptor));
       result &= newPage->RestoreState(pageMem, activeDescriptor);
       pageList.Add(newPage);
       //      StartupThreading.runWithoutExceptions(new StartupRunnable() {
       //
       //        public void runWithException() throws Throwable {
       partService.PageOpened(newPage);
       //          firePageOpened(newPage[0]);
       //        }});
 
     }
     catch (const WorkbenchException& e)
     {
       WorkbenchPlugin::Log(
           "Unable to restore perspective - constructor failed.", e); //$NON-NLS-1$
       //result.add(e.getStatus());
       continue;
     }
 
     if (!strFocus.isEmpty())
     {
       newActivePage = newPage;
     }
   }
 
   // If there are no pages create a default.
   if (pageList.IsEmpty())
   {
     try
     {
       const QString defPerspID = this->GetWorkbenchImpl()->GetPerspectiveRegistry()
       ->GetDefaultPerspective();
       if (!defPerspID.isEmpty())
       {
         WorkbenchPage::Pointer newPage;
         //StartupThreading.runWithWorkbenchExceptions(new StartupRunnable() {
 
         //  public void runWithException() throws Throwable {
         newPage = new WorkbenchPage(this, defPerspID,
             this->GetDefaultPageInput());
         //  }});
 
         pageList.Add(newPage);
         //StartupThreading.runWithoutExceptions(new StartupRunnable() {
 
         //  public void runWithException() throws Throwable {
         //    firePageOpened(newPage[0]);
         partService.PageOpened(newPage);
         //  }});
       }
     }
     catch (WorkbenchException& e)
     {
       WorkbenchPlugin
       ::Log(
           "Unable to create default perspective - constructor failed.", e);
       result = false;
       //TODO set product name
       //      String productName = WorkbenchPlugin.getDefault()
       //          .getProductName();
       //      if (productName == null) {
       //        productName = ""; //$NON-NLS-1$
       //      }
       //      getShell().setText(productName);
     }
   }
 
   // Set active page.
   if (newActivePage.IsNull())
   {
     newActivePage = pageList.GetNextActive().Cast<IWorkbenchPage>();
   }
 
   //StartupThreading.runWithoutExceptions(new StartupRunnable() {
 
   //  public void runWithException() throws Throwable {
   this->SetActivePage(newActivePage);
   //  }});
 
 
   IMemento::Pointer introMem = memento->GetChild(WorkbenchConstants::TAG_INTRO);
   if (introMem) {
 //    StartupThreading.runWithoutExceptions(new StartupRunnable() {
 //
 //      public void runWithException() throws Throwable {
     bool isStandby = false;
     introMem->GetBoolean(WorkbenchConstants::TAG_STANDBY, isStandby);
         GetWorkbench()->GetIntroManager()->ShowIntro(
                 IWorkbenchWindow::Pointer(this), isStandby);
 //      }
 //    });
   }
   //
   //  // Only restore the trim state if we're using the default layout
   //  if (defaultLayout != null) {
   //    // Restore the trim state. We pass in the 'root'
   //    // memento since we have to check for pre-3.2
   //    // state.
   //    result.add(restoreTrimState(memento));
   //  }
 
   return result;
 }
 
 IAdaptable* WorkbenchWindow::GetDefaultPageInput()
 {
   return this->GetWorkbenchImpl()->GetDefaultPageInput();
 }
 
 IWorkbenchPage::Pointer WorkbenchWindow::OpenPage(
     const QString& perspId, IAdaptable* input)
 {
   // Run op in busy cursor.
   IWorkbenchPage::Pointer result;
   //BusyIndicator.showWhile(null, new Runnable() {
   //  public void run() {
   result = this->BusyOpenPage(perspId, input);
 
   // }
 
   return result;
 }
 
 SmartPointer<IWorkbenchPage> WorkbenchWindow::OpenPage(IAdaptable* input)
 {
   QString perspId = this->GetWorkbenchImpl()->GetDefaultPerspectiveId();
   return this->OpenPage(perspId, input);
 }
 
 IWorkbenchPage::Pointer WorkbenchWindow::BusyOpenPage(
     const QString& perspID, IAdaptable* input)
 {
   IWorkbenchPage::Pointer newPage;
 
   if (pageList.IsEmpty())
   {
     newPage = new WorkbenchPage(this, perspID, input);
     pageList.Add(newPage);
     //this->FirePageOpened(newPage);
     partService.PageOpened(newPage);
     this->SetActivePage(newPage);
   }
   else
   {
     IWorkbenchWindow::Pointer window = this->GetWorkbench()->OpenWorkbenchWindow(perspID, input);
     newPage = window->GetActivePage();
   }
 
   return newPage;
 }
 
 int WorkbenchWindow::GetNumber()
 {
   return number;
 }
 
 void WorkbenchWindow::UpdateActionBars()
 {
   if (updateDisabled || UpdatesDeferred())
   {
     return;
   }
   // updateAll required in order to enable accelerators on pull-down menus
   GetMenuBarManager()->Update(false);
   //GetToolBarManager()->Update(false);
   //GetStatusLineManager()->Update(false);
 }
 
 void WorkbenchWindow::LargeUpdateStart()
 {
   largeUpdates++;
 }
 
 void WorkbenchWindow::LargeUpdateEnd()
 {
   if (--largeUpdates == 0)
   {
     this->UpdateActionBars();
   }
 }
 
 void WorkbenchWindow::SetActivePage(IWorkbenchPage::Pointer in)
 {
   if (this->GetActivePage() == in)
   {
     return;
   }
 
   // 1FVGTNR: ITPUI:WINNT - busy cursor for switching perspectives
   //BusyIndicator.showWhile(getShell().getDisplay(), new Runnable() {
   //  public void run() {
   // Deactivate old persp.
   WorkbenchPage::Pointer currentPage = pageList.GetActive();
   if (currentPage.IsNotNull())
   {
     currentPage->OnDeactivate();
   }
 
   // Activate new persp.
   if (in.IsNull() || pageList.Contains(in))
   {
     pageList.SetActive(in);
   }
   WorkbenchPage::Pointer newPage = pageList.GetActive();
   //Composite parent = getPageComposite();
   //StackLayout layout = (StackLayout) parent.getLayout();
   if (newPage.IsNotNull())
   {
     //layout.topControl = newPage.getClientComposite();
     //parent.layout();
     this->HideEmptyWindowContents();
     newPage->OnActivate();
     //this->FirePageActivated(newPage);
     partService.PageActivated(newPage);
     //TODO perspective
     if (newPage->GetPerspective() != 0)
     {
       this->FirePerspectiveActivated(newPage, newPage->GetPerspective());
     }
   }
   else
   {
     //layout.topControl = null;
     //parent.layout();
   }
 
   //updateFastViewBar();
 
   if (this->IsClosing())
   {
     return;
   }
 
   updateDisabled = false;
 
   // Update action bars ( implicitly calls updateActionBars() )
   //updateActionSets();
   //submitGlobalActions();
 
   //if (perspectiveSwitcher != null) {
   //  perspectiveSwitcher.update(false);
   //}
 
   //getMenuManager().update(IAction.TEXT);
   //  }
   //});
 }
 
 MenuManager *WorkbenchWindow::GetMenuManager() const
 {
   return this->GetMenuBarManager();
 }
 
 bool WorkbenchWindow::SaveState(IMemento::Pointer memento)
 {
   //  MultiStatus result = new MultiStatus(PlatformUI.PLUGIN_ID, IStatus.OK,
   //        WorkbenchMessages.WorkbenchWindow_problemsSavingWindow, null);
   bool result = true;
 
   // Save the window's state and bounds.
   if (GetShell()->GetMaximized() || asMaximizedState)
   {
     memento->PutString(WorkbenchConstants::TAG_MAXIMIZED, "true");
   }
   if (GetShell()->GetMinimized())
   {
     memento->PutString(WorkbenchConstants::TAG_MINIMIZED, "true");
   }
   if (normalBounds.IsEmpty())
   {
     normalBounds = GetShell()->GetBounds();
   }
 
   //  IMemento fastViewBarMem = memento
   //      .createChild(IWorkbenchConstants.TAG_FAST_VIEW_DATA);
   //  if (fastViewBar != null) {
   //    fastViewBar.saveState(fastViewBarMem);
   //  }
 
   memento->PutInteger(WorkbenchConstants::TAG_X, normalBounds.x);
   memento->PutInteger(WorkbenchConstants::TAG_Y, normalBounds.y);
   memento->PutInteger(WorkbenchConstants::TAG_WIDTH, normalBounds.width);
   memento->PutInteger(WorkbenchConstants::TAG_HEIGHT, normalBounds.height);
 
   IWorkbenchPage::Pointer activePage = GetActivePage();
   if (activePage
       && activePage->FindView(IntroConstants::INTRO_VIEW_ID))
   {
     IMemento::Pointer introMem = memento
         ->CreateChild(WorkbenchConstants::TAG_INTRO);
     bool isStandby = GetWorkbench()->GetIntroManager()
         ->IsIntroStandby(GetWorkbench()->GetIntroManager()->GetIntro());
     introMem->PutBoolean(WorkbenchConstants::TAG_STANDBY, isStandby);
   }
 
   //  // save the width of the perspective bar
   //  IMemento persBarMem = memento
   //      .createChild(IWorkbenchConstants.TAG_PERSPECTIVE_BAR);
   //  if (perspectiveSwitcher != null) {
   //    perspectiveSwitcher.saveState(persBarMem);
   //  }
 
   //  // / Save the order of the cool bar contribution items
   //        ICoolBarManager2 coolBarMgr = (ICoolBarManager2) getCoolBarManager2();
   //        if (coolBarMgr != null) {
   //          coolBarMgr.refresh();
   //      IMemento coolBarMem = memento
   //          .createChild(IWorkbenchConstants.TAG_COOLBAR_LAYOUT);
   //            if (coolBarMgr.getLockLayout() == true) {
   //        coolBarMem.putInteger(IWorkbenchConstants.TAG_LOCKED, 1);
   //      } else {
   //        coolBarMem.putInteger(IWorkbenchConstants.TAG_LOCKED, 0);
   //      }
   //            IContributionItem[] items = coolBarMgr.getItems();
   //      for (int i = 0; i < items.length; i++) {
   //        IMemento coolItemMem = coolBarMem
   //            .createChild(IWorkbenchConstants.TAG_COOLITEM);
   //        IContributionItem item = items[i];
   //        // The id of the contribution item
   //        if (item.getId() != null) {
   //          coolItemMem.putString(IWorkbenchConstants.TAG_ID, item
   //              .getId());
   //        }
   //        // Write out type and size if applicable
   //        if (item.isSeparator()) {
   //          coolItemMem.putString(IWorkbenchConstants.TAG_ITEM_TYPE,
   //              IWorkbenchConstants.TAG_TYPE_SEPARATOR);
   //        } else if (item.isGroupMarker() && !item.isSeparator()) {
   //          coolItemMem.putString(IWorkbenchConstants.TAG_ITEM_TYPE,
   //              IWorkbenchConstants.TAG_TYPE_GROUPMARKER);
   //        } else {
   //          if (item instanceof PlaceholderContributionItem) {
   //            coolItemMem.putString(
   //                IWorkbenchConstants.TAG_ITEM_TYPE,
   //                IWorkbenchConstants.TAG_TYPE_PLACEHOLDER);
   //          } else {
   //            // Store the identifier.
   //            coolItemMem
   //                .putString(
   //                    IWorkbenchConstants.TAG_ITEM_TYPE,
   //                    IWorkbenchConstants.TAG_TYPE_TOOLBARCONTRIBUTION);
   //          }
   //
   //          /*
   //           * Retrieve a reasonable approximation of the height and
   //           * width, if possible.
   //           */
   //          final int height;
   //          final int width;
   //          if (item instanceof IToolBarContributionItem) {
   //            IToolBarContributionItem toolBarItem = (IToolBarContributionItem) item;
   //            toolBarItem.saveWidgetState();
   //            height = toolBarItem.getCurrentHeight();
   //            width = toolBarItem.getCurrentWidth();
   //          } else if (item instanceof PlaceholderContributionItem) {
   //            PlaceholderContributionItem placeholder = (PlaceholderContributionItem) item;
   //            height = placeholder.getHeight();
   //            width = placeholder.getWidth();
   //          } else {
   //            height = -1;
   //            width = -1;
   //          }
   //
   //          // Store the height and width.
   //          coolItemMem.putInteger(IWorkbenchConstants.TAG_ITEM_X,
   //              width);
   //          coolItemMem.putInteger(IWorkbenchConstants.TAG_ITEM_Y,
   //              height);
   //        }
   //      }
   //    }
 
 
   // Save each page.
   for (PageList::iterator itr = pageList.Begin();
       itr != pageList.End(); ++itr)
   {
     WorkbenchPage::Pointer page = itr->Cast<WorkbenchPage>();
 
     // Save perspective.
     IMemento::Pointer pageMem = memento
     ->CreateChild(WorkbenchConstants::TAG_PAGE);
     pageMem->PutString(WorkbenchConstants::TAG_LABEL, page->GetLabel());
     //result.add(page.saveState(pageMem));
     result &= page->SaveState(pageMem);
 
     if (page == GetActivePage().Cast<WorkbenchPage>())
     {
       pageMem->PutString(WorkbenchConstants::TAG_FOCUS, "true");
     }
 
     //    // Get the input.
     //    IAdaptable* input = page->GetInput();
     //    if (input != 0) {
     //      IPersistableElement persistable = (IPersistableElement) Util.getAdapter(input,
     //          IPersistableElement.class);
     //      if (persistable == null) {
     //        WorkbenchPlugin
     //            .log("Unable to save page input: " //$NON-NLS-1$
     //                + input
     //                + ", because it does not adapt to IPersistableElement"); //$NON-NLS-1$
     //      } else {
     //        // Save input.
     //        IMemento inputMem = pageMem
     //            .createChild(IWorkbenchConstants.TAG_INPUT);
     //        inputMem.putString(IWorkbenchConstants.TAG_FACTORY_ID,
     //            persistable.getFactoryId());
     //        persistable.saveState(inputMem);
     //      }
     //    }
   }
 
   // Save window advisor state.
   IMemento::Pointer windowAdvisorState = memento
   ->CreateChild(WorkbenchConstants::TAG_WORKBENCH_WINDOW_ADVISOR);
   //result.add(getWindowAdvisor().saveState(windowAdvisorState));
   result &= GetWindowAdvisor()->SaveState(windowAdvisorState);
 
   // Save actionbar advisor state.
   IMemento::Pointer actionBarAdvisorState = memento
   ->CreateChild(WorkbenchConstants::TAG_ACTION_BAR_ADVISOR);
   //result.add(getActionBarAdvisor().saveState(actionBarAdvisorState));
   result &= GetActionBarAdvisor()->SaveState(actionBarAdvisorState);
 
   //  // Only save the trim state if we're using the default layout
   //  if (defaultLayout != null) {
   //    IMemento trimState = memento.createChild(IWorkbenchConstants.TAG_TRIM);
   //    result.add(saveTrimState(trimState));
   //  }
 
   return result;
 }
 
-WorkbenchWindowConfigurer::Pointer WorkbenchWindow::GetWindowConfigurer()
+WorkbenchWindowConfigurer::Pointer WorkbenchWindow::GetWindowConfigurer() const
 {
   if (windowConfigurer.IsNull())
   {
     // lazy initialize
-    windowConfigurer = new WorkbenchWindowConfigurer(WorkbenchWindow::Pointer(this));
+    windowConfigurer = new WorkbenchWindowConfigurer(WorkbenchWindow::Pointer(const_cast<WorkbenchWindow*>(this)));
   }
   return windowConfigurer;
 }
 
 bool WorkbenchWindow::CanHandleShellCloseEvent()
 {
   if (!Window::CanHandleShellCloseEvent())
   {
     return false;
   }
 
   // let the advisor or other interested parties
   // veto the user's explicit request to close the window
   return FireWindowShellClosing();
 }
 
 void WorkbenchWindow::ConfigureShell(Shell::Pointer shell)
 {
   Window::ConfigureShell(shell);
 
   detachedWindowShells = new ShellPool(shell, Constants::TITLE
       | Constants::MAX | Constants::CLOSE | Constants::RESIZE | Constants::BORDER );
 
   QString title = this->GetWindowConfigurer()->BasicGetTitle();
   if (!title.isEmpty())
   {
     shell->SetText(title);
   }
 
   //  final IWorkbench workbench = getWorkbench();
   //  workbench.getHelpSystem().setHelp(shell,
   //      IWorkbenchHelpContextIds.WORKBENCH_WINDOW);
 
   //    final IContextService contextService = (IContextService) getWorkbench().getService(IContextService.class);
   //    contextService.registerShell(shell, IContextService.TYPE_WINDOW);
 
   this->TrackShellActivation(shell);
   this->TrackShellResize(shell);
 }
 
 ShellPool::Pointer WorkbenchWindow::GetDetachedWindowPool()
 {
   return detachedWindowShells;
 }
 
 WorkbenchAdvisor* WorkbenchWindow::GetAdvisor()
 {
   return this->GetWorkbenchImpl()->GetAdvisor();
 }
 
 WorkbenchWindowAdvisor* WorkbenchWindow::GetWindowAdvisor()
 {
   if (windowAdvisor == 0)
   {
     windowAdvisor = this->GetAdvisor()->CreateWorkbenchWindowAdvisor(this->GetWindowConfigurer());
     poco_check_ptr(windowAdvisor);
   }
   return windowAdvisor;
 }
 
 ActionBarAdvisor::Pointer WorkbenchWindow::GetActionBarAdvisor()
 {
   if (actionBarAdvisor.IsNull())
   {
     actionBarAdvisor = this->GetWindowAdvisor()->CreateActionBarAdvisor(this->GetWindowConfigurer()->GetActionBarConfigurer());
     poco_assert(actionBarAdvisor.IsNotNull());
   }
   return actionBarAdvisor;
 }
 
 Workbench* WorkbenchWindow::GetWorkbenchImpl()
 {
   return dynamic_cast<Workbench*>(this->GetWorkbench());
 }
 
 void WorkbenchWindow::ShowEmptyWindowContents()
 {
   if (!emptyWindowContentsCreated)
   {
     void* parent = this->GetPageComposite();
     emptyWindowContents = this->GetWindowAdvisor()->CreateEmptyWindowContents(
         parent);
     emptyWindowContentsCreated = true;
     //    // force the empty window composite to be layed out
     //    ((StackLayout) parent.getLayout()).topControl = emptyWindowContents;
     //    parent.layout();
   }
 }
 
 void WorkbenchWindow::HideEmptyWindowContents()
 {
   if (emptyWindowContentsCreated)
   {
     if (emptyWindowContents != 0)
     {
       Tweaklets::Get(GuiWidgetsTweaklet::KEY)->Dispose(emptyWindowContents);
       emptyWindowContents = 0;
       //this->GetPageComposite().layout();
     }
     emptyWindowContentsCreated = false;
   }
 }
 
 WorkbenchWindow::ServiceLocatorOwner::ServiceLocatorOwner(WorkbenchWindow* wnd)
 : window(wnd)
 {
 
 }
 
 void WorkbenchWindow::ServiceLocatorOwner::Dispose()
 {
   Shell::Pointer shell = window->GetShell();
   if (shell != 0)
   {
     window->Close();
   }
 }
 
 bool WorkbenchWindow::PageList::Add(IWorkbenchPage::Pointer object)
 {
   pagesInCreationOrder.push_back(object);
   pagesInActivationOrder.push_front(object);
   // It will be moved to top only when activated.
   return true;
 }
 
 WorkbenchWindow::PageList::iterator WorkbenchWindow::PageList::Begin()
 {
   return pagesInCreationOrder.begin();
 }
 
 WorkbenchWindow::PageList::iterator WorkbenchWindow::PageList::End()
 {
   return pagesInCreationOrder.end();
 }
 
 bool WorkbenchWindow::PageList::Contains(IWorkbenchPage::Pointer object)
 {
   return std::find(pagesInCreationOrder.begin(), pagesInCreationOrder.end(),
       object) != pagesInCreationOrder.end();
 }
 
 bool WorkbenchWindow::PageList::Remove(IWorkbenchPage::Pointer object)
 {
   if (active == object)
   {
     active = 0;
   }
   pagesInActivationOrder.removeAll(object);
-  std::size_t origSize = pagesInCreationOrder.size();
+  const int origSize = pagesInCreationOrder.size();
   pagesInCreationOrder.removeAll(object);
   return origSize != pagesInCreationOrder.size();
 }
 
 void WorkbenchWindow::PageList::Clear()
 {
   pagesInCreationOrder.clear();
   pagesInActivationOrder.clear();
   active = 0;
 }
 
 bool WorkbenchWindow::PageList::IsEmpty()
 {
   return pagesInCreationOrder.empty();
 }
 
 const QList<IWorkbenchPage::Pointer>& WorkbenchWindow::PageList::GetPages()
 {
   return pagesInCreationOrder;
 }
 
 void WorkbenchWindow::PageList::SetActive(IWorkbenchPage::Pointer page)
 {
   if (active == page)
   {
     return;
   }
 
   active = page;
 
   if (page.IsNotNull())
   {
     pagesInActivationOrder.removeAll(page);
     pagesInActivationOrder.push_back(page);
   }
 }
 
-WorkbenchPage::Pointer WorkbenchWindow::PageList::GetActive()
+WorkbenchPage::Pointer WorkbenchWindow::PageList::GetActive() const
 {
   return active.Cast<WorkbenchPage>();
 }
 
 WorkbenchPage::Pointer WorkbenchWindow::PageList::GetNextActive()
 {
   if (active.IsNull())
   {
     if (pagesInActivationOrder.empty())
     {
       return WorkbenchPage::Pointer(0);
     }
 
     return pagesInActivationOrder.back().Cast<WorkbenchPage>();
   }
 
   if (pagesInActivationOrder.size() < 2)
   {
     return WorkbenchPage::Pointer(0);
   }
 
   return pagesInActivationOrder.at(pagesInActivationOrder.size()-2).Cast<WorkbenchPage>();
 }
 
 WorkbenchWindow::ShellActivationListener::ShellActivationListener(WorkbenchWindow::Pointer w) :
 window(w)
 {
 }
 
-void WorkbenchWindow::ShellActivationListener::ShellActivated(ShellEvent::Pointer /*event*/)
+void WorkbenchWindow::ShellActivationListener::ShellActivated(const ShellEvent::Pointer& /*event*/)
 {
   WorkbenchWindow::Pointer wnd(window);
 
   wnd->shellActivated = true;
   wnd->serviceLocator->Activate();
   wnd->GetWorkbenchImpl()->SetActivatedWindow(wnd);
   WorkbenchPage::Pointer currentPage = wnd->GetActivePage().Cast<WorkbenchPage>();
   if (currentPage != 0)
   {
     IWorkbenchPart::Pointer part = currentPage->GetActivePart();
     if (part != 0)
     {
       PartSite::Pointer site = part->GetSite().Cast<PartSite>();
       site->GetPane()->ShellActivated();
     }
     IEditorPart::Pointer editor = currentPage->GetActiveEditor();
     if (editor != 0)
     {
       PartSite::Pointer site = editor->GetSite().Cast<PartSite>();
       site->GetPane()->ShellActivated();
     }
     wnd->GetWorkbenchImpl()->FireWindowActivated(wnd);
   }
   //liftRestrictions();
 }
 
-void WorkbenchWindow::ShellActivationListener::ShellDeactivated(ShellEvent::Pointer /*event*/)
+void WorkbenchWindow::ShellActivationListener::ShellDeactivated(const ShellEvent::Pointer& /*event*/)
 {
   WorkbenchWindow::Pointer wnd(window);
 
   wnd->shellActivated = false;
   //imposeRestrictions();
   wnd->serviceLocator->Deactivate();
   WorkbenchPage::Pointer currentPage = wnd->GetActivePage().Cast<WorkbenchPage>();
   if (currentPage != 0)
   {
     IWorkbenchPart::Pointer part = currentPage->GetActivePart();
     if (part != 0)
     {
       PartSite::Pointer site = part->GetSite().Cast<PartSite>();
       site->GetPane()->ShellDeactivated();
     }
     IEditorPart::Pointer editor = currentPage->GetActiveEditor();
     if (editor != 0)
     {
       PartSite::Pointer site = editor->GetSite().Cast<PartSite>();
       site->GetPane()->ShellDeactivated();
     }
     wnd->GetWorkbenchImpl()->FireWindowDeactivated(wnd);
   }
 }
 
 void WorkbenchWindow::TrackShellActivation(Shell::Pointer shell)
 {
-  shellActivationListener = new ShellActivationListener(WorkbenchWindow::Pointer(this));
-  shell->AddShellListener(shellActivationListener);
+  shellActivationListener.reset(new ShellActivationListener(WorkbenchWindow::Pointer(this)));
+  shell->AddShellListener(shellActivationListener.data());
 }
 
 WorkbenchWindow::ControlResizeListener::ControlResizeListener(WorkbenchWindow* w)
 : window(w)
 {
 }
 
 GuiTk::IControlListener::Events::Types WorkbenchWindow::ControlResizeListener::GetEventTypes() const
 {
   return Events::MOVED | Events::RESIZED;
 }
 
 void WorkbenchWindow::
 ControlResizeListener::ControlMoved(GuiTk::ControlEvent::Pointer /*e*/)
 {
   this->SaveBounds();
 }
 
 void WorkbenchWindow::
 ControlResizeListener::ControlResized(GuiTk::ControlEvent::Pointer /*e*/)
 {
   this->SaveBounds();
 }
 
 void WorkbenchWindow::ControlResizeListener::SaveBounds()
 {
   WorkbenchWindow::Pointer wnd(window);
 
   Shell::Pointer shell = wnd->GetShell();
   if (shell == 0)
   {
     return;
   }
   //  if (shell->IsDisposed())
   //  {
   //    return;
   //  }
   if (shell->GetMinimized())
   {
     return;
   }
   if (shell->GetMaximized())
   {
     wnd->asMaximizedState = true;
     return;
   }
   wnd->asMaximizedState = false;
   wnd->normalBounds = shell->GetBounds();
 }
 
 void WorkbenchWindow::TrackShellResize(Shell::Pointer newShell)
 {
   controlResizeListener = new ControlResizeListener(this);
   Tweaklets::Get(GuiWidgetsTweaklet::KEY)->AddControlListener(newShell->GetControl(), controlResizeListener);
 }
 
 bool WorkbenchWindow::UpdatesDeferred() const
 {
   return largeUpdates > 0;
 }
 
+void WorkbenchWindow::InitializeDefaultServices()
+{
+  workbenchLocationService.reset(
+        new WorkbenchLocationService(IServiceScopes::WINDOW_SCOPE, GetWorkbench(), this, NULL, 1));
+  workbenchLocationService->Register();
+  serviceLocator->RegisterService(workbenchLocationService.data());
+
+  //ActionCommandMappingService* mappingService = new ActionCommandMappingService();
+  //serviceLocator->RegisterService(IActionCommandMappingService, mappingService);
+}
+
+QSet<SmartPointer<IEvaluationReference> > WorkbenchWindow::GetMenuRestrictions() const
+{
+  return QSet<SmartPointer<IEvaluationReference> >();
+}
+
+void WorkbenchWindow::FirePropertyChanged(const  QString& property, const Object::Pointer& oldValue,
+                                          const Object::Pointer& newValue)
+{
+  PropertyChangeEvent::Pointer event(new PropertyChangeEvent(Object::Pointer(this), property, oldValue, newValue));
+  genericPropertyListeners.propertyChange(event);
+}
+
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchWindow.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchWindow.h
index 4f0b2c6d66..6815e57d29 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchWindow.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchWindow.h
@@ -1,667 +1,738 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYWORKBENCHWINDOW_H_
 #define BERRYWORKBENCHWINDOW_H_
 
 #include "berryIWorkbenchWindow.h"
 
 #include "berryIPerspectiveListener.h"
 #include "guitk/berryGuiTkIControlListener.h"
 #include "berryWindow.h"
 
 #include "berryWorkbenchWindowConfigurer.h"
 #include "berryShellPool.h"
 #include "berryServiceLocator.h"
 #include "berryWWinPartService.h"
 
 #include "application/berryWorkbenchAdvisor.h"
 #include "application/berryWorkbenchWindowAdvisor.h"
 #include "application/berryActionBarAdvisor.h"
 
 #include <list>
 
 namespace berry
 {
 
+struct IEvaluationReference;
 struct IWorkbench;
 struct IWorkbenchPage;
 struct IPartService;
 struct ISelectionService;
 struct IPerspectiveDescriptor;
+struct IWorkbenchLocationService;
 
 class Workbench;
 class WorkbenchPage;
 class WWinActionBars;
 
 /**
  * \ingroup org_blueberry_ui_qt
  *
  */
 class BERRY_UI_QT WorkbenchWindow: public Window, public IWorkbenchWindow
 {
 
 public:
 
-  berryObjectMacro(WorkbenchWindow);
+  /**
+   * Toolbar visibility change property.
+   */
+  static const QString PROP_TOOLBAR_VISIBLE; // = "toolbarVisible";
+
+  /**
+   * Perspective bar visibility change property.
+   */
+  static const QString PROP_PERSPECTIVEBAR_VISIBLE; // = "perspectiveBarVisible";
+
+  /**
+   * The status line visibility change property.  for internal use only.
+   */
+  static const QString PROP_STATUS_LINE_VISIBLE; // = "statusLineVisible";
+
+public:
+
+  berryObjectMacro(WorkbenchWindow)
 
   WorkbenchWindow(int number);
 
   ~WorkbenchWindow();
 
   Object* GetService(const QString& key);
 
   bool HasService(const QString& key) const;
 
   int Open();
   bool Close();
 
-  Shell::Pointer GetShell();
+  Shell::Pointer GetShell() const;
 
   /**
    * @see org.blueberry.ui.IPageService
    */
-  void AddPerspectiveListener(IPerspectiveListener::Pointer l);
+  void AddPerspectiveListener(IPerspectiveListener* l);
 
   /**
    * @see org.blueberry.ui.IPageService
    */
-  void RemovePerspectiveListener(IPerspectiveListener::Pointer l);
+  void RemovePerspectiveListener(IPerspectiveListener* l);
 
   /**
    * @see org.blueberry.ui.IPageService
    */
   IPerspectiveListener::Events& GetPerspectiveEvents();
 
   /**
    * Returns the action bars for this window.
    */
   WWinActionBars* GetActionBars();
 
-  SmartPointer<IWorkbenchPage> GetActivePage();
+  SmartPointer<IWorkbenchPage> GetActivePage() const;
 
   SmartPointer<IWorkbenchPage> GetPage(int i);
 
   void SetPerspectiveExcludeList(std::vector<std::string> v);
   std::vector<std::string> GetPerspectiveExcludeList();
 
   void SetViewExcludeList(std::vector<std::string> v);
   std::vector<std::string> GetViewExcludeList();
 
   /**
    * Sets the active page within the window.
    *
    * @param in
    *            identifies the new active page, or <code>null</code> for no
    *            active page
    */
   void SetActivePage(SmartPointer<IWorkbenchPage> in);
 
   /**
    * Answer the menu manager for this window.
    */
   MenuManager* GetMenuManager() const;
 
   IWorkbench* GetWorkbench();
 
   IPartService* GetPartService();
 
   ISelectionService* GetSelectionService();
 
+  /**
+   * @return whether the tool bar should be shown. This is only applicable if
+   *         the window configurer also wishes the cool bar to be visible.
+   */
+  bool GetToolBarVisible() const;
+
+  /**
+   * @return whether the perspective bar should be shown. This is only
+   *         applicable if the window configurer also wishes the perspective
+   *         bar to be visible.
+   */
+  bool GetPerspectiveBarVisible() const;
+
+  /**
+   * @return whether the status line should be shown. This is only applicable if
+   *         the window configurer also wishes status line to be visible.
+   */
+  bool GetStatusLineVisible() const;
+
+  /**
+   * Add a generic property listener.
+   *
+   * @param listener the listener to add
+   */
+  void AddPropertyChangeListener(IPropertyChangeListener* listener);
+
+  /**
+   * Removes a generic property listener.
+   *
+   * @param listener the listener to remove
+   */
+  void RemovePropertyChangeListener(IPropertyChangeListener* listener);
+
   SmartPointer<IWorkbenchPage> OpenPage(const QString& perspectiveId,
       IAdaptable* input);
 
   SmartPointer<IWorkbenchPage> OpenPage(IAdaptable* input);
 
   //TODO menu manager
   //virtual void* GetMenuManager() = 0;
 
   virtual bool SaveState(IMemento::Pointer memento);
 
   /**
    * Called when this window is about to be closed.
    *
    * Subclasses may overide to add code that returns <code>false</code> to
    * prevent closing under certain conditions.
    */
   virtual bool OkToClose();
 
   bool RestoreState(IMemento::Pointer memento, SmartPointer<
       IPerspectiveDescriptor> activeDescriptor);
 
   /**
    * Returns the number. This corresponds to a page number in a window or a
    * window number in the workbench.
    */
   int GetNumber();
 
   /**
    * update the action bars.
    */
   void UpdateActionBars();
 
   /**
    * <p>
    * Indicates the start of a large update within this window. This is used to
    * disable CPU-intensive, change-sensitive services that were temporarily
    * disabled in the midst of large changes. This method should always be
    * called in tandem with <code>largeUpdateEnd</code>, and the event loop
    * should not be allowed to spin before that method is called.
    * </p>
    * <p>
    * Important: always use with <code>largeUpdateEnd</code>!
    * </p>
    *
    * @since 3.1
    */
   void LargeUpdateStart();
 
   /**
    * <p>
    * Indicates the end of a large update within this window. This is used to
    * re-enable services that were temporarily disabled in the midst of large
    * changes. This method should always be called in tandem with
    * <code>largeUpdateStart</code>, and the event loop should not be
    * allowed to spin before this method is called.
    * </p>
    * <p>
    * Important: always protect this call by using <code>finally</code>!
    * </p>
    *
    * @since 3.1
    */
   void LargeUpdateEnd();
 
+  QSet<SmartPointer<IEvaluationReference> > GetMenuRestrictions() const;
+
 protected:
 
   friend class WorkbenchConfigurer;
   friend class WorkbenchWindowConfigurer;
   friend class WorkbenchWindowConfigurer::WindowActionBarConfigurer;
   friend class Workbench;
   friend class LayoutPartSash;
   friend class EditorSashContainer;
   friend class WorkbenchPage;
   friend class DetachedWindow;
 
   /**
    * Returns the GUI dependent page composite, under which the window's
    * pages create their controls.
    */
   void* GetPageComposite();
 
   /**
    * Creates and remembers the client composite, under which workbench pages
    * create their controls.
    */
   QWidget* CreatePageComposite(QWidget* parent);
 
   /**
    * Creates the contents of the workbench window, including trim controls and
    * the client composite. This MUST create the client composite via a call to
    * <code>createClientComposite</code>.
    *
    * @since 3.0
    */
   void* CreateContents(Shell::Pointer parent);
 
   /**
    * Creates the default contents and layout of the shell.
    *
    * @param shell
    *            the shell
    */
   virtual void CreateDefaultContents(Shell::Pointer shell);
 
   void CreateTrimWidgets(SmartPointer<Shell> shell);
 
   /**
    * Returns the unique object that applications use to configure this window.
    * <p>
    * IMPORTANT This method is declared package-private to prevent regular
    * plug-ins from downcasting IWorkbenchWindow to WorkbenchWindow and getting
    * hold of the workbench window configurer that would allow them to tamper
    * with the workbench window. The workbench window configurer is available
    * only to the application.
    * </p>
    */
-  WorkbenchWindowConfigurer::Pointer GetWindowConfigurer();
+  WorkbenchWindowConfigurer::Pointer GetWindowConfigurer() const;
 
   bool CanHandleShellCloseEvent();
 
   /*
    * @see berry::Window#configureShell(Shell::Pointer)
    */
   void ConfigureShell(Shell::Pointer shell);
 
   ShellPool::Pointer GetDetachedWindowPool();
 
   /**
    * Fills the window's real action bars.
    *
    * @param flags
    *            indicate which bars to fill
    */
   void FillActionBars(ActionBarAdvisor::FillFlags flags);
 
   /**
    * The <code>WorkbenchWindow</code> implementation of this method
    * delegates to the window configurer.
    *
    * @since 3.0
    */
   Point GetInitialSize();
 
   /**
    * Returns the default page input for workbench pages opened in this window.
    *
    * @return the default page input or <code>null</code> if none
    * @since 3.1
    */
   IAdaptable* GetDefaultPageInput();
 
   bool IsClosing();
 
   /**
    * Opens a new page. Assumes that busy cursor is active.
    * <p>
    * <b>Note:</b> Since release 2.0, a window is limited to contain at most
    * one page. If a page exist in the window when this method is used, then
    * another window is created for the new page. Callers are strongly
    * recommended to use the <code>IWorkbench.openPerspective</code> APIs to
    * programmatically show a perspective.
    * </p>
    */
   SmartPointer<IWorkbenchPage> BusyOpenPage(const QString& perspID,
       IAdaptable* input);
 
   bool ClosePage(SmartPointer<IWorkbenchPage> in, bool save);
 
   /**
    * Makes the window visible and frontmost.
    */
   void MakeVisible();
 
   /**
    * The composite under which workbench pages create their controls.
    */
   QWidget* pageComposite;
 
 private:
 
   /**
    * Constant indicating that all the actions bars should be filled.
    *
    * @since 3.0
    */
   static const ActionBarAdvisor::FillFlags FILL_ALL_ACTION_BARS;
 
   ShellPool::Pointer detachedWindowShells;
 
   /**
    * Object for configuring this workbench window. Lazily initialized to an
    * instance unique to this window.
    *
    * @since 3.0
    */
-  WorkbenchWindowConfigurer::Pointer windowConfigurer;
+  mutable WorkbenchWindowConfigurer::Pointer windowConfigurer;
 
   WorkbenchWindowAdvisor* windowAdvisor;
 
   ActionBarAdvisor::Pointer actionBarAdvisor;
 
   SmartPointer<WWinActionBars> actionBars;
 
+  IPropertyChangeListener::Events genericPropertyListeners;
+
   int number;
 
   /**
    * The number of large updates that are currently going on. If this is
    * number is greater than zero, then UI updateActionBars is a no-op.
    */
   int largeUpdates;
 
   bool closing;
   bool shellActivated;
   bool updateDisabled;
 
+  bool toolBarVisible;
+  bool perspectiveBarVisible;
+  bool statusLineVisible;
+
   /**
    * The map of services maintained by the workbench window. These services
    * are initialized during workbench window during the
    * {@link #configureShell(Shell)}.
    */
   ServiceLocator::Pointer serviceLocator;
 
+  QScopedPointer<IWorkbenchLocationService, QScopedPointerObjectDeleter> workbenchLocationService;
+
   bool emptyWindowContentsCreated;
   void* emptyWindowContents;
 
   Rectangle normalBounds;
 
   bool asMaximizedState;
 
   IPerspectiveListener::Events perspectiveEvents;
 
   WWinPartService partService;
 
   std::vector<std::string> perspectiveExcludeList;
   std::vector<std::string> viewExcludeList;
 
   struct ServiceLocatorOwner: public IDisposable
   {
     ServiceLocatorOwner(WorkbenchWindow* wnd);
 
     WorkbenchWindow* window;
 
     void Dispose();
   };
 
   IDisposable::Pointer serviceLocatorOwner;
 
   class PageList
   {
 
   private:
     // List of pages in the order they were created;
     QList<SmartPointer<IWorkbenchPage> > pagesInCreationOrder;
 
     // List of pages where the top is the last activated.
     QList<SmartPointer<IWorkbenchPage> > pagesInActivationOrder;
 
     // The page explicitly activated
     SmartPointer<IWorkbenchPage> active;
 
   public:
 
     typedef QList<SmartPointer<IWorkbenchPage> >::iterator iterator;
 
     bool Add(SmartPointer<IWorkbenchPage> object);
 
     iterator Begin();
 
     iterator End();
 
     void Clear();
 
     bool Contains(SmartPointer<IWorkbenchPage> object);
 
     bool Remove(SmartPointer<IWorkbenchPage> object);
 
     bool IsEmpty();
 
     const QList<SmartPointer<IWorkbenchPage> >& GetPages();
 
     void SetActive(SmartPointer<IWorkbenchPage> page);
 
-    SmartPointer<WorkbenchPage> GetActive();
+    SmartPointer<WorkbenchPage> GetActive() const;
 
     SmartPointer<WorkbenchPage> GetNextActive();
   };
 
   PageList pageList;
 
   /**
    * Notifies interested parties (namely the advisor) that the window is about
    * to be opened.
    *
    * @since 3.1
    */
   void FireWindowOpening();
 
   /**
    * Notifies interested parties (namely the advisor) that the window has been
    * restored from a previously saved state.
    *
    * @throws WorkbenchException
    *             passed through from the advisor
    * @since 3.1
    */
   void FireWindowRestored();
 
   /**
    * Notifies interested parties (namely the advisor) that the window has been
    * created.
    *
    * @since 3.1
    */
   void FireWindowCreated();
 
   /**
    * Notifies interested parties (namely the advisor and the window listeners)
    * that the window has been opened.
    *
    * @since 3.1
    */
   void FireWindowOpened();
 
   /**
    * Notifies interested parties (namely the advisor) that the window's shell
    * is closing. Allows the close to be vetoed.
    *
    * @return <code>true</code> if the close should proceed,
    *         <code>false</code> if it should be canceled
    * @since 3.1
    */
   bool FireWindowShellClosing();
 
   /**
    * Notifies interested parties (namely the advisor and the window listeners)
    * that the window has been closed.
    *
    * @since 3.1
    */
   void FireWindowClosed();
 
   //  /**
   //   * Fires page activated
   //   */
   //  void FirePageActivated(IWorkbenchPage::Pointer page);
   //
   //  /**
   //   * Fires page closed
   //   */
   //  void FirePageClosed(IWorkbenchPage::Pointer page);
   //
   //  /**
   //   * Fires page opened
   //   */
   //  void FirePageOpened(IWorkbenchPage::Pointer page);
 
   /**
    * Fires perspective activated
    */
   void FirePerspectiveActivated(SmartPointer<IWorkbenchPage> page,
       IPerspectiveDescriptor::Pointer perspective);
 
   /**
    * Fires perspective deactivated.
    *
    * @since 3.2
    */
   void FirePerspectivePreDeactivate(SmartPointer<IWorkbenchPage> page,
       IPerspectiveDescriptor::Pointer perspective);
 
   /**
    * Fires perspective deactivated.
    *
    * @since 3.1
    */
   void FirePerspectiveDeactivated(SmartPointer<IWorkbenchPage> page,
       IPerspectiveDescriptor::Pointer perspective);
 
   /**
    * Fires perspective changed
    */
   void FirePerspectiveChanged(SmartPointer<IWorkbenchPage> ,
       IPerspectiveDescriptor::Pointer perspective, const QString& changeId);
 
   /**
    * Fires perspective changed for an affected part
    */
   void FirePerspectiveChanged(SmartPointer<IWorkbenchPage> ,
       IPerspectiveDescriptor::Pointer perspective,
       IWorkbenchPartReference::Pointer partRef, const QString& changeId);
 
   /**
    * Fires perspective closed
    */
   void FirePerspectiveClosed(SmartPointer<IWorkbenchPage> ,
       IPerspectiveDescriptor::Pointer perspective);
 
   /**
    * Fires perspective opened
    */
   void FirePerspectiveOpened(SmartPointer<IWorkbenchPage> ,
       IPerspectiveDescriptor::Pointer perspective);
 
   /**
    * Fires perspective saved as.
    *
    * @since 3.1
    */
   void FirePerspectiveSavedAs(SmartPointer<IWorkbenchPage> ,
       IPerspectiveDescriptor::Pointer oldPerspective,
       IPerspectiveDescriptor::Pointer newPerspective);
 
   /**
    * Returns the workbench advisor. Assumes the workbench has been created
    * already.
    * <p>
    * IMPORTANT This method is declared private to prevent regular plug-ins
    * from downcasting IWorkbenchWindow to WorkbenchWindow and getting hold of
    * the workbench advisor that would allow them to tamper with the workbench.
    * The workbench advisor is internal to the application.
    * </p>
    */
   /* private - DO NOT CHANGE */
   WorkbenchAdvisor* GetAdvisor();
 
   /**
    * Returns the window advisor, creating a new one for this window if needed.
    * <p>
    * IMPORTANT This method is declared private to prevent regular plug-ins
    * from downcasting IWorkbenchWindow to WorkbenchWindow and getting hold of
    * the window advisor that would allow them to tamper with the window. The
    * window advisor is internal to the application.
    * </p>
    */
   /* private - DO NOT CHANGE */
   WorkbenchWindowAdvisor* GetWindowAdvisor();
 
   /**
    * Returns the action bar advisor, creating a new one for this window if
    * needed.
    * <p>
    * IMPORTANT This method is declared private to prevent regular plug-ins
    * from downcasting IWorkbenchWindow to WorkbenchWindow and getting hold of
    * the action bar advisor that would allow them to tamper with the window's
    * action bars. The action bar advisor is internal to the application.
    * </p>
    */
   /* private - DO NOT CHANGE */
   ActionBarAdvisor::Pointer GetActionBarAdvisor();
 
   /*
    * Returns the IWorkbench implementation.
    */
   Workbench* GetWorkbenchImpl();
 
   bool UnableToRestorePage(IMemento::Pointer pageMem);
 
   /**
    * Close the window.
    *
    * Assumes that busy cursor is active.
    */
   bool BusyClose();
 
   /**
    * Unconditionally close this window. Assumes the proper flags have been set
    * correctly (e.i. closing and updateDisabled)
    */
   bool HardClose();
 
   /**
    * Close all of the pages.
    */
   void CloseAllPages();
 
   /**
    * Save all of the pages. Returns true if the operation succeeded.
    */
   bool SaveAllPages(bool bConfirm);
 
   void ShowEmptyWindowContents();
 
   void HideEmptyWindowContents();
 
   struct ShellActivationListener: public IShellListener
   {
     ShellActivationListener(WorkbenchWindow::Pointer window);
 
-    void ShellActivated(ShellEvent::Pointer event);
+    void ShellActivated(const ShellEvent::Pointer& event);
 
-    void ShellDeactivated(ShellEvent::Pointer event);
+    void ShellDeactivated(const ShellEvent::Pointer& event);
 
   private:
 
     WorkbenchWindow::WeakPtr window;
   };
 
-  IShellListener::Pointer shellActivationListener;
+  QScopedPointer<IShellListener> shellActivationListener;
 
   /**
    * Hooks a listener to track the activation and deactivation of the window's
    * shell. Notifies the active part and editor of the change
    */
   void TrackShellActivation(Shell::Pointer shell);
 
   struct ControlResizeListener: public GuiTk::IControlListener
   {
     ControlResizeListener(WorkbenchWindow* window);
 
     GuiTk::IControlListener::Events::Types GetEventTypes() const;
 
     void ControlMoved(GuiTk::ControlEvent::Pointer e);
 
     void ControlResized(GuiTk::ControlEvent::Pointer e);
 
   private:
 
     void SaveBounds();
 
     WorkbenchWindow* window;
   };
 
   GuiTk::IControlListener::Pointer controlResizeListener;
 
   /**
    * Hooks a listener to track the resize of the window's shell. Stores the
    * new bounds if in normal state - that is, not in minimized or maximized
    * state)
    */
   void TrackShellResize(Shell::Pointer newShell);
 
   /**
    * Returns true iff we are currently deferring UI processing due to a large
    * update
    *
    * @return true iff we are deferring UI updates.
    */
   bool UpdatesDeferred() const;
 
+  /**
+   * Initializes all of the default command-based services for the workbench
+   * window.
+   */
+  void InitializeDefaultServices();
+
+  void FirePropertyChanged(const  QString& property, const Object::Pointer& oldValue,
+                           const Object::Pointer& newValue);
+
 };
 
 }
 
 #endif /*BERRYWORKBENCHWINDOW_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchWindowConfigurer.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchWindowConfigurer.cpp
index 46104f4374..70a3875594 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchWindowConfigurer.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchWindowConfigurer.cpp
@@ -1,290 +1,296 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryWorkbenchWindowConfigurer.h"
 
 #include "berryWorkbenchWindow.h"
 #include "berryImageDescriptor.h"
 #include "berryWorkbench.h"
 #include "berryWorkbenchPage.h"
 #include "berryEditorSashContainer.h"
 #include "berryWorkbenchPlugin.h"
 #include "berryMenuManager.h"
 
 #include "berryQtDnDControlWidget.h"
 
 namespace berry
 {
 
 WorkbenchWindowConfigurer::WindowActionBarConfigurer::WindowActionBarConfigurer(WorkbenchWindow::WeakPtr wnd)
 : window(wnd)
 {
 
 }
 
 void WorkbenchWindowConfigurer::WindowActionBarConfigurer::SetProxy(IActionBarConfigurer::Pointer proxy)
 {
   this->proxy = proxy;
 }
 
 IWorkbenchWindowConfigurer::Pointer WorkbenchWindowConfigurer::WindowActionBarConfigurer::GetWindowConfigurer()
 {
   return WorkbenchWindow::Pointer(window)->GetWindowConfigurer();
 }
 
 IMenuManager* WorkbenchWindowConfigurer::WindowActionBarConfigurer::GetMenuManager()
 {
   if (proxy.IsNotNull())
   {
     return proxy->GetMenuManager();
   }
   return window.Lock()->GetMenuManager();
 }
 
 IToolBarManager* WorkbenchWindowConfigurer::WindowActionBarConfigurer::GetToolBarManager()
 {
   if (proxy.IsNotNull())
   {
     return proxy->GetToolBarManager();
   }
   //return window.Lock()->GetToolBarManager();
   return 0;
 }
 
 WorkbenchWindowConfigurer::WorkbenchWindowConfigurer(const WorkbenchWindow::Pointer& window)
- : shellStyle(0), showPerspectiveBar(false), showStatusLine(true), showToolBar(true),
-   showMenuBar(true), showProgressIndicator(false), initialSize(1024,768)
+ : shellStyle(0)
+ , showPerspectiveBar(false)
+ , showStatusLine(true)
+ , showToolBar(true)
+ , showMenuBar(true)
+ , showProgressIndicator(false)
+ , dropTargetListener(NULL)
+ , initialSize(1024,768)
 {
   if (window.IsNull())
   {
     throw Poco::InvalidArgumentException();
   }
   this->window = window;
   windowTitle = "BlueBerry Application";
 }
 
 IWorkbenchWindow::Pointer WorkbenchWindowConfigurer::GetWindow()
 {
   return IWorkbenchWindow::Pointer(window);
 }
 
 IWorkbenchConfigurer::Pointer WorkbenchWindowConfigurer::GetWorkbenchConfigurer()
 {
   return dynamic_cast<Workbench*>(PlatformUI::GetWorkbench())->GetWorkbenchConfigurer();
 }
 
 QString WorkbenchWindowConfigurer::BasicGetTitle()
 {
   return windowTitle;
 }
 
 QString WorkbenchWindowConfigurer::GetTitle()
 {
   Shell::Pointer shell = window.Lock()->GetShell();
   if (shell)
   {
     // update the cached title
     windowTitle = shell->GetText();
   }
   return windowTitle;
 }
 
 void WorkbenchWindowConfigurer::SetTitle(const QString &title)
 {
   windowTitle = title;
   Shell::Pointer shell = window.Lock()->GetShell();
   if (shell)
   {
     shell->SetText(title);
   }
 }
 
 bool WorkbenchWindowConfigurer::GetShowMenuBar() const
 {
   return showMenuBar;
 }
 
 void WorkbenchWindowConfigurer::SetShowMenuBar(bool show)
 {
   showMenuBar = show;
 //  WorkbenchWindow win = (WorkbenchWindow) getWindow();
 //  Shell shell = win.getShell();
 //  if (shell != null)
 //  {
 //    boolean showing = shell.getMenuBar() != null;
 //    if (show != showing)
 //    {
 //      if (show)
 //      {
 //        shell.setMenuBar(win.getMenuBarManager().getMenu());
 //      }
 //      else
 //      {
 //        shell.setMenuBar(null);
 //      }
 //    }
 //  }
 }
 
 bool WorkbenchWindowConfigurer::GetShowToolBar() const
 {
   return showToolBar;
 }
 
 void WorkbenchWindowConfigurer::SetShowToolBar(bool show)
 {
   showToolBar = show;
   //window.setCoolBarVisible(show);
   // @issue need to be able to reconfigure after window's controls created
 }
 
 bool WorkbenchWindowConfigurer::GetShowPerspectiveBar() const
 {
   return showPerspectiveBar;
 }
 
 void WorkbenchWindowConfigurer::SetShowPerspectiveBar(bool show)
 {
   showPerspectiveBar = show;
   //window.setPerspectiveBarVisible(show);
   // @issue need to be able to reconfigure after window's controls created
 }
 
 bool WorkbenchWindowConfigurer::GetShowStatusLine() const
 {
   return showStatusLine;
 }
 
 void WorkbenchWindowConfigurer::SetShowStatusLine(bool show)
 {
   showStatusLine = show;
   // @issue need to be able to reconfigure after window's controls created
 }
 
 bool WorkbenchWindowConfigurer::GetShowProgressIndicator() const
 {
   return showProgressIndicator;
 }
 
 void WorkbenchWindowConfigurer::SetShowProgressIndicator(bool show)
 {
   showProgressIndicator = show;
   // @issue need to be able to reconfigure after window's controls created
 }
 
 void WorkbenchWindowConfigurer::AddEditorAreaTransfer(const QStringList& transfers)
 {
   if (transfers.isEmpty()) return;
 
   int oldSize = transferTypes.size();
   transferTypes.unite(QSet<QString>::fromList(transfers));
 
   if (transferTypes.size() == oldSize) return;
 
   WorkbenchPage::Pointer page = window.Lock()->GetActivePage().Cast<WorkbenchPage>();
   if (page)
   {
     QtDnDControlWidget* dropTarget =
         static_cast<QtDnDControlWidget*>(page->GetEditorPresentation()->GetLayoutPart().Cast<EditorSashContainer>()->GetParent());
     dropTarget->SetTransferTypes(transferTypes.toList());
   }
 }
 
-void WorkbenchWindowConfigurer::ConfigureEditorAreaDropListener(const IDropTargetListener::Pointer& listener)
+void WorkbenchWindowConfigurer::ConfigureEditorAreaDropListener(IDropTargetListener* listener)
 {
   if (listener == 0) return;
   dropTargetListener = listener;
 
   WorkbenchPage::Pointer page = window.Lock()->GetActivePage().Cast<WorkbenchPage>();
   if (page)
   {
     QtDnDControlWidget* dropTarget =
         static_cast<QtDnDControlWidget*>(page->GetEditorPresentation()->GetLayoutPart().Cast<EditorSashContainer>()->GetParent());
-    dropTarget->AddDropListener(listener.GetPointer());
+    dropTarget->AddDropListener(listener);
   }
 }
 
 QStringList WorkbenchWindowConfigurer::GetTransfers() const
 {
   return transferTypes.toList();
 }
 
-IDropTargetListener::Pointer WorkbenchWindowConfigurer::GetDropTargetListener() const
+IDropTargetListener* WorkbenchWindowConfigurer::GetDropTargetListener() const
 {
   return dropTargetListener;
 }
 
 IActionBarConfigurer::Pointer WorkbenchWindowConfigurer::GetActionBarConfigurer()
 {
   if (actionBarConfigurer.IsNull())
   {
     // lazily initialize
     actionBarConfigurer = new WindowActionBarConfigurer(window);
   }
   return actionBarConfigurer;
 }
 
 Qt::WindowFlags WorkbenchWindowConfigurer::GetWindowFlags() const
 {
   return shellStyle;
 }
 
 void WorkbenchWindowConfigurer::SetWindowFlags(Qt::WindowFlags shellStyle)
 {
   this->shellStyle = shellStyle;
 }
 
 Point WorkbenchWindowConfigurer::GetInitialSize() const
 {
   return initialSize;
 }
 
 void WorkbenchWindowConfigurer::SetInitialSize(Point size)
 {
   initialSize = size;
 }
 
 void WorkbenchWindowConfigurer::CreateDefaultContents(Shell::Pointer shell)
 {
   WorkbenchWindow::Pointer(window)->CreateDefaultContents(shell);
 }
 
 QMenuBar* WorkbenchWindowConfigurer::CreateMenuBar()
 {
   return window.Lock()->GetMenuManager()->CreateMenuBar(window.Lock()->GetShell()->GetControl());
 }
 
-QWidget* WorkbenchWindowConfigurer::CreateToolBar(QWidget* parent)
+QWidget* WorkbenchWindowConfigurer::CreateToolBar(QWidget* /*parent*/)
 {
 //  IToolBarManager* toolBarManager = window->GetToolBarManager();
 //  if (toolBarManager)
 //  {
 //    return toolBarManager->CreateControl(parent);
 //  }
   return 0;
 }
 
 QWidget *WorkbenchWindowConfigurer::CreatePageComposite(QWidget *parent)
 {
   return WorkbenchWindow::Pointer(window)->CreatePageComposite(parent);
 }
 
 bool WorkbenchWindowConfigurer::SaveState(IMemento::Pointer memento)
 {
   return WorkbenchWindow::Pointer(window)->SaveState(memento);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchWindowConfigurer.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchWindowConfigurer.h
index 1ca48c9bb3..8cd53c38d8 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchWindowConfigurer.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchWindowConfigurer.h
@@ -1,405 +1,405 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYWORKBENCHWINDOWCONFIGURER_H_
 #define BERRYWORKBENCHWINDOWCONFIGURER_H_
 
 #include "application/berryIActionBarConfigurer.h"
 #include "application/berryIWorkbenchConfigurer.h"
 #include "application/berryIWorkbenchWindowConfigurer.h"
 
 #include <berryWeakPointer.h>
 
 #include <QSet>
 
 class QToolBar;
 class QMenuBar;
 
 namespace berry
 {
 
 class WorkbenchWindow;
 
 /**
  * Internal class providing special access for configuring workbench windows.
  * <p>
  * Note that these objects are only available to the main application
  * (the plug-in that creates and owns the workbench).
  * </p>
  * <p>
  * This class is not intended to be instantiated or subclassed by clients.
  * </p>
  */
 class WorkbenchWindowConfigurer : public IWorkbenchWindowConfigurer
 {
 
   friend class WorkbenchWindow;
 
 public:
 
   berryObjectMacro(WorkbenchWindowConfigurer)
 
   /**
    * Creates a new workbench window configurer.
    * <p>
    * This method is declared package-private:. Clients obtain instances
    * via {@link WorkbenchAdvisor#getWindowConfigurer
    * WorkbenchAdvisor.getWindowConfigurer}
    * </p>
    *
    * @param window the workbench window that this object configures
    * @see WorkbenchAdvisor#getWindowConfigurer
    */
   WorkbenchWindowConfigurer(const SmartPointer<WorkbenchWindow>& window);
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer#getWindow
    */
   SmartPointer<IWorkbenchWindow> GetWindow();
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer#getWorkbenchConfigurer()
    */
   SmartPointer<IWorkbenchConfigurer> GetWorkbenchConfigurer();
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer#getTitle
    */
   QString GetTitle();
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer#setTitle
    */
   void SetTitle(const QString& title);
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer#getShowMenuBar
    */
   bool GetShowMenuBar() const;
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer#setShowMenuBar
    */
   void SetShowMenuBar(bool show);
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer#getShowToolBar
    */
   bool GetShowToolBar() const;
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer
    */
   void SetShowToolBar(bool show);
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer
    */
   bool GetShowPerspectiveBar() const;
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer
    */
   void SetShowPerspectiveBar(bool show);
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer#getShowStatusLine
    */
   bool GetShowStatusLine() const;
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer#setShowStatusLine
    */
   void SetShowStatusLine(bool show);
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer
    */
   bool GetShowProgressIndicator() const;
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer
    */
   void SetShowProgressIndicator(bool show);
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer#getData
    */
 //  Object getData(String key) {
 //        if (key == null) {
 //            throw new IllegalArgumentException();
 //        }
 //        return extraData.get(key);
 //    }
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer#setData
    */
 // void setData(String key, Object data) {
 //        if (key == null) {
 //            throw new IllegalArgumentException();
 //        }
 //        if (data != null) {
 //            extraData.put(key, data);
 //        } else {
 //            extraData.remove(key);
 //        }
 //    }
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer#addEditorAreaTransfer
    */
   void AddEditorAreaTransfer(const QStringList& transferTypes);
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer
    */
-  void ConfigureEditorAreaDropListener(const SmartPointer<IDropTargetListener> &listener);
+  void ConfigureEditorAreaDropListener(IDropTargetListener* listener);
 
   /**
    * Returns the array of <code>Transfer</code> added by the application
    */
   QStringList GetTransfers() const;
 
   /**
    * Returns the drop listener provided by the application.
    */
-  SmartPointer<IDropTargetListener> GetDropTargetListener() const;
+  IDropTargetListener* GetDropTargetListener() const;
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer
    */
   SmartPointer<IActionBarConfigurer> GetActionBarConfigurer();
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer
    */
   Qt::WindowFlags GetWindowFlags() const;
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer
    */
   void SetWindowFlags(Qt::WindowFlags shellStyle);
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer
    */
   Point GetInitialSize() const;
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer
    */
   void SetInitialSize(Point size);
 
   /**
    * Creates the default window contents.
    *
    * @param shell the shell
    */
   void CreateDefaultContents(SmartPointer<Shell> shell);
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer
    */
   QMenuBar* CreateMenuBar();
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer
    */
   QWidget* CreateToolBar(QWidget* parent);
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer
    */
 //    public: Control createStatusLineControl(Composite parent) {
 //        return window.getStatusLineManager().createControl(parent);
 //    }
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer
    */
   QWidget* CreatePageComposite(QWidget* parent);
 
   /*
    * @see org.blueberry.ui.application.IWorkbenchWindowConfigurer#saveState(org.blueberry.ui.IMemento)
    */
   bool SaveState(SmartPointer<IMemento> memento);
 
 protected:
 
   /**
    * Returns the title as set by <code>setTitle</code>, without consulting the shell.
    *
    * @return the window title as set, or <code>null</code> if not set
    */
   QString BasicGetTitle();
 
 private:
 
   /**
    * Action bar configurer that changes this workbench window.
    * This implementation keeps track of tool bar items
    */
   class WindowActionBarConfigurer : public IActionBarConfigurer
   {
 
   private:
 
     IActionBarConfigurer::Pointer proxy;
     WeakPointer<WorkbenchWindow> window;
 
   public:
 
     berryObjectMacro(WindowActionBarConfigurer)
 
     WindowActionBarConfigurer(WeakPointer<WorkbenchWindow> wnd);
 
     /**
      * Sets the proxy to use, or <code>null</code> for none.
      *
      * @param proxy the proxy
      */
     void SetProxy(IActionBarConfigurer::Pointer proxy);
 
     /*
      * @see org.blueberry.ui.application.IActionBarConfigurer#getWindowConfigurer()
      */
     IWorkbenchWindowConfigurer::Pointer GetWindowConfigurer();
 
       /*
        * @see org.blueberry.ui.application.IActionBarConfigurer
        */
   //        public: IStatusLineManager getStatusLineManager() {
   //            if (proxy != null) {
   //                return proxy.getStatusLineManager();
   //            }
   //            return window.getStatusLineManager();
   //        }
 
     /*
      * @see org.blueberry.ui.application.IActionBarConfigurer
      */
     IMenuManager* GetMenuManager();
 
     /*
      * @see org.blueberry.ui.internal.AbstractActionBarConfigurer
      */
     IToolBarManager* GetToolBarManager();
 
     /*
      * @see org.blueberry.ui.application.IActionBarConfigurer
      */
   //        public: void registerGlobalAction(IAction action) {
   //            if (proxy != null) {
   //                proxy.registerGlobalAction(action);
   //            }
   //            window.registerGlobalAction(action);
   //        }
 
 
 
   /*
    * @see org.blueberry.ui.application.IActionBarConfigurer#createToolBarManager()
    */
   //    public: IToolBarManager createToolBarManager() {
   //      if (proxy != null) {
   //        return proxy.createToolBarManager();
   //      }
   //      return getActionBarPresentationFactory().createToolBarManager();
   //    }
 
   };
 
   /**
    * The workbench window associated with this configurer.
    */
   WeakPointer<WorkbenchWindow> window;
 
   /**
    * The shell style bits to use when the window's shell is being created.
    */
   Qt::WindowFlags shellStyle;
 
   /**
    * The window title to set when the window's shell has been created.
    */
   QString windowTitle;
 
   /*
    * Whether the workbench window should show the fast view bars.
    */
   //bool showFastViewBars = false;
 
   /**
    * Whether the workbench window should show the perspective bar
    */
   bool showPerspectiveBar;
 
   /**
    * Whether the workbench window should show the status line.
    */
   bool showStatusLine;
 
   /**
    * Whether the workbench window should show the main tool bar.
    */
   bool showToolBar;
 
   /**
    * Whether the workbench window should show the main menu bar.
    */
   bool showMenuBar;
 
   /**
    * Whether the workbench window should have a progress indicator.
    */
   bool showProgressIndicator;
 
   /*
    * Table to hold arbitrary key-data settings (key type: <code>String</code>,
    * value type: <code>Object</code>).
    * @see #setData
    */
   //Map extraData = new HashMap(1);
 
   /**
    * Holds the list drag and drop <code>Transfer</code> for the
    * editor area
    */
   QSet<QString> transferTypes;
 
   /**
    * The <code>DropTargetListener</code> implementation for handling a
    * drop into the editor area.
    */
-  SmartPointer<IDropTargetListener> dropTargetListener;
+  IDropTargetListener* dropTargetListener;
 
   /**
    * The initial size to use for the shell.
    */
   Point initialSize;
 
   /**
    * Object for configuring this workbench window's action bars.
    * Lazily initialized to an instance unique to this window.
    */
   SmartPointer<WindowActionBarConfigurer> actionBarConfigurer;
 
 };
 
 }
 
 #endif /*BERRYWORKBENCHWINDOWCONFIGURER_H_*/
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchWindowExpression.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchWindowExpression.cpp
new file mode 100644
index 0000000000..411570178c
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchWindowExpression.cpp
@@ -0,0 +1,79 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berryWorkbenchWindowExpression.h"
+
+#include "berryISources.h"
+#include "berryIWorkbenchWindow.h"
+
+namespace berry {
+
+const int WorkbenchWindowExpression::HASH_INITIAL = qHash(WorkbenchWindowExpression::GetStaticClassName());
+
+WorkbenchWindowExpression::WorkbenchWindowExpression(IWorkbenchWindow* window)
+  : window(window)
+{
+}
+
+void WorkbenchWindowExpression::CollectExpressionInfo(ExpressionInfo* info) const
+{
+  if (window != NULL)
+  {
+    info->AddVariableNameAccess(ISources::ACTIVE_WORKBENCH_WINDOW_NAME());
+  }
+}
+
+bool WorkbenchWindowExpression::operator==(const Object* object) const
+{
+  if (const WorkbenchWindowExpression* that = dynamic_cast<const WorkbenchWindowExpression*>(object))
+  {
+   return this->window->operator ==(that->window);
+  }
+
+  return false;
+}
+
+SmartPointer<const EvaluationResult> WorkbenchWindowExpression::Evaluate(IEvaluationContext* context) const
+{
+  if (window != NULL)
+  {
+    Object::ConstPointer value = context->GetVariable(ISources::ACTIVE_WORKBENCH_WINDOW_NAME());
+    if (value == window)
+    {
+      return EvaluationResult::TRUE_EVAL;
+    }
+  }
+
+  return EvaluationResult::FALSE_EVAL;
+}
+
+QString WorkbenchWindowExpression::ToString() const
+{
+  QString str = "WorkbenchWindowExpression(" + window->ToString() + ')';
+  return str;
+}
+
+uint WorkbenchWindowExpression::ComputeHashCode() const
+{
+  return HASH_INITIAL * HASH_FACTOR + window->HashCode();
+}
+
+IWorkbenchWindow* WorkbenchWindowExpression::GetWindow() const
+{
+  return window;
+}
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchWindowExpression.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchWindowExpression.h
new file mode 100644
index 0000000000..41f1ce6bd9
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/berryWorkbenchWindowExpression.h
@@ -0,0 +1,87 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYWORKBENCHWINDOWEXPRESSION_H
+#define BERRYWORKBENCHWINDOWEXPRESSION_H
+
+#include "berryExpression.h"
+
+namespace berry {
+
+struct IWorkbenchWindow;
+
+/**
+ * <p>
+ * An expression that evaluates to {@link EvaluationResult#TRUE} when the active
+ * workbench window matches the window held by this expression.
+ * </p>
+ */
+class WorkbenchWindowExpression : public Expression
+{
+
+private:
+
+  /**
+   * The seed for the hash code for all schemes.
+   */
+  static const int HASH_INITIAL;
+
+  /**
+   * The workbench window that must be active for this expression to evaluate
+   * to <code>true</code>. If this value is <code>null</code>, then any
+   * workbench window may be active.
+   */
+  IWorkbenchWindow* const window;
+
+public:
+
+  berryObjectMacro(berry::WorkbenchWindowExpression)
+
+  /**
+   * Constructs a new instance.
+   *
+   * @param window
+   *            The workbench window which must be active for this expression
+   *            to evaluate to <code>true</code>; may be <code>null</code>
+   *            if this expression is always <code>true</code>.
+   */
+  WorkbenchWindowExpression(IWorkbenchWindow* window);
+
+  void CollectExpressionInfo(ExpressionInfo* info) const;
+
+  bool operator==(const Object* object) const;
+
+  SmartPointer<const EvaluationResult> Evaluate(IEvaluationContext* context) const;
+
+  QString ToString() const;
+
+protected:
+
+  uint ComputeHashCode() const;
+
+  /**
+   * Returns the workbench window to which this expression applies.
+   *
+   * @return The workbench window to which this expression applies; may be
+   *         <code>null</code>.
+   */
+  IWorkbenchWindow* GetWindow() const;
+
+};
+
+}
+
+#endif // BERRYWORKBENCHWINDOWEXPRESSION_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/defaultpresentation/berryNativeTabFolder.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/defaultpresentation/berryNativeTabFolder.h
index 23d8791f3f..a8817693e7 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/defaultpresentation/berryNativeTabFolder.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/defaultpresentation/berryNativeTabFolder.h
@@ -1,228 +1,230 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYNATIVETABFOLDER_H_
 #define BERRYNATIVETABFOLDER_H_
 
 #include <internal/util/berryAbstractTabFolder.h>
 
 #include <QObject>
 
 class QFrame;
 class QWidget;
 
 namespace berry
 {
 
 struct IQtStyleManager;
 
 class QCTabBar;
 
 class NativeTabFolder: public QObject, public AbstractTabFolder
 {
 
 Q_OBJECT
 
 private:
 
   QCTabBar* tabControl;
   QFrame* contentFrame;
   QWidget* viewForm;
   QWidget* content;
   //  ViewForm viewForm;
   //  StandardSystemToolbar systemToolbar;
   //  CLabel title;
   //    ProxyControl topCenter;
   //    SizeCache topCenterCache;
 
   //    IPropertyListener systemToolbarListener = new IPropertyListener() {
   //
   //        public void propertyChanged(Object source, int propId) {
   //            Point location;
   //
   //            if (propId == TabFolderEvent.EVENT_PANE_MENU) {
   //                location = getPaneMenuLocation();
   //            } else {
   //                location = new Point(0,0);
   //            }
   //
   //            fireEvent(propId, getSelection(), location);
   //        }
   //
   //    };
 
   IQtStyleManager* skinManager;
 
   /**
    * @param item
    * @return
    */
   AbstractTabItem* GetTab(int index);
 
 private slots:
 
   void TabSelectionChanged(int index);
   void DragStarted(const QPoint& location);
   void ViewFormDestroyed(QObject*);
 
 public:
 
   NativeTabFolder(QWidget* parent);
 
   ~NativeTabFolder();
 
   void UpdateColors();
 
   void SetActive(int activeState);
 
   bool eventFilter(QObject* watched, QEvent* event);
 
   void CloseButtonClicked(AbstractTabItem* item);
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.presentations.util.AbstractTabFolder#computeSize(int, int)
    */
   QSize ComputeSize(int widthHint, int heightHint);
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.presentations.util.AbstractTabFolder#add(int)
    */
   AbstractTabItem* Add(int index, int flags);
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.presentations.util.AbstractTabFolder#move(int, int)
    */
   void Move(int from, int to);
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.presentations.util.AbstractTabFolder#layout(boolean)
    */
   void Layout(bool flushCache);
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.presentations.util.AbstractTabFolder#getPaneMenuLocation()
    */
   QPoint GetPaneMenuLocation();
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.presentations.util.AbstractTabFolder#setState(int)
    */
   void SetState(int state);
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.presentations.util.AbstractTabFolder#getClientArea()
    */
   QRect GetClientArea();
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.presentations.util.AbstractTabFolder#getItems()
    */
   QList<AbstractTabItem*> GetItems();
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.presentations.util.AbstractTabFolder#setSelection(org.blueberry.ui.internal.presentations.util.Widget)
    */
   void SetSelection(AbstractTabItem* toSelect);
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.presentations.util.AbstractTabFolder#setSelectedInfo(org.blueberry.ui.internal.presentations.util.PartInfo)
    */
   void SetSelectedInfo(const PartInfo& info);
 
   //    /* (non-Javadoc)
   //     * @see org.blueberry.ui.internal.presentations.util.AbstractTabFolder#getToolbarParent()
   //     */
   //    Composite getToolbarParent() {
   //        return viewForm;
   //    }
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.presentations.util.AbstractTabFolder#getTabArea()
    */
   QRect GetTabArea();
 
   //    /* (non-Javadoc)
   //     * @see org.blueberry.ui.internal.presentations.util.AbstractTabFolder#setToolbar(org.blueberry.swt.widgets.Control)
   //     */
   //    void setToolbar(Control toolbarControl) {
   //
   //        if (toolbarControl != null) {
   //            topCenterCache.setControl(toolbarControl);
   //            topCenter.setTarget(topCenterCache);
   //            viewForm.setTopCenter(topCenter.getControl());
   //        } else {
   //            topCenterCache.setControl(null);
   //            topCenter.setTarget(null);
   //            viewForm.setTopCenter(null);
   //        }
   //
   //        super.setToolbar(toolbarControl);
   //    }
 
   QWidget* GetControl();
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.presentations.util.AbstractTabFolder#isOnBorder(org.blueberry.swt.graphics.Point)
    */
   bool IsOnBorder(const QPoint& globalPos);
 
   AbstractTabItem* GetSelection();
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.presentations.util.AbstractTabFolder#getContentParent()
    */
   QWidget* GetContentParent();
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.presentations.util.AbstractTabFolder#setContent(org.blueberry.swt.widgets.Control)
    */
   void SetContent(QWidget* newContent);
 
   /**
    * @return
    * @since 3.1
    */
   QCTabBar* GetTabFolder();
 
   /**
    * @param item
    * @param newTitle
    * @since 3.1
    */
   /* protected */void SetSelectedTitle(const QString& newTitle);
 
   /**
    * @param image
    * @since 3.1
    */
   /* protected */void SetSelectedImage(const QPixmap* image);
 
+  using AbstractTabFolder::GetItem;
+
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.presentations.util.AbstractTabFolder#getItem(org.blueberry.swt.graphics.Point)
    */
   AbstractTabItem* GetItem(const QPoint& toFind);
 
   /**
    * @param enabled
    * @since 3.1
    */
   void EnablePaneMenu(bool enabled);
 
 };
 
 }
 
 #endif /* BERRYNATIVETABFOLDER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/defaultpresentation/berryQtWorkbenchPresentationFactory.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/defaultpresentation/berryQtWorkbenchPresentationFactory.cpp
index 8b4221c095..23da392a90 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/defaultpresentation/berryQtWorkbenchPresentationFactory.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/defaultpresentation/berryQtWorkbenchPresentationFactory.cpp
@@ -1,167 +1,170 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryQtWorkbenchPresentationFactory.h"
 
 #include "berryNativeTabFolder.h"
 #include "berryEmptyTabFolder.h"
+#include "berryShell.h"
+#include "berryIMemento.h"
 
 #include "internal/util/berryPresentablePartFolder.h"
 #include "internal/util/berryTabbedStackPresentation.h"
 
 #include "internal/berryQtSash.h"
 #include <internal/berryQtControlWidget.h>
 
 #include <QApplication>
 
 namespace berry
 {
 
 QtWorkbenchPresentationFactory::QtWorkbenchPresentationFactory()
 {}
 
 QtWorkbenchPresentationFactory::QtWorkbenchPresentationFactory(
-  const QtWorkbenchPresentationFactory& other)
+  const QtWorkbenchPresentationFactory& /*other*/)
+  : QObject()
 {
 
 }
 
 StackPresentation::Pointer QtWorkbenchPresentationFactory::CreateEditorPresentation(
     void* parent, IStackPresentationSite::Pointer site)
 {
   NativeTabFolder* folder = new NativeTabFolder(static_cast<QWidget*> (parent));
 
   //    /*
   //     * Set the minimum characters to display, if the preference is something
   //     * other than the default. This is mainly intended for RCP applications
   //     * or for expert users (i.e., via the plug-in customization file).
   //     *
   //     * Bug 32789.
   //     */
   //    final IPreferenceStore store = PlatformUI.getPreferenceStore();
   //    if (store
   //        .contains(IWorkbenchPreferenceConstants.EDITOR_MINIMUM_CHARACTERS)) {
   //      final int minimumCharacters = store
   //          .getInt(IWorkbenchPreferenceConstants.EDITOR_MINIMUM_CHARACTERS);
   //      if (minimumCharacters >= 0) {
   //        folder.setMinimumCharacters(minimumCharacters);
   //      }
   //    }
 
   PresentablePartFolder* partFolder = new PresentablePartFolder(folder);
 
   StackPresentation::Pointer result(new TabbedStackPresentation(site,
       partFolder)); //, new StandardEditorSystemMenu(site));
 
   //  DefaultThemeListener themeListener =
   //      new DefaultThemeListener(folder, result.getTheme());
   //  result.getTheme().addListener(themeListener);
   //
   //  new DefaultMultiTabListener(result.getApiPreferences(), IWorkbenchPreferenceConstants.SHOW_MULTIPLE_EDITOR_TABS, folder);
   //
   //  new DefaultSimpleTabListener(result.getApiPreferences(), IWorkbenchPreferenceConstants.SHOW_TRADITIONAL_STYLE_TABS, folder);
 
   return result;
 }
 
 StackPresentation::Pointer QtWorkbenchPresentationFactory::CreateViewPresentation(
     void* parent, IStackPresentationSite::Pointer site)
 {
 
   NativeTabFolder* folder = new NativeTabFolder(static_cast<QWidget*> (parent));
 
   //    final IPreferenceStore store = PlatformUI.getPreferenceStore();
   //    final int minimumCharacters = store
   //        .getInt(IWorkbenchPreferenceConstants.VIEW_MINIMUM_CHARACTERS);
   //    if (minimumCharacters >= 0) {
   //      folder.setMinimumCharacters(minimumCharacters);
   //    }
 
   PresentablePartFolder* partFolder = new PresentablePartFolder(folder);
 
   //folder->SetUnselectedCloseVisible(false);
   //folder->SetUnselectedImageVisible(true);
 
   StackPresentation::Pointer result(new TabbedStackPresentation(site,
       partFolder)); //, new StandardViewSystemMenu(site));
 
   //  DefaultThemeListener themeListener =
   //      new DefaultThemeListener(folder, result.getTheme());
   //  result.getTheme().addListener(themeListener);
   //
   //  new DefaultSimpleTabListener(result.getApiPreferences(), IWorkbenchPreferenceConstants.SHOW_TRADITIONAL_STYLE_TABS, folder);
 
   return result;
 }
 
 StackPresentation::Pointer QtWorkbenchPresentationFactory::CreateStandaloneViewPresentation(
     void* parent, IStackPresentationSite::Pointer site, bool showTitle)
 {
 
   if (showTitle)
   {
     return this->CreateViewPresentation(parent, site);
   }
   EmptyTabFolder* folder = new EmptyTabFolder(static_cast<QWidget*> (parent),
       true);
   StackPresentation::Pointer presentation(new TabbedStackPresentation(site,
       folder)); //, new StandardViewSystemMenu(site));
 
   return presentation;
 }
 
 QString QtWorkbenchPresentationFactory::GetId()
 {
   return "berryQtWorkbenchPresentationFactory";
 }
 
 void* QtWorkbenchPresentationFactory::CreateSash(void* parent, int style)
 {
   Qt::Orientation orientation =
       style & SASHORIENTATION_HORIZONTAL ? Qt::Horizontal : Qt::Vertical;
   QWidget* sash = new QtSash(orientation, static_cast<QWidget*> (parent));
   sash->setObjectName("Sash widget");
   if (orientation == Qt::Horizontal)
     sash->setFixedHeight(this->GetSashSize(style));
   else
     sash->setFixedWidth(this->GetSashSize(style));
 
   return sash;
 }
 
 int QtWorkbenchPresentationFactory::GetSashSize(int /*style*/)
 {
   return 3;
 }
 
 void QtWorkbenchPresentationFactory::UpdateTheme()
 {
   QWidgetList topLevels = QApplication::topLevelWidgets();
   QListIterator<QWidget*> topIt(topLevels);
   while (topIt.hasNext())
   {
     QWidget* topWidget = topIt.next();
     QList<NativeTabFolder*> folders =
         topWidget->findChildren<NativeTabFolder*> ();
     QListIterator<NativeTabFolder*> i(folders);
     while (i.hasNext())
     {
       i.next()->UpdateColors();
     }
   }
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryEditorIntroAdapterPart.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryEditorIntroAdapterPart.cpp
index b770d1620c..477ce11a11 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryEditorIntroAdapterPart.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryEditorIntroAdapterPart.cpp
@@ -1,147 +1,141 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryEditorIntroAdapterPart.h"
 
 #include "berryIntroPartAdapterSite.h"
 
 #include "internal/berryWorkbench.h"
 #include "internal/berryWorkbenchPlugin.h"
 
 namespace berry
 {
 
 EditorIntroAdapterPart::EditorIntroAdapterPart() :
   propChangeListener(new PropertyChangeIntAdapter<EditorIntroAdapterPart>(this, &EditorIntroAdapterPart::PropertyChange))
 {
 
 }
 
-EditorIntroAdapterPart::EditorIntroAdapterPart(const EditorIntroAdapterPart& other)
-{
-  Q_UNUSED(other)
-  throw std::runtime_error("Copy constructor not implemented");
-}
-
 void EditorIntroAdapterPart::SetStandby(bool standby)
 {
   //        final Control control = ((PartSite) getSite()).getPane().getControl();
   //        BusyIndicator.showWhile(control.getDisplay(), new Runnable() {
   //            public void run() {
   //                try {
   //                    control.setRedraw(false);
   introPart->StandbyStateChanged(standby);
   //                } finally {
   //                    control.setRedraw(true);
   //                }
   //
   //                setBarVisibility(standby);
   //            }
   //        });
 }
 
 void EditorIntroAdapterPart::CreatePartControl(void* parent)
 {
   //addPaneListener();
   introPart->CreatePartControl(parent);
 }
 
 EditorIntroAdapterPart::~EditorIntroAdapterPart()
 {
   //setBarVisibility(true);
   if(introPart)
   {
     introPart->RemovePropertyListener(propChangeListener.data());
     GetSite()->GetWorkbenchWindow()->GetWorkbench()->GetIntroManager()->CloseIntro(
       introPart);
   }
 }
 
-void* EditorIntroAdapterPart::GetTitleImage()
+void* EditorIntroAdapterPart::GetTitleImage() const
 {
   return introPart->GetTitleImage();
 }
 
-QString EditorIntroAdapterPart::GetPartName()
+QString EditorIntroAdapterPart::GetPartName() const
 {
   // this method is called eagerly before our init method is called (and
   // therefore before our intropart is created).  By default return
   // the view title from the view declaration.  We will fire a property
   // change to set the title to the proper value in the init method.
   return introPart.IsNull() ? EditorPart::GetPartName() : introPart->GetPartName();
 }
 
 void EditorIntroAdapterPart::Init(IEditorSite::Pointer site,
     IEditorInput::Pointer input)
 {
   Workbench* workbench =
       dynamic_cast<Workbench*>(site->GetWorkbenchWindow()->GetWorkbench());
   try
   {
     introPart = workbench->GetWorkbenchIntroManager()->CreateNewIntroPart();
     // reset the part name of this view to be that of the intro title
     SetPartName(introPart->GetPartName());
     introPart->AddPropertyListener(propChangeListener.data());
     introSite
         = IIntroSite::Pointer(new IntroPartAdapterSite(site, workbench->GetIntroDescriptor()));
     introPart->Init(introSite, IMemento::Pointer(0));
   }
   catch (CoreException& e)
   {
     //TODO IStatus
     //            WorkbenchPlugin.log(
     //                            IntroMessages.Intro_could_not_create_proxy,
     //                            new Status(IStatus.ERROR, WorkbenchPlugin.PI_WORKBENCH,
     //                                IStatus.ERROR, IntroMessages.Intro_could_not_create_proxy, e));
     WorkbenchPlugin::Log("Could not create intro editor proxy.", e);
   }
 
   this->SetSite(site);
   this->SetInput(input);
 }
 
 void EditorIntroAdapterPart::DoSave(/*IProgressMonitor monitor*/)
 {
 
 }
 
 void EditorIntroAdapterPart::DoSaveAs()
 {
 
 }
 
 bool EditorIntroAdapterPart::IsDirty() const
 {
   return false;
 }
 
 bool EditorIntroAdapterPart::IsSaveAsAllowed() const
 {
   return false;
 }
 
 void EditorIntroAdapterPart::PropertyChange(const Object::Pointer& /*source*/,
     int propId)
 {
   FirePropertyChange(propId);
 }
 
 void EditorIntroAdapterPart::SetFocus()
 {
   introPart->SetFocus();
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryEditorIntroAdapterPart.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryEditorIntroAdapterPart.h
index 8e574e6705..bf7e4f8924 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryEditorIntroAdapterPart.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryEditorIntroAdapterPart.h
@@ -1,160 +1,159 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYEDITORINTROADAPTERPART_H_
 #define BERRYEDITORINTROADAPTERPART_H_
 
 #include <berryEditorPart.h>
 
 #include <intro/berryIIntroPart.h>
 #include <intro/berryIIntroSite.h>
 
 namespace berry
 {
 
 /**
  * Simple editor that will wrap an <code>IIntroPart</code>.
  */
 class EditorIntroAdapterPart: public EditorPart
 {
   Q_OBJECT
 
 private:
 
   IIntroPart::Pointer introPart;
 
   IIntroSite::Pointer introSite;
 
   QScopedPointer<IPropertyChangeListener> propChangeListener;
   friend struct PropertyChangeIntAdapter<EditorIntroAdapterPart> ;
 
   void PropertyChange(const Object::Pointer& source, int propId);
 
   //     bool handleZoomEvents = true;
 
   //    /**
   //     * Adds a listener that toggles standby state if the view pane is zoomed.
   //     */
   //    void AddPaneListener() {
   //        IWorkbenchPartSite site = getSite();
   //        if (site instanceof PartSite) {
   //            final WorkbenchPartReference ref = ((WorkbenchPartReference)((PartSite) site).getPartReference());
   //            ref.addInternalPropertyListener(
   //                    new IPropertyListener() {
   //                        public void propertyChanged(Object source, int propId) {
   //                            if (handleZoomEvents) {
   //                                if (propId == WorkbenchPartReference.INTERNAL_PROPERTY_ZOOMED) {
   //                                    setStandby(!ref.getPane().isZoomed());
   //                                }
   //                            }
   //                        }
   //                    });
   //        }
   //    }
 
   //  /**
   //   * Sets whether the CoolBar/PerspectiveBar should be visible.
   //   *
   //   * @param visible whether the CoolBar/PerspectiveBar should be visible
   //   */
   //   void SetBarVisibility(bool visible) {
   //    WorkbenchWindow window = (WorkbenchWindow) getSite()
   //        .getWorkbenchWindow();
   //
   //    final boolean layout = (visible != window.getCoolBarVisible())
   //        || (visible != window.getPerspectiveBarVisible()); // don't layout unless things have actually changed
   //    if (visible) {
   //      window.setCoolBarVisible(true);
   //      window.setPerspectiveBarVisible(true);
   //    } else {
   //      window.setCoolBarVisible(false);
   //      window.setPerspectiveBarVisible(false);
   //    }
   //
   //    if (layout) {
   //      window.getShell().layout();
   //    }
   //  }
 
 public:
 
   EditorIntroAdapterPart();
-  EditorIntroAdapterPart(const EditorIntroAdapterPart& other);
 
   /**
    * Forces the standby state of the intro part.
    *
    * @param standby update the standby state
    */
   void SetStandby(bool standby);
 
   //    /**
   //     * Toggles handling of zoom events.
   //     *
   //     * @param handle whether to handle zoom events
   //     */
   //    void SetHandleZoomEvents(boolean handle) {
   //        handleZoomEvents = handle;
   //    }
 
   /* (non-Javadoc)
    * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
    */
   void CreatePartControl(void* parent);
 
   /* (non-Javadoc)
    * @see org.eclipse.ui.IWorkbenchPart#dispose()
    */
   ~EditorIntroAdapterPart();
 
   /* (non-Javadoc)
    * @see org.eclipse.ui.IWorkbenchPart#getTitleImage()
    */
-  void* GetTitleImage();
+  void* GetTitleImage() const;
 
   /* (non-Javadoc)
    * @see org.eclipse.ui.part.WorkbenchPart#GetPartName()
    */
-  QString GetPartName();
+  QString GetPartName() const;
 
   void Init(IEditorSite::Pointer site, IEditorInput::Pointer input);
 
   void DoSave(/*IProgressMonitor monitor*/);
 
   void DoSaveAs();
 
   bool IsDirty() const;
 
   bool IsSaveAsAllowed() const;
 
   /*
    * (non-Javadoc)
    *
    * @see org.eclipse.ui.IWorkbenchPart#setFocus()
    */
   void SetFocus();
 
   /* (non-Javadoc)
    * @see org.eclipse.ui.IViewPart#saveState(org.eclipse.ui.IMemento)
    */
   void SaveState(IMemento::Pointer memento);
 
 };
 
 }
 
 #endif /* BERRYEDITORINTROADAPTERPART_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryIIntroDescriptor.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryIIntroDescriptor.h
index a042c379b9..2032d5c6dd 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryIIntroDescriptor.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryIIntroDescriptor.h
@@ -1,77 +1,78 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIINTRODESCRIPTOR_H_
 #define BERRYIINTRODESCRIPTOR_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
 
 #include "intro/berryIIntroPart.h"
 
 #include <berryImageDescriptor.h>
 
 namespace berry {
 
 /**
  * Describes an introduction extension.
  *
  * @since 3.0
  */
-struct BERRY_UI_QT IIntroDescriptor : public Object {
+struct BERRY_UI_QT IIntroDescriptor : public Object
+{
 
-  berryInterfaceMacro(IIntroDescriptor, berry);
+  berryObjectMacro(berry::IIntroDescriptor)
 
   ~IIntroDescriptor();
 
   /**
    * Creates an instance of the intro part defined in the descriptor.
    */
   virtual IIntroPart::Pointer CreateIntro() = 0;
 
   /**
    * Returns the role of the intro part (view or editor)
    * @return the role of the part
    */
   virtual int GetRole() const = 0;
 
   /**
    * Returns the part id.
    *
    * @return the id of the part
    */
   virtual QString GetId() const = 0;
 
   /**
    * Returns the descriptor of the image for this part.
    *
    * @return the descriptor of the image to display next to this part
    */
   virtual ImageDescriptor::Pointer GetImageDescriptor() const = 0;
 
   /**
    * Return the label override string for this part.
    *
    * @return the label override string or the empty string if one has not
    *         been specified
    */
   virtual QString GetLabelOverride() const = 0;
 };
 
 }
 
 #endif /* BERRYIINTRODESCRIPTOR_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryIntroRegistry.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryIntroRegistry.cpp
index 6902094cb9..23eb758b69 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryIntroRegistry.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryIntroRegistry.cpp
@@ -1,172 +1,172 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryIntroRegistry.h"
 
 #include <berryIConfigurationElement.h>
 #include <berryIExtension.h>
 
 #include "berryIntroDescriptor.h"
 #include "internal/berryRegistryReader.h"
 #include "internal/berryWorkbenchPlugin.h"
 
 namespace berry
 {
 
 const QString IntroRegistry::TAG_INTRO = "intro";
 const QString IntroRegistry::TAG_INTROPRODUCTBINDING = "introProductBinding";
 const QString IntroRegistry::ATT_INTROID = "introId";
 const QString IntroRegistry::ATT_PRODUCTID = "productId";
 
 QString IntroRegistry::GetIntroForProduct(
     const QString& targetProductId,
     const QList<IExtension::Pointer>& extensions) const
 {
   for (int i = 0; i < extensions.size(); i++)
   {
     QList<IConfigurationElement::Pointer> elements(
         extensions[i]->GetConfigurationElements());
     for (int j = 0; j < elements.size(); j++)
     {
       if (elements[j]->GetName() == TAG_INTROPRODUCTBINDING)
       {
         QString introId = elements[j]->GetAttribute(ATT_INTROID);
         QString productId = elements[j]->GetAttribute(ATT_PRODUCTID);
 
         if (introId.isEmpty() || productId.isEmpty())
         {
           //TODO IStatus
           /*
            IStatus status = new Status(
            IStatus.ERROR,
            elements[j].getDeclaringExtension()
            .getNamespace(),
            IStatus.ERROR,
            "introId and productId must be defined.", new IllegalArgumentException()); //$NON-NLS-1$
            WorkbenchPlugin.log("Invalid intro binding", status); //$NON-NLS-1$
            */
           WorkbenchPlugin::Log(
                 elements[j]->GetDeclaringExtension()->GetNamespaceIdentifier()
                 + ": Invalid intro binding. introId and productId must be defined");
           continue;
         }
 
         if (targetProductId == productId)
         {
           return introId;
         }
       }
     }
   }
   return "";
 }
 
 int IntroRegistry::GetIntroCount() const
 {
   return static_cast<int> (GetIntros().size());
 }
 
 QList<IIntroDescriptor::Pointer> IntroRegistry::GetIntros() const
 {
   IExtensionPoint::Pointer point =
       Platform::GetExtensionRegistry()->GetExtensionPoint(
         PlatformUI::PLUGIN_ID() + "." + WorkbenchRegistryConstants::PL_INTRO);
   if (!point)
   {
     return QList<IIntroDescriptor::Pointer>();
   }
 
   QList<IExtension::Pointer> extensions(point->GetExtensions());
   extensions = RegistryReader::OrderExtensions(extensions);
 
   QList<IIntroDescriptor::Pointer> list;
   for (int i = 0; i < extensions.size(); i++)
   {
     QList<IConfigurationElement::Pointer> elements(
         extensions[i]->GetConfigurationElements());
     for (int j = 0; j < elements.size(); j++)
     {
       if (elements[j]->GetName() == TAG_INTRO)
       {
         try
         {
           IIntroDescriptor::Pointer
               descriptor(new IntroDescriptor(elements[j]));
           list.push_back(descriptor);
         }
         catch (const CoreException& e)
         {
           // log an error since its not safe to open a dialog here
           //TODO IStatus
           WorkbenchPlugin::Log("Unable to create intro descriptor", e); // e.getStatus());
         }
       }
     }
   }
 
   return list;
 }
 
 IIntroDescriptor::Pointer IntroRegistry::GetIntroForProduct(
     const QString& targetProductId) const
 {
   IExtensionPoint::Pointer point =
       Platform::GetExtensionRegistry()->GetExtensionPoint(
         PlatformUI::PLUGIN_ID() + "." + WorkbenchRegistryConstants::PL_INTRO);
   if (!point)
   {
     return IIntroDescriptor::Pointer();
   }
 
   QList<IExtension::Pointer> extensions(point->GetExtensions());
   extensions = RegistryReader::OrderExtensions(extensions);
 
   QString targetIntroId = GetIntroForProduct(targetProductId, extensions);
   if (targetIntroId.isEmpty())
   {
     return IIntroDescriptor::Pointer();
   }
 
   IIntroDescriptor::Pointer descriptor;
 
   QList<IIntroDescriptor::Pointer> intros(GetIntros());
-  for (std::size_t i = 0; i < intros.size(); i++)
+  for (int i = 0; i < intros.size(); i++)
   {
     if (intros[i]->GetId() == targetIntroId)
     {
       descriptor = intros[i];
       break;
     }
   }
 
   return descriptor;
 }
 
 IIntroDescriptor::Pointer IntroRegistry::GetIntro(const QString& id) const
 {
   QList<IIntroDescriptor::Pointer> intros(GetIntros());
-  for (std::size_t i = 0; i < intros.size(); i++)
+  for (int i = 0; i < intros.size(); i++)
   {
     IIntroDescriptor::Pointer desc = intros[i];
     if (desc->GetId() == id)
     {
       return desc;
     }
   }
   return IIntroDescriptor::Pointer();
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryViewIntroAdapterPart.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryViewIntroAdapterPart.cpp
index 0df7b31c34..739727b951 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryViewIntroAdapterPart.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryViewIntroAdapterPart.cpp
@@ -1,121 +1,121 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryViewIntroAdapterPart.h"
 
 #include "berryIntroPartAdapterSite.h"
 
 #include "internal/berryWorkbench.h"
 #include "internal/berryWorkbenchPlugin.h"
 
 namespace berry
 {
 
 ViewIntroAdapterPart::ViewIntroAdapterPart() :
   propChangeListener(new PropertyChangeIntAdapter<ViewIntroAdapterPart>(this, &ViewIntroAdapterPart::PropertyChange))
 {
 
 }
 
 void ViewIntroAdapterPart::SetStandby(bool standby)
 {
   //        final Control control = ((PartSite) getSite()).getPane().getControl();
   //        BusyIndicator.showWhile(control.getDisplay(), new Runnable() {
   //            public void run() {
   //                try {
   //                    control.setRedraw(false);
   introPart->StandbyStateChanged(standby);
   //                } finally {
   //                    control.setRedraw(true);
   //                }
   //
   //                setBarVisibility(standby);
   //            }
   //        });
 }
 
 void ViewIntroAdapterPart::CreatePartControl(void* parent)
 {
   //addPaneListener();
   introPart->CreatePartControl(parent);
 }
 
 ViewIntroAdapterPart::~ViewIntroAdapterPart()
 {
   //setBarVisibility(true);
   introPart->RemovePropertyListener(propChangeListener.data());
   GetSite()->GetWorkbenchWindow()->GetWorkbench()->GetIntroManager()->CloseIntro(
       introPart);
 }
 
-void* ViewIntroAdapterPart::GetTitleImage()
+void* ViewIntroAdapterPart::GetTitleImage() const
 {
   return introPart->GetTitleImage();
 }
 
-QString ViewIntroAdapterPart::GetPartName()
+QString ViewIntroAdapterPart::GetPartName() const
 {
   // this method is called eagerly before our init method is called (and
   // therefore before our intropart is created).  By default return
   // the view title from the view declaration.  We will fire a property
   // change to set the title to the proper value in the init method.
   return introPart.IsNull() ? ViewPart::GetPartName() : introPart->GetPartName();
 }
 
 void ViewIntroAdapterPart::Init(IViewSite::Pointer site,
     IMemento::Pointer memento) throw (PartInitException)
 {
   ViewPart::Init(site);
   Workbench* workbench =
       dynamic_cast<Workbench*>(site->GetWorkbenchWindow()->GetWorkbench());
   try
   {
     introPart = workbench->GetWorkbenchIntroManager() ->CreateNewIntroPart();
     // reset the part name of this view to be that of the intro title
     SetPartName(introPart->GetPartName());
     introPart->AddPropertyListener(propChangeListener.data());
     introSite
         = IIntroSite::Pointer(new IntroPartAdapterSite(site, workbench->GetIntroDescriptor()));
     introPart->Init(introSite, memento);
 
   } catch (CoreException& e)
   {
     //TODO IStatus
     //            WorkbenchPlugin.log(
     //                            IntroMessages.Intro_could_not_create_proxy,
     //                            new Status(IStatus.ERROR, WorkbenchPlugin.PI_WORKBENCH,
     //                                IStatus.ERROR, IntroMessages.Intro_could_not_create_proxy, e));
     WorkbenchPlugin::Log("Could not create intro view proxy.", e);
   }
 }
 
 void ViewIntroAdapterPart::PropertyChange(const Object::Pointer& /*source*/,
     int propId)
 {
   FirePropertyChange(propId);
 }
 
 void ViewIntroAdapterPart::SetFocus()
 {
   introPart->SetFocus();
 }
 
 void ViewIntroAdapterPart::SaveState(IMemento::Pointer memento)
 {
   introPart->SaveState(memento);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryViewIntroAdapterPart.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryViewIntroAdapterPart.h
index d386fd50a5..0b6e3d1847 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryViewIntroAdapterPart.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryViewIntroAdapterPart.h
@@ -1,155 +1,155 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYVIEWINTROADAPTERPART_H_
 #define BERRYVIEWINTROADAPTERPART_H_
 
 #include <berryViewPart.h>
 
 #include <intro/berryIIntroPart.h>
 #include <intro/berryIIntroSite.h>
 
 namespace berry
 {
 
 /**
  * Simple view that will wrap an <code>IIntroPart</code>.
  *
  * @since 3.0
  */
 class ViewIntroAdapterPart: public ViewPart
 {
 
 private:
 
   IIntroPart::Pointer introPart;
 
   IIntroSite::Pointer introSite;
 
   QScopedPointer<IPropertyChangeListener> propChangeListener;
   friend struct PropertyChangeIntAdapter<ViewIntroAdapterPart> ;
 
   void PropertyChange(const Object::Pointer& source, int propId);
 
   //     bool handleZoomEvents = true;
 
   //    /**
   //     * Adds a listener that toggles standby state if the view pane is zoomed.
   //     */
   //    void AddPaneListener() {
   //        IWorkbenchPartSite site = getSite();
   //        if (site instanceof PartSite) {
   //            final WorkbenchPartReference ref = ((WorkbenchPartReference)((PartSite) site).getPartReference());
   //            ref.addInternalPropertyListener(
   //                    new IPropertyListener() {
   //                        public void propertyChanged(Object source, int propId) {
   //                            if (handleZoomEvents) {
   //                                if (propId == WorkbenchPartReference.INTERNAL_PROPERTY_ZOOMED) {
   //                                    setStandby(!ref.getPane().isZoomed());
   //                                }
   //                            }
   //                        }
   //                    });
   //        }
   //    }
 
   //  /**
   //   * Sets whether the CoolBar/PerspectiveBar should be visible.
   //   *
   //   * @param visible whether the CoolBar/PerspectiveBar should be visible
   //   */
   //   void SetBarVisibility(bool visible) {
   //    WorkbenchWindow window = (WorkbenchWindow) getSite()
   //        .getWorkbenchWindow();
   //
   //    final boolean layout = (visible != window.getCoolBarVisible())
   //        || (visible != window.getPerspectiveBarVisible()); // don't layout unless things have actually changed
   //    if (visible) {
   //      window.setCoolBarVisible(true);
   //      window.setPerspectiveBarVisible(true);
   //    } else {
   //      window.setCoolBarVisible(false);
   //      window.setPerspectiveBarVisible(false);
   //    }
   //
   //    if (layout) {
   //      window.getShell().layout();
   //    }
   //  }
 
 public:
 
   ViewIntroAdapterPart();
 
   /**
    * Forces the standby state of the intro part.
    *
    * @param standby update the standby state
    */
   void SetStandby(bool standby);
 
   //    /**
   //     * Toggles handling of zoom events.
   //     *
   //     * @param handle whether to handle zoom events
   //     */
   //    void SetHandleZoomEvents(boolean handle) {
   //        handleZoomEvents = handle;
   //    }
 
   /* (non-Javadoc)
    * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
    */
   void CreatePartControl(void* parent);
 
   /* (non-Javadoc)
    * @see org.eclipse.ui.IWorkbenchPart#dispose()
    */
   ~ViewIntroAdapterPart();
 
   /* (non-Javadoc)
    * @see org.eclipse.ui.IWorkbenchPart#getTitleImage()
    */
-  void* GetTitleImage();
+  void* GetTitleImage() const;
 
   /* (non-Javadoc)
    * @see org.eclipse.ui.part.WorkbenchPart#GetPartName()
    */
-  QString GetPartName();
+  QString GetPartName() const;
 
   /* (non-Javadoc)
    * @see org.eclipse.ui.IViewPart#init(org.eclipse.ui.IViewSite, org.eclipse.ui.IMemento)
    */
   void Init(IViewSite::Pointer site, IMemento::Pointer memento =
       IMemento::Pointer(0)) throw (PartInitException);
 
   /*
    * (non-Javadoc)
    *
    * @see org.eclipse.ui.IWorkbenchPart#setFocus()
    */
   void SetFocus();
 
   /* (non-Javadoc)
    * @see org.eclipse.ui.IViewPart#saveState(org.eclipse.ui.IMemento)
    */
   void SaveState(IMemento::Pointer memento);
 
 };
 
 }
 
 #endif /* BERRYVIEWINTROADAPTERPART_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryWorkbenchIntroManager.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryWorkbenchIntroManager.cpp
index 98206629bb..f255e89295 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryWorkbenchIntroManager.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/intro/berryWorkbenchIntroManager.cpp
@@ -1,345 +1,345 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryWorkbenchIntroManager.h"
 
 #include "berryIntroConstants.h"
 
 #include "internal/berryWorkbench.h"
 #include "internal/berryWorkbenchPage.h"
 #include "internal/berryWorkbenchPlugin.h"
 #include "internal/berryPerspective.h"
 #include "internal/berryNullEditorInput.h"
 
 namespace berry
 {
 
 void WorkbenchIntroManager::CreateIntro(
     SmartPointer<IWorkbenchWindow> preferredWindow)
 {
   IIntroDescriptor::Pointer descr = this->workbench->GetIntroDescriptor();
   if (!descr)
   {
     return;
   }
 
   IWorkbenchPage::Pointer workbenchPage = preferredWindow->GetActivePage();
   if (!workbenchPage)
   {
     return;
   }
   try
   {
     if (IntroIsView())
     {
       workbenchPage->ShowView(IntroConstants::INTRO_VIEW_ID);
     }
     else
     {
       IEditorInput::Pointer input(new NullEditorInput());
       workbenchPage->OpenEditor(input, IntroConstants::INTRO_EDITOR_ID);
     }
   } catch (PartInitException& e)
   {
     //TODO IStatus
 //    WorkbenchPlugin::Log(IntroMessages.Intro_could_not_create_part, new Status(
 //        IStatus.ERROR, WorkbenchPlugin.PI_WORKBENCH, IStatus.ERROR,
 //        IntroMessages.Intro_could_not_create_part, e));
     WorkbenchPlugin::Log("Could not create intro part.", e);
   }
 }
 
 bool WorkbenchIntroManager::IntroIsView() const
 {
   IIntroDescriptor::Pointer descr = this->workbench->GetIntroDescriptor();
   if (descr)
   {
     return descr->GetRole() == IntroConstants::INTRO_ROLE_VIEW;
   }
   return true;
 }
 
 WorkbenchIntroManager::WorkbenchIntroManager(Workbench* workbench)
 : workbench(workbench)
 {
   //        workbench.getExtensionTracker().registerHandler(new IExtensionChangeHandler(){
   //
   //            /* (non-Javadoc)
   //             * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler#addExtension(org.eclipse.core.runtime.dynamicHelpers.IExtensionTracker, org.eclipse.core.runtime.IExtension)
   //             */
   //            public void addExtension(IExtensionTracker tracker,IExtension extension) {
   //                //Do nothing
   //            }
   //
   //      /* (non-Javadoc)
   //       * @see org.eclipse.core.runtime.dynamicHelpers.IExtensionChangeHandler#removeExtension(org.eclipse.core.runtime.IExtension, java.lang.Object[])
   //       */
   //      public void removeExtension(IExtension source, Object[] objects) {
   //                for (int i = 0; i < objects.length; i++) {
   //                    if (objects[i] instanceof IIntroPart) {
   //                        closeIntro((IIntroPart) objects[i]);
   //                    }
   //                }
   //
   //      }}, null);
 
 }
 
 bool WorkbenchIntroManager::CloseIntro(IIntroPart::Pointer part)
 {
   if (!introPart || introPart != part)
   {
     return false;
   }
 
   IWorkbenchPart::Pointer introView = GetIntroAdapterPart();
   if (introView)
   {
     //assumption is that there is only ever one intro per workbench
     //if we ever support one per window then this will need revisiting
     IWorkbenchPage::Pointer page = introView->GetSite()->GetPage();
     if (IntroIsView())
     {
       IViewReference::Pointer reference = page->FindViewReference(
           IntroConstants::INTRO_VIEW_ID);
       page->HideView(introView.Cast<IViewPart>());
       if (!reference || reference->GetPart(false) == 0)
       {
         introPart = 0;
         return true;
       }
       return false;
     }
     else
     {
       QList<IEditorReference::Pointer> references(page->FindEditors(IEditorInput::Pointer(0), IntroConstants::INTRO_EDITOR_ID, IWorkbenchPage::MATCH_ID));
       Q_ASSERT(references.size() < 2);
       if (references.empty())
         return false;
 
       if (page->CloseEditors(references, false))
       {
         introPart = 0;
         return true;
       }
       return false;
     }
   }
 
   // if there is no part then null our reference
   introPart = 0;
 
   return true;
 }
 
 IIntroPart::Pointer WorkbenchIntroManager::ShowIntro(SmartPointer<
     IWorkbenchWindow> preferredWindow, bool standby)
 {
   if (!preferredWindow)
   {
     preferredWindow = this->workbench->GetActiveWorkbenchWindow();
   }
 
   if (!preferredWindow)
   {
     return IIntroPart::Pointer(0);
   }
 
   IWorkbenchPart::Pointer part = GetIntroAdapterPart();
   if (!part)
   {
     CreateIntro(preferredWindow);
   }
   else
   {
     try
     {
       IWorkbenchPage::Pointer page = part->GetSite()->GetPage();
       IWorkbenchWindow::Pointer window = page->GetWorkbenchWindow();
       if (window != preferredWindow)
       {
         window->GetShell()->SetActive();
       }
 
       if (IntroIsView())
       {
         page->ShowView(IntroConstants::INTRO_VIEW_ID);
       }
       else
       {
         IEditorInput::Pointer input(new NullEditorInput());
         page->OpenEditor(input, IntroConstants::INTRO_EDITOR_ID);
       }
     } catch (PartInitException& e)
     {
       //TODO IStatus
 //      WorkbenchPlugin::Log("Could not open intro", new Status(IStatus.ERROR,
 //          WorkbenchPlugin.PI_WORKBENCH, IStatus.ERROR, "Could not open intro",
 //          e)); //$NON-NLS-1$ //$NON-NLS-2$
       WorkbenchPlugin::Log("Could not open intro", e);
     }
   }
   SetIntroStandby(introPart, standby);
   return introPart;
 }
 
 bool WorkbenchIntroManager::IsIntroInWindow(
     SmartPointer<IWorkbenchWindow> testWindow) const
 {
   IWorkbenchPart::Pointer part = GetIntroAdapterPart();
   if (!part)
   {
     return false;
   }
 
   IWorkbenchWindow::Pointer window = part->GetSite()->GetWorkbenchWindow();
   if (window == testWindow)
   {
     return true;
   }
   return false;
 }
 
 void WorkbenchIntroManager::SetIntroStandby(IIntroPart::Pointer part,
     bool /*standby*/)
 {
   if (!introPart || introPart != part)
   {
     return;
   }
 
   IWorkbenchPart::Pointer introPart = GetIntroAdapterPart();
   if (!introPart)
   {
     return;
   }
 
 //  PartPane::Pointer pane = viewIntroAdapterPart->GetSite().Cast<PartSite>()->GetPane();
 //  if (standby == !pane.isZoomed())
 //  {
 //    // the zoom state is already correct - just update the part's state.
 //    viewIntroAdapterPart.setStandby(standby);
 //    return;
 //  }
 //
 //  viewIntroAdapterPart.getSite().getPage().toggleZoom(pane.getPartReference());
 
 }
 
 bool WorkbenchIntroManager::IsIntroStandby(IIntroPart::Pointer part) const
 {
   if (!introPart || introPart != part)
   {
     return false;
   }
 
   IWorkbenchPart::Pointer introPart = GetIntroAdapterPart();
   if (!introPart)
   {
     return false;
   }
 
   //return !((PartSite) introPart.getSite()).getPane().isZoomed();
   return false;
 }
 
 IIntroPart::Pointer WorkbenchIntroManager::GetIntro() const
 {
   return introPart;
 }
 
 IWorkbenchPart::Pointer WorkbenchIntroManager::GetIntroAdapterPart() const
 {
   QList<IWorkbenchWindow::Pointer> windows(this->workbench->GetWorkbenchWindows());
-  for (std::size_t i = 0; i < windows.size(); i++)
+  for (int i = 0; i < windows.size(); i++)
   {
     IWorkbenchWindow::Pointer window = windows[i];
     WorkbenchPage::Pointer page = window->GetActivePage().Cast<WorkbenchPage>();
     if (!page)
     {
       continue;
     }
 
     if (IntroIsView())
     {
       QList<IPerspectiveDescriptor::Pointer> perspDescs(page->GetOpenPerspectives());
-      for (std::size_t j = 0; j < perspDescs.size(); j++)
+      for (int j = 0; j < perspDescs.size(); j++)
       {
         IPerspectiveDescriptor::Pointer descriptor = perspDescs[j];
         IViewReference::Pointer reference = page->FindPerspective(descriptor)->FindView(
             IntroConstants::INTRO_VIEW_ID);
         if (reference)
         {
           return reference->GetView(false);
         }
       }
     }
     else
     {
       QList<IEditorReference::Pointer> references(page->FindEditors(IEditorInput::Pointer(0), IntroConstants::INTRO_EDITOR_ID, IWorkbenchPage::MATCH_ID));
       Q_ASSERT(references.size() < 2);
       if (references.size() == 1)
         return references.front()->GetEditor(false);
     }
   }
   return IWorkbenchPart::Pointer(0);
 }
 
 IIntroPart::Pointer WorkbenchIntroManager::CreateNewIntroPart()
 {
   IntroDescriptor::Pointer introDescriptor(workbench->GetIntroDescriptor());
   introPart = (introDescriptor == 0 ? IIntroPart::Pointer(0) : introDescriptor->CreateIntro());
 //  if (introPart)
 //  {
 //    workbench.getExtensionTracker().registerObject(
 //        introDescriptor.getConfigurationElement() .getDeclaringExtension(),
 //        introPart, IExtensionTracker.REF_WEAK);
 //  }
   return introPart;
 }
 
 bool WorkbenchIntroManager::HasIntro() const
 {
   return workbench->GetIntroDescriptor() != 0;
 }
 
 bool WorkbenchIntroManager::IsNewContentAvailable()
 {
   IntroDescriptor::Pointer introDescriptor = workbench->GetIntroDescriptor();
   if (!introDescriptor)
   {
     return false;
   }
   try
   {
     IntroContentDetector::Pointer contentDetector =
         introDescriptor->GetIntroContentDetector();
     if (contentDetector)
     {
       return contentDetector->IsNewContentAvailable();
     }
   } catch (CoreException& ex)
   {
     //TODO IStatus
 //    WorkbenchPlugin.log(new Status(IStatus.WARNING,
 //        WorkbenchPlugin.PI_WORKBENCH, IStatus.WARNING,
 //        "Could not load intro content detector", ex)); //$NON-NLS-1$
     WorkbenchPlugin::Log("Could not load intro content detector", ex);
   }
   return false;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryAbstractTabFolder.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryAbstractTabFolder.cpp
index cc07161bac..bc2040cf7f 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryAbstractTabFolder.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryAbstractTabFolder.cpp
@@ -1,234 +1,234 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryAbstractTabFolder.h"
 #include "berryAbstractTabItem.h"
 
 #include <berryConstants.h>
 #include <berryIStackPresentationSite.h>
 
 #include <QWidget>
 
 namespace berry
 {
 
 AbstractTabFolder::AbstractTabFolder() :
   activeState(IStackPresentationSite::STATE_RESTORED)
 {
 
 }
 
 AbstractTabFolder::~AbstractTabFolder()
 {
 }
 
 void AbstractTabFolder::SetActive(int activeState)
 {
   this->activeState = activeState;
 }
 
 int AbstractTabFolder::GetActive()
 {
   return activeState;
 }
 
 QPoint AbstractTabFolder::GetPaneMenuLocation()
 {
   return this->GetControl()->mapToGlobal(QPoint(0, 0));
 }
 
 QPoint AbstractTabFolder::GetPartListLocation()
 {
   return this->GetSystemMenuLocation();
 }
 
 QPoint AbstractTabFolder::GetSystemMenuLocation()
 {
   return this->GetControl()->mapToGlobal(QPoint(0, 0));
 }
 
 AbstractTabItem* AbstractTabFolder::GetItem(int idx)
 {
   return this->GetItems()[idx];
 }
 
 AbstractTabItem* AbstractTabFolder::GetItem(const QPoint& toFind)
 {
   QList<AbstractTabItem*> items = this->GetItems();
 
-  for (unsigned int i = 0; i < items.size(); i++)
+  for (int i = 0; i < items.size(); i++)
   {
     AbstractTabItem* item = items[i];
 
     if (item->GetBounds().contains(toFind))
     {
       return item;
     }
   }
 
   return 0;
 }
 
 AbstractTabItem* AbstractTabFolder::FindItem(Object::Pointer dataToFind)
 {
   QList<AbstractTabItem*> items = this->GetItems();
 
-  for (unsigned int i = 0; i < items.size(); i++)
+  for (int i = 0; i < items.size(); i++)
   {
     AbstractTabItem* item = items[i];
 
     if (item->GetData() == dataToFind)
     {
       return item;
     }
   }
 
   return 0;
 }
 
 int AbstractTabFolder::IndexOf(AbstractTabItem* item)
 {
   QList<AbstractTabItem*> items = this->GetItems();
 
-  for (unsigned int idx = 0; idx < items.size(); ++idx)
+  for (int idx = 0; idx < items.size(); ++idx)
   {
     AbstractTabItem* next = items[idx];
 
     if (next == item)
     {
       return idx;
     }
   }
 
   return -1;
 }
 
 int AbstractTabFolder::GetItemCount()
 {
   return this->GetItems().size();
 }
 
 void AbstractTabFolder::SetState(int state)
 {
   this->state = state;
 }
 
 void AbstractTabFolder::ShellActive(bool  /*isActive*/)
 {
 }
 
 void AbstractTabFolder::Layout(bool  /*flushCache*/)
 {
 }
 
 void AbstractTabFolder::SetTabPosition(int  /*tabPosition*/)
 {
 }
 
 int AbstractTabFolder::GetTabPosition()
 {
   return Constants::TOP;
 }
 
 int AbstractTabFolder::GetState()
 {
   return state;
 }
 
 bool AbstractTabFolder::IsOnBorder(const QPoint&  /*toTest*/)
 {
   return false;
 }
 
 void AbstractTabFolder::SetVisible(bool visible)
 {
   this->GetControl()->setVisible(visible);
 }
 
 void AbstractTabFolder::ShowMinMax(bool  /*show*/)
 {
 }
 
 void AbstractTabFolder::FireEvent(TabFolderEvent::Pointer e)
 {
   tabFolderEvent(e);
 }
 
 void AbstractTabFolder::FireEvent(int id)
 {
   TabFolderEvent::Pointer event(new TabFolderEvent(id));
   this->FireEvent(event);
 }
 
 void AbstractTabFolder::FireEvent(int id, AbstractTabItem* w)
 {
   TabFolderEvent::Pointer event(new TabFolderEvent(id, w, 0, 0));
   this->FireEvent(event);
 }
 
 void AbstractTabFolder::FireEvent(int id, AbstractTabItem* w, const QPoint& pos)
 {
   TabFolderEvent::Pointer event(new TabFolderEvent(id, w, pos));
   this->FireEvent(event);
 }
 
 void AbstractTabFolder::HandleContextMenu(const QPoint& displayPos)
 {
   if (this->IsOnBorder(displayPos))
   {
     return;
   }
 
   AbstractTabItem* tab = this->GetItem(displayPos);
 
   this->FireEvent(TabFolderEvent::EVENT_SYSTEM_MENU, tab, displayPos);
 }
 
 void AbstractTabFolder::HandleMousePress(const QPoint&  /*displayPos*/)
 {
   this->FireEvent(TabFolderEvent::EVENT_GIVE_FOCUS_TO_PART);
 }
 
 void AbstractTabFolder::HandleDoubleClick(const QPoint& displayPos)
 {
   if (this->IsOnBorder(displayPos))
   {
     return;
   }
 
   if (this->GetState() == IStackPresentationSite::STATE_MAXIMIZED)
   {
     this->FireEvent(TabFolderEvent::EVENT_RESTORE);
   }
   else
   {
     this->FireEvent(TabFolderEvent::EVENT_MAXIMIZE);
   }
 }
 
 void AbstractTabFolder::HandleDragStarted(const QPoint& displayPos)
 {
 
   if (this->IsOnBorder(displayPos))
   {
     return;
   }
 
   AbstractTabItem* tab = this->GetItem(displayPos);
   this->FireEvent(TabFolderEvent::EVENT_DRAG_START, tab, displayPos);
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryLeftToRightTabOrder.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryLeftToRightTabOrder.cpp
index e36b62a47d..00baf6e0f2 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryLeftToRightTabOrder.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryLeftToRightTabOrder.cpp
@@ -1,101 +1,101 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryLeftToRightTabOrder.h"
 
 #include <internal/berryWorkbenchConstants.h>
 
 namespace berry
 {
 
 LeftToRightTabOrder::LeftToRightTabOrder(IPresentablePartList* _list) :
   list(_list)
 {
 
 }
 
 void LeftToRightTabOrder::Add(IPresentablePart::Pointer newPart)
 {
   list->Insert(newPart, static_cast<int>(list->Size()));
 }
 
 void LeftToRightTabOrder::AddInitial(IPresentablePart::Pointer newPart)
 {
   this->Add(newPart);
 }
 
 void LeftToRightTabOrder::Insert(IPresentablePart::Pointer newPart, int index)
 {
   list->Insert(newPart, index);
 }
 
 void LeftToRightTabOrder::Remove(IPresentablePart::Pointer removed)
 {
   list->Remove(removed);
 }
 
 void LeftToRightTabOrder::Select(IPresentablePart::Pointer selected)
 {
   list->Select(selected);
 }
 
 void LeftToRightTabOrder::Move(IPresentablePart::Pointer toMove, int newIndex)
 {
   list->Move(toMove, newIndex);
 }
 
 QList<IPresentablePart::Pointer> LeftToRightTabOrder::GetPartList()
 {
   return list->GetPartList();
 }
 
 void LeftToRightTabOrder::RestoreState(IPresentationSerializer* serializer,
     IMemento::Pointer savedState)
 {
   QList<IMemento::Pointer> parts = savedState->GetChildren(
       WorkbenchConstants::TAG_PART);
 
-  for (std::size_t idx = 0; idx < parts.size(); idx++)
+  for (int idx = 0; idx < parts.size(); idx++)
   {
     QString id;
     parts[idx]->GetString(WorkbenchConstants::TAG_ID, id);
 
     if (!id.isEmpty())
     {
       IPresentablePart::Pointer part = serializer->GetPart(id);
 
       if (part)
       {
         this->AddInitial(part);
       }
     }
   }
 }
 
 void LeftToRightTabOrder::SaveState(IPresentationSerializer* context,
     IMemento::Pointer memento)
 {
   QList<IPresentablePart::Pointer> parts(list->GetPartList());
 
   for (QList<IPresentablePart::Pointer>::iterator iter = parts.begin();
        iter != parts.end(); ++iter)
   {
     IMemento::Pointer childMem = memento->CreateChild(WorkbenchConstants::TAG_PART);
     childMem->PutString(WorkbenchConstants::TAG_ID, context->GetId(*iter));
   }
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryPresentablePartFolder.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryPresentablePartFolder.cpp
index 3217e3bf47..e610a3c2d3 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryPresentablePartFolder.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryPresentablePartFolder.cpp
@@ -1,436 +1,436 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "internal/berryQtWidgetsTweaklet.h"
 
 #include "berryPresentablePartFolder.h"
 #include "berryAbstractTabItem.h"
 
 #include <internal/berryQtControlWidget.h>
 
 #include <berryConstants.h>
 #include <internal/berryDragUtil.h>
 
 namespace berry
 {
 
 PresentablePartFolder::ContentProxyListener::ContentProxyListener(
     PresentablePartFolder* folder) :
   folder(folder)
 {
 }
 
 GuiTk::IControlListener::Events::Types PresentablePartFolder::ContentProxyListener::GetEventTypes() const
 {
   return static_cast<GuiTk::IControlListener::Events::Types>(Events::MOVED & Events::RESIZED);
 }
 
 void PresentablePartFolder::ContentProxyListener::ControlMoved(
     GuiTk::ControlEvent::Pointer  /*e*/)
 {
   folder->LayoutContent();
 }
 
 void PresentablePartFolder::ContentProxyListener::ControlResized(
     GuiTk::ControlEvent::Pointer  /*e*/)
 {
 }
 
 PresentablePartFolder::ShellListener::ShellListener(AbstractTabFolder* _folder) :
   folder(_folder)
 {
 }
 
-void PresentablePartFolder::ShellListener::ShellActivated(ShellEvent::Pointer  /*e*/)
+void PresentablePartFolder::ShellListener::ShellActivated(const ShellEvent::Pointer& /*e*/)
 {
   folder->ShellActive(true);
 }
 
 void PresentablePartFolder::ShellListener::ShellDeactivated(
-    ShellEvent::Pointer  /*e*/)
+    const ShellEvent::Pointer& /*e*/)
 {
   folder->ShellActive(false);
 }
 
 PresentablePartFolder::ChildPropertyChangeListener::ChildPropertyChangeListener(
     PresentablePartFolder* folder) :
   presentablePartFolder(folder)
 {
 }
 
 void PresentablePartFolder::ChildPropertyChangeListener::PropertyChange(
-    Object::Pointer source, int property)
+    const Object::Pointer& source, int property)
 {
 
   if (source.Cast<IPresentablePart> () != 0)
   {
     IPresentablePart::Pointer part = source.Cast<IPresentablePart> ();
 
     presentablePartFolder->ChildPropertyChanged(part, property);
   }
 }
 
 PartInfo PresentablePartFolder::tempPartInfo = PartInfo();
 
 void PresentablePartFolder::LayoutContent()
 {
   if (current != 0)
   {
     Rectangle clientArea = DragUtil::GetDisplayBounds(contentProxy);
 
     Rectangle bounds = Tweaklets::Get(GuiWidgetsTweaklet::KEY)->ToControl(
         folder->GetControl()->parentWidget(), clientArea);
     current->SetBounds(bounds);
   }
 }
 
 void PresentablePartFolder::InternalRemove(IPresentablePart::Pointer toRemove)
 {
   AbstractTabItem* item = this->GetTab(toRemove);
   if (item != 0) {
       item->Dispose();
   }
   // do not use item anymore!
 
   if (std::find(partList.begin(), partList.end(), toRemove) != partList.end())
   {
     toRemove->RemovePropertyListener(childPropertyChangeListener.data());
     partList.removeAll(toRemove);
   }
 }
 
 void PresentablePartFolder::ChildPropertyChanged(
     IPresentablePart::Pointer part, int property)
 {
   AbstractTabItem* tab = this->GetTab(part);
 
   if (property == IPresentablePart::PROP_HIGHLIGHT_IF_BACK)
   {
     if (tab != 0 && this->GetCurrent() != part)
     {//Set bold if it doesn't currently have focus
       tab->SetBold(true);
       this->InitTab(tab, part);
     }
   }
 
   // else if (property == IPresentablePart::PROP_TOOLBAR)
   //  {
   //    if (tab != 0 && this->GetCurrent() == part)
   //    {
   //      folder->FlushToolbarSize();
   //    }
   //    if (tab != 0)
   //      {
   //        this->InitTab(tab, part);
   //        if (this->GetCurrent() == part)
   //        {
   //          this->Layout(true);
   //        }
   //      }
   else if (property == IPresentablePart::PROP_CONTENT_DESCRIPTION || property
       == IPresentablePart::PROP_PANE_MENU || property
       == IPresentablePart::PROP_TITLE)
   {
     if (tab != 0)
     {
       this->InitTab(tab, part);
       if (this->GetCurrent() == part)
       {
         this->Layout(true);
       }
     }
   }
   else if (property == IPresentablePart::PROP_PREFERRED_SIZE)
   {
     TabFolderEvent::Pointer event(
         new TabFolderEvent(TabFolderEvent::EVENT_PREFERRED_SIZE, tab, 0, 0));
     folder->FireEvent(event);
   }
   else
   {
     if (tab != 0)
       this->InitTab(tab, part);
   }
 }
 
 PresentablePartFolder::~PresentablePartFolder()
 {
   Tweaklets::Get(QtWidgetsTweaklet::KEY)->GetShell(folder->GetControl())->RemoveShellListener(
-      shellListener);
+      shellListener.data());
   for (QList<IPresentablePart::Pointer>::iterator iter = partList.begin(); iter
       != partList.end(); ++iter)
   {
     (*iter)->RemovePropertyListener(childPropertyChangeListener.data());
   }
 
   for (QWidget* currentWidget = contentProxy; currentWidget != 0 && currentWidget
       != folder->GetControl()->parentWidget(); currentWidget = currentWidget->parentWidget())
   {
     Tweaklets::Get(GuiWidgetsTweaklet::KEY)->RemoveControlListener(currentWidget, contentListener);
   }
 
   BERRY_DEBUG << "DELETING PresentablePartFolder and contentProxy\n";
 
   delete folder;
 }
 
 void PresentablePartFolder::InitTab(AbstractTabItem* item,
     IPresentablePart::Pointer part)
 {
   tempPartInfo.Set(part);
   item->SetInfo(tempPartInfo);
 
   item->SetBusy(part->IsBusy());
   if (part == this->GetCurrent())
   {
     folder->SetSelectedInfo(tempPartInfo);
     //TODO Pane menu
     //folder->EnablePaneMenu(part->GetMenu() != 0);
 
     //setToolbar(part.getToolBar());
   }
 }
 
 PresentablePartFolder::PresentablePartFolder(AbstractTabFolder* _folder) :
   folder(_folder), isVisible(true), shellListener(new ShellListener(folder)),
       childPropertyChangeListener(new ChildPropertyChangeListener(this))
 {
   Shell::Pointer controlShell =
       Tweaklets::Get(QtWidgetsTweaklet::KEY)->GetShell(folder->GetControl());
-  controlShell->AddShellListener(shellListener);
+  controlShell->AddShellListener(shellListener.data());
   folder->ShellActive(Tweaklets::Get(QtWidgetsTweaklet::KEY)->GetActiveShell()
       == controlShell);
 
   //folder.getControl().addDisposeListener(tabDisposeListener);
 
   //toolbarProxy = new ProxyControl(folder.getToolbarParent());
 
   // NOTE: if the shape of contentProxy changes, the fix for bug 85899 in EmptyTabFolder.computeSize may need adjustment.
   contentListener = new ContentProxyListener(this);
   contentProxy = new QtControlWidget(folder->GetContentParent(), 0);
   contentProxy->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
   //contentProxy->setVisible(false);
   for (QWidget* currentWidget = contentProxy; currentWidget != 0 && currentWidget
       != folder->GetControl()->parentWidget(); currentWidget = currentWidget->parentWidget())
   {
     Tweaklets::Get(GuiWidgetsTweaklet::KEY)->AddControlListener(currentWidget, contentListener);
   }
   folder->SetContent(contentProxy);
 
 }
 
 QList<IPresentablePart::Pointer> PresentablePartFolder::GetPartList()
 {
   QList<AbstractTabItem*> items = folder->GetItems();
   QList<IPresentablePart::Pointer> result;
 
-  for (unsigned int i = 0; i < items.size(); i++)
+  for (int i = 0; i < items.size(); i++)
   {
     result.push_back(this->GetPartForTab(items[i]));
   }
 
   return result;
 }
 
 void PresentablePartFolder::Insert(IPresentablePart::Pointer part, int idx)
 {
   poco_assert(folder->GetControl() != 0);
 
   if (this->GetTab(part) != 0)
   {
     if (this->IndexOf(part) != idx)
     this->Move(part, idx);
     return;
   }
 
   idx = std::min<int>(idx, static_cast<int>(folder->GetItemCount()));
 
   AbstractTabItem* item = 0;
 
   int style = 0;
 
   if (part->IsCloseable())
   {
     style |= Constants::CLOSE;
   }
 
   item = folder->Add(idx, style);
 
   item->SetData(part);
 
   this->InitTab(item, part);
 
   part->AddPropertyListener(childPropertyChangeListener.data());
   partList.push_back(part);
 }
 
 void PresentablePartFolder::Remove(IPresentablePart::Pointer toRemove)
 {
   if (toRemove == current)
   {
     this->Select(IPresentablePart::Pointer(0));
   }
 
   this->InternalRemove(toRemove);
 }
 
 void PresentablePartFolder::Move(IPresentablePart::Pointer part, int newIndex)
 {
   int currentIndex = this->IndexOf(part);
 
   if (currentIndex == newIndex)
   {
     return;
   }
 
   folder->Move(currentIndex, newIndex);
 
   //this->InternalRemove(part);
   //this->Insert(part, newIndex);
 
   //if (current == part)
   //{
   //  folder->SetSelection(this->GetTab(part));
   //}
 }
 
 int PresentablePartFolder::Size()
 {
   return folder->GetItemCount();
 }
 
 void PresentablePartFolder::SetBounds(const QRect& bounds)
 {
   QSize minSize = folder->ComputeSize(bounds.width(), Constants::DEFAULT);
 
   QRect newBounds(bounds);
   if (folder->GetState() == IStackPresentationSite::STATE_MINIMIZED
       && minSize.height() < bounds.height())
   {
     newBounds.setHeight(minSize.height());
   }
 
   // Set the tab folder's bounds
   folder->GetControl()->setGeometry(newBounds);
 
   this->Layout(false);
 }
 
 void PresentablePartFolder::Select(IPresentablePart::Pointer toSelect)
 {
 
   if (toSelect == current)
   {
     return;
   }
 
   if (toSelect != 0)
   {
     toSelect->SetVisible(true);
   }
 
   if (current != 0)
   {
     current->SetVisible(false);
     //setToolbar(null);
   }
 
   current = toSelect;
 
   AbstractTabItem* selectedItem = this->GetTab(toSelect);
 
   folder->SetSelection(selectedItem);
 
   if (selectedItem != 0)
   {
     // Determine if we need to un-bold this tab
     selectedItem->SetBold(false);
     this->InitTab(selectedItem, toSelect);
   }
   //  else
   //  {
   //    setToolbar(null);
   //  }
 
   this->Layout(true);
 }
 
 IPresentablePart::Pointer PresentablePartFolder::GetPartForTab(
     AbstractTabItem* tab)
 {
   if (tab == 0)
   {
     return IPresentablePart::Pointer(0);
   }
 
   IPresentablePart::Pointer part = tab->GetData().Cast<IPresentablePart> ();
 
   return part;
 }
 
 AbstractTabItem* PresentablePartFolder::GetTab(IPresentablePart::Pointer part)
 {
   return folder->FindItem(part);
 }
 
 int PresentablePartFolder::IndexOf(IPresentablePart::Pointer part)
 {
   AbstractTabItem* item = this->GetTab(part);
 
   if (item == 0)
   {
     return -1;
   }
 
   return folder->IndexOf(item);
 }
 
 AbstractTabFolder* PresentablePartFolder::GetTabFolder()
 {
   return folder;
 }
 
 void PresentablePartFolder::SetVisible(bool isVisible)
 {
   this->isVisible = isVisible;
   this->GetTabFolder()->SetVisible(isVisible);
   if (isVisible)
   {
     this->Layout(true);
   }
 }
 
 void PresentablePartFolder::Layout(bool changed)
 {
   if (!isVisible)
   {
     // Don't bother with layout if we're not visible
     return;
   }
   // Lay out the tab folder and compute the client area
   folder->Layout(changed);
 
   //toolbarProxy.layout();
 
   this->LayoutContent();
 }
 
 IPresentablePart::Pointer PresentablePartFolder::GetCurrent()
 {
   return current;
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryPresentablePartFolder.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryPresentablePartFolder.h
index 19025eb281..814174fcc2 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryPresentablePartFolder.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryPresentablePartFolder.h
@@ -1,196 +1,197 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYPRESENTABLEPARTFOLDER_H_
 #define BERRYPRESENTABLEPARTFOLDER_H_
 
 #include "berryIPresentablePartList.h"
 #include "berryAbstractTabFolder.h"
 #include "berryPartInfo.h"
 
 #include <berryIShellListener.h>
 #include <berryIPropertyChangeListener.h>
 #include <berryGuiTkIControlListener.h>
 #include <list>
 
 namespace berry
 {
 
 class PresentablePartFolder: public IPresentablePartList
 {
 private:
 
   AbstractTabFolder* folder;
   IPresentablePart::Pointer current;
   //private ProxyControl toolbarProxy;
   QWidget* contentProxy;
   static PartInfo tempPartInfo;
 
   QList<IPresentablePart::Pointer> partList;
   bool isVisible;
 
   /**
    * Movement listener. Updates the bounds of the target to match the
    * bounds of the dummy control.
    */
   struct ContentProxyListener : public GuiTk::IControlListener
   {
     ContentProxyListener(PresentablePartFolder*);
 
     Events::Types GetEventTypes() const;
 
     void ControlMoved(GuiTk::ControlEvent::Pointer e);
 
     void ControlResized(GuiTk::ControlEvent::Pointer e);
 
   private:
 
     PresentablePartFolder* folder;
 
   };
 
   GuiTk::IControlListener::Pointer contentListener;
 
   struct ShellListener: public IShellListener
   {
 
     ShellListener(AbstractTabFolder* folder);
 
-    void ShellActivated(ShellEvent::Pointer e);
+    void ShellActivated(const ShellEvent::Pointer& e);
 
-    void ShellDeactivated(ShellEvent::Pointer e);
+    void ShellDeactivated(const ShellEvent::Pointer& e);
 
   private:
 
     AbstractTabFolder* folder;
   };
 
-  IShellListener::Pointer shellListener;
+  QScopedPointer<IShellListener> shellListener;
 
   /**
    * Listener attached to all child parts. It responds to changes in part properties
    */
   struct ChildPropertyChangeListener: public IPropertyChangeListener
   {
     ChildPropertyChangeListener(PresentablePartFolder* folder);
 
-    void PropertyChange(Object::Pointer source, int property);
+    using IPropertyChangeListener::PropertyChange;
+    void PropertyChange(const Object::Pointer& source, int property);
 
   private:
 
     PresentablePartFolder* presentablePartFolder;
   };
 
   QScopedPointer<IPropertyChangeListener> childPropertyChangeListener;
 
   //    /**
   //     * Dispose listener that is attached to the main control. It triggers cleanup of
   //     * any listeners. This is required to prevent memory leaks.
   //     */
   //    private DisposeListener tabDisposeListener = new DisposeListener() {
   //        public void widgetDisposed(DisposeEvent e) {
   //            if (e.widget == folder.getControl()) {
   //                // If we're disposing the main control...
   //                disposed();
   //            }
   //        }
   //    };
 
 
   void LayoutContent();
 
   void InternalRemove(IPresentablePart::Pointer toRemove);
 
   //    void SetToolbar(Control newToolbar) {
   //        if (folder.getToolbar() != newToolbar) {
   //            folder.setToolbar(newToolbar);
   //        }
   //    }
 
   void ChildPropertyChanged(IPresentablePart::Pointer part, int property);
 
 protected:
 
   void InitTab(AbstractTabItem* item, IPresentablePart::Pointer part);
 
 public:
 
   /**
    * The PresentablePartFolder takes ownership of the AbstractTabFolder pointer.
    */
   PresentablePartFolder(AbstractTabFolder* folder);
 
   ~PresentablePartFolder();
 
   /* (non-Javadoc)
    * @see org.blueberry.ui.internal.presentations.util.IPresentablePartList#getPartList()
    */
   QList<IPresentablePart::Pointer> GetPartList();
 
   /**
    * Adds the given presentable part directly into this presentation at the
    * given index. Does nothing if a tab already exists for the given part.
    * This is intended to be called by TabOrder and its subclasses.
    *
    * @param part part to add
    * @param idx index to insert at
    */
   void Insert(IPresentablePart::Pointer part, int idx);
 
   void Remove(IPresentablePart::Pointer toRemove);
 
   /**
    * Moves the given part to the given index. When this method returns,
    * indexOf(part) will return newIndex.
    *
    * @param part
    * @param newIndex
    */
   void Move(IPresentablePart::Pointer part, int newIndex);
 
   /**
    * Returns the number of parts in this folder
    */
   int Size();
 
   void SetBounds(const QRect& bounds);
 
   void Select(IPresentablePart::Pointer toSelect);
 
   IPresentablePart::Pointer GetPartForTab(AbstractTabItem* tab);
 
   /**
    * Returns the tab for the given part, or null if there is no such tab
    *
    * @param part the part being searched for
    * @return the tab for the given part, or null if there is no such tab
    */
   AbstractTabItem* GetTab(IPresentablePart::Pointer part);
 
   int IndexOf(IPresentablePart::Pointer part);
 
   AbstractTabFolder* GetTabFolder();
 
   void SetVisible(bool isVisible);
 
   void Layout(bool changed);
 
   IPresentablePart::Pointer GetCurrent();
 };
 
 }
 
 #endif /* BERRYPRESENTABLEPARTFOLDER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryTabbedStackPresentation.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryTabbedStackPresentation.cpp
index cd6ccf51db..a614847301 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryTabbedStackPresentation.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/internal/util/berryTabbedStackPresentation.cpp
@@ -1,498 +1,501 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryLog.h"
 
+#include "berryIMemento.h"
+
 #include "berryTabbedStackPresentation.h"
 #include "berryAbstractTabItem.h"
 #include "berryLeftToRightTabOrder.h"
 #include "berryReplaceDragHandler.h"
+#include "berryShell.h"
 
 #include <berryConstants.h>
 
 namespace berry
 {
 
 int TabbedStackPresentation::ComputePreferredMinimumSize(bool width,
     int availablePerpendicular)
 {
   int minSize;
   int hint =
           availablePerpendicular == INF ? Constants::DEFAULT
               : availablePerpendicular;
   if (width)
   {
     minSize = folder->GetTabFolder()->ComputeSize(Constants::DEFAULT, hint).width();
   }
   else
   {
     minSize = folder->GetTabFolder()->ComputeSize(hint, Constants::DEFAULT).height();
   }
   return minSize;
 }
 
 void TabbedStackPresentation::HandleTabFolderEvent(TabFolderEvent::Pointer e)
 {
   int type = e->type;
   if (type == TabFolderEvent::EVENT_MINIMIZE)
   {
     this->GetSite()->SetState(IStackPresentationSite::STATE_MINIMIZED);
   }
   else if (type == TabFolderEvent::EVENT_MAXIMIZE)
   {
     this->GetSite()->SetState(IStackPresentationSite::STATE_MAXIMIZED);
   }
   else if (type == TabFolderEvent::EVENT_RESTORE)
   {
     this->GetSite()->SetState(IStackPresentationSite::STATE_RESTORED);
   }
   else if (type == TabFolderEvent::EVENT_CLOSE)
   {
     IPresentablePart::Pointer part = folder->GetPartForTab(e->tab);
     if (part != 0)
     {
       QList<IPresentablePart::Pointer> parts;
       parts.push_back(part);
       this->GetSite()->Close(parts);
     }
   }
   else if (type == TabFolderEvent::EVENT_SHOW_LIST)
   {
     this->ShowPartList();
   }
   else if (type == TabFolderEvent::EVENT_GIVE_FOCUS_TO_PART)
   {
     IPresentablePart::Pointer part = this->GetSite()->GetSelectedPart();
     if (part != 0)
     {
       part->SetFocus();
     }
   }
   else if (type == TabFolderEvent::EVENT_PANE_MENU)
   {
     IPresentablePart::Pointer part = this->GetSite()->GetSelectedPart();
     if (part != 0)
     {
       part->SetFocus();
     }
     //this->ShowPaneMenu(folder->GetPartForTab(e->tab), QPoint(e->x, e->y));
   }
   else if (type == TabFolderEvent::EVENT_DRAG_START)
   {
     AbstractTabItem* beingDragged = e->tab;
     Point initialLocation(e->x, e->y);
 
     if (beingDragged == 0)
     {
       this->GetSite()->DragStart(initialLocation, false);
     }
     else
     {
       IPresentablePart::Pointer part = folder->GetPartForTab(beingDragged);
 
       try
       {
         dragStart = folder->IndexOf(part);
         // hold on to this TabbedStackPresentation instance, because
         // in this->GetSite()->DragStart() all reference may be deleted
         // and this instance is destroyed, leading to a seg fault when
         // trying to write to dragStart
         StackPresentation::Pointer tabbedStackPresentation(this);
         this->GetSite()->DragStart(part, initialLocation, false);
         dragStart = -1;
       }
       catch(const std::exception& exc)
       {
         dragStart = -1;
         throw exc;
       }
     }
   }
   else if (type == TabFolderEvent::EVENT_TAB_SELECTED)
   {
     if (ignoreSelectionChanges > 0)
     {
       return;
     }
 
     IPresentablePart::Pointer part = folder->GetPartForTab(e->tab);
 
     if (part != 0)
     {
       this->GetSite()->SelectPart(part);
     }
   }
   else if (type == TabFolderEvent::EVENT_SYSTEM_MENU)
   {
     IPresentablePart::Pointer part = folder->GetPartForTab(e->tab);
 
     if (part == 0)
     {
       part = this->GetSite()->GetSelectedPart();
     }
 
     if (part != 0)
     {
       //this->ShowSystemMenu(QPoint(e->x, e->y), part);
     }
   }
   else if (type == TabFolderEvent::EVENT_PREFERRED_SIZE)
   {
     IPresentablePart::Pointer part = folder->GetPartForTab(e->tab);
     if (part == 0)
     {
       // Standalone views with no title have no tab, so just get the part.
       QList<IPresentablePart::Pointer> parts = this->GetSite()->GetPartList();
       if (parts.size() > 0)
         part = parts.front();
     }
     if (part == this->GetSite()->GetSelectedPart())
     {
       this->GetSite()->FlushLayout();
     }
   }
 
 }
 
 TabbedStackPresentation::TabbedStackPresentation(
     IStackPresentationSite::Pointer site, AbstractTabFolder* widget/*, ISystemMenu systemMenu*/)
  : StackPresentation(site)
 {
   PresentablePartFolder* folder = new PresentablePartFolder(widget);
   this->Init(site, folder, new LeftToRightTabOrder(folder),
       new ReplaceDragHandler(widget)); // systemMenu);
 }
 
 TabbedStackPresentation::TabbedStackPresentation(
     IStackPresentationSite::Pointer site, PresentablePartFolder* folder/*, ISystemMenu systemMenu*/)
  : StackPresentation(site)
 {
   this->Init(site, folder, new LeftToRightTabOrder(folder),
       new ReplaceDragHandler(folder->GetTabFolder())); //, systemMenu);
 }
 
 TabbedStackPresentation::TabbedStackPresentation(
     IStackPresentationSite::Pointer site, PresentablePartFolder* newFolder,
     TabOrder* tabs, TabDragHandler* dragBehavior /*, ISystemMenu systemMenu*/)
  : StackPresentation(site)
 {
   this->Init(site, newFolder, tabs, dragBehavior);
 }
 
 void TabbedStackPresentation::Init(IStackPresentationSite::Pointer,
             PresentablePartFolder* newFolder, TabOrder* tabs, TabDragHandler* dragBehavior /*, ISystemMenu systemMenu*/)
 {
   //this->systemMenu = systemMenu;
 
   initializing = true;
   ignoreSelectionChanges = 0;
   dragStart = -1;
 
   this->folder = newFolder;
   this->tabs = tabs;
   this->dragBehavior = dragBehavior;
 
   //        // Add a dispose listener. This will call the presentationDisposed()
   //        // method when the widget is destroyed.
   //        folder.getTabFolder().getControl().addDisposeListener(new DisposeListener() {
   //            public void widgetDisposed(DisposeEvent e) {
   //                presentationDisposed();
   //            }
   //        });
 
   folder->GetTabFolder()->tabFolderEvent += TabFolderEventDelegate(this, &TabbedStackPresentation::HandleTabFolderEvent);
 
   //this->partList = new DefaultPartList(site, newFolder);
 }
 
 void TabbedStackPresentation::RestoreState(IPresentationSerializer* serializer,
     IMemento::Pointer savedState)
 {
   tabs->RestoreState(serializer, savedState);
 }
 
 void TabbedStackPresentation::SaveState(IPresentationSerializer* context,
     IMemento::Pointer memento)
 {
   StackPresentation::SaveState(context, memento);
 
   tabs->SaveState(context, memento);
 }
 
 void TabbedStackPresentation::SetBounds(const Rectangle& bounds)
 {
   QRect rectangle(bounds.x, bounds.y, bounds.width, bounds.height);
   folder->SetBounds(rectangle);
 }
 
 Point TabbedStackPresentation::ComputeMinimumSize()
 {
   QSize point = folder->GetTabFolder()->ComputeSize(Constants::DEFAULT, Constants::DEFAULT);
   return Point(point.width(), point.height());
 }
 
 int TabbedStackPresentation::ComputePreferredSize(bool width,
     int availableParallel, int availablePerpendicular, int preferredResult)
 {
 
   // If there is exactly one part in the stack, this just returns the
   // preferred size of the part as the preferred size of the stack.
   QList<IPresentablePart::Pointer> parts = this->GetSite()->GetPartList();
   if (parts.size() == 1 && parts.front() != 0 && !(this->GetSite()->GetState()
       == IStackPresentationSite::STATE_MINIMIZED))
   {
     int partSize = parts.front()->ComputePreferredSize(width, availableParallel,
         availablePerpendicular, preferredResult);
 
     if (partSize == INF)
       return partSize;
 
     // Adjust preferred size to take into account tab and border trim.
     int minSize = this->ComputePreferredMinimumSize(width, availablePerpendicular);
     if (width)
     {
       // PaneFolder adds some bogus tab spacing, so just find the maximum width.
       partSize = std::max<int>(minSize, partSize);
     }
     else
     {
       // Add them (but only if there's enough room)
       if (INF - minSize > partSize)
         partSize += minSize;
     }
 
     return partSize;
   }
 
   if (preferredResult != INF || this->GetSite()->GetState()
       == IStackPresentationSite::STATE_MINIMIZED)
   {
     int minSize = this->ComputePreferredMinimumSize(width, availablePerpendicular);
 
     if (this->GetSite()->GetState() == IStackPresentationSite::STATE_MINIMIZED)
     {
       return minSize;
     }
 
     return std::max<int>(minSize, preferredResult);
   }
 
   return INF;
 }
 
 int TabbedStackPresentation::GetSizeFlags(bool width)
 {
   int flags = 0;
   // If there is exactly one part in the stack,
   // then take into account the size flags of the part.
   QList<IPresentablePart::Pointer> parts = this->GetSite()->GetPartList();
   if (parts.size() == 1 && parts.front() != 0)
   {
     flags |= parts.front()->GetSizeFlags(width);
   }
 
   return flags | StackPresentation::GetSizeFlags(width);
 }
 
 void TabbedStackPresentation::ShowPartList()
 {
 //  if (partList != 0)
 //  {
 //    int numberOfParts = folder->GetTabFolder()->GetItemCount();
 //    if (numberOfParts > 0)
 //    {
 //      partList.show(getControl(), folder.getTabFolder() .getPartListLocation(),
 //          getSite().getSelectedPart());
 //    }
 //  }
 }
 
 TabbedStackPresentation::~TabbedStackPresentation()
 {
 //  // Dispose the tab folder's widgetry
 //  folder.getTabFolder().getControl().dispose();
 
   BERRY_DEBUG << "DELETING TabbedStackPresentation\n";
 
   delete tabs;
   delete dragBehavior;
   delete folder;
 }
 
 void TabbedStackPresentation::SetActive(int newState)
 {
   folder->GetTabFolder()->SetActive(newState);
 }
 
 void TabbedStackPresentation::SetVisible(bool isVisible)
 {
   IPresentablePart::Pointer current = this->GetSite()->GetSelectedPart();
   if (current != 0)
   {
     current->SetVisible(isVisible);
   }
 
   folder->SetVisible(isVisible);
 }
 
 void TabbedStackPresentation::SetState(int state)
 {
   folder->GetTabFolder()->SetState(state);
 }
 
 void* TabbedStackPresentation::GetControl()
 {
   return folder->GetTabFolder()->GetControl();
 }
 
 AbstractTabFolder* TabbedStackPresentation::GetTabFolder()
 {
   return folder->GetTabFolder();
 }
 
 void TabbedStackPresentation::AddPart(IPresentablePart::Pointer newPart,
     Object::Pointer cookie)
 {
   ++ignoreSelectionChanges;
   try
   {
     if (initializing)
     {
       tabs->AddInitial(newPart);
     }
     else
     {
       if (cookie == 0)
       {
         tabs->Add(newPart);
       }
       else
       {
         int insertionPoint = dragBehavior->GetInsertionPosition(cookie);
         tabs->Insert(newPart, insertionPoint);
       }
     }
 
     --ignoreSelectionChanges;
   } catch (std::exception& e)
   {
     --ignoreSelectionChanges;
     throw e;
   }
 
   if (tabs->GetPartList().size() == 1)
   {
     if (newPart->GetSizeFlags(true) != 0 || newPart->GetSizeFlags(false) != 0)
     {
       this->GetSite()->FlushLayout();
     }
   }
 }
 
 void TabbedStackPresentation::MovePart(IPresentablePart::Pointer toMove,
     Object::Pointer cookie)
 {
   ++ignoreSelectionChanges;
   try
   {
     int insertionPoint = dragBehavior->GetInsertionPosition(cookie);
 
     if (insertionPoint == folder->IndexOf(toMove))
     {
       --ignoreSelectionChanges;
       return;
     }
 
     tabs->Move(toMove, insertionPoint);
 
     --ignoreSelectionChanges;
   } catch (std::exception& e)
   {
     --ignoreSelectionChanges;
     throw e;
   }
 }
 
 void TabbedStackPresentation::RemovePart(IPresentablePart::Pointer oldPart)
 {
   ++ignoreSelectionChanges;
   try
   {
     tabs->Remove(oldPart);
 
     --ignoreSelectionChanges;
   } catch (std::exception& e)
   {
     --ignoreSelectionChanges;
     throw e;
   }
 }
 
 void TabbedStackPresentation::SelectPart(IPresentablePart::Pointer toSelect)
 {
   initializing = false;
 
   tabs->Select(toSelect);
 }
 
 StackDropResult::Pointer TabbedStackPresentation::DragOver(void* currentControl, const Point& location)
 {
   QWidget* currentWidget = static_cast<QWidget*>(currentControl);
   return dragBehavior->DragOver(currentWidget, location, dragStart);
 }
 
 QList<void*> TabbedStackPresentation::GetTabList(
     IPresentablePart::Pointer part)
 {
   QList<void*> list;
   if (folder->GetTabFolder()->GetTabPosition() == Constants::BOTTOM)
   {
     if (part->GetControl() != 0)
     {
       list.push_back(part->GetControl());
     }
   }
 
   list.push_back(folder->GetTabFolder()->GetControl());
 
 //  if (part->GetToolBar() != 0)
 //  {
 //    list.push_back(part->GetToolBar());
 //  }
 
   if (folder->GetTabFolder()->GetTabPosition() == Constants::TOP)
   {
     if (part->GetControl() != 0)
     {
       list.push_back(part->GetControl());
     }
   }
 
   return list;
 }
 
 void TabbedStackPresentation::MoveTab(IPresentablePart::Pointer part, int index)
 {
   tabs->Move(part, index);
   folder->Layout(true);
 }
 
 QList<IPresentablePart::Pointer> TabbedStackPresentation::GetPartList()
 {
   return tabs->GetPartList();
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/intro/berryIIntroPart.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/intro/berryIIntroPart.h
index b2e03376bc..6b40b4c98e 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/intro/berryIIntroPart.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/intro/berryIIntroPart.h
@@ -1,212 +1,213 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIINTROPART_H_
 #define BERRYIINTROPART_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
 
 #include <berryIMemento.h>
 #include <berryIPropertyChangeListener.h>
 #include <berryUIException.h>
 
 #include "berryIIntroSite.h"
 
 #include <QObject>
 
 namespace berry {
 
 /**
  * The intro part is a visual component within the workbench responsible for
  * introducing the product to new users. The intro part is typically shown the
  * first time a product is started up.
  * <p>
  * The intro part implementation is contributed to the workbench via the
  * <code>org.blueberry.ui.intro</code> extension point.  There can be several
  * intro part implementations, and associations between intro part
  * implementations and products. The workbench will only make use of the intro
  * part implementation for the current product (as given by
  * {@link berry::Platform#GetProduct()}. There is at most one
  * intro part instance in the entire workbench, and it resides in exactly one
  * workbench window at a time.
  * </p>
  * <p>
  * This interface in not intended to be directly implemented. Rather, clients
  * providing a intro part implementation should subclass
  * {@link berry::IntroPart}.
  * </p>
  *
  * @see IIntroManager#ShowIntro(IWorkbenchWindow::Pointer, bool)
  * @noimplement This interface is not intended to be implemented by clients.
  */
-struct BERRY_UI_QT IIntroPart : public virtual Object { // IAdaptable {
+struct BERRY_UI_QT IIntroPart : public virtual Object
+{ // IAdaptable {
 
-  berryInterfaceMacro(IIntroPart, berry);
+  berryObjectMacro(berry::IIntroPart)
 
   ~IIntroPart();
 
     /**
    * The property id for <code>getTitleImage</code> and
    * <code>getTitle</code>.
    *
    * @since 3.2 this property now covers changes to <code>getTitle</code> in
    *        addition to <code>getTitleImage</code>
    */
    //static const int PROP_TITLE = IWorkbenchPart::PROP_TITLE;
 
     /**
    * Returns the site for this intro part.
    *
    * @return the intro site
    */
    virtual IIntroSite::Pointer GetIntroSite() const = 0;
 
     /**
      * Initializes this intro part with the given intro site. A memento is
      * passed to the part which contains a snapshot of the part state from a
      * previous session. Where possible, the part should try to recreate that
      * state.
      * <p>
      * This method is automatically called by the workbench shortly after
      * part construction.  It marks the start of the intro's lifecycle. Clients
      * must not call this method.
      * </p>
      *
      * @param site the intro site
      * @param memento the intro part state or <code>null</code> if there is no previous
      * saved state
      * @exception PartInitException if this part was not initialized
      * successfully
      */
     virtual void Init(IIntroSite::Pointer site, IMemento::Pointer memento) = 0;
 
     /**
      * Sets the standby state of this intro part. An intro part should render
      * itself differently in the full and standby modes. In standby mode, the
      * part should be partially visible to the user but otherwise allow them
      * to work. In full mode, the part should be fully visible and be the center
      * of the user's attention.
      * <p>
      * This method is automatically called by the workbench at appropriate
      * times. Clients must not call this method directly (call
      * {@link IIntroManager#setIntroStandby(IIntroPart, boolean)} instead.
      * </p>
      *
      * @param standby <code>true</code> to put this part in its partially
      * visible standy mode, and <code>false</code> to make it fully visible
      */
     virtual void StandbyStateChanged(bool standby) = 0;
 
     /**
      * Saves the object state within a memento.
      * <p>
      * This method is automatically called by the workbench at appropriate
      * times. Clients must not call this method directly.
      * </p>
      *
      * @param memento a memento to receive the object state
      */
     virtual void SaveState(IMemento::Pointer memento) = 0;
 
     /**
      * Adds a listener for changes to properties of this intro part.
      * Has no effect if an identical listener is already registered.
      * <p>
      * The properties ids are as follows:
      * <ul>
      *   <li><code>IIntroPart.PROP_TITLE</code> </li>
      * </ul>
      * </p>
      *
      * @param listener a property listener
      */
     virtual void AddPropertyListener(IPropertyChangeListener* listener) = 0;
 
     /**
      * Creates the SWT controls for this intro part.
      * <p>
      * Clients should not call this method (the workbench calls this method when
      * it needs to, which may be never).
      * </p>
      * <p>
      * For implementors this is a multi-step process:
      * <ol>
      *   <li>Create one or more controls within the parent.</li>
      *   <li>Set the parent layout as needed.</li>
      *   <li>Register any global actions with the <code>IActionService</code>.</li>
      *   <li>Register any popup menus with the <code>IActionService</code>.</li>
      *   <li>Register a selection provider with the <code>ISelectionService</code>
      *     (optional). </li>
      * </ol>
      * </p>
      *
      * @param parent the parent control
      */
     virtual void CreatePartControl(void* parent) = 0;
 
     /**
      * Returns the title image of this intro part.  If this value changes
      * the part must fire a property listener event with
      * {@link IIntroPart#PROP_TITLE}.
      * <p>
      * The title image is usually used to populate the title bar of this part's
      * visual container. Since this image is managed by the part itself, callers
      * must <b>not</b> dispose the returned image.
      * </p>
      *
      * @return the title image
      */
     virtual void* GetTitleImage() const = 0;
 
     /**
      * Returns the title of this intro part. If this value changes
      * the part must fire a property listener event with
      * {@link IIntroPart#PROP_TITLE}.
      * <p>
      * The title is used to populate the title bar of this part's visual
      * container.
      * </p>
      *
      * @return the intro part title (not <code>null</code>)
      */
     virtual QString GetPartName() const = 0;
 
     /**
      * Removes the given property listener from this intro part.
      * Has no affect if an identical listener is not registered.
      *
      * @param listener a property listener
      */
     virtual void RemovePropertyListener(IPropertyChangeListener* listener) = 0;
 
     /**
      * Asks this part to take focus within the workbench.
      * <p>
      * Clients should not call this method (the workbench calls this method at
      * appropriate times).  To have the workbench activate a part, use
      * {@link IIntroManager#showIntro(IWorkbenchWindow, boolean)}.
      * </p>
      */
     virtual void SetFocus() = 0;
 };
 
 }
 
-Q_DECLARE_INTERFACE(berry::IIntroPart, "org.blueberry.IIntroPart")
+Q_DECLARE_INTERFACE(berry::IIntroPart, "org.blueberry.ui.IIntroPart")
 
 #endif /* BERRYIINTROPART_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/intro/berryIIntroSite.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/intro/berryIIntroSite.h
index 95e27919f2..4fe2bf770d 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/intro/berryIIntroSite.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/intro/berryIIntroSite.h
@@ -1,72 +1,72 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIINTROSITE_H_
 #define BERRYIINTROSITE_H_
 
 #include <berryIWorkbenchSite.h>
 
 namespace berry {
 
 /**
  * The primary interface between an intro part and the workbench.
  * <p>
  * The workbench exposes its implemention of intro part sites via this
  * interface, which is not intended to be implemented or extended by clients.
  * </p>
  *
- * @since 3.0
  * @noimplement This interface is not intended to be implemented by clients.
  */
-struct BERRY_UI_QT IIntroSite : public IWorkbenchSite {
+struct BERRY_UI_QT IIntroSite : public IWorkbenchSite
+{
 
-  berryInterfaceMacro(IIntroSite, berry);
+  berryObjectMacro(berry::IIntroSite)
 
   ~IIntroSite();
 
   /**
    * Returns the part registry extension id for this intro site's part.
    * <p>
    * The name comes from the <code>id</code> attribute in the configuration
    * element.
    * </p>
    *
    * @return the registry extension id
    */
   virtual QString GetId() const = 0;
 
   /**
    * Returns the unique identifier of the plug-in that defines this intro
    * site's part.
    *
    * @return the unique identifier of the declaring plug-in
    * @see org.eclipse.core.runtime.IPluginDescriptor#getUniqueIdentifier()
    */
   virtual QString GetPluginId() const = 0;
 
   /**
    * Returns the action bars for this part site.
    * The intro part has exclusive use of its site's action bars.
    *
    * @return the action bars
    */
   //virtual IActionBars GetActionBars() const = 0;
 };
 
 }
 
 #endif /* BERRYIINTROSITE_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/intro/berryIntroContentDetector.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/intro/berryIntroContentDetector.h
index 54ace57e08..6be0adfa52 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/intro/berryIntroContentDetector.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/intro/berryIntroContentDetector.h
@@ -1,57 +1,58 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYINTROCONTENTDETECTOR_H_
 #define BERRYINTROCONTENTDETECTOR_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 
 namespace berry {
 
 /**
  * An intro content detector is used when starting the Workbench to determine if
  * new intro content is available. Since calling this method is part of the
  * Workbench start sequence, subclasses should be implemented with care as not
  * to introduce noticeable delay at startup. If an intro content detector
  * reports new available content, the view part showing the content will be
  * opened again even if the user had closed it in a previous session. Because of
  * this, the intro view part should draw the user's attention to the new content
  * to avoid confusion about why the intro view part was opened again without the
  * user requesting it.
  *
  */
-struct BERRY_UI_QT IntroContentDetector : public Object {
+struct BERRY_UI_QT IntroContentDetector : public Object
+{
 
-  berryInterfaceMacro(IntroContentDetector, berry);
+  berryObjectMacro(berry::IntroContentDetector)
 
   /**
    * Returns <code>true</code> if new intro content is available.
    *
    * @return <code>true</code> if new intro content is available
    */
   virtual bool IsNewContentAvailable() const = 0;
 
 };
 
 }
 
-Q_DECLARE_INTERFACE(berry::IntroContentDetector, "org.blueberr.IntroContentDetector")
+Q_DECLARE_INTERFACE(berry::IntroContentDetector, "org.blueberry.ui.IntroContentDetector")
 
 #endif /* BERRYINTROCONTENTDETECTOR_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/presentations/berryIPresentablePart.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/presentations/berryIPresentablePart.h
index 8500a0d244..c96c21b17d 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/presentations/berryIPresentablePart.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/presentations/berryIPresentablePart.h
@@ -1,269 +1,269 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIPRESENTABLEPART_H_
 #define BERRYIPRESENTABLEPART_H_
 
 #include <berryMacros.h>
 
 #include "berryISizeProvider.h"
 #include "berryRectangle.h"
 #include "berryIPropertyChangeListener.h"
 
 namespace berry {
 
 /**
  * This is a skin's interface to the contents of a view or editor. Note that this
  * is essentially the same as IWorkbenchPart, except it does not provide access
  * to lifecycle events and allows repositioning of the part.
  *
  * Not intended to be implemented by clients.
  *
  * @since 3.0
  * @since 3.4 now extends {@link org.blueberry.ui.ISizeProvider}
  * @noimplement This interface is not intended to be implemented by clients.
  */
 struct BERRY_UI_QT IPresentablePart : public Object, public ISizeProvider {
 
-  berryInterfaceMacro(IPresentablePart, berry);
+  berryObjectMacro(berry::IPresentablePart)
 
   ~IPresentablePart();
 
     /**
      * The property id for <code>isDirty</code>.
      */
     static const int PROP_DIRTY; // = IWorkbenchPartConstants.PROP_DIRTY;
 
     /**
      * The property id for <code>getEditorInput</code>.
      */
     static const int PROP_INPUT; // = IWorkbenchPartConstants.PROP_INPUT;
 
     /**
      * The property id for <code>getTitle</code>, <code>getTitleImage</code>
      * and <code>getTitleToolTip</code>.
      */
     static const int PROP_TITLE; // = IWorkbenchPartConstants.PROP_TITLE;
 
     /**
      * The property id for <code>IWorkbenchPart2.getContentDescription()</code>
      */
     static const int PROP_CONTENT_DESCRIPTION; // = IWorkbenchPartConstants.PROP_CONTENT_DESCRIPTION;
 
     /**
      * The property id for <code>IWorkbenchPart2.getContentDescription()</code>
      */
     static const int PROP_PART_NAME; // = IWorkbenchPartConstants.PROP_PART_NAME;
 
     /**
      * The property id for <code>isBusy</code>.
      */
     static const int PROP_BUSY; // = 0x92;
 
     /**
      * The property id for toolbar changes
      */
     static const int PROP_TOOLBAR; // = 0x93;
 
     /**
      * The property id for highlighting the
      * part if it is not in front.
      */
     static const int PROP_HIGHLIGHT_IF_BACK; // = 0x94;
 
     /**
      * The property id for pane menu changes
      */
     static const int PROP_PANE_MENU; // = 0x302;
 
     /**
      * The property id for preferred size changes
      * @since 3.4
      */
     static const int PROP_PREFERRED_SIZE; // = IWorkbenchPartConstants.PROP_PREFERRED_SIZE;
 
     /**
      * Sets the bounds of this part.
      *
      * @param bounds bounding rectangle (not null)
      */
     virtual void SetBounds(const Rectangle& bounds) = 0;
 
     /**
      * Notifies the part whether or not it is visible in the current
      * perspective. A part is visible iff any part of its widgetry can
      * be seen.
      *
      * @param isVisible true if the part has just become visible, false
      * if the part has just become hidden
      */
     virtual void SetVisible(bool isVisible) = 0;
 
     /**
      * Forces this part to have focus.
      */
     virtual void SetFocus() = 0;
 
     /**
      * Adds a listener for changes to properties of this workbench part.
      * Has no effect if an identical listener is already registered.
      * <p>
      * The properties ids are defined by the PROP_* constants, above.
      * </p>
      *
      * @param listener a property listener (not null)
      */
     virtual void AddPropertyListener(IPropertyChangeListener* listener) = 0;
 
     /**
      * Remove a listener that was previously added using addPropertyListener.
      *
      * @param listener a property listener (not null)
      */
     virtual void RemovePropertyListener(IPropertyChangeListener* listener) = 0;
 
     /**
      * Returns the short name of the part. This is used as the text on
      * the tab when this part is stacked on top of other parts.
      *
      * @return the short name of the part (not null)
      */
     virtual QString GetName() const = 0;
 
     /**
      * Returns the title of this workbench part. If this value changes
      * the part must fire a property listener event with
      * <code>PROP_TITLE</code>.
      * <p>
      * The title is used to populate the title bar of this part's visual
      * container.
      * </p>
      *
      * @return the workbench part title (not null)
      */
     virtual QString GetTitle() const = 0;
 
     /**
      * Returns the status message from the part's title, or the empty string if none.
      * This is a substring of the part's title. A typical title will consist of
      * the part name, a separator, and a status message describing the current contents.
      * <p>
      * Presentations can query getName() and getTitleStatus() if they want to display
      * the status message and name separately, or they can use getTitle() if they want
      * to display the entire title.
      * </p>
      *
      * @return the status message or the empty string if none (not null)
      */
     virtual QString GetTitleStatus() const = 0;
 
     /**
      * Returns the title image of this workbench part.  If this value changes
      * the part must fire a property listener event with
      * <code>PROP_TITLE</code>.
      * <p>
      * The title image is usually used to populate the title bar of this part's
      * visual container. Since this image is managed by the part itself, callers
      * must <b>not</b> dispose the returned image.
      * </p>
      *
      * @return the title image
      */
     virtual void* GetTitleImage() = 0;
 
     /**
      * Returns the title tool tip text of this workbench part. If this value
      * changes the part must fire a property listener event with
      * <code>PROP_TITLE</code>.
      * <p>
      * The tool tip text is used to populate the title bar of this part's
      * visual container.
      * </p>
      *
      * @return the workbench part title tool tip (not null)
      */
     virtual QString GetTitleToolTip() const = 0;
 
     /**
      * Returns true iff the contents of this part have changed recently. For
      * editors, this indicates that the part has changed since the last save.
      * For views, this indicates that the view contains interesting changes
      * that it wants to draw the user's attention to.
      *
      * @return true iff the part is dirty
      */
     virtual bool IsDirty() const = 0;
 
     /**
      * Return true if the the receiver is currently in a busy state.
      * @return boolean true if busy
      */
     virtual bool IsBusy() const = 0;
 
     /**
      * Returns true iff this part can be closed
      *
      * @return true iff this part can be closed
      * @since 3.1
      */
     virtual bool IsCloseable() const = 0;
 
     /**
      * Returns the local toolbar for this part, or null if this part does not
      * have a local toolbar. Callers must not dispose or downcast the return value.
      *
      * @return the local toolbar for the part, or null if none
      */
     virtual void* GetToolBar() = 0;
 
     /**
      * Returns the menu for this part or null if none
      *
      * @return the menu for this part or null if none
      */
     //virtual IPartMenu getMenu();
 
     /**
      * Returns an SWT control that can be used to indicate the tab order for
      * this part. This can be returned as part of the result to
      * {@link StackPresentation#getTabList(IPresentablePart)}. Any other use of this control is
      * unsupported. This may return a placeholder control that is only
      * meaningful in the context of <code>getTabList</code>.
      *
      * @return the part's control (not null)
      */
     virtual void* GetControl() = 0;
 
     /**
    * Get a property from the part's arbitrary property set.
    * <p>
    * <b>Note:</b> this is a different set of properties than the ones covered
    * by the PROP_* constants.
    * </p>
    *
    * @param key
    *            The property key to retrieve. Must not be <code>null</code>.
    * @return the property, or <code>null</code> if that property is not set.
    * @since 3.3
    */
   virtual QString GetPartProperty(const QString& key) const = 0;
 
 };
 
 }
 
 #endif /* BERRYIPRESENTABLEPART_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/presentations/berryIPresentationFactory.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/presentations/berryIPresentationFactory.h
index e49f6d2d72..82467ebc99 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/presentations/berryIPresentationFactory.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/presentations/berryIPresentationFactory.h
@@ -1,185 +1,185 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIPRESENTATIONFACTORY_H_
 #define BERRYIPRESENTATIONFACTORY_H_
 
 #include <berryMacros.h>
 
 #include "berryStackPresentation.h"
 
 #include <QObject>
 
 namespace berry
 {
 
 /**
  * This is a factory for presentation objects that control the appearance of
  * editors, views and other components in the workbench.
  *
  * @since 3.0
  */
 class BERRY_UI_QT IPresentationFactory {
 
 public:
 
   virtual ~IPresentationFactory();
 
   /**
    * Bit value for the createSash method's 'style' parameter.
    * @since 3.4
    */
   static int SASHTYPE_NORMAL; // = 0;
   /**
    * Bit value for the createSash method's 'style' parameter.
    * @since 3.4
    */
   static int SASHTYPE_FLOATING; // = 1<<1;
   /**
    * Bit value for the createSash method's 'style' parameter.
    * @since 3.4
    */
   static int SASHORIENTATION_HORIZONTAL; // = SWT.HORIZONTAL; // 1<<8
   /**
    * Bit value for the createSash method's 'style' parameter.
    * @since 3.4
    */
   static int SASHORIENTATION_VERTICAL; // = SWT.VERTICAL; // 1<<9
 
     /**
      * Creates an editor presentation for presenting editors.
      * <p>
      * The presentation creates its controls under the given parent composite.
      * </p>
      *
      * @param parent
      *            the parent composite to use for the presentation's controls
      * @param site
      *            the site used for communication between the presentation and
      *            the workbench
      * @return a newly created part presentation
      */
     virtual StackPresentation::Pointer CreateEditorPresentation(
             void* parent, IStackPresentationSite::Pointer site) = 0;
 
     /**
      * Creates a stack presentation for presenting regular docked views.
      * <p>
      * The presentation creates its controls under the given parent composite.
      * </p>
      *
      * @param parent
      *            the parent composite to use for the presentation's controls
      * @param site
      *            the site used for communication between the presentation and
      *            the workbench
      * @return a newly created part presentation
      */
     virtual StackPresentation::Pointer CreateViewPresentation(void* parent,
             IStackPresentationSite::Pointer site) = 0;
 
     /**
      * Creates a standalone stack presentation for presenting a standalone view.
      * A standalone view cannot be docked together with other views. The title
      * of a standalone view may be hidden.
      * <p>
      * The presentation creates its controls under the given parent composite.
      * </p>
      *
      * @param parent
      *            the parent composite to use for the presentation's controls
      * @param site
      *            the site used for communication between the presentation and
      *            the workbench
      * @param showTitle
      *            <code>true</code> to show the title for the view,
      *            <code>false</code> to hide it
      * @return a newly created part presentation
      */
     virtual StackPresentation::Pointer CreateStandaloneViewPresentation(
             void* parent, IStackPresentationSite::Pointer site, bool showTitle) = 0;
 
     /**
      * Creates the status line manager for the window.
      * Subclasses may override.
      *
      * @return the window's status line manager
      */
 //    public IStatusLineManager createStatusLineManager() {
 //        return new StatusLineManager();
 //    }
 
     /**
      * Creates the control for the window's status line.
      * Subclasses may override.
      *
      * @param statusLine the window's status line manager
      * @param parent the parent composite
      * @return the window's status line control
      */
 //    public Control createStatusLineControl(IStatusLineManager statusLine,
 //            Composite parent) {
 //        return ((StatusLineManager) statusLine).createControl(parent, SWT.NONE);
 //    }
 
     /**
      * Returns a globally unique identifier for this type of presentation factory. This is used
      * to ensure that one presentation is not restored from mementos saved by a different
      * presentation.
      *
      * @return a globally unique identifier for this type of presentation factory.
      */
     virtual QString GetId() = 0;
 
     /**
      * Creates the Sash control that is used to separate view and editor parts.
      *
      * @param parent the parent composite
      * @param style A bit set giving both the 'type' of the desired sash and
      * its orientation (i.e. one 'SASHTYPE' value and one "SASHORIENTATION" value).
      * @return the sash control
      * @since 3.4
      */
     virtual void* CreateSash(void* parent, int style) = 0;
 //    {
 //      int orientation = style & (SASHORIENTATION_HORIZONTAL
 //          | SASHORIENTATION_VERTICAL);
 //      Sash sash = new Sash(parent, orientation | SWT.SMOOTH);
 //      return sash;
 //    }
 
     /**
      * Returns the size of the Sash control that is used to separate view and editor parts.
      *
      * @param style A bit set giving both the 'type' of the desired sash and
      * its orientation.
      * @return the sash size
      * @since 3.4
      */
     virtual int GetSashSize(int style) = 0;
 
     /**
      * Applies changes of the current theme to the user interface.
      */
     virtual void UpdateTheme() = 0;
 };
 
 }
 
-Q_DECLARE_INTERFACE(berry::IPresentationFactory, "org.blueberry.IPresentationFactory")
+Q_DECLARE_INTERFACE(berry::IPresentationFactory, "org.blueberry.ui.IPresentationFactory")
 
 #endif /* BERRYABSTRACTPRESENTATIONFACTORY_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/presentations/berryIStackPresentationSite.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/presentations/berryIStackPresentationSite.h
index 6836612221..3a4b170188 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/presentations/berryIStackPresentationSite.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/presentations/berryIStackPresentationSite.h
@@ -1,193 +1,193 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef BERRYISTACKPRESENTATIONSITE_H_
 #define BERRYISTACKPRESENTATIONSITE_H_
 
 #include <berryMacros.h>
 
 #include <list>
 
 #include "berryIPresentablePart.h"
 
 #include <org_blueberry_ui_qt_Export.h>
 #include "berryPoint.h"
 
 namespace berry
 {
 
 /**
  * Represents the main interface between a StackPresentation and the workbench.
  *
  * Not intended to be implemented by clients.
  *
  * @since 3.0
  * @noimplement This interface is not intended to be implemented by clients.
  */
 struct BERRY_UI_QT IStackPresentationSite : public Object
 {
 
-  berryInterfaceMacro(IStackPresentationSite, berry)
+  berryObjectMacro(berry::IStackPresentationSite)
 
   static int STATE_MINIMIZED; // = 0;
 
   static int STATE_MAXIMIZED; // = 1;
 
   static int STATE_RESTORED; // = 2;
 
   ~IStackPresentationSite();
 
   /**
    * Sets the state of the container. Called by the presentation when the
    * user causes the the container to be minimized, maximized, etc.
    *
    * @param newState one of the STATE_* constants
    */
   virtual void SetState(int newState) = 0;
 
   /**
    * Returns the current state of the site (one of the STATE_* constants)
    *
    * @return the current state of the site (one of the STATE_* constants)
    */
   virtual int GetState() = 0;
 
   /**
    * Returns true iff the site supports the given state
    *
    * @param state one of the STATE_* constants, above
    * @return true iff the site supports the given state
    */
   virtual bool SupportsState(int state) = 0;
 
   /**
    * Begins dragging the given part
    *
    * @param beingDragged the part to drag (not null)
    * @param initialPosition the mouse position at the time of the initial mousedown
    * (display coordinates, not null)
    * @param keyboard true iff the drag was initiated via mouse dragging,
    * and false if the drag may be using the keyboard
    */
   virtual void DragStart(IPresentablePart::Pointer beingDragged,
       Point& initialPosition, bool keyboard) = 0;
 
   /**
    * Closes the given set of parts.
    *
    * @param toClose the set of parts to close (Not null. All of the entries must be non-null)
    */
   virtual void Close(const QList<IPresentablePart::Pointer>& toClose) = 0;
 
   /**
    * Begins dragging the entire stack of parts
    *
    * @param initialPosition the mouse position at the time of the initial mousedown (display coordinates,
    * not null)
    * @param keyboard true iff the drag was initiated via mouse dragging,
    * and false if the drag may be using the keyboard
    */
   virtual void DragStart(Point& initialPosition, bool keyboard) = 0;
 
   /**
    * Returns true iff this site will allow the given part to be closed
    *
    * @param toClose part to test (not null)
    * @return true iff the part may be closed
    */
   virtual bool IsCloseable(IPresentablePart::Pointer toClose) = 0;
 
   /**
    * Returns true iff the given part can be dragged. If this
    * returns false, the given part should not trigger a drag.
    *
    * @param toMove part to test (not null)
    * @return true iff this part is a valid drag source
    */
   virtual bool IsPartMoveable(IPresentablePart::Pointer toMove) = 0;
 
   /**
    * Returns true iff this entire stack can be dragged
    *
    * @return true iff the stack can be dragged
    */
   virtual bool IsStackMoveable() = 0;
 
   /**
    * Makes the given part active
    *
    * @param toSelect
    */
   virtual void SelectPart(IPresentablePart::Pointer toSelect) = 0;
 
   /**
    * Returns the currently selected part or null if the stack is empty
    *
    * @return the currently selected part or null if the stack is empty
    */
   virtual IPresentablePart::Pointer GetSelectedPart() = 0;
 
   /**
    * Adds system actions to the given menu manager. The site may
    * make use of the following group ids:
    * <ul>
    * <li><code>close</code>, for close actions</li>
    * <li><code>size</code>, for resize actions</li>
    * <li><code>misc</code>, for miscellaneous actions</li>
    * </ul>
    * The presentation can control the insertion position by creating
    * these group IDs where appropriate.
    *
    * @param menuManager the menu manager to populate
    */
   //virtual void AddSystemActions(IMenuManager menuManager);
 
   /**
    * Notifies the workbench that the preferred size of the presentation has
    * changed. Hints to the workbench that it should trigger a layout at the
    * next opportunity.
    *
    * @since 3.1
    */
   virtual void FlushLayout() = 0;
 
   /**
    * Returns the list of presentable parts currently in this site
    *
    * @return the list of presentable parts currently in this site
    * @since 3.1
    */
   virtual QList<IPresentablePart::Pointer> GetPartList() = 0;
 
   /**
    * Returns the property with the given id or <code>null</code>. Folder
    * properties are an extensible mechanism for perspective authors to
    * customize the appearance of view stacks. The list of customizable
    * properties is determined by the presentation factory, and set in the
    * perspective factory.
    *
    * @param id
    *            Must not be <code>null</code>.
    * @return property value, or <code>null</code> if the property is not
    *         set.
    * @since 3.3
    */
   virtual QString GetProperty(const QString& id) = 0;
 };
 
 }
 
 #endif /* BERRYISTACKPRESENTATIONSITE_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIDisposable.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIDisposable.h
index b2affccbb5..9f2b98e591 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIDisposable.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIDisposable.h
@@ -1,69 +1,67 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIDISPOSABLE_H_
 #define BERRYIDISPOSABLE_H_
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include <berryObject.h>
 #include <berryMacros.h>
 
 namespace berry {
 
 /**
  * <p>
  * The interface that should be implemented by services that make themselves
  * available through the <code>IAdaptable</code> mechanism. This is the
  * interface that drives the majority of services provided at the workbench
  * level.
  * </p>
  * <p>
  * A service has life-cycle. When the constructor completes, the service must be
  * fully functional. When it comes time for the service to go away, then the
  * service will receive a {@link #dispose()} call. At this point, the service
  * must release all resources and detach all listeners. A service can only be
  * disposed once; it cannot be reused.
  * </p>
  * <p>
  * This interface has nothing to do with OSGi services.
  * </p>
  * <p>
  * This interface can be extended or implemented by clients.
  * </p>
- *
- * @since 3.2
  */
 struct IDisposable : public virtual Object
 {
 
-  berryInterfaceMacro(IDisposable, berry);
+  berryObjectMacro(berry::IDisposable)
 
   ~IDisposable();
 
   /**
    * Disposes of this service. All resources must be freed. All listeners must
    * be detached. Dispose will only be called once during the life cycle of a
    * service.
    */
   virtual void Dispose() = 0;
 
 };
 
 }
 
 #endif /* BERRYIDISPOSABLE_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIEvaluationReference.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIEvaluationReference.h
index 91998cdd45..a676d1cfca 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIEvaluationReference.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIEvaluationReference.h
@@ -1,57 +1,57 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIEVALUATIONREFERENCE_H
 #define BERRYIEVALUATIONREFERENCE_H
 
 #include "internal/berryIEvaluationResultCache.h"
 
 namespace berry {
 
 struct IPropertyChangeListener;
 
 /**
  * A token representing a core expression and property change listener currently
  * working in the <code>IEvaluationService</code>.
  *
  * @noimplement This interface is not intended to be implemented by clients.
  * @noextend This interface is not intended to be extended by clients.
  */
 struct IEvaluationReference : public virtual IEvaluationResultCache
 {
 
-  berryInterfaceMacro(IEvaluationReference, berry)
+  berryObjectMacro(berry::IEvaluationReference)
 
   /**
    * The property change listener associated with the evaluated expression.
    *
    * @return the listener for updates.
    */
   virtual IPropertyChangeListener* GetListener() const = 0;
 
   /**
    * The property used in change notifications.
    *
    * @return the property name.
    */
   virtual QString GetProperty() const = 0;
 
 };
 
 }
 
 #endif // BERRYIEVALUATIONREFERENCE_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIEvaluationService.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIEvaluationService.h
index d814707797..2054fd66ee 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIEvaluationService.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIEvaluationService.h
@@ -1,213 +1,213 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIEVALUATIONSERVICE_H
 #define BERRYIEVALUATIONSERVICE_H
 
 #include <berryIServiceWithSources.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 
 namespace berry {
 
 struct IEvaluationContext;
 struct IEvaluationReference;
 struct IPropertyChangeListener;
 
 class Expression;
 
 /**
  * Evaluate a core expression against the workbench application context and
  * report updates using a Boolean property. Clients supply an
  * <code>IPropertyChangeListener</code> that will be notified as changes
  * occur.
  * <p>
  * This can be used to implement core expressions in client extension points
  * similar to the &lt;enabledWhen&gt; of
  * <code>org.blueberry.ui.handlers/handler</code> elements.
  * </p>
  * <p>
  * The service will fire <code>TRUE</code> and
  * <code>FALSE</code> for the oldValue and newValue in the property
  * change events.
  * </p>
  * <p>
  * Adding the evaluation listener will fire one change with oldValue=<code>null</code>
  * and newValue=&quot;evaluated expression&quot;. Remove the
  * <code>IEvaluationReference</code> will fire one change with
  * oldValue=&quot;last evaluated value&quot; and newValue=<code>null</code>.
  * </p>
  * <p>
  * Adding a service listener will fire the {@link #PROP_NOTIFYING} property
  * change event with newValue=<code>TRUE</code> when a source change
  * causes expression evaluations to update and another {@link #PROP_NOTIFYING}
  * property change event with newValue=<code>FALSE</code> when the
  * changes that started with a specific source change have finished. The
  * {@link #PROP_NOTIFYING} change events will not be fired for source changes
  * caused by the outer most recalculations.
  * </p>
  * <p>
  * Variable sources can be provided to this service using the <code>org.blueberry.ui.services</code>
  * Extension Point.  This makes the available to &lt;with/&gt; expressions.
  * </p>
  * <p>
  * This service can be acquired from your service locator:
  * <pre>
  *   IEvaluationService::Pointer service = GetSite()->GetService(IEvaluationService::GetManifestName());
  * </pre>
  * <ul>
  * <li>This service is available globally.</li>
  * </ul>
  * </p>
  *
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
  */
 struct BERRY_UI_QT IEvaluationService : public IServiceWithSources
 {
-  berryInterfaceMacro(IEvaluationService,  berry)
+  berryObjectMacro(berry::IEvaluationService)
 
   /**
    * A general property that can be used.
    */
   static const QString RESULT; // = "org.blueberry.ui.services.result";
 
   /**
    * The property used to notify any service listeners.
    */
   static const QString PROP_NOTIFYING; // = "org.blueberry.ui.services.notifying";
 
   /**
    * When a source change starts recalculating expressions the
    * {@link #PROP_NOTIFYING} property change is fired with the newValue=<code>TRUE</code>.
    * This property is not fired for any source changes caused by the outer
    * recalculations.
    * <p>
    * <b>Note:</b> listeners should be removed when no longer necessary. If
    * not, they will be removed when the IServiceLocator used to acquire this
    * service is disposed.
    * </p>
    *
    * @param listener
    *            The listener to be notified. Must not be <code>null</code>.
    *            Has no effect if the listener has already been added.
    */
   virtual void AddServiceListener(IPropertyChangeListener* listener) = 0;
 
   /**
    * Remove the listener for {@link #PROP_NOTIFYING} property changes.
    *
    * @param listener
    *            The listener to remove. Must not be <code>null</code>. Has
    *            no effect if the listener is not currently registered.
    */
   virtual void RemoveServiceListener(IPropertyChangeListener* listener) = 0;
 
   /**
    * Add a listener that can be notified when the workbench application
    * context causes the expression evaluation value to change.
    * <p>
    * <b>Note:</b> listeners should be removed when no longer necessary. If
    * not, they will be removed when the IServiceLocator used to acquire this
    * service is disposed.
    * </p>
    *
    * @param expression
    *            the core expression to evaluate.
    * @param listener
    *            the listener to be notified.
    * @param property
    *            the property contained in the notification
    * @return a token that can be used to remove this listener.
    * {@link #removeEvaluationListener(IEvaluationReference)}
    */
   virtual SmartPointer<IEvaluationReference> AddEvaluationListener(
       const SmartPointer<Expression>& expression,
       IPropertyChangeListener* listener,
       const QString& property) = 0;
 
   /**
    * Re-add a property change listener that has already been removed by
    * {@link #removeEvaluationListener(IEvaluationReference)}.
    * <p>
    * It will only accept IEvaluationReferences returned from a previous call
    * to
    * {@link #addEvaluationListener(Expression, IPropertyChangeListener, String)}
    * on this service.
    * </p>
    * <p>
    * <b>Note:</b> references should be removed when no longer necessary. If
    * not, they will be removed when the IServiceLocator used to acquire this
    * service is disposed.
    * </p>
    *
    * @param ref
    *            The listener to re-add.
    * @see #removeEvaluationListener(IEvaluationReference)
    */
   virtual void AddEvaluationReference(const SmartPointer<IEvaluationReference>& ref) = 0;
 
   /**
    * Remove the listener represented by the evaluation reference.
    *
    * @param ref
    *            the reference to be removed.
    */
   virtual void RemoveEvaluationListener(const SmartPointer<IEvaluationReference>& ref) = 0;
 
   /**
    * Get an IEvaluationContext that contains the current state of the
    * workbench application context. This context changes with the application
    * state, but becomes invalid when the global current selection changes.
    * <p>
    * Note: This context should not be modified.
    * </p>
    *
    * @return the latest context.
    * @see ISources#ACTIVE_CURRENT_SELECTION_NAME
    */
   virtual SmartPointer<IEvaluationContext> GetCurrentState() const = 0;
 
   /**
    * Request that this service re-evaluate all registered core expressions
    * that contain a property tester for the given property name. This will
    * fire a {@link #PROP_NOTIFYING} property change event to service
    * listeners.
    * <p>
    * Notes:
    * <ul>
    * <li>the property must be able to return the new value before this
    * re-evaluation is requested</li>
    * <li>limit calls to this method to avoid unnecessary churn</li>
    * <li>A re-evaluation that does not change the value of an expression will
    * not fire a property change event</li>
    * </ul>
    * </p>
    *
    * @param propertyName
    *            The fully qualified property name, like
    *            <code>org.eclipse.core.resources.name</code>. Must not be
    *            <code>null</code>.
    */
   virtual void RequestEvaluation(const QString& propertyName) = 0;
 };
 
 }
 
-Q_DECLARE_INTERFACE(berry::IEvaluationService, "org.blueberry.ui.qt.IEvaluationService")
+Q_DECLARE_INTERFACE(berry::IEvaluationService, "org.blueberry.ui.IEvaluationService")
 
 #endif // BERRYIEVALUATIONSERVICE_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryINestable.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryINestable.h
index e1ac559a9f..97ea81ce70 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryINestable.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryINestable.h
@@ -1,82 +1,80 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYINESTABLE_H_
 #define BERRYINESTABLE_H_
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include <berryObject.h>
 #include <berryMacros.h>
 
 namespace berry {
 
 /**
  * </p>
  * A service which can appear on a component which is wholly contained with
  * another component. The component on which it appears can be active or
  * inactive -- depending on the state of the application. For example, a
  * workbench part is a component which appears within a workbench window. This
  * workbench part can either be active or inactive, depending on what the user
  * is doing.
  * </p>
  * <p>
  * Services implement this interface, and are then notified by the component
  * when the activation changes. It is the responsibility of the component to
  * notify such services when the activation changes.
  * </p>
  * <p>
  * This class is not intended for use outside of the
  * <code>org.blueberry.ui.workbench</code> plug-in.
  * </p>
  * <p>
  * <strong>PROVISIONAL</strong>. This class or interface has been added as part
  * of a work in progress. There is a guarantee neither that this API will work
  * nor that it will remain the same. Please do not use this API without
  * consulting with the Platform/UI team.
  * </p>
  * <p>
  * This class should eventually move to <code>org.blueberry.ui.services</code>.
  * </p>
- *
- * @since 3.2
  */
 struct BERRY_UI_QT INestable : public virtual Object
 {
 
-  berryInterfaceMacro(INestable, berry);
+  berryObjectMacro(berry::INestable)
 
   ~INestable();
 
   /**
    * Notifies this service that the component within which it exists has
    * become active. The service should modify its state as appropriate.
    *
    */
   virtual void Activate() = 0;
 
   /**
    * Notifies this service that the component within which it exists has
    * become inactive. The service should modify its state as appropriate.
    */
   virtual void Deactivate() = 0;
 
 };
 
 }
 
 #endif /* BERRYINESTABLE_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIServiceFactory.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIServiceFactory.h
index 32ccde7849..7c1497ac92 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIServiceFactory.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIServiceFactory.h
@@ -1,82 +1,77 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYISERVICEFACTORY_H_
 #define BERRYISERVICEFACTORY_H_
 
 #include <org_blueberry_ui_qt_Export.h>
 
-#include <berryObject.h>
-#include <berryMacros.h>
-
 #include <QObject>
 
 namespace berry {
 
 struct IServiceLocator;
 
+class Object;
+
 /**
  * A factory for creating services for use with the
  * <code>org.blueberry.ui.services</code> extension point. You are given a
  * service locator to look up other services, and can retrieve your parent
  * service (if one has already been created).
- *
- * @since 3.4
  */
-struct BERRY_UI_QT IServiceFactory : public virtual Object {
-
-  berryInterfaceMacro(IServiceFactory, berry)
+struct BERRY_UI_QT IServiceFactory {
 
-  ~IServiceFactory();
+  virtual ~IServiceFactory();
 
   /**
    * When a service locator cannot find a service it will request one from the
    * registry, which will call this factory create method.
    * <p>
    * You can use the locator to get any needed services and a parent service
    * locator will be provided if you need access to the parent service. If the
    * parent object return from the parent locator is not <code>null</code>
    * it can be cast to the service interface that is requested. The parent
    * service locator will only return the serviceInterface service.
    * </p>
    *
    * @param serviceInterface
    *            the service we need to create. Will not be <code>null</code>.
    * @param parentLocator
    *            A locator that can return a parent service instance if
    *            desired. The parent service can be cast to serviceInterface.
    *            Will not be <code>null</code>.
    * @param locator
    *            the service locator which can be used to retrieve dependent
    *            services. Will not be <code>null</code>
    * @return the created service or <code>null</code>
    */
   template<class S>
-  S* Create(const IServiceLocator* parentLocator, const IServiceLocator* locator) const
+  S* Create(IServiceLocator* parentLocator, IServiceLocator* locator) const
   {
     return dynamic_cast<S*>(this->Create(qobject_interface_iid<S*>(), parentLocator, locator));
   }
 
   virtual Object* Create(const QString& serviceInterface,
-                         const IServiceLocator* parentLocator, const IServiceLocator* locator) const = 0;
+                         IServiceLocator* parentLocator, IServiceLocator* locator) const = 0;
 };
 
 }
 
-Q_DECLARE_INTERFACE(berry::IServiceFactory, "org.blueberry.IServiceFactory")
+Q_DECLARE_INTERFACE(berry::IServiceFactory, "org.blueberry.ui.IServiceFactory")
 
 #endif /* BERRYISERVICEFACTORY_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIServiceLocator.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIServiceLocator.h
index 1da0e9e605..a2f5f89a33 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIServiceLocator.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIServiceLocator.h
@@ -1,91 +1,107 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYISERVICELOCATOR_H_
 #define BERRYISERVICELOCATOR_H_
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include <berryObject.h>
 #include <berryMacros.h>
+#include <berryLog.h>
 
 #include <QObject>
 
+#include <typeinfo>
+
 namespace berry {
 
 /**
  * <p>
  * A component with which one or more services are registered. The services can
  * be retrieved from this locator using the service type. For example:
  * </p>
  *
  * <pre>
  * IHandlerService* service = workbenchWindow->GetService<IHandlerService>();
  * </pre>
  *
  * <p>
  * This interface is not to be implemented or extended by clients.
  * </p>
- *
- * @since 3.2
  */
-struct BERRY_UI_QT IServiceLocator : public virtual Object {
+struct BERRY_UI_QT IServiceLocator : public virtual Object
+{
 
-  berryInterfaceMacro(IServiceLocator, berry);
+  berryObjectMacro(berry::IServiceLocator)
 
   ~IServiceLocator();
 
   /**
    * Retrieves the service corresponding to the given API.
    *
    * @tparam S
    *            This is the interface that the service implements. Must not be
    *            <code>null</code>.
    * @return The service, or <code>null</code> if no such service could be
    *         found.
    */
   template<class S>
   S* GetService()
   {
-    return dynamic_cast<S*>(this->GetService(qobject_interface_iid<S*>()));
+    const char* typeName = qobject_interface_iid<S*>();
+    if (typeName == NULL)
+    {
+      BERRY_WARN << "Error getting service: Cannot get the interface id for type '" << Object::DemangleName(typeid(S).name())
+                 << "'. It is probably missing a Q_DECLARE_INTERFACE macro in its header.";
+      return NULL;
+    }
+    Object* obj = this->GetService(typeName);
+    S* service = dynamic_cast<S*>(obj);
+    if (obj != NULL && service == NULL)
+    {
+      BERRY_WARN << "Error getting service: Class '" << obj->GetClassName() << "' cannot be cast to service interface "
+                 << "'" << Object::DemangleName(typeid(S).name()) << "'";
+    }
+    return service;
   }
 
   /**
    * Whether this service exists within the scope of this service locator.
    * This does not include looking for the service within the scope of the
    * parents. This method can be used to determine whether a particular
    * service supports nesting in this scope.
    *
    * @tparam S
    *            This is the interface that the service implements. Must not be
    *            <code>null</code>.
    * @return <code>true</code> iff the service locator can find a service
    *         for the given interface; <code>false</code> otherwise.
    */
   template<class S>
   bool HasService() const
   {
     return this->HasService(qobject_interface_iid<S*>());
   }
 
   virtual Object* GetService(const QString& api) = 0;
   virtual bool HasService(const QString& api) const = 0;
 };
 
 }
 
 #endif /* BERRYISERVICELOCATOR_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIServiceScopes.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIServiceScopes.cpp
new file mode 100644
index 0000000000..db53afe4d9
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIServiceScopes.cpp
@@ -0,0 +1,28 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "berryIServiceScopes.h"
+
+namespace berry {
+
+const QString IServiceScopes::WORKBENCH_SCOPE = "org.blueberry.ui.IWorkbench";
+const QString IServiceScopes::DIALOG_SCOPE = "org.blueberry.ui.IDialog";
+const QString IServiceScopes::WINDOW_SCOPE = "org.blueberry.ui.IWorkbenchWindow";
+const QString IServiceScopes::PARTSITE_SCOPE = "org.blueberry.ui.IWorkbenchPartSite";
+const QString IServiceScopes::PAGESITE_SCOPE = "org.blueberry.ui.PageSite";
+const QString IServiceScopes::MPESITE_SCOPE = "org.blueberry.ui.MultiPageEditorSite";
+
+}
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIServiceScopes.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIServiceScopes.h
new file mode 100644
index 0000000000..327d828f2a
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIServiceScopes.h
@@ -0,0 +1,71 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYISERVICESCOPES_H
+#define BERRYISERVICESCOPES_H
+
+#include <QString>
+
+#include <org_blueberry_ui_qt_Export.h>
+
+namespace berry {
+
+/**
+ * Different levels of service locators supported by the workbench.
+ *
+ * @noextend This interface is not intended to be extended by clients.
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+struct BERRY_UI_QT IServiceScopes
+{
+  /**
+   * The global service locator scope.
+   */
+  static const QString WORKBENCH_SCOPE; // = "org.blueberry.ui.IWorkbench";
+
+  /**
+   * A sub-scope to the global scope that is not the workbench window.
+   */
+  static const QString DIALOG_SCOPE; // = "org.blueberry.ui.IDialog";
+
+  /**
+   * A workbench window service locator scope.
+   */
+  static const QString WINDOW_SCOPE; // = "org.blueberry.ui.IWorkbenchWindow";
+
+  /**
+   * A part site service locator scope.  Found in editors and views.
+   */
+  static const QString PARTSITE_SCOPE; // = "org.blueberry.ui.IWorkbenchPartSite";
+
+  /**
+   * A page site service locator scope.  Found in pages in a PageBookView.
+   */
+  static const QString PAGESITE_SCOPE; // = "org.blueberry.ui.PageSite";
+
+  /**
+   * An editor site within a MultiPageEditorPart.
+   */
+  static const QString MPESITE_SCOPE; // = "org.blueberry.ui.MultiPageEditorSite";
+
+private:
+
+  IServiceScopes();
+};
+
+}
+
+#endif // BERRYISERVICESCOPES_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIServiceWithSources.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIServiceWithSources.h
index d668bb7af3..147f5b6ec2 100755
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIServiceWithSources.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryIServiceWithSources.h
@@ -1,68 +1,68 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYISERVICEWITHSOURCES_H_
 #define BERRYISERVICEWITHSOURCES_H_
 
 #include "berryIDisposable.h"
 
 namespace berry {
 
 struct ISourceProvider;
 
 /**
  * <p>
  * A service that responds to changes in one or more sources. These sources can
  * be plugged into the service. Sources represent a common event framework for
  * services.
  * </p>
  * <p>
  * Clients must not extend or implement.
  * </p>
  *
  */
 struct IServiceWithSources : public IDisposable {
 
-  berryInterfaceMacro(IServiceWithSources, berry);
+  berryObjectMacro(berry::IServiceWithSources)
 
   ~IServiceWithSources();
 
   /**
    * Adds a source provider to this service. A source provider will notify the
    * service when the source it provides changes. An example of a source might
    * be an active editor or the current selection. This amounts to a pluggable
    * state tracker for the service.
    *
    * @param provider
    *            The provider to add; must not be <code>null</code>.
    */
-  virtual void AddSourceProvider(SmartPointer<ISourceProvider> provider) = 0;
+  virtual void AddSourceProvider(const SmartPointer<ISourceProvider>& provider) = 0;
 
   /**
    * Removes a source provider from this service. Most of the time, this
    * method call is not required as source providers typically share the same
    * life span as the workbench itself.
    *
    * @param provider
    *            The provider to remove; must not be <code>null</code>.
    */
-  virtual void RemoveSourceProvider(SmartPointer<ISourceProvider> provider) = 0;
+  virtual void RemoveSourceProvider(const SmartPointer<ISourceProvider>& provider) = 0;
 };
 
 }
 
 #endif /* BERRYISERVICEWITHSOURCES_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryRuntime.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryISourceProviderService.cpp
similarity index 82%
rename from BlueBerry/Bundles/org.blueberry.core.runtime/src/berryRuntime.cpp
rename to BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryISourceProviderService.cpp
index 7be762e2ce..e535b391bb 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/src/berryRuntime.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryISourceProviderService.cpp
@@ -1,23 +1,25 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
-#include "berryRuntime.h"
+#include "berryISourceProviderService.h"
 
 namespace berry {
 
-const std::string Runtime::ADAPTER_SERVICE_ID = "org.blueberry.service.adapter";
+ISourceProviderService::~ISourceProviderService()
+{
+}
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryISourceProviderService.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryISourceProviderService.h
new file mode 100644
index 0000000000..d3d4a9978d
--- /dev/null
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/services/berryISourceProviderService.h
@@ -0,0 +1,89 @@
+/*===================================================================
+
+BlueBerry Platform
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef BERRYISOURCEPROVIDERSERVICE_H
+#define BERRYISOURCEPROVIDERSERVICE_H
+
+#include "org_blueberry_ui_qt_Export.h"
+
+#include "berryObject.h"
+
+#include <QList>
+
+namespace berry {
+
+template<class T> class SmartPointer;
+
+struct ISourceProvider;
+
+/**
+ * <p>
+ * A service from which all of the source providers can be retrieved.
+ * </p>
+ * <p>
+ * This service can be acquired from your service locator:
+ * <pre>
+ *   ISourceProviderService* service = GetSite()->GetService<ISourceProviderService>();
+ * </pre>
+ * <ul>
+ * <li>This service is available globally.</li>
+ * </ul>
+ * </p>
+ *
+ * @noimplement This interface is not intended to be implemented by clients.
+ * @noextend This interface is not intended to be extended by clients.
+ *
+ * @see IEvaluationService
+ */
+struct BERRY_UI_QT ISourceProviderService : public virtual Object
+{
+
+  berryObjectMacro(berry::ISourceProviderService)
+
+  virtual ~ISourceProviderService();
+
+  /**
+   * Retrieves a source provider providing the given source. This is used by
+   * clients who only need specific sources.
+   *
+   * @param sourceName
+   *            The name of the source; must not be <code>null</code>.
+   * @return A source provider which provides the request source, or
+   *         <code>null</code> if no such source exists.
+   * @see ISources
+   */
+  virtual SmartPointer<ISourceProvider> GetSourceProvider(const QString& sourceName) const = 0;
+
+  /**
+   * Retrieves all of the source providers registered with this service at the
+   * time of this call.
+   * <p>
+   * <code>IEvaluationService</code> can be used
+   * to receive notifications about source variable changes and to
+   * evaluate core expressions against source providers.
+   * </p>
+   *
+   * @return The source providers registered with this service. This value may be empty.
+   */
+  virtual QList<SmartPointer<ISourceProvider> > GetSourceProviders() const = 0;
+
+};
+
+}
+
+Q_DECLARE_INTERFACE(berry::ISourceProviderService, "org.blueberry.ui.ISourceProviderService")
+
+#endif // BERRYISOURCEPROVIDERSERVICE_H
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/testing/berryITestHarness.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/testing/berryITestHarness.h
index 7d67145b02..abda2c67c6 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/testing/berryITestHarness.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/testing/berryITestHarness.h
@@ -1,50 +1,51 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYITESTHARNESS_H_
 #define BERRYITESTHARNESS_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include <QtPlugin>
 
 namespace berry {
 
 /**
  * Represents an arbitrary test harness.
  *
  * @since 3.0
  */
-struct BERRY_UI_QT ITestHarness : public virtual Object {
+struct BERRY_UI_QT ITestHarness : public virtual Object
+{
 
-  berryInterfaceMacro(ITestHarness, berry);
+  berryObjectMacro(berry::ITestHarness)
 
     /**
      * Runs the tests.
      */
   virtual void RunTests() = 0;
 
 };
 
 }
 
-Q_DECLARE_INTERFACE(berry::ITestHarness, "org.blueberry.ITestHarness")
+Q_DECLARE_INTERFACE(berry::ITestHarness, "org.blueberry.ui.ITestHarness")
 
 #endif /* BERRYITESTHARNESS_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/util/berryISafeRunnableRunner.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/util/berryISafeRunnableRunner.h
index 89fab0d589..abc707d3d8 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/util/berryISafeRunnableRunner.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/util/berryISafeRunnableRunner.h
@@ -1,63 +1,64 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYISAFERUNNABLERUNNER_H_
 #define BERRYISAFERUNNABLERUNNER_H_
 
 #include <org_blueberry_ui_qt_Export.h>
 
 #include <berryObject.h>
 #include <berryMacros.h>
 
 #include <berryISafeRunnable.h>
 
 namespace berry {
 
 /**
  * Runs a safe runnables.
  * <p>
  * Clients may provide their own implementation to change
  * how safe runnables are run from within the workbench.
  * </p>
  *
  * @see SafeRunnable#GetRunner()
  * @see SafeRunnable#SetRunner(ISafeRunnableRunner::Pointer)
  * @see SafeRunnable#Run(ISafeRunnable::Pointer)
  */
-struct BERRY_UI_QT ISafeRunnableRunner : public Object {
+struct BERRY_UI_QT ISafeRunnableRunner : public Object
+{
 
 public:
 
-  berryInterfaceMacro(ISafeRunnableRunner, berry);
+  berryObjectMacro(berry::ISafeRunnableRunner)
 
   ~ISafeRunnableRunner();
 
   /**
    * Runs the runnable.  All <code>ISafeRunnableRunners</code> must catch any exception
    * thrown by the <code>ISafeRunnable</code> and pass the exception to
    * <code>ISafeRunnable::HandleException()</code>.
    * @param code the code executed as a save runnable
    *
    * @see SafeRunnable#Run(ISafeRunnable::Pointer)
    */
   virtual void Run(ISafeRunnable::Pointer code) = 0;
 
 };
 
 }
 
 #endif /* BERRYISAFERUNNABLERUNNER_H_ */
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/util/berrySafeRunnable.h b/BlueBerry/Bundles/org.blueberry.ui.qt/src/util/berrySafeRunnable.h
index df5ae49f6e..dde7fb783f 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/util/berrySafeRunnable.h
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/util/berrySafeRunnable.h
@@ -1,115 +1,117 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYSAFERUNNABLE_H_
 #define BERRYSAFERUNNABLE_H_
 
 #include <berryISafeRunnable.h>
 #include "berryISafeRunnableRunner.h"
 
 namespace berry {
 
 /**
  * Implements a default implementation of ISafeRunnable. The default
  * implementation of <code>HandleException</code> opens a dialog to show any
  * errors as they accumulate.
  * <p>
  * This may be executed on any thread.
  */
 class BERRY_UI_QT SafeRunnable : public ISafeRunnable {
 
 private:
 
   static bool ignoreErrors;
 
   static ISafeRunnableRunner::Pointer runner;
 
   QString message;
 
    /**
    * Creates the default safe runnable runner.
    *
    * @return the default safe runnable runner
    */
   static ISafeRunnableRunner::Pointer CreateDefaultRunner();
 
 public:
 
+  using ISafeRunnable::Run;
+
   /**
    * Creates a new instance of SafeRunnable with the given error message.
    *
    * @param message
    *            the error message to use
    */
   SafeRunnable(const QString& message = "");
 
   /*
    * (non-Javadoc)
    *
    * @see ISafeRunnable#HandleException(const std::exception&)
    */
   void HandleException(const std::exception& e);
 
   /**
    * Flag to avoid interactive error dialogs during automated testing.
    *
    * @return true if errors should be ignored
    *
    */
   static bool GetIgnoreErrors();
 
   /**
    * Flag to avoid interactive error dialogs during automated testing.
    *
    * @param flag
    *            set to true if errors should be ignored
    */
   static void SetIgnoreErrors(bool flag);
 
   /**
    * Returns the safe runnable runner.
    *
    * @return the safe runnable runner
    *
    */
   static ISafeRunnableRunner::Pointer GetRunner();
 
   /**
    * Sets the safe runnable runner.
    *
    * @param runner
    *            the runner to set, or <code>null</code> to reset to the
    *            default runner
    */
   static void SetRunner(ISafeRunnableRunner::Pointer runner);
 
   /**
    * Runs the given safe runnable using the safe runnable runner. This is a
    * convenience method, equivalent to:
    * <code>SafeRunnable#GetRunner()->Run(runnable)</code>.
    *
    * @param runnable
    *            the runnable to run
    */
   static void Run(ISafeRunnable::Pointer runnable);
 
 };
 
 
 }
 
 #endif /* BERRYSAFERUNNABLE_H_ */
diff --git a/BlueBerry/CMakeLists.txt b/BlueBerry/CMakeLists.txt
index 504bfd1e0a..4ef3e9934a 100644
--- a/BlueBerry/CMakeLists.txt
+++ b/BlueBerry/CMakeLists.txt
@@ -1,279 +1,283 @@
 project(BlueBerry)
 if (${CMAKE_SOURCE_DIR} EQUAL ${PROJECT_SOURCE_DIR})
   cmake_minimum_required(VERSION 2.8.9)
 endif()
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/CMake/")
 
 include(CMakeParseArguments)
 include(MacroConvertSchema)
 include(MacroOrganizeSources)
 include(MacroCreateCTKPlugin)
 include(MacroCreateQtHelp)
 include(MacroInstallCTKPlugin)
 include(FunctionCreateProvisioningFile)
 
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${BLUEBERRY_CXX_FLAGS}")
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${BLUEBERRY_CXX_FLAGS_RELEASE}")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${BLUEBERRY_C_FLAGS}")
+
 if(MSVC)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOMINMAX /wd4250 /wd4275 /wd4251 /wd4503")
 endif()
 
 if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
 endif()
 
 find_package(mbilog REQUIRED)
 include_directories(${mbilog_INCLUDE_DIRS})
 
 if(MITK_USE_Qt4)
   find_package(Qt4 4.7 REQUIRED)
 else()
   find_package(Qt5Concurrent ${MITK_QT5_MINIMUM_VERSION} REQUIRED)
   find_package(Qt5Help ${MITK_QT5_MINIMUM_VERSION} REQUIRED)
   find_package(Qt5Sql ${MITK_QT5_MINIMUM_VERSION} REQUIRED)
   find_package(Qt5WebKitWidgets ${MITK_QT5_MINIMUM_VERSION} REQUIRED)
   find_package(Qt5Widgets ${MITK_QT5_MINIMUM_VERSION} REQUIRED)
   find_package(Qt5Xml ${MITK_QT5_MINIMUM_VERSION} REQUIRED)
 endif()
 
 if(QT_QMAKE_CHANGED)
   set(QT_HELPGENERATOR_EXECUTABLE NOTFOUND)
   set(QT_COLLECTIONGENERATOR_EXECUTABLE NOTFOUND)
   set(QT_ASSISTANT_EXECUTABLE NOTFOUND)
   set(QT_XMLPATTERNS_EXECUTABLE NOTFOUND)
 endif()
 
 find_program(QT_HELPGENERATOR_EXECUTABLE
   NAMES qhelpgenerator qhelpgenerator-qt4 qhelpgenerator4
   PATHS ${QT_BINARY_DIR}
   NO_DEFAULT_PATH
 )
 
 find_program(QT_COLLECTIONGENERATOR_EXECUTABLE
   NAMES qcollectiongenerator qcollectiongenerator-qt4 qcollectiongenerator4
   PATHS ${QT_BINARY_DIR}
   NO_DEFAULT_PATH
 )
 
 find_program(QT_ASSISTANT_EXECUTABLE
   NAMES assistant-qt4 assistant4 assistant
   PATHS ${QT_BINARY_DIR}
   NO_DEFAULT_PATH
 )
 
 find_program(QT_XMLPATTERNS_EXECUTABLE
   NAMES xmlpatterns
   PATHS ${QT_BINARY_DIR}
   NO_DEFAULT_PATH
 )
 
 find_package(Doxygen)
 
 option(BLUEBERRY_USE_QT_HELP "Enable support for integrating bundle documentation into Qt Help" ${DOXYGEN_FOUND})
 
 mark_as_advanced(BLUEBERRY_USE_QT_HELP
                  QT_HELPGENERATOR_EXECUTABLE
                  QT_COLLECTIONGENERATOR_EXECUTABLE
                  QT_ASSISTANT_EXECUTABLE
                  QT_XMLPATTERNS_EXECUTABLE)
 
 if(BLUEBERRY_USE_QT_HELP)
   set(_force_blueberry_use_qt_help_to_off 0)
   if(NOT DOXYGEN_FOUND)
     message("> Forcing BLUEBERRY_USE_QT_HELP to OFF because Doxygen was not found.")
     set(_force_blueberry_use_qt_help_to_off 1)
   endif()
   if(DOXYGEN_FOUND AND DOXYGEN_VERSION VERSION_LESS 1.8.7)
     message("> Forcing BLUEBERRY_USE_QT_HELP to OFF because Doxygen version 1.8.7 or newer not found.")
     set(_force_blueberry_use_qt_help_to_off 1)
   endif()
 
   if(NOT QT_HELPGENERATOR_EXECUTABLE)
     message("> Forcing BLUEBERRY_USE_QT_HELP to OFF because QT_HELPGENERATOR_EXECUTABLE is empty.")
     set(_force_blueberry_use_qt_help_to_off 1)
   endif()
 
   if(NOT QT_XMLPATTERNS_EXECUTABLE)
     message("You have enabled Qt Help support, but QT_XMLPATTERNS_EXECUTABLE is empty")
     set(_force_blueberry_use_qt_help_to_off 1)
   endif()
 
   if(_force_blueberry_use_qt_help_to_off)
     set(BLUEBERRY_USE_QT_HELP OFF CACHE BOOL "Enable support for integrating bundle documentation into Qt Help" FORCE)
   endif()
 endif(BLUEBERRY_USE_QT_HELP)
 
 if(BLUEBERRY_QT_HELP_REQUIRED AND NOT BLUEBERRY_USE_QT_HELP)
   message(FATAL_ERROR "BLUEBERRY_USE_QT_HELP is required to be set to ON")
 endif()
 
 if(MITK_USE_Qt4)
   include(${QT_USE_FILE})
 endif()
 
 # =========  CTK specific CMake stuff ============
 cmake_policy(SET CMP0012 NEW)
 
 find_package(CTK REQUIRED)
 
 # Extract all library names starting with org_blueberry_
 macro(GetMyTargetLibraries all_target_libraries varname)
   set(re_ctkplugin "^org_blueberry_[a-zA-Z0-9_]+$")
   set(_tmp_list)
   list(APPEND _tmp_list ${all_target_libraries})
   ctkMacroListFilter(_tmp_list re_ctkplugin OUTPUT_VARIABLE ${varname})
 endmacro()
 # ================================================
 
 option(BLUEBERRY_BUILD_ALL_PLUGINS "Build all BlueBerry plugins (overriding selection)" OFF)
 mark_as_advanced(BLUEBERRY_BUILD_ALL_PLUGINS)
 
 if(BLUEBERRY_BUILD_ALL_PLUGINS)
   set(BLUEBERRY_BUILD_ALL_PLUGINS_OPTION "FORCE_BUILD_ALL")
 endif()
 
 option(BLUEBERRY_STATIC "Build all plugins as static libraries" OFF)
 mark_as_advanced(BLUEBERRY_STATIC)
 
 option(BLUEBERRY_DEBUG_SMARTPOINTER "Enable code for debugging smart pointers" OFF)
 mark_as_advanced(BLUEBERRY_DEBUG_SMARTPOINTER)
 
 find_package(Poco PATHS ${Poco_DIR} COMPONENTS Foundation Util XML REQUIRED)
 find_package(Ant)
 find_package(Eclipse)
 
 set(BLUEBERRY_SOURCE_DIR ${BlueBerry_SOURCE_DIR})
 set(BLUEBERRY_BINARY_DIR ${BlueBerry_BINARY_DIR})
 
 set(BLUEBERRY_PLUGINS_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Bundles)
 set(BLUEBERRY_PLUGINS_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/Bundles)
 
 set(OSGI_APP solstice)
 set(OSGI_UI_APP solstice_ui)
 
 if(Eclipse_DIR)
   set(BLUEBERRY_DOC_TOOLS_DIR "${Eclipse_DIR}" CACHE PATH "Directory containing additional tools needed for generating the documentation")
 else()
   set(BLUEBERRY_DOC_TOOLS_DIR "" CACHE PATH "Directory containing additional tools needed for generating the documentation")
 endif()
 
 set(BLUEBERRY_DEBUG_POSTFIX d)
 
 # Testing options
 
 if(DEFINED BLUEBERRY_BUILD_TESTING)
   option(BLUEBERRY_BUILD_TESTING "Build the BlueBerry tests." ${BLUEBERRY_BUILD_TESTING})
 else()
   option(BLUEBERRY_BUILD_TESTING "Build the BlueBerry tests." ${BUILD_TESTING})
 endif()
 
 if(WIN32)
   set(_gui_testing_default "ON")
 else()
   set(_gui_testing_default "OFF")
 endif()
 
 option(BLUEBERRY_ENABLE_GUI_TESTING "Enable the BlueBerry GUI tests" ${_gui_testing_default})
 mark_as_advanced(BLUEBERRY_ENABLE_GUI_TESTING)
 
 if(BLUEBERRY_BUILD_TESTING)
   enable_testing()
 endif()
 
 
 # Add CTK plugins
 
 set(_ctk_plugins
   Bundles/org.blueberry.core.runtime:ON
   Bundles/org.blueberry.core.expressions:OFF
   Bundles/org.blueberry.core.commands:OFF
   Bundles/org.blueberry.core.jobs:OFF
   Bundles/org.blueberry.ui.qt:OFF
   Bundles/org.blueberry.ui.qt.help:OFF
   Bundles/org.blueberry.ui.qt.log:ON
   Bundles/org.blueberry.ui.qt.objectinspector:OFF
 )
 
 set(_ctk_test_plugins )
 
 if(BLUEBERRY_BUILD_TESTING)
   find_package(CppUnit PATHS ${CppUnit_DIR} REQUIRED)
   include(berryTestingHelpers)
 
   set(BLUEBERRY_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OSGI_APP}")
   #get_target_property(_is_macosx_bundle ${OSGI_APP} MACOSX_BUNDLE)
   #if(APPLE AND _is_macosx_bundle)
   #  set(BLUEBERRY_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OSGI_APP}.app/Contents/MacOS/${OSGI_APP}")
   #endif()
 
   set(_ctk_testinfrastructure_plugins
     Bundles/org.blueberry.test:ON
     Bundles/org.blueberry.uitest:ON
   )
 
   set(_ctk_test_plugins
 #    Testing/org.blueberry.core.runtime.tests:ON
 #    Testing/org.blueberry.osgi.tests:ON
   )
 
   if(BLUEBERRY_ENABLE_GUI_TESTING)
 #    list(APPEND _ctk_test_plugins Testing/org.blueberry.ui.tests:ON)
 
     set(BLUEBERRY_UI_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OSGI_UI_APP}")
     #get_target_property(_is_macosx_bundle ${OSGI_UI_APP} MACOSX_BUNDLE)
     #if(APPLE AND _is_macosx_bundle)
     #  set(BLUEBERRY_UI_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OSGI_UI_APP}.app/Contents/MacOS/${OSGI_UI_APP}")
     #endif()
   endif()
 endif()
 
 set(BLUEBERRY_TESTING_PROVISIONING_FILE "${BlueBerry_BINARY_DIR}/BlueBerryTesting.provisioning")
 
 add_custom_target(BlueBerry)
 
 ctkMacroSetupPlugins(${_ctk_plugins} ${_ctk_testinfrastructure_plugins} ${_ctk_test_plugins}
                      BUILD_OPTION_PREFIX BLUEBERRY_BUILD_
                      BUILD_ALL ${BLUEBERRY_BUILD_ALL_PLUGINS}
                      COMPACT_OPTIONS)
 
 set(BLUEBERRY_PROVISIONING_FILE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/BlueBerry.provisioning")
 FunctionCreateProvisioningFile(
   FILE ${BLUEBERRY_PROVISIONING_FILE}
   PLUGINS ${_ctk_plugins}
 )
 
 FunctionCreateProvisioningFile(
   FILE ${BLUEBERRY_TESTING_PROVISIONING_FILE}
   INCLUDE ${BLUEBERRY_PROVISIONING_FILE}
   PLUGINS ${_ctk_testinfrastructure_plugins} ${_ctk_test_plugins}
 )
 
 if(${CMAKE_PROJECT_NAME}_PLUGIN_LIBRARIES)
   add_dependencies(BlueBerry ${${CMAKE_PROJECT_NAME}_PLUGIN_LIBRARIES})
 endif()
 set_property(TARGET ${${CMAKE_PROJECT_NAME}_PLUGIN_LIBRARIES} PROPERTY LABELS BlueBerry)
 
 set(BB_PLUGIN_USE_FILE "${BlueBerry_BINARY_DIR}/BlueBerryPluginUseFile.cmake")
 if(${PROJECT_NAME}_PLUGIN_LIBRARIES)
   ctkFunctionGeneratePluginUseFile(${BB_PLUGIN_USE_FILE})
 else()
   file(REMOVE ${BB_PLUGIN_USE_FILE})
   set(BB_PLUGIN_USE_FILE )
 endif()
 
 # CTK Plugin Exports
 set(BB_PLUGIN_EXPORTS_FILE "${CMAKE_CURRENT_BINARY_DIR}/BlueBerryPluginExports.cmake")
 GetMyTargetLibraries("${${PROJECT_NAME}_PLUGIN_LIBRARIES}" my_plugin_targets)
 set(additional_export_targets mbilog)
 export(TARGETS ${my_plugin_targets} ${additional_export_targets}
        FILE ${BB_PLUGIN_EXPORTS_FILE})
 
 
 add_subdirectory(Documentation)
 
 set(BLUEBERRY_QTPLUGIN_PATH )
 if(CTK_QTDESIGNERPLUGINS_DIR AND EXISTS ${CTK_QTDESIGNERPLUGINS_DIR})
   set(BLUEBERRY_QTPLUGIN_PATH "${CTK_QTDESIGNERPLUGINS_DIR}")
 endif()
 
 configure_file(BlueBerryConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/BlueBerryConfig.cmake @ONLY)
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95526036bf..188aa69c8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,1329 +1,1333 @@
 set(MITK_CMAKE_MINIMUM_REQUIRED_VERSION 3.1)
 cmake_minimum_required(VERSION ${MITK_CMAKE_MINIMUM_REQUIRED_VERSION})
 
 #-----------------------------------------------------------------------------
 # See http://cmake.org/cmake/help/cmake-2-8-docs.html#section_Policies for details
 #-----------------------------------------------------------------------------
 
 set(project_policies )
 foreach(policy ${project_policies})
   if(POLICY ${policy})
     cmake_policy(SET ${policy} NEW)
   endif()
 endforeach()
 
 #-----------------------------------------------------------------------------
 # Superbuild Option - Enabled by default
 #-----------------------------------------------------------------------------
 
 option(MITK_USE_SUPERBUILD "Build MITK and the projects it depends on via SuperBuild.cmake." ON)
 
 if(MITK_USE_SUPERBUILD)
   project(MITK-superbuild)
   set(MITK_SOURCE_DIR ${PROJECT_SOURCE_DIR})
   set(MITK_BINARY_DIR ${PROJECT_BINARY_DIR})
 else()
   project(MITK VERSION 2014.10.99)
 endif()
 
 #-----------------------------------------------------------------------------
 # Update CMake module path
 #------------------------------------------------------------------------------
 
 set(MITK_CMAKE_DIR ${MITK_SOURCE_DIR}/CMake)
 
 set(CMAKE_MODULE_PATH
   ${MITK_CMAKE_DIR}
   ${CMAKE_MODULE_PATH}
   )
 
 #-----------------------------------------------------------------------------
 # CMake function(s) and macro(s)
 #-----------------------------------------------------------------------------
 
 # Standard CMake macros
 include(FeatureSummary)
 include(CTestUseLaunchers)
 include(CMakeParseArguments)
 include(FindPackageHandleStandardArgs)
 
 # MITK macros
 include(mitkFunctionGetGccVersion)
 include(mitkFunctionCheckCompilerFlags)
 include(mitkFunctionSuppressWarnings) # includes several functions
 include(mitkMacroEmptyExternalProject)
 include(mitkFunctionGenerateProjectXml)
 include(mitkFunctionEnableBuildConfiguration)
 include(mitkFunctionWhitelists)
 include(mitkFunctionAddExternalProject)
 
 SUPPRESS_VC_DEPRECATED_WARNINGS()
 
 #-----------------------------------------------------------------------------
 # Set a default build type if none was specified
 #-----------------------------------------------------------------------------
 
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
   message(STATUS "Setting build type to 'Debug' as none was specified.")
   set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build." FORCE)
 
   # Set the possible values of build type for cmake-gui
   set_property(CACHE CMAKE_BUILD_TYPE PROPERTY
                STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
 endif()
 
 #-----------------------------------------------------------------------------
 # Check miminum compiler versions
 #-----------------------------------------------------------------------------
 
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
   # require at least gcc 4.6 as provided by Ubuntu 12.04
   if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
     message(FATAL_ERROR "GCC version must be at least 4.6")
   endif()
 elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
   # require at least clang 3.2 for correct RTTI handling and C++11 support
   if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.2)
     message(FATAL_ERROR "Clang version must be at least 3.2")
   endif()
 elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
   # require at least clang 5.0
   if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
     message(FATAL_ERROR "Apple Clang version must be at least 5.0")
   endif()
 elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
   # require at least Visual Studio 2010 (msvc ...)
   if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16)
     message(FATAL_ERROR "Micorsoft Visual Studio 2010 or newer required (MSVC 16.0)")
   endif()
 else()
   message(WARNING "You are using an unsupported compiler! Compilation has only been tested with Clang (Linux or Apple), GCC and MSVC.")
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX)
   mitkFunctionGetGccVersion(${CMAKE_CXX_COMPILER} GCC_VERSION)
 else()
   set(GCC_VERSION 0)
 endif()
 
 set(MITK_CXX_STANDARD 11)
 
 # help keeping cross-platform compatibility
 # CMake 3.1 does not yet know how to handle AppleClang...
 # See http://public.kitware.com/Bug/view.php?id=15355
 if(NOT MSVC AND
    NOT CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" AND
    GCC_VERSION VERSION_GREATER 4.6)
   set(CMAKE_CXX_EXTENSIONS 0)
   set(CMAKE_CXX_STANDARD ${MITK_CXX_STANDARD})
   set(CMAKE_CXX_STANDARD_REQUIRED 1)
 endif()
 
 # This is necessary to avoid problems with compile feature checks.
 # CMAKE_CXX_STANDARD seems to only set the -std=c++11 flag for targets.
 # However, compile flag checks also need to be done with -std=c++11.
 # The MITK_CXX11_FLAG variable is also used for external projects
 # build during the MITK super-build.
 mitkFunctionCheckCompilerFlags("-std=c++11" MITK_CXX11_FLAG)
 if(NOT MITK_CXX11_FLAG)
   # Older gcc compilers use -std=c++0x
   mitkFunctionCheckCompilerFlags("-std=c++0x" MITK_CXX11_FLAG)
 endif()
 
 #-----------------------------------------------------------------------------
 # Warn if source or build path is too long
 #-----------------------------------------------------------------------------
 
 if(WIN32)
   set(_src_dir_length_max 50)
   set(_bin_dir_length_max 50)
   if(MITK_USE_SUPERBUILD)
     set(_src_dir_length_max 43) # _src_dir_length_max - strlen(ITK-src)
     set(_bin_dir_length_max 40) # _bin_dir_length_max - strlen(MITK-build)
   endif()
 
   string(LENGTH "${MITK_SOURCE_DIR}" _src_n)
   string(LENGTH "${MITK_BINARY_DIR}" _bin_n)
 
   # The warnings should be converted to errors
   if(_src_n GREATER _src_dir_length_max)
     message(WARNING "MITK source code directory path length is too long (${_src_n} > ${_src_dir_length_max})."
                     "Please move the MITK source code directory to a directory with a shorter path." )
   endif()
   if(_bin_n GREATER _bin_dir_length_max)
     message(WARNING "MITK build directory path length is too long (${_bin_n} > ${_bin_dir_length_max})."
                     "Please move the MITK build directory to a directory with a shorter path." )
   endif()
 endif()
 
 #-----------------------------------------------------------------------------
 # Additional MITK Options (also shown during superbuild)
 #-----------------------------------------------------------------------------
 
 macro(env_option name doc value)
   set(_value $ENV{${name}})
   if("${_value}" STREQUAL "")
     set(_value ${value})
   endif()
   option(${name} "${doc}" ${_value})
 endmacro()
 
 # -----------------------------------------
 # General build options
 option(BUILD_SHARED_LIBS "Build MITK with shared libraries" ON)
 option(WITH_COVERAGE "Enable/Disable coverage" OFF)
 option(BUILD_TESTING "Test the project" ON)
 
 env_option(MITK_BUILD_ALL_APPS "Build all MITK applications" OFF)
 env_option(MITK_BUILD_EXAMPLES "Build the MITK Examples" OFF)
 option(MITK_ENABLE_PIC_READER "Enable support for reading the DKFZ pic file format." ON)
 
 mark_as_advanced(MITK_BUILD_ALL_APPS
                  MITK_ENABLE_PIC_READER
                 )
 
 # -----------------------------------------
 # Qt version related variables
 
 set(DESIRED_QT_VERSION 4 CACHE STRING "Pick a version of Qt to use: 4 or 5")
 env_option(MITK_USE_QT "Use Nokia's Qt library" ON)
 set(MITK_DESIRED_QT_VERSION ${DESIRED_QT_VERSION})
 
 if(MITK_USE_QT)
   # find the package at the very beginning, so that QT4_FOUND is available
   if(DESIRED_QT_VERSION MATCHES 4)
     set(MITK_QT4_MINIMUM_VERSION 4.7)
     find_package(Qt4 ${MITK_QT4_MINIMUM_VERSION} REQUIRED)
     set(MITK_USE_Qt4 TRUE)
     set(MITK_USE_Qt5 FALSE)
   endif()
   if(DESIRED_QT_VERSION MATCHES 5)
     set(MITK_QT5_MINIMUM_VERSION 5.0.0)
     set(MITK_USE_Qt4 FALSE)
     set(MITK_USE_Qt5 TRUE)
     set(QT5_INSTALL_PREFIX "" CACHE PATH "The install location of Qt5")
     set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT5_INSTALL_PREFIX})
     set(MITK_QT5_COMPONENTS Concurrent OpenGL PrintSupport Script Sql Svg WebKitWidgets Xml XmlPatterns UiTools)
     find_package(Qt5 ${MITK_QT5_MINIMUM_VERSION} COMPONENTS ${MITK_QT5_COMPONENTS} REQUIRED)
   endif()
 else()
   set(MITK_USE_Qt4 FALSE)
   set(MITK_USE_Qt5 FALSE)
 endif()
 
 # ------------------------------------------------------------------------
 # Register external projects which can be build with the MITK superbuild
 # system. Each mitkFunctionAddExternalProject() call registers an external
 # project for which a CMakeExternals/<project>.cmake file must exist. The
 # call also creates a MITK_USE_<project> variable (appearing in the CMake
 # UI if the NO_CACHE option is *not* given).
 
 
 # -----------------------------------------
 # Optional external projects with no
 # inter-dependencies
 
 set_property(GLOBAL PROPERTY MITK_EXTERNAL_PROJECTS "")
 
 mitkFunctionAddExternalProject(NAME Poco        ON  COMPONENTS Foundation Util XML Zip)
 mitkFunctionAddExternalProject(NAME Boost       OFF DOC "Use the Boost C++ library")
 mitkFunctionAddExternalProject(NAME DCMTK       ON  DOC "EXPERIMENTAL, superbuild only: Use DCMTK in MITK")
 mitkFunctionAddExternalProject(NAME OpenIGTLink OFF)
 
 mitkFunctionAddExternalProject(NAME tinyxml     ON  ADVANCED)
 mitkFunctionAddExternalProject(NAME GDCM        ON  ADVANCED)
 mitkFunctionAddExternalProject(NAME GLUT        OFF ADVANCED)
 mitkFunctionAddExternalProject(NAME Raptor2     OFF ADVANCED)
 mitkFunctionAddExternalProject(NAME Eigen       ON  ADVANCED DOC "Use the Eigen library")
 mitkFunctionAddExternalProject(NAME GLEW        ON  ADVANCED DOC "Use the GLEW library")
 mitkFunctionAddExternalProject(NAME ANN         ON  ADVANCED DOC "Use Approximate Nearest Neighbor Library")
 mitkFunctionAddExternalProject(NAME CppUnit     ON  ADVANCED DOC "Use CppUnit for unit tests")
 
 mitkFunctionAddExternalProject(NAME PCRE        OFF ADVANCED NO_PACKAGE)
 mitkFunctionAddExternalProject(NAME ZLIB        OFF ADVANCED NO_PACKAGE NO_CACHE)
 
 # -----------------------------------------
 # The following external projects must be
 # ordered according to their
 # inter-dependencies
 
 mitkFunctionAddExternalProject(NAME SWIG      OFF ADVANCED NO_PACKAGE DEPENDS PCRE)
 mitkFunctionAddExternalProject(NAME Python    OFF          NO_PACKAGE DEPENDS SWIG DOC "Use Python wrapping in MITK")
 mitkFunctionAddExternalProject(NAME Numpy     OFF ADVANCED NO_PACKAGE)
 mitkFunctionAddExternalProject(NAME OpenCV    OFF)
 
 # These are "hard" dependencies and always set to ON
 mitkFunctionAddExternalProject(NAME ITK       ON           NO_CACHE)
 mitkFunctionAddExternalProject(NAME VTK       ON           NO_CACHE)
 
 mitkFunctionAddExternalProject(NAME SimpleITK OFF          DEPENDS ITK GDCM SWIG)
 mitkFunctionAddExternalProject(NAME ACVD      OFF          DOC "Use Approximated Centroidal Voronoi Diagrams")
 mitkFunctionAddExternalProject(NAME CTK       ON           DEPENDS QT DCMTK DOC "Use CTK in MITK")
 mitkFunctionAddExternalProject(NAME Rasqal    OFF          DEPENDS Raptor2 PCRE ADVANCED)
 mitkFunctionAddExternalProject(NAME Redland   OFF          DEPENDS Rasqal DOC "Use the Redland RDF library")
 mitkFunctionAddExternalProject(NAME SOFA      OFF          DEPENDS GLUT Boost DOC "Use Simulation Open Framework Architecture")
 
 if(MITK_USE_QT)
   mitkFunctionAddExternalProject(NAME Qwt     ON  ADVANCED DEPENDS QT)
 endif()
 
 #-----------------------------------------------------------------------------
 # Build configurations
 #-----------------------------------------------------------------------------
 
 set(_buildConfigs "Custom")
 
 file(GLOB _buildConfigFiles CMake/BuildConfigurations/*.cmake)
 
 foreach(_buildConfigFile ${_buildConfigFiles})
   get_filename_component(_buildConfigFile ${_buildConfigFile} NAME_WE)
   list(APPEND _buildConfigs ${_buildConfigFile})
 endforeach()
 
 set(MITK_BUILD_CONFIGURATION "Custom" CACHE STRING "Use pre-defined MITK configurations")
 mark_as_advanced(MITK_BUILD_CONFIGURATION)
 set_property(CACHE MITK_BUILD_CONFIGURATION PROPERTY STRINGS ${_buildConfigs})
 
 mitkFunctionEnableBuildConfiguration()
 
 mitkFunctionCreateWhitelistPaths(MITK)
 mitkFunctionFindWhitelists(MITK)
 
 # -----------------------------------------
 # Custom dependency logic
 
 if(MITK_USE_Boost)
   option(MITK_USE_SYSTEM_Boost "Use the system Boost" OFF)
   set(MITK_USE_Boost_LIBRARIES "" CACHE STRING "A semi-colon separated list of required Boost libraries")
 endif()
 
 if(MITK_USE_SOFA)
   # SOFA requires at least CMake 2.8.8
   set(SOFA_CMAKE_VERSION 2.8.8)
   if(${CMAKE_VERSION} VERSION_LESS ${SOFA_CMAKE_VERSION})
     set(MITK_USE_SOFA OFF CACHE BOOL "" FORCE)
     message(WARNING "Switched off MITK_USE_SOFA\n  Minimum required CMake version: ${SOFA_CMAKE_VERSION}\n  Installed CMake version: ${CMAKE_VERSION}")
   endif()
   # SOFA/ITK combination requires at least MSVC 2010
   if(MSVC_VERSION AND MSVC_VERSION LESS 1600)
     set(MITK_USE_SOFA OFF CACHE BOOL "" FORCE)
     message(WARNING "Switched off MITK_USE_SOFA\n  MSVC versions less than 2010 are not supported.")
   endif()
   # SOFA requires boost library
   if(MITK_USE_SOFA AND NOT MITK_USE_Boost)
     message("> Forcing MITK_USE_Boost to ON because of MITK_USE_SOFA")
     set(MITK_USE_Boost ON CACHE BOOL "" FORCE)
   endif()
   # SOFA requires boost system library
   list(FIND MITK_USE_Boost_LIBRARIES system _result)
   if(_result LESS 0)
     message("> Adding 'system' to MITK_USE_Boost_LIBRARIES.")
     list(APPEND MITK_USE_Boost_LIBRARIES system)
   endif()
   # SOFA requires boost thread library
   list(FIND MITK_USE_Boost_LIBRARIES thread _result)
   if(_result LESS 0)
     message("> Adding 'thread' to MITK_USE_Boost_LIBRARIES.")
     list(APPEND MITK_USE_Boost_LIBRARIES thread)
   endif()
   # Simulation plugin requires boost chrono library
   list(FIND MITK_USE_Boost_LIBRARIES chrono _result)
   if(_result LESS 0)
     message("> Adding 'chrono' to MITK_USE_Boost_LIBRARIES.")
     list(APPEND MITK_USE_Boost_LIBRARIES chrono)
   endif()
   set(MITK_USE_Boost_LIBRARIES ${MITK_USE_Boost_LIBRARIES} CACHE STRING "" FORCE)
   # Allow setting external SOFA plugins directory and SOFA plugins
   set(MITK_USE_SOFA_PLUGINS_DIR ${MITK_USE_SOFA_PLUGINS_DIR} CACHE PATH "External SOFA plugins directory" FORCE)
   set(MITK_USE_SOFA_PLUGINS ${MITK_USE_SOFA_PLUGINS} CACHE PATH "List of semicolon-separated plugin names" FORCE)
 endif()
 
 if(MITK_USE_Python AND NOT MITK_USE_SYSTEM_PYTHON)
   set(MITK_USE_ZLIB ON)
   if(NOT MITK_USE_Numpy)
     message("> Forcing MITK_USE_Numpy to ON because of MITK_USE_Python")
     set(MITK_USE_Numpy ON CACHE BOOL "Use Numpy" FORCE)
   endif()
   if(NOT MITK_USE_SimpleITK)
     message("> Forcing MITK_USE_SimpleITK to ON because of MITK_USE_Python")
     set(MITK_USE_Numpy ON CACHE BOOL "Use Numpy" FORCE)
   endif()
 
   if(APPLE)
     message(WARNING "Python wrapping is unsuported on mac OSX!")
     set(MITK_USE_Python OFF CACHE BOOL "Use Python wrapping in MITK" FORCE)
   else()
     option(MITK_USE_SYSTEM_PYTHON "Use the system python runtime" OFF)
     if(MITK_USE_SYSTEM_PYTHON)
       find_package(PythonLibs REQUIRED)
       find_package(PythonInterp REQUIRED)
     endif()
   endif()
 endif()
 
 if(BUILD_TESTING AND NOT MITK_USE_CppUnit)
   message("> Forcing MITK_USE_CppUnit to ON because BUILD_TESTING=ON")
   set(MITK_USE_CppUnit ON CACHE BOOL "Use CppUnit for unit tests" FORCE)
 endif()
 
 # -----------------------------------------
 # Other MITK_USE_* options not related to
 # external projects build via the
 # MITK superbuild
 
 env_option(MITK_USE_BLUEBERRY "Build the BlueBerry platform" ON)
 env_option(MITK_USE_OpenCL "Use OpenCL GPU-Computing library" OFF)
 
 if(MITK_USE_BLUEBERRY)
   option(MITK_BUILD_ALL_PLUGINS "Build all MITK plugins" OFF)
   mark_as_advanced(MITK_BUILD_ALL_PLUGINS)
 
   if(NOT MITK_USE_CTK)
     message("> Forcing MITK_USE_CTK to ON because of MITK_USE_BLUEBERRY")
     set(MITK_USE_CTK ON CACHE BOOL "Use CTK in MITK" FORCE)
   endif()
 endif()
 
 #-----------------------------------------------------------------------------
 # Pixel type multiplexing
 #-----------------------------------------------------------------------------
 
 # Customize the default pixel types for multiplex macros
 
 set(MITK_ACCESSBYITK_INTEGRAL_PIXEL_TYPES
     "int, unsigned int, short, unsigned short, char, unsigned char"
     CACHE STRING "List of integral pixel types used in AccessByItk and InstantiateAccessFunction macros")
 
 set(MITK_ACCESSBYITK_FLOATING_PIXEL_TYPES
     "double, float"
     CACHE STRING "List of floating pixel types used in AccessByItk and InstantiateAccessFunction macros")
 
 set(MITK_ACCESSBYITK_COMPOSITE_PIXEL_TYPES
     "itk::RGBPixel<unsigned char>, itk::RGBAPixel<unsigned char>"
     CACHE STRING "List of composite pixel types used in AccessByItk and InstantiateAccessFunction macros")
 
 set(MITK_ACCESSBYITK_DIMENSIONS
     "2,3"
     CACHE STRING "List of dimensions used in AccessByItk and InstantiateAccessFunction macros")
 
 mark_as_advanced(MITK_ACCESSBYITK_INTEGRAL_PIXEL_TYPES
                  MITK_ACCESSBYITK_FLOATING_PIXEL_TYPES
                  MITK_ACCESSBYITK_COMPOSITE_PIXEL_TYPES
                  MITK_ACCESSBYITK_DIMENSIONS
                 )
 
 # consistency checks
 
 if(NOT MITK_ACCESSBYITK_INTEGRAL_PIXEL_TYPES)
   set(MITK_ACCESSBYITK_INTEGRAL_PIXEL_TYPES
       "int, unsigned int, short, unsigned short, char, unsigned char"
       CACHE STRING "List of integral pixel types used in AccessByItk and InstantiateAccessFunction macros" FORCE)
 endif()
 
 if(NOT MITK_ACCESSBYITK_FLOATING_PIXEL_TYPES)
   set(MITK_ACCESSBYITK_FLOATING_PIXEL_TYPES
       "double, float"
       CACHE STRING "List of floating pixel types used in AccessByItk and InstantiateAccessFunction macros" FORCE)
 endif()
 
 if(NOT MITK_ACCESSBYITK_COMPOSITE_PIXEL_TYPES)
   set(MITK_ACCESSBYITK_COMPOSITE_PIXEL_TYPES
     "itk::RGBPixel<unsigned char>, itk::RGBAPixel<unsigned char>"
     CACHE STRING "List of composite pixel types used in AccessByItk and InstantiateAccessFunction macros" FORCE)
 endif()
 
 if(NOT MITK_ACCESSBYITK_VECTOR_PIXEL_TYPES)
   string(REPLACE "," ";" _integral_types ${MITK_ACCESSBYITK_INTEGRAL_PIXEL_TYPES})
   string(REPLACE "," ";" _floating_types ${MITK_ACCESSBYITK_FLOATING_PIXEL_TYPES})
   foreach(_scalar_type ${_integral_types} ${_floating_types})
     set(MITK_ACCESSBYITK_VECTOR_PIXEL_TYPES
         "${MITK_ACCESSBYITK_VECTOR_PIXEL_TYPES}itk::VariableLengthVector<${_scalar_type}>,")
   endforeach()
   string(LENGTH "${MITK_ACCESSBYITK_VECTOR_PIXEL_TYPES}" _length)
   math(EXPR _length "${_length} - 1")
   string(SUBSTRING "${MITK_ACCESSBYITK_VECTOR_PIXEL_TYPES}" 0 ${_length} MITK_ACCESSBYITK_VECTOR_PIXEL_TYPES)
   set(MITK_ACCESSBYITK_VECTOR_PIXEL_TYPES ${MITK_ACCESSBYITK_VECTOR_PIXEL_TYPES}
       CACHE STRING "List of vector pixel types used in AccessByItk and InstantiateAccessFunction macros for itk::VectorImage types" FORCE)
 endif()
 
 if(NOT MITK_ACCESSBYITK_DIMENSIONS)
   set(MITK_ACCESSBYITK_DIMENSIONS
       "2,3"
       CACHE STRING "List of dimensions used in AccessByItk and InstantiateAccessFunction macros")
 endif()
 
 #-----------------------------------------------------------------------------
 # Project.xml
 #-----------------------------------------------------------------------------
 
 # A list of topologically ordered targets
 set(CTEST_PROJECT_SUBPROJECTS)
 if(MITK_USE_BLUEBERRY)
   list(APPEND CTEST_PROJECT_SUBPROJECTS BlueBerry)
 endif()
 
 list(APPEND CTEST_PROJECT_SUBPROJECTS
   MITK-Core
   MITK-CoreUI
   MITK-IGT
   MITK-ToF
   MITK-DTI
   MITK-Registration
   MITK-Modules # all modules not contained in a specific subproject
   MITK-Plugins # all plugins not contained in a specific subproject
   MITK-Examples
   Unlabeled # special "subproject" catching all unlabeled targets and tests
   )
 
 # Configure CTestConfigSubProject.cmake that could be used by CTest scripts
 configure_file(${MITK_SOURCE_DIR}/CTestConfigSubProject.cmake.in
                ${MITK_BINARY_DIR}/CTestConfigSubProject.cmake)
 
 if(CTEST_PROJECT_ADDITIONAL_TARGETS)
   # those targets will be executed at the end of the ctest driver script
   # and they also get their own subproject label
   set(subproject_list "${CTEST_PROJECT_SUBPROJECTS};${CTEST_PROJECT_ADDITIONAL_TARGETS}")
 else()
   set(subproject_list "${CTEST_PROJECT_SUBPROJECTS}")
 endif()
 
 # Generate Project.xml file expected by the CTest driver script
 mitkFunctionGenerateProjectXml(${MITK_BINARY_DIR} MITK "${subproject_list}" ${MITK_USE_SUPERBUILD})
 
 #-----------------------------------------------------------------------------
 # Superbuild script
 #-----------------------------------------------------------------------------
 
 if(MITK_USE_SUPERBUILD)
   include("${CMAKE_CURRENT_SOURCE_DIR}/SuperBuild.cmake")
 
   # Print configuration summary
   message("\n\n")
   feature_summary(
     DESCRIPTION "------- FEATURE SUMMARY FOR ${PROJECT_NAME} -------"
     WHAT ALL)
   return()
 endif()
 
 #*****************************************************************************
 #****************************  END OF SUPERBUILD  ****************************
 #*****************************************************************************
 
 #-----------------------------------------------------------------------------
 # CMake function(s) and macro(s)
 #-----------------------------------------------------------------------------
 
 include(WriteBasicConfigVersionFile)
 include(CheckCXXSourceCompiles)
 include(GenerateExportHeader)
 include(mitkFunctionOrganizeSources)
 include(mitkFunctionGetVersion)
 include(mitkFunctionGetVersionDescription)
 include(mitkFunctionCreateWindowsBatchScript)
 include(mitkFunctionInstallProvisioningFiles)
 include(mitkFunctionInstallAutoLoadModules)
 include(mitkFunctionGetLibrarySearchPaths)
 include(mitkFunctionCompileSnippets)
 include(mitkFunctionUseModules)
 include(mitkFunctionCheckModuleDependencies)
 include(mitkFunctionCreateModule)
 include(mitkMacroCreateExecutable)
 include(mitkMacroCreateModuleTests)
 include(mitkFunctionAddCustomModuleTest)
 include(mitkMacroMultiplexPicType)
 include(mitkMacroInstall)
 include(mitkMacroInstallHelperApp)
 include(mitkMacroInstallTargets)
 include(mitkMacroGenerateToolsLibrary)
 include(mitkMacroGetLinuxDistribution)
 include(mitkMacroGetPMDPlatformString)
 include(mitkMacroConfigureItkPixelTypes)
 
 #-----------------------------------------------------------------------------
 # Global CMake variables
 #-----------------------------------------------------------------------------
 
 # Required and enabled C++11 features for all MITK code.
 # These are added as PUBLIC compile features to all MITK modules.
 set(MITK_CXX_FEATURES cxx_auto_type cxx_nullptr cxx_override)
 
 if(NOT DEFINED CMAKE_DEBUG_POSTFIX)
   # We can't do this yet because the CTK Plugin Framework
   # cannot cope with a postfix yet.
   #set(CMAKE_DEBUG_POSTFIX d)
 endif()
 
 #-----------------------------------------------------------------------------
 # Output directories.
 #-----------------------------------------------------------------------------
 
 set(_default_LIBRARY_output_dir lib)
 set(_default_RUNTIME_output_dir bin)
 set(_default_ARCHIVE_output_dir lib)
 
 foreach(type LIBRARY RUNTIME ARCHIVE)
   # Make sure the directory exists
   if(MITK_CMAKE_${type}_OUTPUT_DIRECTORY
      AND NOT EXISTS ${MITK_CMAKE_${type}_OUTPUT_DIRECTORY})
     message("Creating directory MITK_CMAKE_${type}_OUTPUT_DIRECTORY: ${MITK_CMAKE_${type}_OUTPUT_DIRECTORY}")
     file(MAKE_DIRECTORY "${MITK_CMAKE_${type}_OUTPUT_DIRECTORY}")
   endif()
 
   if(MITK_CMAKE_${type}_OUTPUT_DIRECTORY)
     set(CMAKE_${type}_OUTPUT_DIRECTORY ${MITK_CMAKE_${type}_OUTPUT_DIRECTORY})
   else()
     set(CMAKE_${type}_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${_default_${type}_output_dir})
     set(MITK_CMAKE_${type}_OUTPUT_DIRECTORY ${CMAKE_${type}_OUTPUT_DIRECTORY})
   endif()
 
   set(CMAKE_${type}_OUTPUT_DIRECTORY ${CMAKE_${type}_OUTPUT_DIRECTORY} CACHE INTERNAL "Output directory for ${type} files.")
   mark_as_advanced(CMAKE_${type}_OUTPUT_DIRECTORY)
 endforeach()
 
 #-----------------------------------------------------------------------------
 # Set MITK specific options and variables (NOT available during superbuild)
 #-----------------------------------------------------------------------------
 
 # ASK THE USER TO SHOW THE CONSOLE WINDOW FOR CoreApp and mitkWorkbench
 option(MITK_SHOW_CONSOLE_WINDOW "Use this to enable or disable the console window when starting MITK GUI Applications" ON)
 mark_as_advanced(MITK_SHOW_CONSOLE_WINDOW)
 
 # TODO: check if necessary
 option(USE_ITKZLIB "Use the ITK zlib for pic compression." ON)
 mark_as_advanced(USE_ITKZLIB)
 
 if(NOT MITK_FAST_TESTING)
   if(DEFINED MITK_CTEST_SCRIPT_MODE
       AND (MITK_CTEST_SCRIPT_MODE STREQUAL "continuous" OR MITK_CTEST_SCRIPT_MODE STREQUAL "experimental") )
     set(MITK_FAST_TESTING 1)
   endif()
 endif()
 
 # MITK_VERSION
 set(MITK_VERSION_STRING "${MITK_VERSION_MAJOR}.${MITK_VERSION_MINOR}.${MITK_VERSION_PATCH}")
 if(MITK_VERSION_PATCH STREQUAL "99")
   set(MITK_VERSION_STRING "${MITK_VERSION_STRING}-${MITK_REVISION_SHORTID}")
 endif()
 
 # Needed early on for redirecting the BlueBerry documentation output dir
 set(MITK_DOXYGEN_OUTPUT_DIR ${PROJECT_BINARY_DIR}/Documentation/Doxygen CACHE PATH
     "Output directory for doxygen generated documentation." )
 
 if(NOT UNIX AND NOT MINGW)
   set(MITK_WIN32_FORCE_STATIC "STATIC" CACHE INTERNAL "Use this variable to always build static libraries on non-unix platforms")
 endif()
 
 if(MITK_BUILD_ALL_PLUGINS)
   set(MITK_BUILD_ALL_PLUGINS_OPTION "FORCE_BUILD_ALL")
 endif()
 
 # Configure pixel types used for ITK image access multiplexing
 mitkMacroConfigureItkPixelTypes()
 
 # Configure module naming conventions
 set(MITK_MODULE_NAME_REGEX_MATCH "^[A-Z].*$")
 set(MITK_MODULE_NAME_REGEX_NOT_MATCH "^[Mm][Ii][Tt][Kk].*$")
 set(MITK_MODULE_NAME_PREFIX "Mitk")
 set(MITK_MODULE_NAME_DEFAULTS_TO_DIRECTORY_NAME 1)
 
 #-----------------------------------------------------------------------------
 # Get MITK version info
 #-----------------------------------------------------------------------------
 
 mitkFunctionGetVersion(${MITK_SOURCE_DIR} MITK)
 mitkFunctionGetVersionDescription(${MITK_SOURCE_DIR} MITK)
 
 #-----------------------------------------------------------------------------
 # Installation preparation
 #
 # These should be set before any MITK install macros are used
 #-----------------------------------------------------------------------------
 
 # on Mac OSX all BlueBerry plugins get copied into every
 # application bundle (.app directory) specified here
 if(MITK_USE_BLUEBERRY AND APPLE)
 
   include("${CMAKE_CURRENT_SOURCE_DIR}/Applications/AppList.cmake")
 
   foreach(mitk_app ${MITK_APPS})
     # extract option_name
     string(REPLACE "^^" "\\;" target_info ${mitk_app})
     set(target_info_list ${target_info})
     list(GET target_info_list 1 option_name)
     list(GET target_info_list 0 app_name)
     # check if the application is enabled
     if(${option_name} OR MITK_BUILD_ALL_APPS)
       set(MACOSX_BUNDLE_NAMES ${MACOSX_BUNDLE_NAMES} Mitk${app_name})
     endif()
   endforeach()
 
 endif()
 
 #-----------------------------------------------------------------------------
 # Set coverage Flags
 #-----------------------------------------------------------------------------
 
 if(WITH_COVERAGE)
   if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     set(coverage_flags "-g -fprofile-arcs -ftest-coverage -O0 -DNDEBUG")
     set(COVERAGE_CXX_FLAGS ${coverage_flags})
     set(COVERAGE_C_FLAGS ${coverage_flags})
   endif()
 endif()
 
 #-----------------------------------------------------------------------------
 # MITK C/CXX Flags
 #-----------------------------------------------------------------------------
 
 set(MITK_C_FLAGS "${COVERAGE_C_FLAGS}")
 set(MITK_C_FLAGS_DEBUG )
 set(MITK_C_FLAGS_RELEASE )
 set(MITK_CXX_FLAGS "${COVERAGE_CXX_FLAGS} ${MITK_CXX11_FLAG}")
 set(MITK_CXX_FLAGS_DEBUG )
 set(MITK_CXX_FLAGS_RELEASE )
 
 set(MITK_EXE_LINKER_FLAGS )
 set(MITK_SHARED_LINKER_FLAGS )
 
 if(WIN32)
   set(MITK_CXX_FLAGS "${MITK_CXX_FLAGS} -D_WIN32_WINNT=0x0501 -DPOCO_NO_UNWINDOWS -DWIN32_LEAN_AND_MEAN -DNOMINMAX")
   mitkFunctionCheckCompilerFlags("/wd4005" MITK_CXX_FLAGS) # warning C4005: macro redefinition
   mitkFunctionCheckCompilerFlags("/wd4231" MITK_CXX_FLAGS) # warning C4231: nonstandard extension used : 'extern' before template explicit instantiation
   # the following line should be removed after fixing bug 17637
   mitkFunctionCheckCompilerFlags("/wd4316" MITK_CXX_FLAGS) # warning C4316: object alignment on heap
 endif()
 
 if(NOT MSVC_VERSION)
   foreach(_flag
     -Wall
     -Wextra
     -Wpointer-arith
     -Winvalid-pch
     -Wcast-align
     -Wwrite-strings
     -Wno-error=gnu
     -Wno-error=unknown-pragmas
     # The strict-overflow warning is generated by ITK template code
     -Wno-error=strict-overflow
     -Woverloaded-virtual
     -Wstrict-null-sentinel
     #-Wold-style-cast
     #-Wsign-promo
 
     # the following two lines should be removed after ITK-3097 has
     # been resolved, see also MITK bug 15279
     -Wno-unused-local-typedefs
     -Wno-array-bounds
 
     -fdiagnostics-show-option
     )
     mitkFunctionCheckCAndCXXCompilerFlags(${_flag} MITK_C_FLAGS MITK_CXX_FLAGS)
   endforeach()
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE)
   mitkFunctionCheckCompilerFlags("-Wl,--no-undefined" MITK_SHARED_LINKER_FLAGS)
   mitkFunctionCheckCompilerFlags("-Wl,--as-needed" MITK_SHARED_LINKER_FLAGS)
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX)
   # With older version of gcc supporting the flag -fstack-protector-all, an extra dependency to libssp.so
   # is introduced. If gcc is smaller than 4.4.0 and the build type is Release let's not include the flag.
   # Doing so should allow to build package made for distribution using older linux distro.
   if(${GCC_VERSION} VERSION_GREATER "4.4.0" OR (CMAKE_BUILD_TYPE STREQUAL "Debug" AND ${GCC_VERSION} VERSION_LESS "4.4.0"))
     mitkFunctionCheckCAndCXXCompilerFlags("-fstack-protector-all" MITK_C_FLAGS MITK_CXX_FLAGS)
   endif()
   if(MINGW)
     # suppress warnings about auto imported symbols
     set(MITK_SHARED_LINKER_FLAGS "-Wl,--enable-auto-import ${MITK_SHARED_LINKER_FLAGS}")
   endif()
 
   set(MITK_CXX_FLAGS_RELEASE "-D_FORTIFY_SOURCE=2 ${MITK_CXX_FLAGS_RELEASE}")
 endif()
 
 set(MITK_MODULE_LINKER_FLAGS ${MITK_SHARED_LINKER_FLAGS})
 set(MITK_EXE_LINKER_FLAGS ${MITK_SHARED_LINKER_FLAGS})
 
 #-----------------------------------------------------------------------------
 # MITK Packages
 #-----------------------------------------------------------------------------
 
 set(MITK_MODULES_PACKAGE_DEPENDS_DIR ${MITK_SOURCE_DIR}/CMake/PackageDepends)
 set(MODULES_PACKAGE_DEPENDS_DIRS ${MITK_MODULES_PACKAGE_DEPENDS_DIR})
 
 if(NOT MITK_USE_SYSTEM_Boost)
   set(Boost_NO_SYSTEM_PATHS 1)
 endif()
 
 set(Boost_USE_MULTITHREADED 1)
 set(Boost_USE_STATIC_LIBS 0)
 set(Boost_USE_STATIC_RUNTIME 0)
 
 # We need this later for a DCMTK workaround
 set(_dcmtk_dir_orig ${DCMTK_DIR})
 
 # This property is populated at the top half of this file
 get_property(MITK_EXTERNAL_PROJECTS GLOBAL PROPERTY MITK_EXTERNAL_PROJECTS)
 foreach(ep ${MITK_EXTERNAL_PROJECTS})
   get_property(_package GLOBAL PROPERTY MITK_${ep}_PACKAGE)
   get_property(_components GLOBAL PROPERTY MITK_${ep}_COMPONENTS)
   if(MITK_USE_${ep} AND _package)
     if(_components)
       find_package(${_package} COMPONENTS ${_components} REQUIRED CONFIG)
     else()
       # Prefer config mode first because it finds external
       # <proj>Config.cmake files pointed at by <proj>_DIR variables.
       # Otherwise, existing Find<proj>.cmake files could fail.
       # (e.g. in the case of GLEW and the FindGLEW.cmake file shipped
       # with CMake).
       find_package(${_package} QUIET CONFIG)
       string(TOUPPER "${_package}" _package_uc)
       if(NOT (${_package}_FOUND OR ${_package_uc}_FOUND))
         find_package(${_package} REQUIRED)
       endif()
     endif()
   endif()
 endforeach()
 
 # Ensure that the MITK CMake module path comes first
 set(CMAKE_MODULE_PATH
   ${MITK_CMAKE_DIR}
   ${CMAKE_MODULE_PATH}
   )
 
 if(MITK_USE_DCMTK)
   # Due to the preferred CONFIG mode in find_package calls above,
   # the DCMTKConfig.cmake file is read, which does not provide useful
   # package information. We explictly need MODULE mode to find DCMTK.
   if(${_dcmtk_dir_orig} MATCHES "${MITK_EXTERNAL_PROJECT_PREFIX}.*")
     # Help our FindDCMTK.cmake script find our super-build DCMTK
     set(DCMTK_DIR ${MITK_EXTERNAL_PROJECT_PREFIX})
   else()
     # Use the original value
     set(DCMTK_DIR ${_dcmtk_dir_orig})
   endif()
   find_package(DCMTK REQUIRED MODULE)
 endif()
 
 if(MITK_USE_Python)
   find_package(PythonLibs REQUIRED)
   find_package(PythonInterp REQUIRED)
 endif()
 
 if(MITK_USE_SOFA)
   # The SOFAConfig.cmake file does not provide exported targets or
   # libraries with absolute paths, hence we need to make the link
   # directories globally available until the SOFAConfig.cmake file
   # supports a proper mechanism for handling targets.
   # The same code is needed in MITKConfig.cmake.
   link_directories(${SOFA_LIBRARY_DIRS})
 endif()
 
 if(MITK_USE_Boost)
   # Same as SOFA above
   link_directories(${Boost_LIBRARY_DIRS})
 endif()
 
 if(MITK_USE_OpenIGTLink)
   # Same as SOFA above
   link_directories(${OpenIGTLink_LIBRARY_DIRS})
 endif()
 
 if(MITK_USE_SimpleITK)
   link_directories(${SimpleITK_LIBRARY_DIRS})
 endif()
 
 # Qt support
 if(MITK_USE_QT)
   if(DESIRED_QT_VERSION MATCHES 4)
     find_package(Qt4 ${MITK_QT4_MINIMUM_VERSION} REQUIRED)
   elseif(DESIRED_QT_VERSION MATCHES 5)
     find_package(Qt5Core ${MITK_QT5_MINIMUM_VERSION} REQUIRED) # at least Core required
     get_target_property(_qmake_exec Qt5::qmake LOCATION)
     execute_process(COMMAND ${_qmake_exec} -query QT_INSTALL_BINS
       RESULT_VARIABLE _result
       OUTPUT_VARIABLE QT_BINARY_DIR
       ERROR_VARIABLE _error
     )
     string(STRIP "${QT_BINARY_DIR}" QT_BINARY_DIR)
     if(_result OR NOT EXISTS "${QT_BINARY_DIR}")
       message(FATAL_ERROR "Could not determine Qt binary directory: ${_result} ${QT_BINARY_DIR} ${_error}")
     endif()
   endif()
 endif()
 
 #-----------------------------------------------------------------------------
 # Testing
 #-----------------------------------------------------------------------------
 
 if(BUILD_TESTING)
   enable_testing()
   include(CTest)
   mark_as_advanced(TCL_TCLSH DART_ROOT)
 
   option(MITK_ENABLE_RENDERING_TESTING OFF "Enable the MITK rendering tests. Requires x-server in Linux.")
   #Rendering testing does not work for Linux nightlies, thus it is disabled per default
   #and activated for Mac and Windows.
   if(WIN32 OR APPLE)
     set(MITK_ENABLE_RENDERING_TESTING ON)
   endif()
   mark_as_advanced( MITK_ENABLE_RENDERING_TESTING )
 
   # Setup file for setting custom ctest vars
   configure_file(
     CMake/CTestCustom.cmake.in
     ${MITK_BINARY_DIR}/CTestCustom.cmake
     @ONLY
     )
 
   # Configuration for the CMake-generated test driver
   set(CMAKE_TESTDRIVER_EXTRA_INCLUDES "#include <stdexcept>")
   set(CMAKE_TESTDRIVER_BEFORE_TESTMAIN "
     try
       {")
   set(CMAKE_TESTDRIVER_AFTER_TESTMAIN "    }
       catch( std::exception & excp )
         {
         fprintf(stderr,\"%s\\n\",excp.what());
         return EXIT_FAILURE;
         }
       catch( ... )
         {
         printf(\"Exception caught in the test driver\\n\");
         return EXIT_FAILURE;
         }
       ")
 
   set(MITK_TEST_OUTPUT_DIR "${MITK_BINARY_DIR}/test_output")
   if(NOT EXISTS ${MITK_TEST_OUTPUT_DIR})
     file(MAKE_DIRECTORY ${MITK_TEST_OUTPUT_DIR})
   endif()
 
   # Test the external project template
   if(MITK_USE_BLUEBERRY)
     #include(mitkTestProjectTemplate)
   endif()
 
   # Test the package target
   include(mitkPackageTest)
 endif()
 
 configure_file(mitkTestingConfig.h.in ${MITK_BINARY_DIR}/mitkTestingConfig.h)
 
 #-----------------------------------------------------------------------------
 # MITK_SUPERBUILD_BINARY_DIR
 #-----------------------------------------------------------------------------
 
 # If MITK_SUPERBUILD_BINARY_DIR isn't defined, it means MITK is *NOT* build using Superbuild.
 # In that specific case, MITK_SUPERBUILD_BINARY_DIR should default to MITK_BINARY_DIR
 if(NOT DEFINED MITK_SUPERBUILD_BINARY_DIR)
   set(MITK_SUPERBUILD_BINARY_DIR ${MITK_BINARY_DIR})
 endif()
 
 #-----------------------------------------------------------------------------
 # Set C/CXX and linker flags for MITK code
 #-----------------------------------------------------------------------------
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MITK_CXX_FLAGS}")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${MITK_CXX_FLAGS_DEBUG}")
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${MITK_CXX_FLAGS_RELEASE}")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MITK_C_FLAGS}")
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${MITK_C_FLAGS_DEBUG}")
 set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${MITK_C_FLAGS_RELEASE}")
 
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MITK_EXE_LINKER_FLAGS}")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${MITK_SHARED_LINKER_FLAGS}")
 set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${MITK_MODULE_LINKER_FLAGS}")
 
 #-----------------------------------------------------------------------------
 # Compile Utilities and set-up MITK variables
 #-----------------------------------------------------------------------------
 
 add_subdirectory(Utilities)
 
 if(MITK_USE_BLUEBERRY)
 
   # We need to hack a little bit because MITK applications may need
   # to enable certain BlueBerry plug-ins. However, these plug-ins
   # are validated separately from the MITK plug-ins and know nothing
   # about potential MITK plug-in dependencies of the applications. Hence
   # we cannot pass the MITK application list to the BlueBerry
   # ctkMacroSetupPlugins call but need to extract the BlueBerry dependencies
   # from the applications and set them explicitly.
 
   include("${CMAKE_CURRENT_SOURCE_DIR}/Applications/AppList.cmake")
 
   foreach(mitk_app ${MITK_APPS})
     # extract target_dir and option_name
     string(REPLACE "^^" "\\;" target_info ${mitk_app})
     set(target_info_list ${target_info})
     list(GET target_info_list 0 target_dir)
     list(GET target_info_list 1 option_name)
     # check if the application is enabled and if target_libraries.cmake exists
     if((${option_name} OR MITK_BUILD_ALL_APPS) AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/Applications/${target_dir}/target_libraries.cmake")
       include("${CMAKE_CURRENT_SOURCE_DIR}/Applications/${target_dir}/target_libraries.cmake")
       foreach(_target_dep ${target_libraries})
         if(_target_dep MATCHES org_blueberry_)
           string(REPLACE _ . _app_bb_dep ${_target_dep})
           # explicitly set the build option for the BlueBerry plug-in
           set(BLUEBERRY_BUILD_${_app_bb_dep} ON CACHE BOOL "Build the ${_app_bb_dep} plug-in")
         endif()
       endforeach()
     endif()
   endforeach()
 
   set(mbilog_DIR "${mbilog_BINARY_DIR}")
 
   if(MITK_BUILD_ALL_PLUGINS)
     set(BLUEBERRY_BUILD_ALL_PLUGINS ON)
   endif()
 
+  set(BLUEBERRY_CXX_FLAGS "${MITK_CXX_FLAGS}")
+  set(BLUEBERRY_CXX_FLAGS_RELEASE "${MITK_CXX_FLAGS_RELEASE}")
+  set(BLUEBERRY_C_FLAGS "${MITK_C_FLAGS}")
+
   set(BLUEBERRY_XPDOC_OUTPUT_DIR ${MITK_DOXYGEN_OUTPUT_DIR}/html/extension-points/html/)
 
   add_subdirectory(BlueBerry)
 
   set(BlueBerry_DIR ${CMAKE_CURRENT_BINARY_DIR}/BlueBerry
       CACHE PATH "The directory containing a CMake configuration file for BlueBerry" FORCE)
 
   include(mitkMacroCreateCTKPlugin)
 
 endif()
 
 #-----------------------------------------------------------------------------
 # Add custom targets representing CDash subprojects
 #-----------------------------------------------------------------------------
 
 foreach(subproject ${CTEST_PROJECT_SUBPROJECTS})
   if(NOT TARGET ${subproject} AND NOT subproject MATCHES "Unlabeled")
     add_custom_target(${subproject})
   endif()
 endforeach()
 
 #-----------------------------------------------------------------------------
 # Add subdirectories
 #-----------------------------------------------------------------------------
 
 add_subdirectory(Modules)
 
 if(MITK_USE_BLUEBERRY)
 
   find_package(BlueBerry REQUIRED)
 
   set(MITK_DEFAULT_SUBPROJECTS MITK-Plugins)
 
   # Plug-in testing (needs some work to be enabled again)
   if(BUILD_TESTING)
     include(berryTestingHelpers)
 
     set(BLUEBERRY_UI_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/CoreApp")
     if(TARGET CoreApp)
       get_target_property(_is_macosx_bundle CoreApp MACOSX_BUNDLE)
       if(APPLE AND _is_macosx_bundle)
         set(BLUEBERRY_UI_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/CoreApp.app/Contents/MacOS/CoreApp")
       endif()
     endif()
     set(BLUEBERRY_TEST_APP_ID "org.mitk.qt.coreapplication")
   endif()
 
   include("${CMAKE_CURRENT_SOURCE_DIR}/Plugins/PluginList.cmake")
   mitkFunctionWhitelistPlugins(MITK MITK_EXT_PLUGINS)
 
   set(mitk_plugins_fullpath "")
   foreach(mitk_plugin ${MITK_EXT_PLUGINS})
     list(APPEND mitk_plugins_fullpath Plugins/${mitk_plugin})
   endforeach()
 
   if(EXISTS ${MITK_PRIVATE_MODULES}/PluginList.cmake)
     include(${MITK_PRIVATE_MODULES}/PluginList.cmake)
 
     foreach(mitk_plugin ${MITK_PRIVATE_PLUGINS})
       list(APPEND mitk_plugins_fullpath ${MITK_PRIVATE_MODULES}/${mitk_plugin})
     endforeach()
   endif()
 
   if(MITK_BUILD_EXAMPLES)
     include("${CMAKE_CURRENT_SOURCE_DIR}/Examples/Plugins/PluginList.cmake")
     set(mitk_example_plugins_fullpath )
     foreach(mitk_example_plugin ${MITK_EXAMPLE_PLUGINS})
       list(APPEND mitk_example_plugins_fullpath Examples/Plugins/${mitk_example_plugin})
       list(APPEND mitk_plugins_fullpath Examples/Plugins/${mitk_example_plugin})
     endforeach()
   endif()
 
   # Specify which plug-ins belong to this project
   macro(GetMyTargetLibraries all_target_libraries varname)
     set(re_ctkplugin_mitk "^org_mitk_[a-zA-Z0-9_]+$")
     set(re_ctkplugin_bb "^org_blueberry_[a-zA-Z0-9_]+$")
     set(_tmp_list)
     list(APPEND _tmp_list ${all_target_libraries})
     ctkMacroListFilter(_tmp_list re_ctkplugin_mitk re_ctkplugin_bb OUTPUT_VARIABLE ${varname})
   endmacro()
 
   # Get infos about application directories and build options
   include("${CMAKE_CURRENT_SOURCE_DIR}/Applications/AppList.cmake")
   set(mitk_apps_fullpath )
   foreach(mitk_app ${MITK_APPS})
     string(FIND ${mitk_app} "MITK_BUILD_APP_" _index)
     string(SUBSTRING ${mitk_app} ${_index} -1 _var)
     if(${_var})
       list(APPEND mitk_apps_fullpath "${CMAKE_CURRENT_SOURCE_DIR}/Applications/${mitk_app}")
     endif()
   endforeach()
 
   if (mitk_plugins_fullpath)
     ctkMacroSetupPlugins(${mitk_plugins_fullpath}
                          BUILD_OPTION_PREFIX MITK_BUILD_
                          APPS ${mitk_apps_fullpath}
                          BUILD_ALL ${MITK_BUILD_ALL_PLUGINS}
                          COMPACT_OPTIONS)
   endif()
 
   set(MITK_PLUGIN_USE_FILE "${MITK_BINARY_DIR}/MitkPluginUseFile.cmake")
   if(${PROJECT_NAME}_PLUGIN_LIBRARIES)
     ctkFunctionGeneratePluginUseFile(${MITK_PLUGIN_USE_FILE})
   else()
     file(REMOVE ${MITK_PLUGIN_USE_FILE})
     set(MITK_PLUGIN_USE_FILE )
   endif()
 endif()
 
 #-----------------------------------------------------------------------------
 # Documentation
 #-----------------------------------------------------------------------------
 
 add_subdirectory(Documentation)
 
 #-----------------------------------------------------------------------------
 # Installation
 #-----------------------------------------------------------------------------
 
 
 # set MITK cpack variables
 # These are the default variables, which can be overwritten ( see below )
 include(mitkSetupCPack)
 
 set(use_default_config ON)
 
 # MITK_APPS is set in Applications/AppList.cmake (included somewhere above
 # if MITK_USE_BLUEBERRY is set to ON).
 if(MITK_APPS)
 
   set(activated_apps_no 0)
   list(LENGTH MITK_APPS app_count)
 
   # Check how many apps have been enabled
   # If more than one app has been activated, the we use the
   # default CPack configuration. Otherwise that apps configuration
   # will be used, if present.
   foreach(mitk_app ${MITK_APPS})
     # extract option_name
     string(REPLACE "^^" "\\;" target_info ${mitk_app})
     set(target_info_list ${target_info})
     list(GET target_info_list 1 option_name)
     # check if the application is enabled
     if(${option_name} OR MITK_BUILD_ALL_APPS)
       MATH(EXPR activated_apps_no "${activated_apps_no} + 1")
     endif()
   endforeach()
 
   if(app_count EQUAL 1 AND (activated_apps_no EQUAL 1 OR MITK_BUILD_ALL_APPS))
     # Corner case if there is only one app in total
     set(use_project_cpack ON)
   elseif(activated_apps_no EQUAL 1 AND NOT MITK_BUILD_ALL_APPS)
     # Only one app is enabled (no "build all" flag set)
     set(use_project_cpack ON)
   else()
     # Less or more then one app is enabled
     set(use_project_cpack OFF)
   endif()
 
   foreach(mitk_app ${MITK_APPS})
     # extract target_dir and option_name
     string(REPLACE "^^" "\\;" target_info ${mitk_app})
     set(target_info_list ${target_info})
     list(GET target_info_list 0 target_dir)
     list(GET target_info_list 1 option_name)
     # check if the application is enabled
     if(${option_name} OR MITK_BUILD_ALL_APPS)
       # check whether application specific configuration files will be used
       if(use_project_cpack)
         # use files if they exist
         if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/Applications/${target_dir}/CPackOptions.cmake")
           include("${CMAKE_CURRENT_SOURCE_DIR}/Applications/${target_dir}/CPackOptions.cmake")
         endif()
 
         if(EXISTS "${PROJECT_SOURCE_DIR}/Applications/${target_dir}/CPackConfig.cmake.in")
           set(CPACK_PROJECT_CONFIG_FILE "${PROJECT_BINARY_DIR}/Applications/${target_dir}/CPackConfig.cmake")
           configure_file(${PROJECT_SOURCE_DIR}/Applications/${target_dir}/CPackConfig.cmake.in
                          ${CPACK_PROJECT_CONFIG_FILE} @ONLY)
           set(use_default_config OFF)
         endif()
       endif()
     # add link to the list
     list(APPEND CPACK_CREATE_DESKTOP_LINKS "${target_dir}")
     endif()
   endforeach()
 
 endif()
 
 # if no application specific configuration file was used, use default
 if(use_default_config)
   configure_file(${MITK_SOURCE_DIR}/MITKCPackOptions.cmake.in
                  ${MITK_BINARY_DIR}/MITKCPackOptions.cmake @ONLY)
   set(CPACK_PROJECT_CONFIG_FILE "${MITK_BINARY_DIR}/MITKCPackOptions.cmake")
 endif()
 
 # include CPack model once all variables are set
 include(CPack)
 
 # Additional installation rules
 include(mitkInstallRules)
 
 #-----------------------------------------------------------------------------
 # Last configuration steps
 #-----------------------------------------------------------------------------
 
 # ---------------- Export targets -----------------
 
 set(MITK_EXPORTS_FILE "${MITK_BINARY_DIR}/MitkExports.cmake")
 file(REMOVE ${MITK_EXPORTS_FILE})
 
 set(targets_to_export)
 get_property(module_targets GLOBAL PROPERTY MITK_MODULE_TARGETS)
 if(module_targets)
   list(APPEND targets_to_export ${module_targets})
 endif()
 
 if(MITK_USE_BLUEBERRY)
   if(MITK_PLUGIN_LIBRARIES)
     list(APPEND targets_to_export ${MITK_PLUGIN_LIBRARIES})
   endif()
 endif()
 
 export(TARGETS ${targets_to_export} APPEND
        FILE ${MITK_EXPORTS_FILE})
 
 set(MITK_EXPORTED_TARGET_PROPERTIES )
 foreach(target_to_export ${targets_to_export})
   get_target_property(autoload_targets ${target_to_export} MITK_AUTOLOAD_TARGETS)
   if(autoload_targets)
     set(MITK_EXPORTED_TARGET_PROPERTIES "${MITK_EXPORTED_TARGET_PROPERTIES}
 set_target_properties(${target_to_export} PROPERTIES MITK_AUTOLOAD_TARGETS \"${autoload_targets}\")")
   endif()
   get_target_property(autoload_dir ${target_to_export} MITK_AUTOLOAD_DIRECTORY)
   if(autoload_dir)
     set(MITK_EXPORTED_TARGET_PROPERTIES "${MITK_EXPORTED_TARGET_PROPERTIES}
 set_target_properties(${target_to_export} PROPERTIES MITK_AUTOLOAD_DIRECTORY \"${autoload_dir}\")")
   endif()
 
   get_target_property(deprecated_module ${target_to_export} MITK_MODULE_DEPRECATED_SINCE)
   if(deprecated_module)
     set(MITK_EXPORTED_TARGET_PROPERTIES "${MITK_EXPORTED_TARGET_PROPERTIES}
 set_target_properties(${target_to_export} PROPERTIES MITK_MODULE_DEPRECATED_SINCE \"${deprecated_module}\")")
   endif()
 endforeach()
 
 # ---------------- External projects -----------------
 
 get_property(MITK_ADDITIONAL_LIBRARY_SEARCH_PATHS_CONFIG GLOBAL PROPERTY MITK_ADDITIONAL_LIBRARY_SEARCH_PATHS)
 
 set(MITK_CONFIG_EXTERNAL_PROJECTS )
 #string(REPLACE "^^" ";" _mitk_external_projects ${MITK_EXTERNAL_PROJECTS})
 
 foreach(ep ${MITK_EXTERNAL_PROJECTS})
   get_property(_components GLOBAL PROPERTY MITK_${ep}_COMPONENTS)
   set(MITK_CONFIG_EXTERNAL_PROJECTS "${MITK_CONFIG_EXTERNAL_PROJECTS}
 set(MITK_USE_${ep} ${MITK_USE_${ep}})
 set(MITK_${ep}_DIR \"${${ep}_DIR}\")
 set(MITK_${ep}_COMPONENTS ${_components})
 ")
 endforeach()
 
 foreach(ep ${MITK_EXTERNAL_PROJECTS})
   get_property(_package GLOBAL PROPERTY MITK_${ep}_PACKAGE)
   get_property(_components GLOBAL PROPERTY MITK_${ep}_COMPONENTS)
   if(_components)
       set(_components_arg COMPONENTS \${_components})
   else()
     set(_components_arg)
   endif()
 
   if(_package)
     set(MITK_CONFIG_EXTERNAL_PROJECTS "${MITK_CONFIG_EXTERNAL_PROJECTS}
 if(MITK_USE_${ep})
   set(${ep}_DIR \${MITK_${ep}_DIR})
   if(MITK_${ep}_COMPONENTS)
     mitkMacroFindDependency(${_package} COMPONENTS \${MITK_${ep}_COMPONENTS})
   else()
     mitkMacroFindDependency(${_package})
   endif()
 endif()")
   endif()
 endforeach()
 
 
 # ---------------- Tools -----------------
 
 configure_file(${MITK_SOURCE_DIR}/CMake/ToolExtensionITKFactory.cpp.in
                ${MITK_BINARY_DIR}/ToolExtensionITKFactory.cpp.in COPYONLY)
 configure_file(${MITK_SOURCE_DIR}/CMake/ToolExtensionITKFactoryLoader.cpp.in
                ${MITK_BINARY_DIR}/ToolExtensionITKFactoryLoader.cpp.in COPYONLY)
 configure_file(${MITK_SOURCE_DIR}/CMake/ToolGUIExtensionITKFactory.cpp.in
                ${MITK_BINARY_DIR}/ToolGUIExtensionITKFactory.cpp.in COPYONLY)
 
 # ---------------- Configure files -----------------
 
 configure_file(mitkVersion.h.in ${MITK_BINARY_DIR}/mitkVersion.h)
 configure_file(mitkConfig.h.in ${MITK_BINARY_DIR}/mitkConfig.h)
 
 set(IPFUNC_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Utilities/ipFunc)
 set(UTILITIES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Utilities)
 
 configure_file(mitkConfig.h.in ${MITK_BINARY_DIR}/mitkConfig.h)
 configure_file(MITKConfig.cmake.in ${MITK_BINARY_DIR}/MITKConfig.cmake @ONLY)
 
 write_basic_config_version_file(${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
   VERSION ${MITK_VERSION_STRING} COMPATIBILITY AnyNewerVersion)
 
 # If we are under Windows, create two batch files which correctly
 # set up the environment for the application and for Visual Studio
 if(WIN32)
   include(mitkFunctionCreateWindowsBatchScript)
 
   set(VS_SOLUTION_FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME}.sln")
   foreach(VS_BUILD_TYPE debug release)
     mitkFunctionCreateWindowsBatchScript("${MITK_SOURCE_DIR}/CMake/StartVS.bat.in"
       ${PROJECT_BINARY_DIR}/StartVS_${VS_BUILD_TYPE}.bat
       ${VS_BUILD_TYPE})
   endforeach()
 endif(WIN32)
 
 
 #-----------------------------------------------------------------------------
 # MITK Applications
 #-----------------------------------------------------------------------------
 
 # This must come after MITKConfig.h was generated, since applications
 # might do a find_package(MITK REQUIRED).
 add_subdirectory(Applications)
 
 #-----------------------------------------------------------------------------
 # MITK Examples
 #-----------------------------------------------------------------------------
 
 if(MITK_BUILD_EXAMPLES)
   # This must come after MITKConfig.h was generated, since applications
   # might do a find_package(MITK REQUIRED).
   add_subdirectory(Examples)
 endif()
 
 #-----------------------------------------------------------------------------
 # Print configuration summary
 #-----------------------------------------------------------------------------
 
 message("\n\n")
 feature_summary(
   DESCRIPTION "------- FEATURE SUMMARY FOR ${PROJECT_NAME} -------"
   WHAT ALL
 )
 
diff --git a/Plugins/org.mitk.core.ext/src/internal/mitkCoreExtActivator.h b/Plugins/org.mitk.core.ext/src/internal/mitkCoreExtActivator.h
index efdd2cb3cb..d53eb07456 100755
--- a/Plugins/org.mitk.core.ext/src/internal/mitkCoreExtActivator.h
+++ b/Plugins/org.mitk.core.ext/src/internal/mitkCoreExtActivator.h
@@ -1,70 +1,70 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef MITKCOREEXTACTIVATOR_H_
 #define MITKCOREEXTACTIVATOR_H_
 
 #include <ctkPluginActivator.h>
 
 namespace mitk
 {
 
-struct InputDeviceRegistry;
+class InputDeviceRegistry;
 
   /**
   * @brief The activator class for the org.mitk.core.ext plug-in.
   * @ingroup org_mitk_core_ext_internal
   *
   * When the plug-in is started by the framework, it calls a global function to initialize
   * the mitkCoreExt module.
   *
   */
   class CoreExtActivator : public QObject, public ctkPluginActivator
   {
     Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "org_mitk_core_ext")
 #endif
     Q_INTERFACES(ctkPluginActivator)
 
   public:
 
     ~CoreExtActivator();
 
     /**
     * Starts this plug-in and registers object factories.
     *
     * @param context
     *        The context for the plug-in.
     */
     void start(ctkPluginContext* context);
 
     void stop(ctkPluginContext* context);
 
   private:
 
     /**
     * Activates the input device modules.
     */
     void StartInputDeviceModules(ctkPluginContext *context);
 
     QScopedPointer<InputDeviceRegistry> m_InputDeviceRegistry;
 
   }; // end class CoreExtActivator
 } //end namespace mitk
 
 #endif /* MITKCOREEXTACTIVATOR_H_ */
diff --git a/Plugins/org.mitk.core.ext/src/mitkIInputDevice.h b/Plugins/org.mitk.core.ext/src/mitkIInputDevice.h
index 2a0acf5100..9354aa0492 100644
--- a/Plugins/org.mitk.core.ext/src/mitkIInputDevice.h
+++ b/Plugins/org.mitk.core.ext/src/mitkIInputDevice.h
@@ -1,56 +1,56 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef MITKIINPUTDEVICE_H_
 #define MITKIINPUTDEVICE_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
 
 #include <vector>
 
 namespace mitk
 {
   /**
   * An input device provides a method to register and unregister itself. Meaning <br>
   * for example adding listeners and instianciate classes necessary to use the input device.
   *
   * @noimplement This interface is not intended to be implemented by clients.
   * @ingroup org_mitk_core_ext
   */
   struct IInputDevice : public berry::Object
   {
 
-    berryInterfaceMacro(IInputDevice, mitk)
+    berryObjectMacro(mitk::IInputDevice)
 
     /**
     * Register the input device at one or more instances.
     */
     virtual bool RegisterInputDevice() = 0;
 
     /**
     * Unregister the input device at one or more instances.
     */
     virtual bool UnRegisterInputDevice() = 0;
 
     virtual ~IInputDevice() {}
 
   }; // end struct IInputDevice
 } // end namespace mitk
 
 Q_DECLARE_INTERFACE(mitk::IInputDevice, "org.mitk.IInputDevice")
 
 #endif /*MITKIINPUTDEVICE_H_*/
diff --git a/Plugins/org.mitk.core.ext/src/mitkIInputDeviceRegistry.h b/Plugins/org.mitk.core.ext/src/mitkIInputDeviceRegistry.h
index f85283ce17..af4b162518 100644
--- a/Plugins/org.mitk.core.ext/src/mitkIInputDeviceRegistry.h
+++ b/Plugins/org.mitk.core.ext/src/mitkIInputDeviceRegistry.h
@@ -1,69 +1,68 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef MITKIINPUTDEVICEREGISTRY_H_
 #define MITKIINPUTDEVICEREGISTRY_H_
 
 #include <QtPlugin>
 
 #include "mitkIInputDeviceDescriptor.h"
 
 namespace mitk
 {
   /**
    *
    * The input device registry maintains a list of input devices explicitly registered
    * against the view extension point.
    * <p>
    * The description of a given input device is kept in a <code>IInputDeviceDescriptor</code>.
    * </p>
    * <p>
    * This interface is not intended to be implemented by clients.
    * </p>
    *
    * @see mitk::IInputDeviceDescriptor
    * @noimplement This interface is not intended to be implemented by clients.
    * @ingroup org_mitk_core_ext
    */
   struct IInputDeviceRegistry
   {
-    berryInterfaceMacro(IInputDeviceRegistry, mitk);
 
     /**
      * Return an input device descriptor with the given extension id. If no input device exists,
      * with the id return <code>null</code>.
      *
      * @param id
      *      the id to search for
      * @return the descriptor or <code>null</code>
      */
     virtual IInputDeviceDescriptor::Pointer Find(const QString& id) const = 0;
 
     /**
      * Return a list of input devices defined in the registry.
      *
      * @return the input devices.
      */
     virtual QList<IInputDeviceDescriptor::Pointer> GetInputDevices() const = 0;
 
     virtual ~IInputDeviceRegistry() {}
 
   }; // end struct IInputDeviceRegistry
 } // end namespace mitk
 
 Q_DECLARE_INTERFACE(mitk::IInputDeviceRegistry, "org.mitk.service.IInputDeviceRegistry")
 
 #endif /*MITKIINPUTDEVICEREGISTRY_H_*/
diff --git a/Plugins/org.mitk.core.services/src/mitkIDataStorageReference.h b/Plugins/org.mitk.core.services/src/mitkIDataStorageReference.h
index c2b2649a4f..8cbfd324b1 100644
--- a/Plugins/org.mitk.core.services/src/mitkIDataStorageReference.h
+++ b/Plugins/org.mitk.core.services/src/mitkIDataStorageReference.h
@@ -1,50 +1,49 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef MITKIDATASTORAGEREFERENCE_H_
 #define MITKIDATASTORAGEREFERENCE_H_
 
 #include <berryObject.h>
 #include <berryMacros.h>
 
 #include <org_mitk_core_services_Export.h>
 
 #include <mitkDataStorage.h>
 
 namespace mitk
 {
 
 /**
  * \ingroup org_mitk_core_services
  */
 struct MITK_CORE_SERVICES_PLUGIN IDataStorageReference : public berry::Object
 {
-  berryInterfaceMacro(IDataStorageReference, mitk);
-
+  berryObjectMacro(mitk::IDataStorageReference)
 
   virtual DataStorage::Pointer GetDataStorage() const = 0;
 
   virtual bool IsDefault() const = 0;
 
   virtual QString GetLabel() const = 0;
   virtual void SetLabel(const QString& label) = 0;
 
   virtual bool operator==(const berry::Object* o) const = 0;
 };
 
 }
 
 #endif /*MITKIDATASTORAGEREFERENCE_H_*/
diff --git a/Plugins/org.mitk.gui.qt.common/src/QmitkAbstractView.cpp b/Plugins/org.mitk.gui.qt.common/src/QmitkAbstractView.cpp
index f2f89b596e..0f1f25cc11 100644
--- a/Plugins/org.mitk.gui.qt.common/src/QmitkAbstractView.cpp
+++ b/Plugins/org.mitk.gui.qt.common/src/QmitkAbstractView.cpp
@@ -1,602 +1,602 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "QmitkAbstractView.h"
 #include "QmitkDataNodeSelectionProvider.h"
 #include "internal/QmitkCommonActivator.h"
 #include "internal/QmitkDataNodeItemModel.h"
 
 // mitk Includes
 #include <mitkLogMacros.h>
 #include <mitkIDataStorageService.h>
 #include <mitkDataStorageEditorInput.h>
 #include <mitkWorkbenchUtil.h>
 #include <mitkDataNodeObject.h>
 #include <mitkIRenderingManager.h>
 
 // berry Includes
 #include <berryIWorkbenchPage.h>
 #include <berryIBerryPreferences.h>
 #include <berryIEditorPart.h>
 #include <berryINullSelectionListener.h>
 #include <berryUIException.h>
 
 // CTK Includes
 #include <ctkServiceTracker.h>
 
 // Qt Includes
 #include <QItemSelectionModel>
 #include <QApplication>
 #include <QMessageBox>
 #include <QScrollArea>
 #include <QVBoxLayout>
 
 class QmitkAbstractViewPrivate
 {
 public:
 
   QmitkAbstractViewPrivate(QmitkAbstractView* qq)
     : q(qq)
     , m_PrefServiceTracker(QmitkCommonActivator::GetContext())
     , m_DataStorageServiceTracker(QmitkCommonActivator::GetContext())
     , m_Parent(0)
     , m_DataNodeItemModel(new QmitkDataNodeItemModel)
     , m_DataNodeSelectionModel(new QItemSelectionModel(m_DataNodeItemModel))
     , m_InDataStorageChanged(false)
   {
     m_PrefServiceTracker.open();
     m_DataStorageServiceTracker.open();
   }
 
   ~QmitkAbstractViewPrivate()
   {
     delete m_DataNodeSelectionModel;
     delete m_DataNodeItemModel;
 
     m_PrefServiceTracker.close();
     m_DataStorageServiceTracker.close();
   }
 
   /**
    * Called when a DataStorage Add Event was thrown. Sets
    * m_InDataStorageChanged to true and calls NodeAdded afterwards.
    * \see m_InDataStorageChanged
    */
   void NodeAddedProxy(const mitk::DataNode* node)
   {
     // garantuee no recursions when a new node event is thrown in NodeAdded()
     if(!m_InDataStorageChanged)
     {
       m_InDataStorageChanged = true;
       q->NodeAdded(node);
       q->DataStorageModified();
       m_InDataStorageChanged = false;
     }
   }
 
   /**
    * Called when a DataStorage remove event was thrown. Sets
    * m_InDataStorageChanged to true and calls NodeRemoved afterwards.
    * \see m_InDataStorageChanged
    */
   void NodeRemovedProxy(const mitk::DataNode* node)
   {
     // garantuee no recursions when a new node event is thrown in NodeAdded()
     if(!m_InDataStorageChanged)
     {
       m_InDataStorageChanged = true;
       q->NodeRemoved(node);
       q->DataStorageModified();
       m_InDataStorageChanged = false;
     }
   }
 
   /**
    * Called when a DataStorage changed event was thrown. Sets
    * m_InDataStorageChanged to true and calls NodeChanged afterwards.
    * \see m_InDataStorageChanged
    */
   void NodeChangedProxy(const mitk::DataNode* node)
   {
     // garantuee no recursions when a new node event is thrown in NodeAdded()
     if(!m_InDataStorageChanged)
     {
       m_InDataStorageChanged = true;
       q->NodeChanged(node);
       q->DataStorageModified();
       m_InDataStorageChanged = false;
     }
   }
 
   /**
    * reactions to selection events from views
    */
-  void BlueBerrySelectionChanged(berry::IWorkbenchPart::Pointer sourcepart, berry::ISelection::ConstPointer selection)
+  void BlueBerrySelectionChanged(const berry::IWorkbenchPart::Pointer& sourcepart,
+                                 const berry::ISelection::ConstPointer& selection)
   {
     if(sourcepart.IsNull() || sourcepart.GetPointer() == static_cast<berry::IWorkbenchPart*>(q))
       return;
 
     if(selection.IsNull())
     {
       q->OnNullSelection(sourcepart);
       return;
     }
 
     mitk::DataNodeSelection::ConstPointer _DataNodeSelection
       = selection.Cast<const mitk::DataNodeSelection>();
     q->OnSelectionChanged(sourcepart, this->DataNodeSelectionToQList(_DataNodeSelection));
   }
 
   /**
    * Converts a mitk::DataNodeSelection to a QList<mitk::DataNode::Pointer> (possibly empty)
    */
   QList<mitk::DataNode::Pointer> DataNodeSelectionToQList(mitk::DataNodeSelection::ConstPointer currentSelection) const;
 
   QmitkAbstractView* const q;
 
   ctkServiceTracker<berry::IPreferencesService*> m_PrefServiceTracker;
 
   ctkServiceTracker<mitk::IDataStorageService*> m_DataStorageServiceTracker;
 
   /**
    * Saves the parent of this view (this is the scrollarea created in CreatePartControl(void*)
    * \see CreatePartControl(void*)
    */
   QWidget* m_Parent;
 
   /**
    * Holds the current selection (selection made by this View !!!)
    */
   QmitkDataNodeSelectionProvider::Pointer m_SelectionProvider;
 
   /**
    * Holds a helper model for firing selection events.
    */
   QmitkDataNodeItemModel* m_DataNodeItemModel;
 
   /**
    * The selection model for the QmitkDataNodeItemModel;
    */
   QItemSelectionModel* m_DataNodeSelectionModel;
 
   /**
    * object to observe BlueBerry selections
    */
-  berry::ISelectionListener::Pointer m_BlueBerrySelectionListener;
+  QScopedPointer<berry::ISelectionListener> m_BlueBerrySelectionListener;
 
   /**
    * Saves if this class is currently working on DataStorage changes.
    * This is a protector variable to avoid recursive calls on event listener functions.
    */
   bool m_InDataStorageChanged;
 
 };
 
 QmitkAbstractView::QmitkAbstractView()
   : d(new QmitkAbstractViewPrivate(this))
 {
 }
 
 void QmitkAbstractView::CreatePartControl(void* parent)
 {
 
   // scrollArea
   QScrollArea* scrollArea = new QScrollArea;
   //QVBoxLayout* scrollAreaLayout = new QVBoxLayout(scrollArea);
   scrollArea->setFrameShadow(QFrame::Plain);
   scrollArea->setFrameShape(QFrame::NoFrame);
   scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
   scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
 
   // m_Parent
   d->m_Parent = new QWidget;
   //m_Parent->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
   this->CreateQtPartControl(d->m_Parent);
 
   //scrollAreaLayout->addWidget(m_Parent);
   //scrollArea->setLayout(scrollAreaLayout);
 
   // set the widget now
   scrollArea->setWidgetResizable(true);
   scrollArea->setWidget(d->m_Parent);
 
   // add the scroll area to the real parent (the view tabbar)
   QWidget* parentQWidget = static_cast<QWidget*>(parent);
   QVBoxLayout* parentLayout = new QVBoxLayout(parentQWidget);
   parentLayout->setMargin(0);
   parentLayout->setSpacing(0);
   parentLayout->addWidget(scrollArea);
 
   // finally set the layout containing the scroll area to the parent widget (= show it)
   parentQWidget->setLayout(parentLayout);
 
   this->AfterCreateQtPartControl();
 }
 
 void QmitkAbstractView::AfterCreateQtPartControl()
 {
   this->SetSelectionProvider();
 
   // REGISTER DATASTORAGE LISTENER
   this->GetDataStorage()->AddNodeEvent.AddListener( mitk::MessageDelegate1<QmitkAbstractViewPrivate, const mitk::DataNode*>
                                                     ( d.data(), &QmitkAbstractViewPrivate::NodeAddedProxy ) );
   this->GetDataStorage()->ChangedNodeEvent.AddListener( mitk::MessageDelegate1<QmitkAbstractViewPrivate, const mitk::DataNode*>
                                                         ( d.data(), &QmitkAbstractViewPrivate::NodeChangedProxy ) );
   this->GetDataStorage()->RemoveNodeEvent.AddListener( mitk::MessageDelegate1<QmitkAbstractViewPrivate, const mitk::DataNode*>
                                                        ( d.data(), &QmitkAbstractViewPrivate::NodeRemovedProxy ) );
 
   // REGISTER PREFERENCES LISTENER
   berry::IBerryPreferences::Pointer prefs = this->GetPreferences().Cast<berry::IBerryPreferences>();
   if(prefs.IsNotNull())
     prefs->OnChanged.AddListener(
           berry::MessageDelegate1<QmitkAbstractView, const berry::IBerryPreferences*>(this,
                                                                               &QmitkAbstractView::OnPreferencesChanged));
 
   // REGISTER FOR WORKBENCH SELECTION EVENTS
-  d->m_BlueBerrySelectionListener = berry::ISelectionListener::Pointer(
-        new berry::NullSelectionChangedAdapter<QmitkAbstractViewPrivate>(d.data(),
-                                                             &QmitkAbstractViewPrivate::BlueBerrySelectionChanged));
-  this->GetSite()->GetWorkbenchWindow()->GetSelectionService()->AddPostSelectionListener(d->m_BlueBerrySelectionListener);
+  d->m_BlueBerrySelectionListener.reset(new berry::NullSelectionChangedAdapter<QmitkAbstractViewPrivate>(
+                                          d.data(), &QmitkAbstractViewPrivate::BlueBerrySelectionChanged));
+  this->GetSite()->GetWorkbenchWindow()->GetSelectionService()->AddPostSelectionListener(d->m_BlueBerrySelectionListener.data());
 
   // EMULATE INITIAL SELECTION EVENTS
 
   // send the current selection
   berry::IWorkbenchPart::Pointer activePart = this->GetSite()->GetPage()->GetActivePart();
   if (activePart.IsNotNull())
   {
     this->OnSelectionChanged(activePart, this->GetCurrentSelection());
   }
 
   // send preferences changed event
   this->OnPreferencesChanged(this->GetPreferences().Cast<berry::IBerryPreferences>().GetPointer());
 }
 
 QmitkAbstractView::~QmitkAbstractView()
 {
   this->Register();
 
   this->GetDataStorage()->AddNodeEvent.RemoveListener( mitk::MessageDelegate1<QmitkAbstractViewPrivate, const mitk::DataNode*>
                                                        ( d.data(), &QmitkAbstractViewPrivate::NodeAddedProxy ) );
   this->GetDataStorage()->RemoveNodeEvent.RemoveListener( mitk::MessageDelegate1<QmitkAbstractViewPrivate, const mitk::DataNode*>
                                                           ( d.data(), &QmitkAbstractViewPrivate::NodeRemovedProxy) );
   this->GetDataStorage()->ChangedNodeEvent.RemoveListener( mitk::MessageDelegate1<QmitkAbstractViewPrivate, const mitk::DataNode*>
                                                            ( d.data(), &QmitkAbstractViewPrivate::NodeChangedProxy ) );
 
   berry::IBerryPreferences::Pointer prefs = this->GetPreferences().Cast<berry::IBerryPreferences>();
   if(prefs.IsNotNull())
   {
     prefs->OnChanged.RemoveListener(
           berry::MessageDelegate1<QmitkAbstractView, const berry::IBerryPreferences*>(this,
                                                                               &QmitkAbstractView::OnPreferencesChanged));
     // flush the preferences here (disabled, everyone should flush them by themselves at the right moment)
     // prefs->Flush();
   }
 
   // REMOVE SELECTION PROVIDER
   this->GetSite()->SetSelectionProvider(berry::ISelectionProvider::Pointer(NULL));
 
   berry::ISelectionService* s = GetSite()->GetWorkbenchWindow()->GetSelectionService();
   if(s)
   {
-    s->RemovePostSelectionListener(d->m_BlueBerrySelectionListener);
+    s->RemovePostSelectionListener(d->m_BlueBerrySelectionListener.data());
   }
 
   this->UnRegister(false);
 }
 
 void QmitkAbstractView::SetSelectionProvider()
 {
   // REGISTER A SELECTION PROVIDER
   d->m_SelectionProvider = QmitkDataNodeSelectionProvider::Pointer(new QmitkDataNodeSelectionProvider);
   d->m_SelectionProvider->SetItemSelectionModel(GetDataNodeSelectionModel());
   this->GetSite()->SetSelectionProvider(berry::ISelectionProvider::Pointer(d->m_SelectionProvider));
 }
 
 QItemSelectionModel *QmitkAbstractView::GetDataNodeSelectionModel() const
 {
   return 0;
 }
 
 void QmitkAbstractView::OnPreferencesChanged( const berry::IBerryPreferences* )
 {
 }
 
 void QmitkAbstractView::DataStorageModified()
 {
 }
 
 void QmitkAbstractView::DataStorageChanged(mitk::IDataStorageReference::Pointer /*dsRef*/)
 {
 }
 
 mitk::IRenderWindowPart* QmitkAbstractView::GetRenderWindowPart( IRenderWindowPartStrategies strategies ) const
 {
   berry::IWorkbenchPage::Pointer page = this->GetSite()->GetPage();
 
   // Return the active editor if it implements mitk::IRenderWindowPart
   mitk::IRenderWindowPart* renderPart =
       dynamic_cast<mitk::IRenderWindowPart*>(page->GetActiveEditor().GetPointer());
   if (renderPart) return renderPart;
 
   // No suitable active editor found, check visible editors
   QList<berry::IEditorReference::Pointer> editors = page->GetEditorReferences();
   for (QList<berry::IEditorReference::Pointer>::iterator i = editors.begin();
        i != editors.end(); ++i)
   {
     berry::IWorkbenchPart::Pointer part = (*i)->GetPart(false);
     if (page->IsPartVisible(part))
     {
       renderPart = dynamic_cast<mitk::IRenderWindowPart*>(part.GetPointer());
       if (renderPart) return renderPart;
     }
   }
 
   // No suitable visible editor found, check visible views
   QList<berry::IViewReference::Pointer> views = page->GetViewReferences();
   for(QList<berry::IViewReference::Pointer>::iterator i = views.begin();
       i != views.end(); ++i)
   {
     berry::IWorkbenchPart::Pointer part = (*i)->GetPart(false);
     if (page->IsPartVisible(part))
     {
       renderPart = dynamic_cast<mitk::IRenderWindowPart*>(part.GetPointer());
       if (renderPart) return renderPart;
     }
   }
 
   // No strategies given
   if (strategies == NONE) return 0;
 
   mitk::DataStorageEditorInput::Pointer input(new mitk::DataStorageEditorInput(GetDataStorageReference()));
 
   bool activate = false;
   if(strategies & ACTIVATE)
   {
     activate = true;
   }
 
   berry::IEditorPart::Pointer editorPart;
 
   if(strategies & OPEN)
   {
     // This will create a default editor for the given input. If an editor
     // with that input is already open, the editor is brought to the front.
     try
     {
       editorPart = mitk::WorkbenchUtil::OpenEditor(page, input, activate);
     }
     catch (const berry::PartInitException&)
     {
       // There is no editor registered which can handle the given input.
     }
   }
   else if (activate || (strategies & BRING_TO_FRONT))
   {
     // check if a suitable editor is already opened
     editorPart = page->FindEditor(input);
     if (editorPart)
     {
       if (activate)
       {
         page->Activate(editorPart);
       }
       else
       {
         page->BringToTop(editorPart);
       }
     }
   }
 
   return dynamic_cast<mitk::IRenderWindowPart*>(editorPart.GetPointer());
 }
 
 void QmitkAbstractView::RequestRenderWindowUpdate(mitk::RenderingManager::RequestType requestType)
 {
   mitk::IRenderWindowPart* renderPart = this->GetRenderWindowPart();
   if (renderPart == 0) return;
 
   if (mitk::IRenderingManager* renderingManager = renderPart->GetRenderingManager())
   {
     renderingManager->RequestUpdateAll(requestType);
   }
   else
   {
     renderPart->RequestUpdate(requestType);
   }
 }
 
 void QmitkAbstractView::HandleException( const char* str, QWidget* parent, bool showDialog ) const
 {
   //itkGenericOutputMacro( << "Exception caught: " << str );
   MITK_ERROR << str;
   if ( showDialog )
   {
     QMessageBox::critical ( parent, "Exception caught!", str );
   }
 }
 
 void QmitkAbstractView::HandleException( std::exception& e, QWidget* parent, bool showDialog ) const
 {
   HandleException( e.what(), parent, showDialog );
 }
 
 void QmitkAbstractView::WaitCursorOn()
 {
   QApplication::setOverrideCursor( QCursor(Qt::WaitCursor) );
 }
 
 void QmitkAbstractView::BusyCursorOn()
 {
   QApplication::setOverrideCursor( QCursor(Qt::BusyCursor) );
 }
 
 void QmitkAbstractView::WaitCursorOff()
 {
   this->RestoreOverrideCursor();
 }
 
 void QmitkAbstractView::BusyCursorOff()
 {
   this->RestoreOverrideCursor();
 }
 
 void QmitkAbstractView::RestoreOverrideCursor()
 {
   QApplication::restoreOverrideCursor();
 }
 
 berry::IPreferences::Pointer QmitkAbstractView::GetPreferences() const
 {
   berry::IPreferencesService* prefService = d->m_PrefServiceTracker.getService();
   // const_cast workaround for bad programming: const uncorrectness this->GetViewSite() should be const
   QString id = "/" + (const_cast<QmitkAbstractView*>(this))->GetViewSite()->GetId();
   return prefService ? prefService->GetSystemPreferences()->Node(id): berry::IPreferences::Pointer(0);
 }
 
 mitk::DataStorage::Pointer
 QmitkAbstractView::GetDataStorage() const
 {
   mitk::IDataStorageService* dsService = d->m_DataStorageServiceTracker.getService();
 
   if (dsService != 0)
   {
     return dsService->GetDataStorage()->GetDataStorage();
   }
 
   return 0;
 }
 
 mitk::IDataStorageReference::Pointer QmitkAbstractView::GetDataStorageReference() const
 {
   mitk::IDataStorageService* dsService = d->m_DataStorageServiceTracker.getService();
 
   if (dsService != 0)
   {
     return dsService->GetDataStorage();
   }
 
   return mitk::IDataStorageReference::Pointer(0);
 }
 
 QList<mitk::DataNode::Pointer> QmitkAbstractView::GetCurrentSelection() const
 {
   berry::ISelection::ConstPointer selection( this->GetSite()->GetWorkbenchWindow()->GetSelectionService()->GetSelection());
   mitk::DataNodeSelection::ConstPointer currentSelection = selection.Cast<const mitk::DataNodeSelection>();
   return d->DataNodeSelectionToQList(currentSelection);
 }
 
 bool QmitkAbstractView::IsCurrentSelectionValid() const
 {
   return this->GetSite()->GetWorkbenchWindow()->GetSelectionService()->GetSelection();
 }
 
 QList<mitk::DataNode::Pointer> QmitkAbstractView::GetDataManagerSelection() const
 {
   berry::ISelection::ConstPointer selection( this->GetSite()->GetWorkbenchWindow()->GetSelectionService()->GetSelection("org.mitk.views.datamanager"));
   mitk::DataNodeSelection::ConstPointer currentSelection = selection.Cast<const mitk::DataNodeSelection>();
   return d->DataNodeSelectionToQList(currentSelection);
 }
 
 bool QmitkAbstractView::IsDataManagerSelectionValid() const
 {
   return this->GetSite()->GetWorkbenchWindow()->GetSelectionService()->GetSelection("org.mitk.views.datamanager");
 }
 
 void QmitkAbstractView::SetDataManagerSelection(const berry::ISelection::ConstPointer &selection,
                                                 QItemSelectionModel::SelectionFlags flags) const
 {
   berry::IViewPart::Pointer datamanagerView = this->GetSite()->GetWorkbenchWindow()->GetActivePage()->FindView("org.mitk.views.datamanager");
   if (datamanagerView.IsNull()) return;
 
   datamanagerView->GetSite()->GetSelectionProvider().Cast<berry::QtSelectionProvider>()->SetSelection(selection, flags);
 }
 
 void QmitkAbstractView::SynchronizeDataManagerSelection() const
 {
   berry::ISelection::ConstPointer currentSelection = this->GetSite()->GetSelectionProvider()->GetSelection();
   if (currentSelection.IsNull()) return;
 
   SetDataManagerSelection(currentSelection);
 }
 
 void QmitkAbstractView::OnSelectionChanged(berry::IWorkbenchPart::Pointer /*part*/,
                                            const QList<mitk::DataNode::Pointer>& /*nodes*/)
 {
 }
 
 void QmitkAbstractView::OnNullSelection(berry::IWorkbenchPart::Pointer /*part*/)
 {
 }
 
 QList<mitk::DataNode::Pointer> QmitkAbstractViewPrivate::DataNodeSelectionToQList(mitk::DataNodeSelection::ConstPointer currentSelection) const
 {
   if (currentSelection.IsNull()) return QList<mitk::DataNode::Pointer>();
   return QList<mitk::DataNode::Pointer>::fromStdList(currentSelection->GetSelectedDataNodes());
 }
 
 void QmitkAbstractView::NodeAdded( const mitk::DataNode*  /*node*/ )
 {
 }
 
 void QmitkAbstractView::NodeRemoved( const mitk::DataNode*  /*node*/ )
 {
 }
 
 void QmitkAbstractView::NodeChanged( const mitk::DataNode* /*node*/ )
 {
 }
 
 void QmitkAbstractView::FireNodeSelected( mitk::DataNode::Pointer node )
 {
   QList<mitk::DataNode::Pointer> nodes;
   nodes << node;
   this->FireNodesSelected(nodes);
 }
 
 void QmitkAbstractView::FireNodesSelected( const QList<mitk::DataNode::Pointer>& nodes )
 {
   // if this is the first call to FireNodesSelected and the selection provider has no QItemSelectiomMode
   // yet, set our helper model
   if (d->m_SelectionProvider->GetItemSelectionModel() == 0)
   {
     d->m_SelectionProvider->SetItemSelectionModel(d->m_DataNodeSelectionModel);
   }
   else if (d->m_SelectionProvider->GetItemSelectionModel() != d->m_DataNodeSelectionModel)
   {
     MITK_WARN << "A custom data node selection model has been set. Ignoring call to FireNodesSelected().";
     return;
   }
 
   if (nodes.empty())
   {
     d->m_DataNodeSelectionModel->clearSelection();
     d->m_DataNodeItemModel->clear();
   }
   else
   {
 
     // The helper data node model is just used for sending selection events.
     // We add the to be selected nodes and set the selection range to everything.
 
     d->m_DataNodeItemModel->clear();
     foreach(mitk::DataNode::Pointer node, nodes)
     {
       d->m_DataNodeItemModel->AddDataNode(node);
     }
     d->m_DataNodeSelectionModel->select(QItemSelection(d->m_DataNodeItemModel->index(0,0), d->m_DataNodeItemModel->index(nodes.size()-1, 0)),
                                         QItemSelectionModel::ClearAndSelect);
   }
 }
diff --git a/Plugins/org.mitk.gui.qt.common/src/internal/QmitkCommonActivator.cpp b/Plugins/org.mitk.gui.qt.common/src/internal/QmitkCommonActivator.cpp
index 43cad98bcc..08fe7dbcb7 100644
--- a/Plugins/org.mitk.gui.qt.common/src/internal/QmitkCommonActivator.cpp
+++ b/Plugins/org.mitk.gui.qt.common/src/internal/QmitkCommonActivator.cpp
@@ -1,74 +1,74 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "QmitkCommonActivator.h"
 
 #include <berryPlatformUI.h>
 #include <mitkLogMacros.h>
 
 QmitkCommonActivator* QmitkCommonActivator::m_Instance = 0;
 ctkPluginContext* QmitkCommonActivator::m_Context = 0;
 
 ctkPluginContext* QmitkCommonActivator::GetContext()
 {
   return m_Context;
 }
 
 QmitkCommonActivator* QmitkCommonActivator::GetInstance()
 {
   return m_Instance;
 }
 
 berry::IPreferencesService::Pointer QmitkCommonActivator::GetPreferencesService()
 {
   return berry::IPreferencesService::Pointer(m_PrefServiceTracker->getService());
 }
 
 void
 QmitkCommonActivator::start(ctkPluginContext* context)
 {
   this->m_Instance = this;
   this->m_Context = context;
   this->m_PrefServiceTracker.reset(new ctkServiceTracker<berry::IPreferencesService*>(context));
 
   if(berry::PlatformUI::IsWorkbenchRunning())
   {
-    m_ViewCoordinator = QmitkViewCoordinator::Pointer(new QmitkViewCoordinator);
+    m_ViewCoordinator.reset(new QmitkViewCoordinator);
     m_ViewCoordinator->Start();
   }
   else
   {
     MITK_ERROR << "BlueBerry Workbench not running!";
   }
 }
 
 void
 QmitkCommonActivator::stop(ctkPluginContext* context)
 {
   Q_UNUSED(context)
 
   m_ViewCoordinator->Stop();
-  m_ViewCoordinator = 0;
+  m_ViewCoordinator.reset();
 
   this->m_PrefServiceTracker.reset();
 
   this->m_Context = 0;
   this->m_Instance = 0;
 }
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
   Q_EXPORT_PLUGIN2(org_mitk_gui_qt_common, QmitkCommonActivator)
 #endif
diff --git a/Plugins/org.mitk.gui.qt.common/src/internal/QmitkCommonActivator.h b/Plugins/org.mitk.gui.qt.common/src/internal/QmitkCommonActivator.h
index 2934c38384..94a96ccd9e 100644
--- a/Plugins/org.mitk.gui.qt.common/src/internal/QmitkCommonActivator.h
+++ b/Plugins/org.mitk.gui.qt.common/src/internal/QmitkCommonActivator.h
@@ -1,68 +1,68 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef QMITKCOMMONACTIVATOR_H_
 #define QMITKCOMMONACTIVATOR_H_
 
 #include <ctkPluginActivator.h>
 #include <ctkServiceTracker.h>
 
 #include <berryIPreferencesService.h>
 
 #include "QmitkViewCoordinator.h"
 
 /**
  * \ingroup org_mitk_gui_qt_common_internal
  *
  * \brief The plug-in activator for the StateMachine
  *
  * When the plug-in is started by the framework, it initializes StateMachine
  * specific things.
  */
 class QmitkCommonActivator : public QObject, public ctkPluginActivator
 {
   Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
   Q_PLUGIN_METADATA(IID "org_mitk_gui_qt_common")
 #endif
   Q_INTERFACES(ctkPluginActivator)
 
 public:
 
   static ctkPluginContext* GetContext();
   static QmitkCommonActivator* GetInstance();
 
   berry::IPreferencesService::Pointer GetPreferencesService();
 
   /**
    * Sets default StateMachine to EventMapper.
    */
   void start(ctkPluginContext* context);
   void stop(ctkPluginContext* context);
 
 private:
 
   static QmitkCommonActivator* m_Instance;
   static ctkPluginContext* m_Context;
 
-  QmitkViewCoordinator::Pointer m_ViewCoordinator;
+  QScopedPointer<QmitkViewCoordinator> m_ViewCoordinator;
   QScopedPointer<ctkServiceTracker<berry::IPreferencesService*> > m_PrefServiceTracker;
 
 };
 
 #endif /* QMITKCOMMONACTIVATOR_H_ */
 
diff --git a/Plugins/org.mitk.gui.qt.common/src/internal/QmitkViewCoordinator.cpp b/Plugins/org.mitk.gui.qt.common/src/internal/QmitkViewCoordinator.cpp
index 5cbe0c3eb5..ced4810bdf 100644
--- a/Plugins/org.mitk.gui.qt.common/src/internal/QmitkViewCoordinator.cpp
+++ b/Plugins/org.mitk.gui.qt.common/src/internal/QmitkViewCoordinator.cpp
@@ -1,205 +1,205 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "QmitkViewCoordinator.h"
 #include "QmitkAbstractView.h"
 
 #include <mitkIRenderWindowPart.h>
 #include <mitkIRenderWindowPartListener.h>
 #include <mitkIZombieViewPart.h>
 
 #include <berryPlatformUI.h>
 #include <berryIWorkbenchPage.h>
 
 QmitkViewCoordinator::QmitkViewCoordinator()
   : m_ActiveZombieView(0)
   , m_ActiveRenderWindowPart(0)
   , m_VisibleRenderWindowPart(0)
 {
 }
 
 QmitkViewCoordinator::~QmitkViewCoordinator()
 {
 }
 
 void QmitkViewCoordinator::Start()
 {
-  berry::PlatformUI::GetWorkbench()->AddWindowListener(berry::IWindowListener::Pointer(this));
+  berry::PlatformUI::GetWorkbench()->AddWindowListener(this);
   QList<berry::IWorkbenchWindow::Pointer> wnds(berry::PlatformUI::GetWorkbench()->GetWorkbenchWindows());
   for (QList<berry::IWorkbenchWindow::Pointer>::iterator i = wnds.begin();
        i != wnds.end(); ++i)
   {
-    (*i)->GetPartService()->AddPartListener(berry::IPartListener::Pointer(this));
+    (*i)->GetPartService()->AddPartListener(this);
   }
 }
 
 void QmitkViewCoordinator::Stop()
 {
   if (!berry::PlatformUI::IsWorkbenchRunning()) return;
 
-  berry::PlatformUI::GetWorkbench()->RemoveWindowListener(berry::IWindowListener::Pointer(this));
+  berry::PlatformUI::GetWorkbench()->RemoveWindowListener(this);
   QList<berry::IWorkbenchWindow::Pointer> wnds(berry::PlatformUI::GetWorkbench()->GetWorkbenchWindows());
   for (QList<berry::IWorkbenchWindow::Pointer>::iterator i = wnds.begin();
        i != wnds.end(); ++i)
   {
-    (*i)->GetPartService()->RemovePartListener(berry::IPartListener::Pointer(this));
+    (*i)->GetPartService()->RemovePartListener(this);
   }
 }
 
 berry::IPartListener::Events::Types QmitkViewCoordinator::GetPartEventTypes() const
 {
   return berry::IPartListener::Events::ACTIVATED | berry::IPartListener::Events::DEACTIVATED
     | berry::IPartListener::Events::CLOSED | berry::IPartListener::Events::HIDDEN
     | berry::IPartListener::Events::VISIBLE | berry::IPartListener::Events::OPENED;
 }
 
-void QmitkViewCoordinator::PartActivated( berry::IWorkbenchPartReference::Pointer partRef )
+void QmitkViewCoordinator::PartActivated(const berry::IWorkbenchPartReference::Pointer& partRef )
 {
   //MITK_INFO << "*** PartActivated (" << partRef->GetPart(false)->GetPartName() << ")";
   berry::IWorkbenchPart* part = partRef->GetPart(false).GetPointer();
 
   // Check for a render window part and inform IRenderWindowPartListener views
   // that it was activated
   if ( mitk::IRenderWindowPart* renderPart = dynamic_cast<mitk::IRenderWindowPart*>(part) )
   {
     if (m_VisibleRenderWindowPart != renderPart)
     {
       RenderWindowPartActivated(renderPart);
       m_ActiveRenderWindowPart = renderPart;
       m_VisibleRenderWindowPart = renderPart;
     }
   }
 
   // Check if the activated part wants to be notified
   if (mitk::ILifecycleAwarePart* lifecycleAwarePart = dynamic_cast<mitk::ILifecycleAwarePart*>(part))
   {
     lifecycleAwarePart->Activated();
   }
 
   // Check if a zombie view has been activated.
   if (mitk::IZombieViewPart* zombieView = dynamic_cast<mitk::IZombieViewPart*>(part))
   {
     if (m_ActiveZombieView && (m_ActiveZombieView != zombieView))
     {
       // Another zombie view has been activated. Tell the old one about it.
       m_ActiveZombieView->ActivatedZombieView(partRef);
       m_ActiveZombieView = zombieView;
     }
   }
 }
 
-void QmitkViewCoordinator::PartDeactivated( berry::IWorkbenchPartReference::Pointer partRef )
+void QmitkViewCoordinator::PartDeactivated(const berry::IWorkbenchPartReference::Pointer& partRef )
 {
   //MITK_INFO << "*** PartDeactivated (" << partRef->GetPart(false)->GetPartName() << ")";
   berry::IWorkbenchPart* part = partRef->GetPart(false).GetPointer();
 
   if (mitk::ILifecycleAwarePart* lifecycleAwarePart = dynamic_cast<mitk::ILifecycleAwarePart*>(part))
   {
     lifecycleAwarePart->Deactivated();
   }
 }
 
-void QmitkViewCoordinator::PartOpened( berry::IWorkbenchPartReference::Pointer partRef )
+void QmitkViewCoordinator::PartOpened(const berry::IWorkbenchPartReference::Pointer& partRef )
 {
   //MITK_INFO << "*** PartOpened (" << partRef->GetPart(false)->GetPartName() << ")";
   berry::IWorkbenchPart* part = partRef->GetPart(false).GetPointer();
 
   if (mitk::IRenderWindowPartListener* renderWindowListener = dynamic_cast<mitk::IRenderWindowPartListener*>(part))
   {
     m_RenderWindowListeners.insert(renderWindowListener);
   }
 }
 
-void QmitkViewCoordinator::PartClosed( berry::IWorkbenchPartReference::Pointer partRef )
+void QmitkViewCoordinator::PartClosed(const berry::IWorkbenchPartReference::Pointer& partRef )
 {
   //MITK_INFO << "*** PartClosed (" << partRef->GetPart(false)->GetPartName() << ")";
   berry::IWorkbenchPart* part = partRef->GetPart(false).GetPointer();
 
   if (mitk::IRenderWindowPartListener* renderWindowListener = dynamic_cast<mitk::IRenderWindowPartListener*>(part))
   {
     m_RenderWindowListeners.remove(renderWindowListener);
   }
 }
 
-void QmitkViewCoordinator::PartHidden( berry::IWorkbenchPartReference::Pointer partRef )
+void QmitkViewCoordinator::PartHidden(const berry::IWorkbenchPartReference::Pointer& partRef )
 {
   //MITK_INFO << "*** PartHidden (" << partRef->GetPart(false)->GetPartName() << ")";
   berry::IWorkbenchPart* part = partRef->GetPart(false).GetPointer();
 
   // Check for a render window part and if it is the currently active on.
   // Inform IRenderWindowPartListener views that it has been hidden.
   if ( mitk::IRenderWindowPart* renderPart = dynamic_cast<mitk::IRenderWindowPart*>(part) )
   {
     if (!m_ActiveRenderWindowPart && m_VisibleRenderWindowPart == renderPart)
     {
       RenderWindowPartDeactivated(renderPart);
       m_VisibleRenderWindowPart = 0;
     }
   }
 
   if (mitk::ILifecycleAwarePart* lifecycleAwarePart = dynamic_cast<mitk::ILifecycleAwarePart*>(part))
   {
     lifecycleAwarePart->Hidden();
   }
 }
 
-void QmitkViewCoordinator::PartVisible( berry::IWorkbenchPartReference::Pointer partRef )
+void QmitkViewCoordinator::PartVisible(const berry::IWorkbenchPartReference::Pointer& partRef )
 {
   //MITK_INFO << "*** PartVisible (" << partRef->GetPart(false)->GetPartName() << ")";
   berry::IWorkbenchPart* part = partRef->GetPart(false).GetPointer();
 
   // Check for a render window part and inform IRenderWindowPartListener views
   // that it was activated
   if ( mitk::IRenderWindowPart* renderPart = dynamic_cast<mitk::IRenderWindowPart*>(part) )
   {
     if (!m_ActiveRenderWindowPart)
     {
       RenderWindowPartActivated(renderPart);
       m_VisibleRenderWindowPart = renderPart;
     }
   }
 
   if (mitk::ILifecycleAwarePart* lifecycleAwarePart = dynamic_cast<mitk::ILifecycleAwarePart*>(part))
   {
     lifecycleAwarePart->Visible();
   }
 }
 
 void QmitkViewCoordinator::RenderWindowPartActivated(mitk::IRenderWindowPart* renderPart)
 {
   foreach (mitk::IRenderWindowPartListener* l, m_RenderWindowListeners)
   {
     l->RenderWindowPartActivated(renderPart);
   }
 }
 
 void QmitkViewCoordinator::RenderWindowPartDeactivated(mitk::IRenderWindowPart* renderPart)
 {
   foreach (mitk::IRenderWindowPartListener* l, m_RenderWindowListeners)
   {
     l->RenderWindowPartDeactivated(renderPart);
   }
 }
 
-void QmitkViewCoordinator::WindowClosed( berry::IWorkbenchWindow::Pointer /*window*/ )
+void QmitkViewCoordinator::WindowClosed(const berry::IWorkbenchWindow::Pointer& /*window*/ )
 {
 }
 
-void QmitkViewCoordinator::WindowOpened( berry::IWorkbenchWindow::Pointer window )
+void QmitkViewCoordinator::WindowOpened(const berry::IWorkbenchWindow::Pointer& window )
 {
-  window->GetPartService()->AddPartListener(berry::IPartListener::Pointer(this));
+  window->GetPartService()->AddPartListener(this);
 }
 
diff --git a/Plugins/org.mitk.gui.qt.common/src/internal/QmitkViewCoordinator.h b/Plugins/org.mitk.gui.qt.common/src/internal/QmitkViewCoordinator.h
index 8ed0eeb286..9baaf1d3de 100644
--- a/Plugins/org.mitk.gui.qt.common/src/internal/QmitkViewCoordinator.h
+++ b/Plugins/org.mitk.gui.qt.common/src/internal/QmitkViewCoordinator.h
@@ -1,124 +1,124 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef QmitkViewCoordinator_h
 #define QmitkViewCoordinator_h
 
 #include <berryIPartListener.h>
 #include <berryIWindowListener.h>
 #include <berryIWorkbenchWindow.h>
 
 #include <mitkILifecycleAwarePart.h>
 
 #include <QSet>
 
 namespace mitk {
 
 struct IRenderWindowPart;
 struct IRenderWindowPartListener;
 struct IZombieViewPart;
 
 }
 
 class QmitkAbstractView;
 
 /**
  * A class which coordinates active QmitkAbstractView s, e.g. calling activated and hidden on them.
  */
-class QmitkViewCoordinator : public berry::IPartListener, public berry::IWindowListener
+class QmitkViewCoordinator : private berry::IPartListener, private berry::IWindowListener
 {
 public:
 
   berryObjectMacro(QmitkViewCoordinator);
 
   /**
    * Add listener
    */
   QmitkViewCoordinator();
 
   /**
    * Remove listener
    */
   virtual ~QmitkViewCoordinator();
 
   void Start();
   void Stop();
 
 
   //#IPartListener methods (these methods internally call Activated() or other similar methods)
 
   /**
    * \see IPartListener::GetPartEventTypes()
    */
   berry::IPartListener::Events::Types GetPartEventTypes() const;
 
   /**
    * \see IPartListener::PartActivated()
    */
-  virtual void PartActivated (berry::IWorkbenchPartReference::Pointer partRef);
+  virtual void PartActivated (const berry::IWorkbenchPartReference::Pointer& partRef);
 
   /**
    * \see IPartListener::PartDeactivated()
    */
-  virtual void PartDeactivated(berry::IWorkbenchPartReference::Pointer /*partRef*/);
+  virtual void PartDeactivated(const berry::IWorkbenchPartReference::Pointer& /*partRef*/);
 
   /**
    * \see IPartListener::PartOpened()
    */
-  virtual void PartOpened(berry::IWorkbenchPartReference::Pointer partRef);
+  virtual void PartOpened(const berry::IWorkbenchPartReference::Pointer& partRef);
 
   /**
    * \see IPartListener::PartClosed()
    */
-  virtual void PartClosed (berry::IWorkbenchPartReference::Pointer partRef);
+  virtual void PartClosed (const berry::IWorkbenchPartReference::Pointer& partRef);
 
   /**
    * \see IPartListener::PartHidden()
    */
-  virtual void PartHidden (berry::IWorkbenchPartReference::Pointer partRef);
+  virtual void PartHidden(const berry::IWorkbenchPartReference::Pointer& partRef);
 
   /**
    * \see IPartListener::PartVisible()
    */
-  virtual void PartVisible (berry::IWorkbenchPartReference::Pointer partRef);
+  virtual void PartVisible(const berry::IWorkbenchPartReference::Pointer& partRef);
 
   /**
    * Notifies this listener that the given window has been closed.
    */
-  virtual void WindowClosed(berry::IWorkbenchWindow::Pointer window);
+  virtual void WindowClosed(const berry::IWorkbenchWindow::Pointer& window);
 
   /**
    * Notifies this listener that the given window has been opened.
    */
-  virtual void WindowOpened(berry::IWorkbenchWindow::Pointer /*window*/);
+  virtual void WindowOpened(const berry::IWorkbenchWindow::Pointer& /*window*/);
 
 private:
 
   void RenderWindowPartActivated(mitk::IRenderWindowPart* renderPart);
   void RenderWindowPartDeactivated(mitk::IRenderWindowPart* renderPart);
 
 private:
 
   mitk::IZombieViewPart* m_ActiveZombieView;
   mitk::IRenderWindowPart* m_ActiveRenderWindowPart;
   mitk::IRenderWindowPart* m_VisibleRenderWindowPart;
 
   QSet<mitk::IRenderWindowPartListener*> m_RenderWindowListeners;
 
 };
 
 #endif // QmitkViewCoordinator_h
diff --git a/Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.cpp b/Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.cpp
index 580becd6bb..fdb7175c07 100644
--- a/Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.cpp
+++ b/Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.cpp
@@ -1,1054 +1,1054 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "QmitkDataManagerView.h"
 
 #include <itkOtsuThresholdImageFilter.h>
 
 //# Own Includes
 //## mitk
 #include "mitkDataStorageEditorInput.h"
 #include "mitkIDataStorageReference.h"
 #include "mitkNodePredicateDataType.h"
 #include "mitkCoreObjectFactory.h"
 #include "mitkColorProperty.h"
 #include "mitkCommon.h"
 #include "mitkNodePredicateData.h"
 #include "mitkNodePredicateNot.h"
 #include "mitkNodePredicateOr.h"
 #include "mitkNodePredicateProperty.h"
 #include "mitkEnumerationProperty.h"
 #include "mitkLookupTableProperty.h"
 #include "mitkProperties.h"
 #include <mitkNodePredicateAnd.h>
 #include <mitkITKImageImport.h>
 #include <mitkIDataStorageService.h>
 #include <mitkIRenderingManager.h>
 #include <mitkImageCast.h>
 //## Qmitk
 #include <QmitkDnDFrameWidget.h>
 #include <QmitkIOUtil.h>
 #include <QmitkDataStorageTreeModel.h>
 #include <QmitkCustomVariants.h>
 #include <QmitkFileSaveAction.h>
 #include <QmitkDataStorageFilterProxyModel.h>
 #include <QmitkNumberPropertySlider.h>
 #include "src/internal/QmitkNodeTableViewKeyFilter.h"
 #include "src/internal/QmitkInfoDialog.h"
 #include "src/internal/QmitkDataManagerItemDelegate.h"
 //## Berry
 #include <berryIEditorPart.h>
 #include <berryIWorkbenchPage.h>
 #include <berryIPreferencesService.h>
 #include <berryPlatform.h>
 #include <berryPlatformUI.h>
 #include <berryIEditorRegistry.h>
 
 //# Toolkit Includes
 #include <QTableView>
 #include <QGroupBox>
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QLabel>
 #include <QListView>
 #include <QMenu>
 #include <QAction>
 #include <QComboBox>
 #include <QApplication>
 #include <QCursor>
 #include <QHeaderView>
 #include <QTreeView>
 #include <QWidgetAction>
 #include <QSplitter>
 #include <QPushButton>
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QToolBar>
 #include <QKeyEvent>
 #include <QColor>
 #include <QColorDialog>
 #include <QSizePolicy>
 #include <QSortFilterProxyModel>
 #include <QSignalMapper>
 
 #include "mitkDataNodeObject.h"
 #include "mitkIContextMenuAction.h"
 #include "berryIExtensionRegistry.h"
 #include "mitkRenderingModeProperty.h"
 
 const QString QmitkDataManagerView::VIEW_ID = "org.mitk.views.datamanager";
 
 QmitkDataManagerView::QmitkDataManagerView()
     : m_GlobalReinitOnNodeDelete(true),
       m_ItemDelegate(NULL)
 {
 }
 
 QmitkDataManagerView::~QmitkDataManagerView()
 {
   //Remove all registered actions from each descriptor
   for (std::vector< std::pair< QmitkNodeDescriptor*, QAction* > >::iterator it = m_DescriptorActionList.begin();it != m_DescriptorActionList.end(); it++)
   {
     // first== the NodeDescriptor; second== the registered QAction
     (it->first)->RemoveAction(it->second);
   }
 }
 
 void QmitkDataManagerView::CreateQtPartControl(QWidget* parent)
 {
   m_CurrentRowCount = 0;
   m_Parent = parent;
   //# Preferences
   berry::IPreferencesService* prefService = berry::Platform::GetPreferencesService();
 
   berry::IBerryPreferences::Pointer prefs
       = (prefService->GetSystemPreferences()->Node(VIEW_ID))
         .Cast<berry::IBerryPreferences>();
   assert( prefs );
   prefs->OnChanged.AddListener( berry::MessageDelegate1<QmitkDataManagerView
     , const berry::IBerryPreferences*>( this
       , &QmitkDataManagerView::OnPreferencesChanged ) );
 
   //# GUI
   m_NodeTreeModel = new QmitkDataStorageTreeModel(this->GetDataStorage());
   m_NodeTreeModel->setParent( parent );
   m_NodeTreeModel->SetPlaceNewNodesOnTop(
       prefs->GetBool("Place new nodes on top", true) );
   m_SurfaceDecimation = prefs->GetBool("Use surface decimation", false);
   // Prepare filters
   m_HelperObjectFilterPredicate = mitk::NodePredicateOr::New(
    mitk::NodePredicateProperty::New("helper object", mitk::BoolProperty::New(true)),
    mitk::NodePredicateProperty::New("hidden object", mitk::BoolProperty::New(true)));
   m_NodeWithNoDataFilterPredicate = mitk::NodePredicateData::New(0);
 
   m_FilterModel = new QmitkDataStorageFilterProxyModel();
   m_FilterModel->setSourceModel(m_NodeTreeModel);
   m_FilterModel->AddFilterPredicate(m_HelperObjectFilterPredicate);
   m_FilterModel->AddFilterPredicate(m_NodeWithNoDataFilterPredicate);
 
   //# Tree View (experimental)
   m_NodeTreeView = new QTreeView;
   m_NodeTreeView->setHeaderHidden(true);
   m_NodeTreeView->setSelectionMode( QAbstractItemView::ExtendedSelection );
   m_NodeTreeView->setSelectionBehavior( QAbstractItemView::SelectRows );
   m_NodeTreeView->setAlternatingRowColors(true);
   m_NodeTreeView->setDragEnabled(true);
   m_NodeTreeView->setDropIndicatorShown(true);
   m_NodeTreeView->setAcceptDrops(true);
   m_NodeTreeView->setContextMenuPolicy(Qt::CustomContextMenu);
   m_NodeTreeView->setModel(m_FilterModel);
   m_NodeTreeView->setTextElideMode(Qt::ElideMiddle);
   m_NodeTreeView->installEventFilter(new QmitkNodeTableViewKeyFilter(this));
 
   m_ItemDelegate = new QmitkDataManagerItemDelegate(m_NodeTreeView);
   m_NodeTreeView->setItemDelegate(m_ItemDelegate);
 
   QObject::connect( m_NodeTreeView, SIGNAL(customContextMenuRequested(const QPoint&))
     , this, SLOT(NodeTableViewContextMenuRequested(const QPoint&)) );
   QObject::connect( m_NodeTreeModel, SIGNAL(rowsInserted (const QModelIndex&, int, int))
     , this, SLOT(NodeTreeViewRowsInserted ( const QModelIndex&, int, int )) );
   QObject::connect( m_NodeTreeModel, SIGNAL(rowsRemoved (const QModelIndex&, int, int))
     , this, SLOT(NodeTreeViewRowsRemoved( const QModelIndex&, int, int )) );
   QObject::connect( m_NodeTreeView->selectionModel()
     , SIGNAL( selectionChanged ( const QItemSelection &, const QItemSelection & ) )
     , this
     , SLOT( NodeSelectionChanged ( const QItemSelection &, const QItemSelection & ) ) );
 
   //# m_NodeMenu
   m_NodeMenu = new QMenu(m_NodeTreeView);
 
   // # Actions
   berry::IEditorRegistry* editorRegistry = berry::PlatformUI::GetWorkbench()->GetEditorRegistry();
   QList<berry::IEditorDescriptor::Pointer> editors = editorRegistry->GetEditors("*.mitk");
   if (editors.size() > 1)
   {
     m_ShowInMapper = new QSignalMapper(this);
     foreach(berry::IEditorDescriptor::Pointer descriptor, editors)
     {
       QAction* action = new QAction(descriptor->GetLabel(), this);
       m_ShowInActions << action;
       m_ShowInMapper->connect(action, SIGNAL(triggered()), m_ShowInMapper, SLOT(map()));
       m_ShowInMapper->setMapping(action, descriptor->GetId());
     }
     connect(m_ShowInMapper, SIGNAL(mapped(QString)), this, SLOT(ShowIn(QString)));
   }
 
   QmitkNodeDescriptor* unknownDataNodeDescriptor =
     QmitkNodeDescriptorManager::GetInstance()->GetUnknownDataNodeDescriptor();
 
   QmitkNodeDescriptor* imageDataNodeDescriptor =
     QmitkNodeDescriptorManager::GetInstance()->GetDescriptor("Image");
 
   QmitkNodeDescriptor* diffusionImageDataNodeDescriptor =
     QmitkNodeDescriptorManager::GetInstance()->GetDescriptor("DiffusionImage");
 
   QmitkNodeDescriptor* surfaceDataNodeDescriptor =
     QmitkNodeDescriptorManager::GetInstance()->GetDescriptor("Surface");
 
   QAction* globalReinitAction = new QAction(QIcon(":/org.mitk.gui.qt.datamanager/Refresh_48.png"), "Global Reinit", this);
   QObject::connect( globalReinitAction, SIGNAL( triggered(bool) )
     , this, SLOT( GlobalReinit(bool) ) );
   unknownDataNodeDescriptor->AddAction(globalReinitAction);
   m_DescriptorActionList.push_back(std::pair<QmitkNodeDescriptor*, QAction*>(unknownDataNodeDescriptor, globalReinitAction));
 
   QAction* saveAction = new QmitkFileSaveAction(QIcon(":/org.mitk.gui.qt.datamanager/Save_48.png"),
                                                 this->GetSite()->GetWorkbenchWindow());
   unknownDataNodeDescriptor->AddAction(saveAction);
   m_DescriptorActionList.push_back(std::pair<QmitkNodeDescriptor*, QAction*>(unknownDataNodeDescriptor,saveAction));
 
   QAction* removeAction = new QAction(QIcon(":/org.mitk.gui.qt.datamanager/Remove_48.png"), "Remove", this);
   QObject::connect( removeAction, SIGNAL( triggered(bool) )
     , this, SLOT( RemoveSelectedNodes(bool) ) );
   unknownDataNodeDescriptor->AddAction(removeAction);
   m_DescriptorActionList.push_back(std::pair<QmitkNodeDescriptor*, QAction*>(unknownDataNodeDescriptor,removeAction));
 
   QAction* reinitAction = new QAction(QIcon(":/org.mitk.gui.qt.datamanager/Refresh_48.png"), "Reinit", this);
   QObject::connect( reinitAction, SIGNAL( triggered(bool) )
     , this, SLOT( ReinitSelectedNodes(bool) ) );
   unknownDataNodeDescriptor->AddAction(reinitAction);
   m_DescriptorActionList.push_back(std::pair<QmitkNodeDescriptor*, QAction*>(unknownDataNodeDescriptor,reinitAction));
 
   // find contextMenuAction extension points and add them to the node descriptor
   berry::IExtensionRegistry* extensionPointService = berry::Platform::GetExtensionRegistry();
   QList<berry::IConfigurationElement::Pointer> cmActions(
     extensionPointService->GetConfigurationElementsFor("org.mitk.gui.qt.datamanager.contextMenuActions") );
   QList<berry::IConfigurationElement::Pointer>::iterator cmActionsIt;
 
   QmitkNodeDescriptor* tmpDescriptor;
   QAction* contextMenuAction;
   QVariant cmActionDataIt;
   m_ConfElements.clear();
 
   int i=1;
   for (cmActionsIt = cmActions.begin()
     ; cmActionsIt != cmActions.end()
     ; ++cmActionsIt)
   {
     QString cmNodeDescriptorName = (*cmActionsIt)->GetAttribute("nodeDescriptorName");
     QString cmLabel = (*cmActionsIt)->GetAttribute("label");
     QString cmClass = (*cmActionsIt)->GetAttribute("class");
     if(!cmNodeDescriptorName.isEmpty() &&
        !cmLabel.isEmpty() &&
        !cmClass.isEmpty())
     {
       QString cmIcon = (*cmActionsIt)->GetAttribute("icon");
       // create context menu entry here
       tmpDescriptor = QmitkNodeDescriptorManager::GetInstance()->GetDescriptor(cmNodeDescriptorName);
       if(!tmpDescriptor)
       {
         MITK_WARN << "cannot add action \"" << cmLabel << "\" because descriptor " << cmNodeDescriptorName << " does not exist";
         continue;
       }
       // check if the user specified an icon attribute
       if ( !cmIcon.isEmpty() )
       {
         contextMenuAction = new QAction( QIcon(cmIco), cmLabel, parent);
       }
       else
       {
         contextMenuAction = new QAction( cmLabel, parent);
       }
       tmpDescriptor->AddAction(contextMenuAction);
       m_DescriptorActionList.push_back(std::pair<QmitkNodeDescriptor*, QAction*>(tmpDescriptor,contextMenuAction));
       m_ConfElements[contextMenuAction] = *cmActionsIt;
 
       cmActionDataIt.setValue<int>(i);
       contextMenuAction->setData( cmActionDataIt );
       connect( contextMenuAction, SIGNAL( triggered(bool) ) , this, SLOT( ContextMenuActionTriggered(bool) ) );
       ++i;
     }
   }
 
   m_OpacitySlider = new QSlider;
   m_OpacitySlider->setMinimum(0);
   m_OpacitySlider->setMaximum(100);
   m_OpacitySlider->setOrientation(Qt::Horizontal);
   QObject::connect( m_OpacitySlider, SIGNAL( valueChanged(int) )
     , this, SLOT( OpacityChanged(int) ) );
 
   QLabel* _OpacityLabel = new QLabel("Opacity: ");
   QHBoxLayout* _OpacityWidgetLayout = new QHBoxLayout;
   _OpacityWidgetLayout->setContentsMargins(4,4,4,4);
   _OpacityWidgetLayout->addWidget(_OpacityLabel);
   _OpacityWidgetLayout->addWidget(m_OpacitySlider);
   QWidget* _OpacityWidget = new QWidget;
   _OpacityWidget->setLayout(_OpacityWidgetLayout);
 
   QWidgetAction* opacityAction = new QWidgetAction(this);
   opacityAction ->setDefaultWidget(_OpacityWidget);
   QObject::connect( opacityAction , SIGNAL( changed() )
     , this, SLOT( OpacityActionChanged() ) );
   unknownDataNodeDescriptor->AddAction(opacityAction , false);
   m_DescriptorActionList.push_back(std::pair<QmitkNodeDescriptor*, QAction*>(unknownDataNodeDescriptor,opacityAction));
 
   m_ColorButton = new QPushButton;
   m_ColorButton->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Minimum);
   //m_ColorButton->setText("Change color");
   QObject::connect( m_ColorButton, SIGNAL( clicked() )
     , this, SLOT( ColorChanged() ) );
 
   QLabel* _ColorLabel = new QLabel("Color: ");
   _ColorLabel->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum);
   QHBoxLayout* _ColorWidgetLayout = new QHBoxLayout;
   _ColorWidgetLayout->setContentsMargins(4,4,4,4);
   _ColorWidgetLayout->addWidget(_ColorLabel);
   _ColorWidgetLayout->addWidget(m_ColorButton);
   QWidget* _ColorWidget = new QWidget;
   _ColorWidget->setLayout(_ColorWidgetLayout);
 
   QWidgetAction* colorAction = new QWidgetAction(this);
   colorAction->setDefaultWidget(_ColorWidget);
   QObject::connect( colorAction, SIGNAL( changed() )
     , this, SLOT( ColorActionChanged() ) );
   unknownDataNodeDescriptor->AddAction(colorAction, false);
   m_DescriptorActionList.push_back(std::pair<QmitkNodeDescriptor*, QAction*>(unknownDataNodeDescriptor,colorAction));
 
   m_ComponentSlider = new QmitkNumberPropertySlider;
   m_ComponentSlider->setOrientation(Qt::Horizontal);
   //QObject::connect( m_OpacitySlider, SIGNAL( valueChanged(int) )
   //  , this, SLOT( OpacityChanged(int) ) );
 
   QLabel* _ComponentLabel = new QLabel("Component: ");
   QHBoxLayout* _ComponentWidgetLayout = new QHBoxLayout;
   _ComponentWidgetLayout->setContentsMargins(4,4,4,4);
   _ComponentWidgetLayout->addWidget(_ComponentLabel);
   _ComponentWidgetLayout->addWidget(m_ComponentSlider);
   QLabel* _ComponentValueLabel = new QLabel();
   _ComponentWidgetLayout->addWidget(_ComponentValueLabel);
   connect(m_ComponentSlider, SIGNAL(valueChanged(int)), _ComponentValueLabel, SLOT(setNum(int)));
   QWidget* _ComponentWidget = new QWidget;
   _ComponentWidget->setLayout(_ComponentWidgetLayout);
 
   QWidgetAction* componentAction = new QWidgetAction(this);
   componentAction->setDefaultWidget(_ComponentWidget);
   QObject::connect( componentAction , SIGNAL( changed() )
     , this, SLOT( ComponentActionChanged() ) );
   imageDataNodeDescriptor->AddAction(componentAction, false);
   m_DescriptorActionList.push_back(std::pair<QmitkNodeDescriptor*, QAction*>(imageDataNodeDescriptor,componentAction));
   if (diffusionImageDataNodeDescriptor!=NULL)
   {
       diffusionImageDataNodeDescriptor->AddAction(componentAction, false);
       m_DescriptorActionList.push_back(std::pair<QmitkNodeDescriptor*, QAction*>(diffusionImageDataNodeDescriptor,componentAction));
   }
 
   m_TextureInterpolation = new QAction("Texture Interpolation", this);
   m_TextureInterpolation->setCheckable ( true );
   QObject::connect( m_TextureInterpolation, SIGNAL( changed() )
     , this, SLOT( TextureInterpolationChanged() ) );
   QObject::connect( m_TextureInterpolation, SIGNAL( toggled(bool) )
     , this, SLOT( TextureInterpolationToggled(bool) ) );
   imageDataNodeDescriptor->AddAction(m_TextureInterpolation, false);
   m_DescriptorActionList.push_back(std::pair<QmitkNodeDescriptor*, QAction*>(imageDataNodeDescriptor,m_TextureInterpolation));
   if (diffusionImageDataNodeDescriptor!=NULL)
   {
       diffusionImageDataNodeDescriptor->AddAction(m_TextureInterpolation, false);
       m_DescriptorActionList.push_back(std::pair<QmitkNodeDescriptor*, QAction*>(diffusionImageDataNodeDescriptor,m_TextureInterpolation));
   }
 
   m_ColormapAction = new QAction("Colormap", this);
   m_ColormapAction->setMenu(new QMenu);
   QObject::connect( m_ColormapAction->menu(), SIGNAL( aboutToShow() )
     , this, SLOT( ColormapMenuAboutToShow() ) );
   imageDataNodeDescriptor->AddAction(m_ColormapAction, false);
   m_DescriptorActionList.push_back(std::pair<QmitkNodeDescriptor*, QAction*>(imageDataNodeDescriptor, m_ColormapAction));
   if (diffusionImageDataNodeDescriptor!=NULL)
   {
       diffusionImageDataNodeDescriptor->AddAction(m_ColormapAction, false);
       m_DescriptorActionList.push_back(std::pair<QmitkNodeDescriptor*, QAction*>(diffusionImageDataNodeDescriptor, m_ColormapAction));
   }
 
   m_SurfaceRepresentation = new QAction("Surface Representation", this);
   m_SurfaceRepresentation->setMenu(new QMenu(m_NodeTreeView));
   QObject::connect( m_SurfaceRepresentation->menu(), SIGNAL( aboutToShow() )
     , this, SLOT( SurfaceRepresentationMenuAboutToShow() ) );
   surfaceDataNodeDescriptor->AddAction(m_SurfaceRepresentation, false);
   m_DescriptorActionList.push_back(std::pair<QmitkNodeDescriptor*, QAction*>(surfaceDataNodeDescriptor, m_SurfaceRepresentation));
 
   QAction* showOnlySelectedNodes
     = new QAction(QIcon(":/org.mitk.gui.qt.datamanager/ShowSelectedNode_48.png")
     , "Show only selected nodes", this);
   QObject::connect( showOnlySelectedNodes, SIGNAL( triggered(bool) )
     , this, SLOT( ShowOnlySelectedNodes(bool) ) );
   unknownDataNodeDescriptor->AddAction(showOnlySelectedNodes);
   m_DescriptorActionList.push_back(std::pair<QmitkNodeDescriptor*, QAction*>(unknownDataNodeDescriptor, showOnlySelectedNodes));
 
   QAction* toggleSelectedVisibility
     = new QAction(QIcon(":/org.mitk.gui.qt.datamanager/InvertShowSelectedNode_48.png")
     , "Toggle visibility", this);
   QObject::connect( toggleSelectedVisibility, SIGNAL( triggered(bool) )
     , this, SLOT( ToggleVisibilityOfSelectedNodes(bool) ) );
   unknownDataNodeDescriptor->AddAction(toggleSelectedVisibility);
   m_DescriptorActionList.push_back(std::pair<QmitkNodeDescriptor*, QAction*>(unknownDataNodeDescriptor,toggleSelectedVisibility));
 
   QAction* actionShowInfoDialog
     = new QAction(QIcon(":/org.mitk.gui.qt.datamanager/ShowDataInfo_48.png")
     , "Details...", this);
   QObject::connect( actionShowInfoDialog, SIGNAL( triggered(bool) )
     , this, SLOT( ShowInfoDialogForSelectedNodes(bool) ) );
   unknownDataNodeDescriptor->AddAction(actionShowInfoDialog);
   m_DescriptorActionList.push_back(std::pair<QmitkNodeDescriptor*, QAction*>(unknownDataNodeDescriptor,actionShowInfoDialog));
 
   //obsolete...
   //QAction* otsuFilterAction = new QAction("Apply Otsu Filter", this);
   //QObject::connect( otsuFilterAction, SIGNAL( triggered(bool) )
   //  , this, SLOT( OtsuFilter(bool) ) );
   // //Otsu filter does not work properly, remove it temporarily
   // imageDataNodeDescriptor->AddAction(otsuFilterAction);
   // m_DescriptorActionList.push_back(std::pair<QmitkNodeDescriptor*, QAction*>(imageDataNodeDescriptor,otsuFilterAction));
 
   QGridLayout* _DndFrameWidgetLayout = new QGridLayout;
   _DndFrameWidgetLayout->addWidget(m_NodeTreeView, 0, 0);
   _DndFrameWidgetLayout->setContentsMargins(0,0,0,0);
 
   m_DndFrameWidget = new QmitkDnDFrameWidget(m_Parent);
   m_DndFrameWidget->setLayout(_DndFrameWidgetLayout);
 
   QVBoxLayout* layout = new QVBoxLayout(parent);
   layout->addWidget(m_DndFrameWidget);
   layout->setContentsMargins(0,0,0,0);
 
   m_Parent->setLayout(layout);
 }
 
 void QmitkDataManagerView::SetFocus()
 {
 }
 
 void QmitkDataManagerView::ContextMenuActionTriggered( bool )
 {
   QAction* action = qobject_cast<QAction*> ( sender() );
 
   std::map<QAction*, berry::IConfigurationElement::Pointer>::iterator it
     = m_ConfElements.find( action );
   if( it == m_ConfElements.end() )
   {
     MITK_WARN << "associated conf element for action " << action->text().toStdString() << " not found";
     return;
   }
   berry::IConfigurationElement::Pointer confElem = it->second;
   mitk::IContextMenuAction* contextMenuAction = confElem->CreateExecutableExtension<mitk::IContextMenuAction>("class");
 
   QString className = confElem->GetAttribute("class");
   QString smoothed = confElem->GetAttribute("smoothed");
 
   if(className == "QmitkCreatePolygonModelAction")
   {
     contextMenuAction->SetDataStorage(this->GetDataStorage());
     if(smoothed == "false")
     {
       contextMenuAction->SetSmoothed(false);
     }
     else
     {
       contextMenuAction->SetSmoothed(true);
     }
     contextMenuAction->SetDecimated(m_SurfaceDecimation);
   }
   else if(className == "QmitkStatisticsAction")
   {
     contextMenuAction->SetFunctionality(this);
   }
   else if(className == "QmitkCreateSimulationAction")
   {
     contextMenuAction->SetDataStorage(this->GetDataStorage());
   }
   contextMenuAction->Run( this->GetCurrentSelection() ); // run the action
 }
 
 void QmitkDataManagerView::OnPreferencesChanged(const berry::IBerryPreferences* prefs)
 {
   if( m_NodeTreeModel->GetPlaceNewNodesOnTopFlag() !=  prefs->GetBool("Place new nodes on top", true) )
     m_NodeTreeModel->SetPlaceNewNodesOnTop( !m_NodeTreeModel->GetPlaceNewNodesOnTopFlag() );
 
   bool hideHelperObjects = !prefs->GetBool("Show helper objects", false);
   if (m_FilterModel->HasFilterPredicate(m_HelperObjectFilterPredicate) != hideHelperObjects)
   {
     if (hideHelperObjects)
     {
         m_FilterModel->AddFilterPredicate(m_HelperObjectFilterPredicate);
     }
     else
     {
         m_FilterModel->RemoveFilterPredicate(m_HelperObjectFilterPredicate);
     }
   }
   bool hideNodesWithNoData = !prefs->GetBool("Show nodes containing no data", false);
 
   if (m_FilterModel->HasFilterPredicate(m_NodeWithNoDataFilterPredicate) != hideNodesWithNoData)
   {
     if (hideNodesWithNoData)
     {
         m_FilterModel->AddFilterPredicate(m_NodeWithNoDataFilterPredicate);
     }
     else
     {
         m_FilterModel->RemoveFilterPredicate(m_NodeWithNoDataFilterPredicate);
     }
   }
 
   m_GlobalReinitOnNodeDelete = prefs->GetBool("Call global reinit if node is deleted", true);
 
   m_NodeTreeView->expandAll();
 
   m_SurfaceDecimation = prefs->GetBool("Use surface decimation", false);
 
   this->GlobalReinit();
 
 
 }
 
 void QmitkDataManagerView::NodeTableViewContextMenuRequested( const QPoint & pos )
 {
   QModelIndex selectedProxy = m_NodeTreeView->indexAt ( pos );
   QModelIndex selected = m_FilterModel->mapToSource(selectedProxy);
   mitk::DataNode::Pointer node = m_NodeTreeModel->GetNode(selected);
   QList<mitk::DataNode::Pointer> selectedNodes = this->GetCurrentSelection();
 
   if(!selectedNodes.isEmpty())
   {
     m_NodeMenu->clear();
     QList<QAction*> actions;
     if(selectedNodes.size() == 1 )
     {
       actions = QmitkNodeDescriptorManager::GetInstance()->GetActions(node);
 
       for(QList<QAction*>::iterator it = actions.begin(); it != actions.end(); ++it)
       {
         (*it)->setData(QVariant::fromValue(node.GetPointer()));
       }
     }
     else
       actions = QmitkNodeDescriptorManager::GetInstance()->GetActions(selectedNodes);
 
     if (!m_ShowInActions.isEmpty())
     {
       QMenu* showInMenu = m_NodeMenu->addMenu("Show In");
       showInMenu->addActions(m_ShowInActions);
     }
     m_NodeMenu->addActions(actions);
     m_NodeMenu->popup(QCursor::pos());
   }
 }
 
 void QmitkDataManagerView::OpacityChanged(int value)
 {
   mitk::DataNode* node = m_NodeTreeModel->GetNode(m_FilterModel->mapToSource(m_NodeTreeView->selectionModel()->currentIndex()));
   if(node)
   {
     float opacity = static_cast<float>(value)/100.0f;
     node->SetFloatProperty("opacity", opacity);
     mitk::RenderingManager::GetInstance()->RequestUpdateAll();
   }
 }
 
 void QmitkDataManagerView::OpacityActionChanged()
 {
   mitk::DataNode* node = m_NodeTreeModel->GetNode(m_FilterModel->mapToSource(m_NodeTreeView->selectionModel()->currentIndex()));
   if(node)
   {
     float opacity = 0.0;
     if(node->GetFloatProperty("opacity", opacity))
     {
       m_OpacitySlider->setValue(static_cast<int>(opacity*100));
     }
   }
 }
 
 void QmitkDataManagerView::ComponentActionChanged()
 {
   mitk::DataNode* node = m_NodeTreeModel->GetNode(m_FilterModel->mapToSource(m_NodeTreeView->selectionModel()->currentIndex()));
   mitk::IntProperty* componentProperty = NULL;
   int numComponents = 0;
   if(node)
   {
     componentProperty =
         dynamic_cast<mitk::IntProperty*>(node->GetProperty("Image.Displayed Component"));
     mitk::Image* img = dynamic_cast<mitk::Image*>(node->GetData());
     if (img != NULL)
     {
       numComponents = img->GetPixelType().GetNumberOfComponents();
     }
   }
   if (componentProperty && numComponents > 1)
   {
     m_ComponentSlider->SetProperty(componentProperty);
     m_ComponentSlider->setMinValue(0);
     m_ComponentSlider->setMaxValue(numComponents-1);
   }
   else
   {
     m_ComponentSlider->SetProperty(static_cast<mitk::IntProperty*>(NULL));
   }
 }
 
 void QmitkDataManagerView::ColorChanged()
  {
    mitk::DataNode* node = m_NodeTreeModel->GetNode(m_FilterModel->mapToSource(m_NodeTreeView->selectionModel()->currentIndex()));
    if(node)
    {
     mitk::Color color;
     mitk::ColorProperty::Pointer colorProp;
     node->GetProperty(colorProp,"color");
     if(colorProp.IsNull())
       return;
     color = colorProp->GetValue();
     QColor initial(color.GetRed()*255,color.GetGreen()*255,color.GetBlue()*255);
     QColor qcolor = QColorDialog::getColor(initial,0,QString("Change color"));
     if (!qcolor.isValid())
       return;
     m_ColorButton->setAutoFillBackground(true);
     node->SetProperty("color",mitk::ColorProperty::New(qcolor.red()/255.0,qcolor.green()/255.0,qcolor.blue()/255.0));
     if (node->GetProperty("binaryimage.selectedcolor"))
     {
       node->SetProperty("binaryimage.selectedcolor",mitk::ColorProperty::New(qcolor.red()/255.0,qcolor.green()/255.0,qcolor.blue()/255.0));
     }
     mitk::RenderingManager::GetInstance()->RequestUpdateAll();
    }
  }
 
 void QmitkDataManagerView::ColorActionChanged()
 {
   mitk::DataNode* node = m_NodeTreeModel->GetNode(m_FilterModel->mapToSource(m_NodeTreeView->selectionModel()->currentIndex()));
   if(node)
   {
     mitk::Color color;
     mitk::ColorProperty::Pointer colorProp;
     node->GetProperty(colorProp,"color");
     if(colorProp.IsNull())
       return;
     color = colorProp->GetValue();
 
     QString styleSheet = "background-color:rgb(";
     styleSheet.append(QString::number(color[0]*255));
     styleSheet.append(",");
     styleSheet.append(QString::number(color[1]*255));
     styleSheet.append(",");
     styleSheet.append(QString::number(color[2]*255));
     styleSheet.append(")");
     m_ColorButton->setStyleSheet(styleSheet);
   }
 }
 
 void QmitkDataManagerView::TextureInterpolationChanged()
 {
   mitk::DataNode* node = m_NodeTreeModel->GetNode(m_FilterModel->mapToSource(m_NodeTreeView->selectionModel()->currentIndex()));
   if(node)
   {
     bool textureInterpolation = false;
     node->GetBoolProperty("texture interpolation", textureInterpolation);
     m_TextureInterpolation->setChecked(textureInterpolation);
   }
 }
 
 void QmitkDataManagerView::TextureInterpolationToggled( bool checked )
 {
   mitk::DataNode* node = m_NodeTreeModel->GetNode(m_FilterModel->mapToSource(m_NodeTreeView->selectionModel()->currentIndex()));
   if(node)
   {
     node->SetBoolProperty("texture interpolation", checked);
     mitk::RenderingManager::GetInstance()->RequestUpdateAll();
   }
 
 }
 
 void QmitkDataManagerView::ColormapActionToggled( bool /*checked*/ )
 {
   mitk::DataNode* node = m_NodeTreeModel->GetNode(m_FilterModel->mapToSource(m_NodeTreeView->selectionModel()->currentIndex()));
   if(!node)
     return;
 
   mitk::LookupTableProperty::Pointer lookupTableProperty =
     dynamic_cast<mitk::LookupTableProperty*>(node->GetProperty("LookupTable"));
   if (!lookupTableProperty)
     return;
 
   QAction* senderAction = qobject_cast<QAction*>(QObject::sender());
   if(!senderAction)
     return;
 
   std::string activatedItem = senderAction->text().toStdString();
 
   mitk::LookupTable::Pointer lookupTable = lookupTableProperty->GetValue();
   if (!lookupTable)
     return;
 
   lookupTable->SetType(activatedItem);
   lookupTableProperty->SetValue(lookupTable);
   mitk::RenderingModeProperty::Pointer renderingMode =
     dynamic_cast<mitk::RenderingModeProperty*>(node->GetProperty("Image Rendering.Mode"));
   renderingMode->SetValue(mitk::RenderingModeProperty::LOOKUPTABLE_LEVELWINDOW_COLOR);
   mitk::RenderingManager::GetInstance()->RequestUpdateAll();
 }
 
 void QmitkDataManagerView::ColormapMenuAboutToShow()
 {
   mitk::DataNode* node = m_NodeTreeModel->GetNode(m_FilterModel->mapToSource(m_NodeTreeView->selectionModel()->currentIndex()));
   if(!node)
     return;
 
   mitk::LookupTableProperty::Pointer lookupTableProperty =
     dynamic_cast<mitk::LookupTableProperty*>(node->GetProperty("LookupTable"));
   if (!lookupTableProperty)
   {
     mitk::LookupTable::Pointer mitkLut = mitk::LookupTable::New();
     lookupTableProperty = mitk::LookupTableProperty::New();
     lookupTableProperty->SetLookupTable(mitkLut);
     node->SetProperty("LookupTable", lookupTableProperty);
   }
 
   mitk::LookupTable::Pointer lookupTable = lookupTableProperty->GetValue();
   if (!lookupTable)
     return;
 
   m_ColormapAction->menu()->clear();
   QAction* tmp;
 
   int i = 0;
   std::string lutType = lookupTable->typenameList[i];
 
   while (lutType != "END_OF_ARRAY")
   {
     tmp = m_ColormapAction->menu()->addAction(QString::fromStdString(lutType));
     tmp->setCheckable(true);
 
     if (lutType == lookupTable->GetActiveTypeAsString())
     {
       tmp->setChecked(true);
     }
 
     QObject::connect(tmp, SIGNAL(triggered(bool)), this, SLOT(ColormapActionToggled(bool)));
 
     lutType = lookupTable->typenameList[++i];
   }
 }
 
 void QmitkDataManagerView::SurfaceRepresentationMenuAboutToShow()
 {
   mitk::DataNode* node = m_NodeTreeModel->GetNode(m_FilterModel->mapToSource(m_NodeTreeView->selectionModel()->currentIndex()));
   if(!node)
     return;
 
   mitk::EnumerationProperty* representationProp =
       dynamic_cast<mitk::EnumerationProperty*> (node->GetProperty("material.representation"));
   if(!representationProp)
     return;
 
   // clear menu
   m_SurfaceRepresentation->menu()->clear();
   QAction* tmp;
 
   // create menu entries
   for(mitk::EnumerationProperty::EnumConstIterator it=representationProp->Begin(); it!=representationProp->End()
     ; it++)
   {
     tmp = m_SurfaceRepresentation->menu()->addAction(QString::fromStdString(it->second));
     tmp->setCheckable(true);
 
     if(it->second == representationProp->GetValueAsString())
     {
       tmp->setChecked(true);
     }
 
     QObject::connect( tmp, SIGNAL( triggered(bool) )
       , this, SLOT( SurfaceRepresentationActionToggled(bool) ) );
   }
 }
 
 void QmitkDataManagerView::SurfaceRepresentationActionToggled( bool /*checked*/ )
 {
   mitk::DataNode* node = m_NodeTreeModel->GetNode(m_FilterModel->mapToSource(m_NodeTreeView->selectionModel()->currentIndex()));
   if(!node)
     return;
 
   mitk::EnumerationProperty* representationProp =
       dynamic_cast<mitk::EnumerationProperty*> (node->GetProperty("material.representation"));
   if(!representationProp)
     return;
 
   QAction* senderAction = qobject_cast<QAction*> ( QObject::sender() );
 
   if(!senderAction)
     return;
 
   std::string activatedItem = senderAction->text().toStdString();
 
   if ( activatedItem != representationProp->GetValueAsString() )
   {
     if ( representationProp->IsValidEnumerationValue( activatedItem ) )
     {
       representationProp->SetValue( activatedItem );
       representationProp->InvokeEvent( itk::ModifiedEvent() );
       representationProp->Modified();
 
       mitk::RenderingManager::GetInstance()->RequestUpdateAll();
     }
   }
 
 }
 
 void QmitkDataManagerView::ReinitSelectedNodes( bool )
 {
   mitk::IRenderWindowPart* renderWindow = this->GetRenderWindowPart();
 
   if (renderWindow == NULL)
     renderWindow = this->OpenRenderWindowPart(false);
 
   QList<mitk::DataNode::Pointer> selectedNodes = this->GetCurrentSelection();
 
   foreach(mitk::DataNode::Pointer node, selectedNodes)
   {
     mitk::BaseData::Pointer basedata = node->GetData();
     if ( basedata.IsNotNull() &&
       basedata->GetTimeGeometry()->IsValid() )
     {
       renderWindow->GetRenderingManager()->InitializeViews(
           basedata->GetTimeGeometry(), mitk::RenderingManager::REQUEST_UPDATE_ALL, true );
       renderWindow->GetRenderingManager()->RequestUpdateAll();
     }
   }
 }
 
 void QmitkDataManagerView::RemoveSelectedNodes( bool )
 {
   QModelIndexList indexesOfSelectedRowsFiltered = m_NodeTreeView->selectionModel()->selectedRows();
   QModelIndexList indexesOfSelectedRows;
   for (int i = 0; i < indexesOfSelectedRowsFiltered.size(); ++i)
   {
     indexesOfSelectedRows.push_back(m_FilterModel->mapToSource(indexesOfSelectedRowsFiltered[i]));
   }
   if(indexesOfSelectedRows.size() < 1)
   {
     return;
   }
   std::vector<mitk::DataNode*> selectedNodes;
 
   mitk::DataNode* node = 0;
   QString question = tr("Do you really want to remove ");
 
   for (QModelIndexList::iterator it = indexesOfSelectedRows.begin()
     ; it != indexesOfSelectedRows.end(); it++)
   {
     node = m_NodeTreeModel->GetNode(*it);
     // if node is not defined or if the node contains geometry data do not remove it
     if ( node != 0 /*& strcmp(node->GetData()->GetNameOfClass(), "PlaneGeometryData") != 0*/ )
     {
       selectedNodes.push_back(node);
       question.append(QString::fromStdString(node->GetName()));
       question.append(", ");
     }
   }
   // remove the last two characters = ", "
   question = question.remove(question.size()-2, 2);
   question.append(" from data storage?");
 
   QMessageBox::StandardButton answerButton = QMessageBox::question( m_Parent
     , tr("DataManager")
     , question
     , QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
 
   if(answerButton == QMessageBox::Yes)
   {
     for (std::vector<mitk::DataNode*>::iterator it = selectedNodes.begin()
       ; it != selectedNodes.end(); it++)
     {
       node = *it;
       this->GetDataStorage()->Remove(node);
       if (m_GlobalReinitOnNodeDelete)
           this->GlobalReinit(false);
     }
   }
 }
 
 void QmitkDataManagerView::MakeAllNodesInvisible( bool )
 {
   QList<mitk::DataNode::Pointer> nodes = m_NodeTreeModel->GetNodeSet();
 
   foreach(mitk::DataNode::Pointer node, nodes)
   {
     node->SetVisibility(false);
   }
   mitk::RenderingManager::GetInstance()->RequestUpdateAll();
 }
 
 void QmitkDataManagerView::ShowOnlySelectedNodes( bool )
 {
   QList<mitk::DataNode::Pointer> selectedNodes = this->GetCurrentSelection();
   QList<mitk::DataNode::Pointer> allNodes = m_NodeTreeModel->GetNodeSet();
 
   foreach(mitk::DataNode::Pointer node, allNodes)
   {
     node->SetVisibility(selectedNodes.contains(node));
   }
   mitk::RenderingManager::GetInstance()->RequestUpdateAll();
 }
 
 void QmitkDataManagerView::ToggleVisibilityOfSelectedNodes( bool )
 {
   QList<mitk::DataNode::Pointer> selectedNodes = this->GetCurrentSelection();
 
   bool isVisible = false;
   foreach(mitk::DataNode::Pointer node, selectedNodes)
   {
     isVisible = false;
     node->GetBoolProperty("visible", isVisible);
     node->SetVisibility(!isVisible);
   }
   mitk::RenderingManager::GetInstance()->RequestUpdateAll();
 }
 
 void QmitkDataManagerView::ShowInfoDialogForSelectedNodes( bool )
 {
   QList<mitk::DataNode::Pointer> selectedNodes = this->GetCurrentSelection();
 
   QmitkInfoDialog _QmitkInfoDialog(selectedNodes, this->m_Parent);
   _QmitkInfoDialog.exec();
 }
 
 void QmitkDataManagerView::NodeChanged(const mitk::DataNode* /*node*/)
 {
   // m_FilterModel->invalidate();
   // fix as proposed by R. Khlebnikov in the mitk-users mail from 02.09.2014
   QMetaObject::invokeMethod( m_FilterModel, "invalidate", Qt::QueuedConnection );
 }
 
 QItemSelectionModel *QmitkDataManagerView::GetDataNodeSelectionModel() const
 {
   return m_NodeTreeView->selectionModel();
 }
 
 void QmitkDataManagerView::GlobalReinit( bool )
 {
   mitk::IRenderWindowPart* renderWindow = this->GetRenderWindowPart();
 
   if (renderWindow == NULL)
     renderWindow = this->OpenRenderWindowPart(false);
 
   // no render window available
   if (renderWindow == NULL) return;
 
   mitk::RenderingManager::GetInstance()->InitializeViewsByBoundingObjects(this->GetDataStorage());
 }
 
 void QmitkDataManagerView::OtsuFilter( bool )
 {
   QList<mitk::DataNode::Pointer> selectedNodes = this->GetCurrentSelection();
 
   mitk::Image::Pointer mitkImage = 0;
   foreach(mitk::DataNode::Pointer node, selectedNodes)
   {
     mitkImage = dynamic_cast<mitk::Image*>( node->GetData() );
 
     if(mitkImage.IsNull())
       continue;
 
     try
     {
       // get selected mitk image
       const unsigned short dim = 3;
       typedef short InputPixelType;
       typedef unsigned char OutputPixelType;
 
       typedef itk::Image< InputPixelType, dim > InputImageType;
       typedef itk::Image< OutputPixelType, dim > OutputImageType;
 
       typedef itk::OtsuThresholdImageFilter< InputImageType, OutputImageType > FilterType;
       FilterType::Pointer filter = FilterType::New();
 
       filter->SetOutsideValue( 1 );
       filter->SetInsideValue( 0 );
 
       InputImageType::Pointer itkImage;
       mitk::CastToItkImage(mitkImage, itkImage);
 
       filter->SetInput( itkImage );
 
       filter->Update();
 
       mitk::DataNode::Pointer resultNode = mitk::DataNode::New();
       std::string nameOfResultImage = node->GetName();
       nameOfResultImage.append("Otsu");
       resultNode->SetProperty("name", mitk::StringProperty::New(nameOfResultImage) );
       resultNode->SetProperty("binary", mitk::BoolProperty::New(true) );
       resultNode->SetData( mitk::ImportItkImage(filter->GetOutput())->Clone());
 
       this->GetDataStorage()->Add(resultNode, node);
 
     }
     catch( std::exception& err )
     {
-      MITK_ERROR(this->GetClassName()) << err.what();
+      MITK_ERROR(qPrintable(this->GetClassName())) << err.what();
     }
 
   }
 }
 void QmitkDataManagerView::NodeTreeViewRowsRemoved (
   const QModelIndex & /*parent*/, int /*start*/, int /*end*/ )
 {
   m_CurrentRowCount = m_NodeTreeModel->rowCount();
 }
 void QmitkDataManagerView::NodeTreeViewRowsInserted( const QModelIndex & parent, int, int )
 {
   m_NodeTreeView->setExpanded(parent, true);
 
   // a new row was inserted
   if( m_CurrentRowCount == 0 && m_NodeTreeModel->rowCount() == 1 )
   {
     this->OpenRenderWindowPart();
     m_CurrentRowCount = m_NodeTreeModel->rowCount();
   }
 }
 
 void QmitkDataManagerView::NodeSelectionChanged( const QItemSelection & /*selected*/, const QItemSelection & /*deselected*/ )
 {
   QList<mitk::DataNode::Pointer> nodes = m_NodeTreeModel->GetNodeSet();
 
   foreach(mitk::DataNode::Pointer node, nodes)
   {
     if ( node.IsNotNull() )
       node->SetBoolProperty("selected", false);
   }
 
   nodes.clear();
   nodes = this->GetCurrentSelection();
 
   foreach(mitk::DataNode::Pointer node, nodes)
   {
     if ( node.IsNotNull() )
       node->SetBoolProperty("selected", true);
   }
   //changing the selection does NOT require any rendering processes!
   //mitk::RenderingManager::GetInstance()->RequestUpdateAll();
 }
 
 void QmitkDataManagerView::ShowIn(const QString &editorId)
 {
   berry::IWorkbenchPage::Pointer page = this->GetSite()->GetPage();
   berry::IEditorInput::Pointer input(new mitk::DataStorageEditorInput(this->GetDataStorageReference()));
   page->OpenEditor(input, editorId, false, berry::IWorkbenchPage::MATCH_ID);
 }
 
 mitk::IRenderWindowPart* QmitkDataManagerView::OpenRenderWindowPart(bool activatedEditor)
 {
   if (activatedEditor)
   {
     return this->GetRenderWindowPart(QmitkAbstractView::ACTIVATE | QmitkAbstractView::OPEN);
   }
   else
   {
     return this->GetRenderWindowPart(QmitkAbstractView::BRING_TO_FRONT | QmitkAbstractView::OPEN);
   }
 }
diff --git a/Plugins/org.mitk.gui.qt.datamanager/src/mitkIContextMenuAction.h b/Plugins/org.mitk.gui.qt.datamanager/src/mitkIContextMenuAction.h
index ec3ae813cf..e2b283bb39 100644
--- a/Plugins/org.mitk.gui.qt.datamanager/src/mitkIContextMenuAction.h
+++ b/Plugins/org.mitk.gui.qt.datamanager/src/mitkIContextMenuAction.h
@@ -1,56 +1,55 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 #ifndef mitkIContextMenuAction_H_
 #define mitkIContextMenuAction_H_
 
 #include <berryMacros.h>
 #include <berryQtViewPart.h>
 
 #include <vector>
 #include <mitkDataNode.h>
 #include "mitkDataStorage.h"
 
 class QmitkStdMultiWidget;
 
 namespace mitk
 {
   /**
   * A context menu action, which is linked to the context menu <br>
   * through an extension point. For an example check the <br>
   * <code> plugin.xml </code> and the connected classes of <br>
   * the the segmentation bundle and also the <code> QmitkDataManagerView.cpp </code> <br>
   * in this bundle.
   */
   struct IContextMenuAction
   {
-    berryInterfaceMacro(IContextMenuAction, mitk);
 
       /**
       * @brief Executes the action, that linked to the context menu entry.
       */
       virtual void Run( const QList<mitk::DataNode::Pointer>& selectedNodes ) = 0;
 
     // Setters
     virtual void SetDataStorage(mitk::DataStorage* dataStorage) = 0;
     virtual void SetSmoothed(bool smoothed) = 0;
     virtual void SetDecimated(bool decimated) = 0;
     virtual void SetFunctionality(berry::QtViewPart* functionality) = 0;
   };
 }
 
 Q_DECLARE_INTERFACE(mitk::IContextMenuAction, "org.mitk.datamanager.IContextMenuAction")
 
 #endif // mitkIContextMenuAction_H_
diff --git a/Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp b/Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp
index acb2f5c1b6..2a709f1be5 100644
--- a/Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp
+++ b/Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp
@@ -1,1358 +1,1355 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "QmitkExtWorkbenchWindowAdvisor.h"
 #include "QmitkExtActionBarAdvisor.h"
 
 #include <QMenu>
 #include <QMenuBar>
 #include <QMainWindow>
 #include <QStatusBar>
 #include <QString>
 #include <QFile>
 #include <QRegExp>
 #include <QTextStream>
 #include <QSettings>
 
 #include <ctkPluginException.h>
 #include <service/event/ctkEventAdmin.h>
 
 #include <berryPlatform.h>
 #include <berryPlatformUI.h>
 #include <berryIActionBarConfigurer.h>
 #include <berryIWorkbenchWindow.h>
 #include <berryIWorkbenchPage.h>
 #include <berryIPreferencesService.h>
 #include <berryIPerspectiveRegistry.h>
 #include <berryIPerspectiveDescriptor.h>
 #include <berryIWorkbenchPartConstants.h>
 #include <berryQtPreferences.h>
 
 #include <internal/berryQtShowViewAction.h>
 #include <internal/berryQtOpenPerspectiveAction.h>
 
 #include <QmitkFileOpenAction.h>
 #include <QmitkFileSaveAction.h>
 #include <QmitkExtFileSaveProjectAction.h>
 #include <QmitkFileExitAction.h>
 #include <QmitkCloseProjectAction.h>
 #include <QmitkDefaultDropTargetListener.h>
 #include <QmitkStatusBar.h>
 #include <QmitkProgressBar.h>
 #include <QmitkMemoryUsageIndicatorView.h>
 #include <QmitkPreferencesDialog.h>
 #include <QmitkOpenDicomEditorAction.h>
 #include <QmitkOpenXnatEditorAction.h>
 
 #include <itkConfigure.h>
 #include <vtkConfigure.h>
 #include <mitkVersion.h>
 #include <mitkIDataStorageService.h>
 #include <mitkIDataStorageReference.h>
 #include <mitkDataStorageEditorInput.h>
 #include <mitkWorkbenchUtil.h>
 #include <vtkVersionMacros.h>
 
 // UGLYYY
 #include "internal/QmitkExtWorkbenchWindowAdvisorHack.h"
 #include "internal/QmitkCommonExtPlugin.h"
 #include "mitkUndoController.h"
 #include "mitkVerboseLimitedLinearUndo.h"
 #include <QToolBar>
 #include <QMessageBox>
 #include <QLabel>
 #include <QmitkAboutDialog.h>
 
 QmitkExtWorkbenchWindowAdvisorHack
 * QmitkExtWorkbenchWindowAdvisorHack::undohack =
 new QmitkExtWorkbenchWindowAdvisorHack();
 
 QString QmitkExtWorkbenchWindowAdvisor::QT_SETTINGS_FILENAME = "QtSettings.ini";
 
 class PartListenerForTitle: public berry::IPartListener
 {
 public:
 
  PartListenerForTitle(QmitkExtWorkbenchWindowAdvisor* wa) :
    windowAdvisor(wa)
    {
    }
 
    Events::Types GetPartEventTypes() const
    {
     return Events::ACTIVATED | Events::BROUGHT_TO_TOP | Events::CLOSED
      | Events::HIDDEN | Events::VISIBLE;
    }
 
-   void PartActivated(berry::IWorkbenchPartReference::Pointer ref)
+   void PartActivated(const berry::IWorkbenchPartReference::Pointer& ref)
    {
     if (ref.Cast<berry::IEditorReference> ())
     {
      windowAdvisor->UpdateTitle(false);
     }
    }
 
-   void PartBroughtToTop(berry::IWorkbenchPartReference::Pointer ref)
+   void PartBroughtToTop(const berry::IWorkbenchPartReference::Pointer& ref)
    {
     if (ref.Cast<berry::IEditorReference> ())
     {
      windowAdvisor->UpdateTitle(false);
     }
    }
 
-   void PartClosed(berry::IWorkbenchPartReference::Pointer /*ref*/)
+   void PartClosed(const berry::IWorkbenchPartReference::Pointer& /*ref*/)
    {
     windowAdvisor->UpdateTitle(false);
    }
 
-   void PartHidden(berry::IWorkbenchPartReference::Pointer ref)
+   void PartHidden(const berry::IWorkbenchPartReference::Pointer& ref)
    {
     if (!windowAdvisor->lastActiveEditor.Expired() &&
      ref->GetPart(false) == windowAdvisor->lastActiveEditor.Lock())
     {
      windowAdvisor->UpdateTitle(true);
     }
    }
 
-   void PartVisible(berry::IWorkbenchPartReference::Pointer ref)
+   void PartVisible(const berry::IWorkbenchPartReference::Pointer& ref)
    {
     if (!windowAdvisor->lastActiveEditor.Expired() &&
      ref->GetPart(false) == windowAdvisor->lastActiveEditor.Lock())
     {
      windowAdvisor->UpdateTitle(false);
     }
    }
 
 private:
  QmitkExtWorkbenchWindowAdvisor* windowAdvisor;
 };
 
 class PartListenerForViewNavigator: public berry::IPartListener
 {
 public:
 
     PartListenerForViewNavigator(QAction* act) :
         viewNavigatorAction(act)
     {
     }
 
     Events::Types GetPartEventTypes() const
     {
         return Events::OPENED | Events::CLOSED | Events::HIDDEN |
                 Events::VISIBLE;
     }
 
-    void PartOpened(berry::IWorkbenchPartReference::Pointer ref)
+    void PartOpened(const berry::IWorkbenchPartReference::Pointer& ref)
     {
         if (ref->GetId()=="org.mitk.views.viewnavigatorview")
         {
             viewNavigatorAction->setChecked(true);
         }
     }
 
-    void PartClosed(berry::IWorkbenchPartReference::Pointer ref)
+    void PartClosed(const berry::IWorkbenchPartReference::Pointer& ref)
     {
         if (ref->GetId()=="org.mitk.views.viewnavigatorview")
         {
             viewNavigatorAction->setChecked(false);
         }
     }
 
-    void PartVisible(berry::IWorkbenchPartReference::Pointer ref)
+    void PartVisible(const berry::IWorkbenchPartReference::Pointer& ref)
     {
         if (ref->GetId()=="org.mitk.views.viewnavigatorview")
         {
             viewNavigatorAction->setChecked(true);
         }
     }
 
-    void PartHidden(berry::IWorkbenchPartReference::Pointer ref)
+    void PartHidden(const berry::IWorkbenchPartReference::Pointer& ref)
     {
         if (ref->GetId()=="org.mitk.views.viewnavigatorview")
         {
             viewNavigatorAction->setChecked(false);
         }
     }
 
 private:
     QAction* viewNavigatorAction;
 
 };
 
 class PartListenerForImageNavigator: public berry::IPartListener
 {
 public:
 
  PartListenerForImageNavigator(QAction* act) :
    imageNavigatorAction(act)
    {
    }
 
    Events::Types GetPartEventTypes() const
    {
     return Events::OPENED | Events::CLOSED | Events::HIDDEN |
      Events::VISIBLE;
    }
 
-   void PartOpened(berry::IWorkbenchPartReference::Pointer ref)
+   void PartOpened(const berry::IWorkbenchPartReference::Pointer& ref)
    {
     if (ref->GetId()=="org.mitk.views.imagenavigator")
     {
      imageNavigatorAction->setChecked(true);
     }
    }
 
-   void PartClosed(berry::IWorkbenchPartReference::Pointer ref)
+   void PartClosed(const berry::IWorkbenchPartReference::Pointer& ref)
    {
     if (ref->GetId()=="org.mitk.views.imagenavigator")
     {
      imageNavigatorAction->setChecked(false);
     }
    }
 
-   void PartVisible(berry::IWorkbenchPartReference::Pointer ref)
+   void PartVisible(const berry::IWorkbenchPartReference::Pointer& ref)
    {
     if (ref->GetId()=="org.mitk.views.imagenavigator")
     {
      imageNavigatorAction->setChecked(true);
     }
    }
 
-   void PartHidden(berry::IWorkbenchPartReference::Pointer ref)
+   void PartHidden(const berry::IWorkbenchPartReference::Pointer& ref)
    {
     if (ref->GetId()=="org.mitk.views.imagenavigator")
     {
      imageNavigatorAction->setChecked(false);
     }
    }
 
 private:
  QAction* imageNavigatorAction;
 
 };
 
 class PerspectiveListenerForTitle: public berry::IPerspectiveListener
 {
 public:
 
  PerspectiveListenerForTitle(QmitkExtWorkbenchWindowAdvisor* wa) :
    windowAdvisor(wa), perspectivesClosed(false)
    {
    }
 
    Events::Types GetPerspectiveEventTypes() const
    {
     return Events::ACTIVATED | Events::SAVED_AS | Events::DEACTIVATED
      // remove the following line when command framework is finished
      | Events::CLOSED | Events::OPENED;
    }
 
-   void PerspectiveActivated(berry::IWorkbenchPage::Pointer /*page*/,
-    berry::IPerspectiveDescriptor::Pointer /*perspective*/)
+   void PerspectiveActivated(const berry::IWorkbenchPage::Pointer& /*page*/,
+                             const berry::IPerspectiveDescriptor::Pointer& /*perspective*/)
    {
     windowAdvisor->UpdateTitle(false);
    }
 
-   void PerspectiveSavedAs(berry::IWorkbenchPage::Pointer /*page*/,
-    berry::IPerspectiveDescriptor::Pointer /*oldPerspective*/,
-    berry::IPerspectiveDescriptor::Pointer /*newPerspective*/)
+   void PerspectiveSavedAs(const berry::IWorkbenchPage::Pointer& /*page*/,
+                           const berry::IPerspectiveDescriptor::Pointer& /*oldPerspective*/,
+                           const berry::IPerspectiveDescriptor::Pointer& /*newPerspective*/)
    {
     windowAdvisor->UpdateTitle(false);
    }
 
-   void PerspectiveDeactivated(berry::IWorkbenchPage::Pointer /*page*/,
-    berry::IPerspectiveDescriptor::Pointer /*perspective*/)
+   void PerspectiveDeactivated(const berry::IWorkbenchPage::Pointer& /*page*/,
+                               const berry::IPerspectiveDescriptor::Pointer& /*perspective*/)
    {
     windowAdvisor->UpdateTitle(false);
    }
 
-   void PerspectiveOpened(berry::IWorkbenchPage::Pointer /*page*/,
-    berry::IPerspectiveDescriptor::Pointer /*perspective*/)
+   void PerspectiveOpened(const berry::IWorkbenchPage::Pointer& /*page*/,
+                          const berry::IPerspectiveDescriptor::Pointer& /*perspective*/)
    {
     if (perspectivesClosed)
     {
      QListIterator<QAction*> i(windowAdvisor->viewActions);
      while (i.hasNext())
      {
       i.next()->setEnabled(true);
      }
 
      //GetViewRegistry()->Find("org.mitk.views.imagenavigator");
      if(windowAdvisor->GetWindowConfigurer()->GetWindow()->GetWorkbench()->GetEditorRegistry()->FindEditor("org.mitk.editors.dicomeditor"))
      {
         windowAdvisor->openDicomEditorAction->setEnabled(true);
      }
      if(windowAdvisor->GetWindowConfigurer()->GetWindow()->GetWorkbench()->GetEditorRegistry()->FindEditor("org.mitk.editors.xnat.browser"))
      {
         windowAdvisor->openXnatEditorAction->setEnabled(true);
      }
      windowAdvisor->fileSaveProjectAction->setEnabled(true);
      windowAdvisor->closeProjectAction->setEnabled(true);
      windowAdvisor->undoAction->setEnabled(true);
      windowAdvisor->redoAction->setEnabled(true);
      windowAdvisor->imageNavigatorAction->setEnabled(true);
      windowAdvisor->viewNavigatorAction->setEnabled(true);
      windowAdvisor->resetPerspAction->setEnabled(true);
      if( windowAdvisor->GetShowClosePerspectiveMenuItem() )
      {
        windowAdvisor->closePerspAction->setEnabled(true);
      }
     }
 
     perspectivesClosed = false;
    }
 
-   void PerspectiveClosed(berry::IWorkbenchPage::Pointer /*page*/,
-    berry::IPerspectiveDescriptor::Pointer /*perspective*/)
+   void PerspectiveClosed(const berry::IWorkbenchPage::Pointer& /*page*/,
+                          const berry::IPerspectiveDescriptor::Pointer& /*perspective*/)
    {
     berry::IWorkbenchWindow::Pointer wnd = windowAdvisor->GetWindowConfigurer()->GetWindow();
     bool allClosed = true;
     if (wnd->GetActivePage())
     {
      QList<berry::IPerspectiveDescriptor::Pointer> perspectives(wnd->GetActivePage()->GetOpenPerspectives());
      allClosed = perspectives.empty();
     }
 
     if (allClosed)
     {
      perspectivesClosed = true;
 
      QListIterator<QAction*> i(windowAdvisor->viewActions);
      while (i.hasNext())
      {
       i.next()->setEnabled(false);
      }
 
      if(windowAdvisor->GetWindowConfigurer()->GetWindow()->GetWorkbench()->GetEditorRegistry()->FindEditor("org.mitk.editors.dicomeditor"))
      {
         windowAdvisor->openDicomEditorAction->setEnabled(false);
      }
      if(windowAdvisor->GetWindowConfigurer()->GetWindow()->GetWorkbench()->GetEditorRegistry()->FindEditor("org.mitk.editors.xnat.browser"))
      {
        windowAdvisor->openXnatEditorAction->setEnabled(false);
      }
      windowAdvisor->fileSaveProjectAction->setEnabled(false);
      windowAdvisor->closeProjectAction->setEnabled(false);
      windowAdvisor->undoAction->setEnabled(false);
      windowAdvisor->redoAction->setEnabled(false);
      windowAdvisor->imageNavigatorAction->setEnabled(false);
      windowAdvisor->viewNavigatorAction->setEnabled(false);
      windowAdvisor->resetPerspAction->setEnabled(false);
      if( windowAdvisor->GetShowClosePerspectiveMenuItem() )
      {
        windowAdvisor->closePerspAction->setEnabled(false);
      }
     }
    }
 
 private:
  QmitkExtWorkbenchWindowAdvisor* windowAdvisor;
  bool perspectivesClosed;
 };
 
 class PerspectiveListenerForMenu: public berry::IPerspectiveListener
 {
 public:
 
  PerspectiveListenerForMenu(QmitkExtWorkbenchWindowAdvisor* wa) :
    windowAdvisor(wa)
    {
    }
 
    Events::Types GetPerspectiveEventTypes() const
    {
     return Events::ACTIVATED | Events::DEACTIVATED;
    }
 
-   void PerspectiveActivated(berry::IWorkbenchPage::Pointer /*page*/,
-    berry::IPerspectiveDescriptor::Pointer perspective)
+   void PerspectiveActivated(const berry::IWorkbenchPage::Pointer& /*page*/,
+                             const berry::IPerspectiveDescriptor::Pointer& perspective)
    {
      QAction* action = windowAdvisor->mapPerspIdToAction[perspective->GetId()];
      if (action)
      {
        action->setChecked(true);
      }
    }
 
-   void PerspectiveDeactivated(berry::IWorkbenchPage::Pointer /*page*/,
-    berry::IPerspectiveDescriptor::Pointer perspective)
+   void PerspectiveDeactivated(const berry::IWorkbenchPage::Pointer& /*page*/,
+                               const berry::IPerspectiveDescriptor::Pointer& perspective)
    {
      QAction* action = windowAdvisor->mapPerspIdToAction[perspective->GetId()];
      if (action)
      {
        action->setChecked(false);
      }
    }
 
 private:
  QmitkExtWorkbenchWindowAdvisor* windowAdvisor;
 };
 
 
 
 QmitkExtWorkbenchWindowAdvisor::QmitkExtWorkbenchWindowAdvisor(berry::WorkbenchAdvisor* wbAdvisor,
                   berry::IWorkbenchWindowConfigurer::Pointer configurer) :
 berry::WorkbenchWindowAdvisor(configurer),
 lastInput(0),
 wbAdvisor(wbAdvisor),
 showViewToolbar(true),
 showPerspectiveToolbar(false),
 showVersionInfo(true),
 showMitkVersionInfo(true),
 showViewMenuItem(true),
 showNewWindowMenuItem(false),
 showClosePerspectiveMenuItem(true),
 viewNavigatorFound(false),
 showMemoryIndicator(true),
 dropTargetListener(new QmitkDefaultDropTargetListener)
 {
  productName = QCoreApplication::applicationName();
   viewExcludeList.push_back("org.mitk.views.viewnavigatorview");
 }
 
 QmitkExtWorkbenchWindowAdvisor::~QmitkExtWorkbenchWindowAdvisor()
 {
 }
 
 berry::ActionBarAdvisor::Pointer QmitkExtWorkbenchWindowAdvisor::CreateActionBarAdvisor(
  berry::IActionBarConfigurer::Pointer configurer)
 {
  berry::ActionBarAdvisor::Pointer actionBarAdvisor(
   new QmitkExtActionBarAdvisor(configurer));
  return actionBarAdvisor;
 }
 
 void* QmitkExtWorkbenchWindowAdvisor::CreateEmptyWindowContents(void* parent)
 {
  QWidget* parentWidget = static_cast<QWidget*>(parent);
  QLabel* label = new QLabel(parentWidget);
  label->setText("<b>No perspectives are open. Open a perspective in the <i>Window->Open Perspective</i> menu.</b>");
  label->setContentsMargins(10,10,10,10);
  label->setAlignment(Qt::AlignTop);
  label->setEnabled(false);
  parentWidget->layout()->addWidget(label);
  return label;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::ShowClosePerspectiveMenuItem(bool show)
 {
  showClosePerspectiveMenuItem = show;
 }
 
 bool QmitkExtWorkbenchWindowAdvisor::GetShowClosePerspectiveMenuItem()
 {
   return showClosePerspectiveMenuItem;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::ShowMemoryIndicator(bool show)
 {
     showMemoryIndicator = show;
 }
 
 bool QmitkExtWorkbenchWindowAdvisor::GetShowMemoryIndicator()
 {
     return showMemoryIndicator;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::ShowNewWindowMenuItem(bool show)
 {
  showNewWindowMenuItem = show;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::ShowViewToolbar(bool show)
 {
  showViewToolbar = show;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::ShowViewMenuItem(bool show)
 {
  showViewMenuItem = show;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::ShowPerspectiveToolbar(bool show)
 {
  showPerspectiveToolbar = show;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::ShowVersionInfo(bool show)
 {
  showVersionInfo = show;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::ShowMitkVersionInfo(bool show)
 {
  showMitkVersionInfo = show;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::SetProductName(const QString& product)
 {
  productName = product;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::SetWindowIcon(const QString& wndIcon)
 {
  windowIcon = wndIcon;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::PostWindowCreate()
 {
  // very bad hack...
  berry::IWorkbenchWindow::Pointer window =
   this->GetWindowConfigurer()->GetWindow();
  QMainWindow* mainWindow =
   qobject_cast<QMainWindow*> (window->GetShell()->GetControl());
 
  window->SetPerspectiveExcludeList(perspectiveExcludeList);
     window->SetViewExcludeList(viewExcludeList);
 
  if (!windowIcon.isEmpty())
  {
   mainWindow->setWindowIcon(QIcon(windowIcon));
  }
  mainWindow->setContextMenuPolicy(Qt::PreventContextMenu);
 
  /*mainWindow->setStyleSheet("color: white;"
  "background-color: #808080;"
  "selection-color: #659EC7;"
  "selection-background-color: #808080;"
  " QMenuBar {"
  "background-color: #808080; }");*/
 
     // Load selected icon theme
 
     QStringList searchPaths = QIcon::themeSearchPaths();
     searchPaths.push_front( QString(":/org_mitk_icons/icons/") );
     QIcon::setThemeSearchPaths( searchPaths );
 
-    berry::IPreferencesService::Pointer prefService
-      = berry::Platform::GetServiceRegistry()
-      .GetServiceById<berry::IPreferencesService>(berry::IPreferencesService::ID);
-
+    berry::IPreferencesService* prefService = berry::Platform::GetPreferencesService();
     berry::IPreferences::Pointer stylePref = prefService->GetSystemPreferences()->Node(berry::QtPreferences::QT_STYLES_NODE);
-    QString iconTheme = QString::fromStdString(stylePref->Get(berry::QtPreferences::QT_ICON_THEME, "<<default>>"));
+    QString iconTheme = stylePref->Get(berry::QtPreferences::QT_ICON_THEME, "<<default>>"));
     if( iconTheme == QString( "<<default>>" ) )
     {
       iconTheme = QString( "tango" );
     }
     QIcon::setThemeName( iconTheme );
 
- /*
  // ==== Application menu ============================
+ /*
  QMenuBar* menuBar = mainWindow->menuBar();
  menuBar->setContextMenuPolicy(Qt::PreventContextMenu);
 
  QMenu* fileMenu = menuBar->addMenu("&File");
  fileMenu->setObjectName("FileMenu");
 
     QAction* fileOpenAction = new QmitkFileOpenAction(QIcon::fromTheme("document-open",QIcon(":/org_mitk_icons/icons/tango/scalable/actions/document-open.svg")), window);
     fileOpenAction->setShortcut(QKeySequence::Open);
  fileMenu->addAction(fileOpenAction);
     QAction* fileSaveAction = new QmitkFileSaveAction(QIcon(":/org.mitk.gui.qt.ext/Save_48.png"), window);
     fileSaveAction->setShortcut(QKeySequence::Save);
     fileMenu->addAction(fileSaveAction);
  fileSaveProjectAction = new QmitkExtFileSaveProjectAction(window);
     fileSaveProjectAction->setIcon(QIcon::fromTheme("document-save",QIcon(":/org_mitk_icons/icons/tango/scalable/actions/document-save.svg")));
  fileMenu->addAction(fileSaveProjectAction);
  closeProjectAction = new QmitkCloseProjectAction(window);
     closeProjectAction->setIcon(QIcon::fromTheme("edit-delete",QIcon(":/org_mitk_icons/icons/tango/scalable/actions/edit-delete.svg")));
  fileMenu->addAction(closeProjectAction);
  fileMenu->addSeparator();
  QAction* fileExitAction = new QmitkFileExitAction(window);
     fileExitAction->setIcon(QIcon::fromTheme("system-log-out",QIcon(":/org_mitk_icons/icons/tango/scalable/actions/system-log-out.svg")));
     fileExitAction->setShortcut(QKeySequence::Quit);
  fileExitAction->setObjectName("QmitkFileExitAction");
  fileMenu->addAction(fileExitAction);
 
 if(this->GetWindowConfigurer()->GetWindow()->GetWorkbench()->GetEditorRegistry()->FindEditor("org.mitk.editors.dicomeditor"))
 {
  openDicomEditorAction = new QmitkOpenDicomEditorAction(QIcon(":/org.mitk.gui.qt.ext/dcm-icon.png"),window);
 }
     if(this->GetWindowConfigurer()->GetWindow()->GetWorkbench()->GetEditorRegistry()->FindEditor("org.mitk.editors.xnat.browser"))
     {
         openXnatEditorAction = new QmitkOpenXnatEditorAction(QIcon(":/org.mitk.gui.qt.ext/xnat-icon.png"),window);
     }
 
  berry::IViewRegistry* viewRegistry =
   berry::PlatformUI::GetWorkbench()->GetViewRegistry();
- const std::vector<berry::IViewDescriptor::Pointer>& viewDescriptors =
-  viewRegistry->GetViews();
+ const QList<berry::IViewDescriptor::Pointer> viewDescriptors = viewRegistry->GetViews();
 
  // another bad hack to get an edit/undo menu...
  QMenu* editMenu = menuBar->addMenu("&Edit");
     undoAction = editMenu->addAction(QIcon::fromTheme("edit-undo",QIcon(":/org_mitk_icons/icons/tango/scalable/actions/edit-undo.svg")),
   "&Undo",
   QmitkExtWorkbenchWindowAdvisorHack::undohack, SLOT(onUndo()),
   QKeySequence("CTRL+Z"));
  undoAction->setToolTip("Undo the last action (not supported by all modules)");
     redoAction = editMenu->addAction(QIcon::fromTheme("edit-redo",QIcon(":/org_mitk_icons/icons/tango/scalable/actions/edit-redo.svg"))
   , "&Redo",
   QmitkExtWorkbenchWindowAdvisorHack::undohack, SLOT(onRedo()),
   QKeySequence("CTRL+Y"));
  redoAction->setToolTip("execute the last action that was undone again (not supported by all modules)");
 
  imageNavigatorAction = new QAction(QIcon(":/org.mitk.gui.qt.ext/Slider.png"), "&Image Navigator", NULL);
  bool imageNavigatorViewFound = window->GetWorkbench()->GetViewRegistry()->Find("org.mitk.views.imagenavigator");
  if (imageNavigatorViewFound)
  {
    QObject::connect(imageNavigatorAction, SIGNAL(triggered(bool)), QmitkExtWorkbenchWindowAdvisorHack::undohack, SLOT(onImageNavigator()));
    imageNavigatorAction->setCheckable(true);
 
    // add part listener for image navigator
-   imageNavigatorPartListener = new PartListenerForImageNavigator(imageNavigatorAction);
-   window->GetPartService()->AddPartListener(imageNavigatorPartListener);
+   imageNavigatorPartListener.reset(new PartListenerForImageNavigator(imageNavigatorAction));
+   window->GetPartService()->AddPartListener(imageNavigatorPartListener.data());
    berry::IViewPart::Pointer imageNavigatorView =
        window->GetActivePage()->FindView("org.mitk.views.imagenavigator");
    imageNavigatorAction->setChecked(false);
    if (imageNavigatorView)
    {
      bool isImageNavigatorVisible = window->GetActivePage()->IsPartVisible(imageNavigatorView);
      if (isImageNavigatorVisible)
        imageNavigatorAction->setChecked(true);
    }
         imageNavigatorAction->setToolTip("Toggle image navigator for navigating through image");
     }
 
     viewNavigatorAction = new QAction(QIcon(":/org.mitk.gui.qt.ext/view-manager_48.png"),"&View Navigator", NULL);
     viewNavigatorFound = window->GetWorkbench()->GetViewRegistry()->Find("org.mitk.views.viewnavigatorview");
     if (viewNavigatorFound)
     {
         QObject::connect(viewNavigatorAction, SIGNAL(triggered(bool)), QmitkExtWorkbenchWindowAdvisorHack::undohack, SLOT(onViewNavigator()));
         viewNavigatorAction->setCheckable(true);
 
         // add part listener for view navigator
-        viewNavigatorPartListener = new PartListenerForViewNavigator(viewNavigatorAction);
-        window->GetPartService()->AddPartListener(viewNavigatorPartListener);
+        viewNavigatorPartListener.reset(new PartListenerForViewNavigator(viewNavigatorAction));
+        window->GetPartService()->AddPartListener(viewNavigatorPartListener.data());
         berry::IViewPart::Pointer viewnavigatorview =
                 window->GetActivePage()->FindView("org.mitk.views.viewnavigatorview");
         viewNavigatorAction->setChecked(false);
         if (viewnavigatorview)
         {
             bool isViewNavigatorVisible = window->GetActivePage()->IsPartVisible(viewnavigatorview);
             if (isViewNavigatorVisible)
                 viewNavigatorAction->setChecked(true);
         }
         viewNavigatorAction->setToolTip("Toggle View Navigator");
  }
 
  // toolbar for showing file open, undo, redo and other main actions
  QToolBar* mainActionsToolBar = new QToolBar;
     mainActionsToolBar->setObjectName("mainActionsToolBar");
  mainActionsToolBar->setContextMenuPolicy(Qt::PreventContextMenu);
 #ifdef __APPLE__
  mainActionsToolBar->setToolButtonStyle ( Qt::ToolButtonTextUnderIcon );
 #else
  mainActionsToolBar->setToolButtonStyle ( Qt::ToolButtonTextBesideIcon );
 #endif
 
  mainActionsToolBar->addAction(fileOpenAction);
  mainActionsToolBar->addAction(fileSaveProjectAction);
  mainActionsToolBar->addAction(closeProjectAction);
  mainActionsToolBar->addAction(undoAction);
  mainActionsToolBar->addAction(redoAction);
 if(this->GetWindowConfigurer()->GetWindow()->GetWorkbench()->GetEditorRegistry()->FindEditor("org.mitk.editors.dicomeditor"))
 {
  mainActionsToolBar->addAction(openDicomEditorAction);
 }
     if(this->GetWindowConfigurer()->GetWindow()->GetWorkbench()->GetEditorRegistry()->FindEditor("org.mitk.editors.xnat.browser"))
     {
         mainActionsToolBar->addAction(openXnatEditorAction);
     }
  if (imageNavigatorViewFound)
  {
    mainActionsToolBar->addAction(imageNavigatorAction);
  }
     if (viewNavigatorFound)
         mainActionsToolBar->addAction(viewNavigatorAction);
  mainWindow->addToolBar(mainActionsToolBar);
 
 #ifdef __APPLE__
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
  mainWindow->setUnifiedTitleAndToolBarOnMac(true);
     // default is false
 #endif
 #endif
 
  // ==== Window Menu ==========================
  QMenu* windowMenu = menuBar->addMenu("Window");
  if (showNewWindowMenuItem)
  {
    windowMenu->addAction("&New Window", QmitkExtWorkbenchWindowAdvisorHack::undohack, SLOT(onNewWindow()));
    windowMenu->addSeparator();
  }
 
  QMenu* perspMenu = windowMenu->addMenu("&Open Perspective");
 
  QMenu* viewMenu;
  if (showViewMenuItem)
  {
    viewMenu = windowMenu->addMenu("Show &View");
    viewMenu->setObjectName("Show View");
  }
  windowMenu->addSeparator();
  resetPerspAction = windowMenu->addAction("&Reset Perspective",
   QmitkExtWorkbenchWindowAdvisorHack::undohack, SLOT(onResetPerspective()));
 
  if(showClosePerspectiveMenuItem)
   closePerspAction = windowMenu->addAction("&Close Perspective", QmitkExtWorkbenchWindowAdvisorHack::undohack, SLOT(onClosePerspective()));
 
  windowMenu->addSeparator();
  windowMenu->addAction("&Preferences...",
   QmitkExtWorkbenchWindowAdvisorHack::undohack, SLOT(onEditPreferences()),
   QKeySequence("CTRL+P"));
 
  // fill perspective menu
  berry::IPerspectiveRegistry* perspRegistry =
   window->GetWorkbench()->GetPerspectiveRegistry();
  QActionGroup* perspGroup = new QActionGroup(menuBar);
 
- std::vector<berry::IPerspectiveDescriptor::Pointer> perspectives(
+ QList<berry::IPerspectiveDescriptor::Pointer> perspectives(
   perspRegistry->GetPerspectives());
 
     bool skip = false;
-    for (std::vector<berry::IPerspectiveDescriptor::Pointer>::iterator perspIt =
+    for (QList<berry::IPerspectiveDescriptor::Pointer>::iterator perspIt =
       perspectives.begin(); perspIt != perspectives.end(); ++perspIt)
     {
 
       // if perspectiveExcludeList is set, it contains the id-strings of perspectives, which
       // should not appear as an menu-entry in the perspective menu
       if (perspectiveExcludeList.size() > 0)
       {
-        for (unsigned int i=0; i<perspectiveExcludeList.size(); i++)
+        for (int i=0; i<perspectiveExcludeList.size(); i++)
         {
           if (perspectiveExcludeList.at(i) == (*perspIt)->GetId())
           {
             skip = true;
             break;
           }
         }
         if (skip)
         {
           skip = false;
           continue;
         }
       }
 
       QAction* perspAction = new berry::QtOpenPerspectiveAction(window,
         *perspIt, perspGroup);
-      mapPerspIdToAction.insert(std::make_pair((*perspIt)->GetId(), perspAction));
+      mapPerspIdToAction.insert((*perspIt)->GetId(), perspAction);
     }
  perspMenu->addActions(perspGroup->actions());
 
  // sort elements (converting vector to map...)
- std::vector<berry::IViewDescriptor::Pointer>::const_iterator iter;
+ QList<berry::IViewDescriptor::Pointer>::const_iterator iter;
  std::map<QString, berry::IViewDescriptor::Pointer> VDMap;
 
  skip = false;
  for (iter = viewDescriptors.begin(); iter != viewDescriptors.end(); ++iter)
  {
 
    // if viewExcludeList is set, it contains the id-strings of view, which
    // should not appear as an menu-entry in the menu
    if (viewExcludeList.size() > 0)
    {
-     for (unsigned int i=0; i<viewExcludeList.size(); i++)
+     for (int i=0; i<viewExcludeList.size(); i++)
      {
        if (viewExcludeList.at(i) == (*iter)->GetId())
        {
          skip = true;
          break;
        }
      }
      if (skip)
      {
        skip = false;
        continue;
      }
    }
 
   if ((*iter)->GetId() == "org.blueberry.ui.internal.introview")
    continue;
   if ((*iter)->GetId() == "org.mitk.views.imagenavigator")
    continue;
         if ((*iter)->GetId() == "org.mitk.views.viewnavigatorview")
    continue;
 
   std::pair<QString, berry::IViewDescriptor::Pointer> p(
    (*iter)->GetLabel(), (*iter));
   VDMap.insert(p);
  }
 
   // ==== Perspective Toolbar ==================================
  QToolBar* qPerspectiveToolbar = new QToolBar;
     qPerspectiveToolbar->setObjectName("perspectiveToolBar");
 
  if (showPerspectiveToolbar)
  {
   qPerspectiveToolbar->addActions(perspGroup->actions());
   mainWindow->addToolBar(qPerspectiveToolbar);
  }
  else
   delete qPerspectiveToolbar;
 
  // ==== View Toolbar ==================================
  QToolBar* qToolbar = new QToolBar;
     qToolbar->setObjectName("viewToolBar");
 
  std::map<QString, berry::IViewDescriptor::Pointer>::const_iterator
   MapIter;
  for (MapIter = VDMap.begin(); MapIter != VDMap.end(); ++MapIter)
  {
   berry::QtShowViewAction* viewAction = new berry::QtShowViewAction(window,
    (*MapIter).second);
   viewActions.push_back(viewAction);
   if(showViewMenuItem)
     viewMenu->addAction(viewAction);
   if (showViewToolbar)
   {
    qToolbar->addAction(viewAction);
   }
  }
 
  if (showViewToolbar)
  {
   mainWindow->addToolBar(qToolbar);
  }
  else
   delete qToolbar;
 
  QSettings settings(GetQSettingsFile(), QSettings::IniFormat);
  mainWindow->restoreState(settings.value("ToolbarPosition").toByteArray());
 
  // ===== Help menu ====================================
  QMenu* helpMenu = menuBar->addMenu("&Help");
  helpMenu->addAction("&Welcome",this, SLOT(onIntro()));
  helpMenu->addAction("&Open Help Perspective", this, SLOT(onHelpOpenHelpPerspective()));
   helpMenu->addAction("&Context Help",this, SLOT(onHelp()),  QKeySequence("F1"));
  helpMenu->addAction("&About",this, SLOT(onAbout()));
  // =====================================================
 
 
  QStatusBar* qStatusBar = new QStatusBar();
 
  //creating a QmitkStatusBar for Output on the QStatusBar and connecting it with the MainStatusBar
  QmitkStatusBar *statusBar = new QmitkStatusBar(qStatusBar);
  //disabling the SizeGrip in the lower right corner
  statusBar->SetSizeGripEnabled(false);
 
 
 
  QmitkProgressBar *progBar = new QmitkProgressBar();
 
  qStatusBar->addPermanentWidget(progBar, 0);
  progBar->hide();
 // progBar->AddStepsToDo(2);
 // progBar->Progress(1);
 
  mainWindow->setStatusBar(qStatusBar);
 
     if (showMemoryIndicator)
     {
         QmitkMemoryUsageIndicatorView* memoryIndicator = new QmitkMemoryUsageIndicatorView();
  qStatusBar->addPermanentWidget(memoryIndicator, 0);
     }
  */
 }
 
 void QmitkExtWorkbenchWindowAdvisor::PreWindowOpen()
 {
  berry::IWorkbenchWindowConfigurer::Pointer configurer = GetWindowConfigurer();
 
  // show the shortcut bar and progress indicator, which are hidden by
  // default
  //configurer->SetShowPerspectiveBar(true);
  //configurer->SetShowFastViewBars(true);
  //configurer->SetShowProgressIndicator(true);
 
  //  // add the drag and drop support for the editor area
  //  configurer.addEditorAreaTransfer(EditorInputTransfer.getInstance());
  //  configurer.addEditorAreaTransfer(ResourceTransfer.getInstance());
  //  configurer.addEditorAreaTransfer(FileTransfer.getInstance());
  //  configurer.addEditorAreaTransfer(MarkerTransfer.getInstance());
  //  configurer.configureEditorAreaDropListener(new EditorAreaDropAdapter(
  //      configurer.getWindow()));
 
  this->HookTitleUpdateListeners(configurer);
 
- menuPerspectiveListener = new PerspectiveListenerForMenu(this);
- configurer->GetWindow()->AddPerspectiveListener(menuPerspectiveListener);
+ menuPerspectiveListener.reset(new PerspectiveListenerForMenu(this));
+ configurer->GetWindow()->AddPerspectiveListener(menuPerspectiveListener.data());
 
  configurer->AddEditorAreaTransfer(QStringList("text/uri-list"));
- configurer->ConfigureEditorAreaDropListener(dropTargetListener);
+ configurer->ConfigureEditorAreaDropListener(dropTargetListener.data());
 
 }
 
 void QmitkExtWorkbenchWindowAdvisor::PostWindowOpen()
 {
+  berry::WorkbenchWindowAdvisor::PostWindowOpen();
   // Force Rendering Window Creation on startup.
   berry::IWorkbenchWindowConfigurer::Pointer configurer = GetWindowConfigurer();
 
   ctkPluginContext* context = QmitkCommonExtPlugin::getContext();
   ctkServiceReference serviceRef = context->getServiceReference<mitk::IDataStorageService>();
   if (serviceRef)
   {
     mitk::IDataStorageService *dsService = context->getService<mitk::IDataStorageService>(serviceRef);
     if (dsService)
     {
       mitk::IDataStorageReference::Pointer dsRef = dsService->GetDataStorage();
       mitk::DataStorageEditorInput::Pointer dsInput(new mitk::DataStorageEditorInput(dsRef));
       mitk::WorkbenchUtil::OpenEditor(configurer->GetWindow()->GetActivePage(),dsInput);
     }
   }
 }
 
 void QmitkExtWorkbenchWindowAdvisor::onIntro()
 {
   QmitkExtWorkbenchWindowAdvisorHack::undohack->onIntro();
 }
 
 void QmitkExtWorkbenchWindowAdvisor::onHelp()
 {
   QmitkExtWorkbenchWindowAdvisorHack::undohack->onHelp();
 }
 
 void QmitkExtWorkbenchWindowAdvisor::onHelpOpenHelpPerspective()
 {
   QmitkExtWorkbenchWindowAdvisorHack::undohack->onHelpOpenHelpPerspective();
 }
 
 void QmitkExtWorkbenchWindowAdvisor::onAbout()
 {
   QmitkExtWorkbenchWindowAdvisorHack::undohack->onAbout();
 }
 
 //--------------------------------------------------------------------------------
 // Ugly hack from here on. Feel free to delete when command framework
 // and undo buttons are done.
 //--------------------------------------------------------------------------------
 
 QmitkExtWorkbenchWindowAdvisorHack::QmitkExtWorkbenchWindowAdvisorHack() : QObject()
 {
 
 }
 
 QmitkExtWorkbenchWindowAdvisorHack::~QmitkExtWorkbenchWindowAdvisorHack()
 {
 
 }
 
 void QmitkExtWorkbenchWindowAdvisorHack::onUndo()
 {
  mitk::UndoModel* model = mitk::UndoController::GetCurrentUndoModel();
  if (model)
  {
   if (mitk::VerboseLimitedLinearUndo* verboseundo = dynamic_cast<mitk::VerboseLimitedLinearUndo*>( model ))
   {
    mitk::VerboseLimitedLinearUndo::StackDescription descriptions =
     verboseundo->GetUndoDescriptions();
    if (descriptions.size() >= 1)
    {
     MITK_INFO << "Undo " << descriptions.front().second;
    }
   }
   model->Undo();
  }
  else
  {
   MITK_ERROR << "No undo model instantiated";
  }
 }
 
 void QmitkExtWorkbenchWindowAdvisorHack::onRedo()
 {
  mitk::UndoModel* model = mitk::UndoController::GetCurrentUndoModel();
  if (model)
  {
   if (mitk::VerboseLimitedLinearUndo* verboseundo = dynamic_cast<mitk::VerboseLimitedLinearUndo*>( model ))
   {
    mitk::VerboseLimitedLinearUndo::StackDescription descriptions =
     verboseundo->GetRedoDescriptions();
    if (descriptions.size() >= 1)
    {
     MITK_INFO << "Redo " << descriptions.front().second;
    }
   }
   model->Redo();
  }
  else
  {
   MITK_ERROR << "No undo model instantiated";
  }
 }
 
 void QmitkExtWorkbenchWindowAdvisorHack::onImageNavigator()
 {
  // get ImageNavigatorView
  berry::IViewPart::Pointer imageNavigatorView =
   berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->FindView("org.mitk.views.imagenavigator");
  if (imageNavigatorView)
  {
   bool isImageNavigatorVisible = berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->IsPartVisible(imageNavigatorView);
   if (isImageNavigatorVisible)
   {
    berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->HideView(imageNavigatorView);
    return;
   }
  }
  berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->ShowView("org.mitk.views.imagenavigator");
     //berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->ResetPerspective();
 }
 
 void QmitkExtWorkbenchWindowAdvisorHack::onViewNavigator()
 {
     // get viewnavigatorView
     berry::IViewPart::Pointer viewnavigatorView =
             berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->FindView("org.mitk.views.viewnavigatorview");
     if (viewnavigatorView)
     {
         bool isviewnavigatorVisible = berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->IsPartVisible(viewnavigatorView);
         if (isviewnavigatorVisible)
         {
             berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->HideView(viewnavigatorView);
             return;
         }
     }
     berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->ShowView("org.mitk.views.viewnavigatorview");
  //berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->ResetPerspective();
 }
 
 void QmitkExtWorkbenchWindowAdvisorHack::onEditPreferences()
 {
  QmitkPreferencesDialog _PreferencesDialog(QApplication::activeWindow());
  _PreferencesDialog.exec();
 }
 
 void QmitkExtWorkbenchWindowAdvisorHack::onQuit()
 {
  berry::PlatformUI::GetWorkbench()->Close();
 }
 
 void QmitkExtWorkbenchWindowAdvisorHack::onResetPerspective()
 {
  berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->ResetPerspective();
 }
 
 void QmitkExtWorkbenchWindowAdvisorHack::onClosePerspective()
 {
  berry::IWorkbenchPage::Pointer
   page =
   berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage();
  page->ClosePerspective(page->GetPerspective(), true, true);
 }
 
 void QmitkExtWorkbenchWindowAdvisorHack::onNewWindow()
 {
  berry::PlatformUI::GetWorkbench()->OpenWorkbenchWindow(0);
 }
 
 void QmitkExtWorkbenchWindowAdvisorHack::onIntro()
 {
  bool hasIntro =
   berry::PlatformUI::GetWorkbench()->GetIntroManager()->HasIntro();
  if (!hasIntro)
  {
 
   QRegExp reg("(.*)<title>(\\n)*");
   QRegExp reg2("(\\n)*</title>(.*)");
   QFile file(":/org.mitk.gui.qt.ext/index.html");
   file.open(QIODevice::ReadOnly | QIODevice::Text); //text file only for reading
 
   QString text = QString(file.readAll());
 
   file.close();
 
   QString title = text;
   title.replace(reg, "");
   title.replace(reg2, "");
 
   std::cout << title.toStdString() << std::endl;
 
   QMessageBox::information(NULL, title,
    text, "Close");
 
  }
  else
  {
   berry::PlatformUI::GetWorkbench()->GetIntroManager()->ShowIntro(
    berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow(), false);
  }
 }
 
 void QmitkExtWorkbenchWindowAdvisorHack::onHelp()
 {
   ctkPluginContext* context = QmitkCommonExtPlugin::getContext();
   if (context == 0)
   {
     MITK_WARN << "Plugin context not set, unable to open context help";
     return;
   }
 
   // Check if the org.blueberry.ui.qt.help plug-in is installed and started
   QList<QSharedPointer<ctkPlugin> > plugins = context->getPlugins();
   foreach(QSharedPointer<ctkPlugin> p, plugins)
   {
     if (p->getSymbolicName() == "org.blueberry.ui.qt.help")
     {
       if (p->getState() != ctkPlugin::ACTIVE)
       {
         // try to activate the plug-in explicitly
         try
         {
           p->start(ctkPlugin::START_TRANSIENT);
         }
         catch (const ctkPluginException& pe)
         {
           MITK_ERROR << "Activating org.blueberry.ui.qt.help failed: " << pe.what();
           return;
         }
       }
     }
   }
 
   ctkServiceReference eventAdminRef = context->getServiceReference<ctkEventAdmin>();
   ctkEventAdmin* eventAdmin = 0;
   if (eventAdminRef)
   {
     eventAdmin = context->getService<ctkEventAdmin>(eventAdminRef);
   }
   if (eventAdmin == 0)
   {
     MITK_WARN << "ctkEventAdmin service not found. Unable to open context help";
   }
   else
   {
     ctkEvent ev("org/blueberry/ui/help/CONTEXTHELP_REQUESTED");
     eventAdmin->postEvent(ev);
   }
 }
 
 void QmitkExtWorkbenchWindowAdvisorHack::onHelpOpenHelpPerspective()
 {
   berry::PlatformUI::GetWorkbench()->ShowPerspective("org.blueberry.perspectives.help",
                                                      berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow());
 }
 
 void QmitkExtWorkbenchWindowAdvisorHack::onAbout()
 {
  QmitkAboutDialog* aboutDialog = new QmitkAboutDialog(QApplication::activeWindow(),NULL);
  aboutDialog->open();
 }
 
 void QmitkExtWorkbenchWindowAdvisor::HookTitleUpdateListeners(
  berry::IWorkbenchWindowConfigurer::Pointer configurer)
 {
  // hook up the listeners to update the window title
- titlePartListener = new PartListenerForTitle(this);
- titlePerspectiveListener = new PerspectiveListenerForTitle(this);
+ titlePartListener.reset(new PartListenerForTitle(this));
+ //titlePerspectiveListener = new PerspectiveListenerForTitle(this);
  editorPropertyListener.reset(new berry::PropertyChangeIntAdapter<
   QmitkExtWorkbenchWindowAdvisor>(this,
   &QmitkExtWorkbenchWindowAdvisor::PropertyChange));
 
  //    configurer.getWindow().addPageListener(new IPageListener() {
  //      public void pageActivated(IWorkbenchPage page) {
  //        updateTitle(false);
  //      }
  //
  //      public void pageClosed(IWorkbenchPage page) {
  //        updateTitle(false);
  //      }
  //
  //      public void pageOpened(IWorkbenchPage page) {
  //        // do nothing
  //      }
  //    });
 
- configurer->GetWindow()->AddPerspectiveListener(titlePerspectiveListener);
- configurer->GetWindow()->GetPartService()->AddPartListener(titlePartListener);
+ //configurer->GetWindow()->AddPerspectiveListener(titlePerspectiveListener);
+ configurer->GetWindow()->GetPartService()->AddPartListener(titlePartListener.data());
 }
 
 QString QmitkExtWorkbenchWindowAdvisor::ComputeTitle()
 {
  berry::IWorkbenchWindowConfigurer::Pointer configurer =
   GetWindowConfigurer();
  berry::IWorkbenchPage::Pointer currentPage =
   configurer->GetWindow()->GetActivePage();
  berry::IEditorPart::Pointer activeEditor;
  if (currentPage)
  {
   activeEditor = lastActiveEditor.Lock();
  }
 
  QString title;
  //TODO Product
  //    IProduct product = Platform.getProduct();
  //    if (product != null) {
  //      title = product.getName();
  //    }
  // instead of the product name, we use a custom variable for now
  title = productName;
 
  if(showMitkVersionInfo)
  {
    title += QString(" ") + MITK_VERSION_STRING;
  }
 
  if (showVersionInfo)
  {
   // add version informatioin
   QString versions = QString(" (ITK %1.%2.%3  VTK %4.%5.%6 Qt %7 MITK %8)")
    .arg(ITK_VERSION_MAJOR).arg(ITK_VERSION_MINOR).arg(ITK_VERSION_PATCH)
    .arg(VTK_MAJOR_VERSION).arg(VTK_MINOR_VERSION).arg(VTK_BUILD_VERSION)
    .arg(QT_VERSION_STR)
    .arg(MITK_VERSION_STRING);
 
   title += versions;
  }
 
  if (currentPage)
  {
   if (activeEditor)
   {
    lastEditorTitle = activeEditor->GetTitleToolTip();
    if (!lastEditorTitle.isEmpty())
     title = lastEditorTitle + " - " + title;
   }
   berry::IPerspectiveDescriptor::Pointer persp =
    currentPage->GetPerspective();
   QString label = "";
   if (persp)
   {
    label = persp->GetLabel();
   }
   berry::IAdaptable* input = currentPage->GetInput();
   if (input && input != wbAdvisor->GetDefaultPageInput())
   {
    label = currentPage->GetLabel();
   }
   if (!label.isEmpty())
   {
    title = label + " - " + title;
   }
  }
 
  title += " (Not for use in diagnosis or treatment of patients)";
 
  return title;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::RecomputeTitle()
 {
  berry::IWorkbenchWindowConfigurer::Pointer configurer =
   GetWindowConfigurer();
  QString oldTitle = configurer->GetTitle();
  QString newTitle = ComputeTitle();
  if (newTitle != oldTitle)
  {
   configurer->SetTitle(newTitle);
  }
 }
 
 void QmitkExtWorkbenchWindowAdvisor::UpdateTitle(bool editorHidden)
 {
  berry::IWorkbenchWindowConfigurer::Pointer configurer =
   GetWindowConfigurer();
  berry::IWorkbenchWindow::Pointer window = configurer->GetWindow();
  berry::IEditorPart::Pointer activeEditor;
  berry::IWorkbenchPage::Pointer currentPage = window->GetActivePage();
  berry::IPerspectiveDescriptor::Pointer persp;
  berry::IAdaptable* input = 0;
 
  if (currentPage)
  {
   activeEditor = currentPage->GetActiveEditor();
   persp = currentPage->GetPerspective();
   input = currentPage->GetInput();
  }
 
  if (editorHidden)
  {
   activeEditor = 0;
  }
 
  // Nothing to do if the editor hasn't changed
  if (activeEditor == lastActiveEditor.Lock() && currentPage == lastActivePage.Lock()
   && persp == lastPerspective.Lock() && input == lastInput)
  {
   return;
  }
 
  if (!lastActiveEditor.Expired())
  {
   lastActiveEditor.Lock()->RemovePropertyListener(editorPropertyListener.data());
  }
 
  lastActiveEditor = activeEditor;
  lastActivePage = currentPage;
  lastPerspective = persp;
  lastInput = input;
 
  if (activeEditor)
  {
   activeEditor->AddPropertyListener(editorPropertyListener.data());
  }
 
  RecomputeTitle();
 }
 
 void QmitkExtWorkbenchWindowAdvisor::PropertyChange(const berry::Object::Pointer& /*source*/, int propId)
 {
  if (propId == berry::IWorkbenchPartConstants::PROP_TITLE)
  {
   if (!lastActiveEditor.Expired())
   {
    QString newTitle = lastActiveEditor.Lock()->GetPartName();
    if (lastEditorTitle != newTitle)
    {
     RecomputeTitle();
    }
   }
  }
 }
 
 
 void QmitkExtWorkbenchWindowAdvisor::SetPerspectiveExcludeList(const QList<QString>& v)
 {
   this->perspectiveExcludeList = v;
 }
 
 QList<QString> QmitkExtWorkbenchWindowAdvisor::GetPerspectiveExcludeList()
 {
   return this->perspectiveExcludeList;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::SetViewExcludeList(const QList<QString>& v)
 {
   this->viewExcludeList = v;
 }
 
 QList<QString> QmitkExtWorkbenchWindowAdvisor::GetViewExcludeList()
 {
   return this->viewExcludeList;
 }
 
 void QmitkExtWorkbenchWindowAdvisor::PostWindowClose()
 {
   berry::IWorkbenchWindow::Pointer window = this->GetWindowConfigurer()->GetWindow();
   QMainWindow* mainWindow = static_cast<QMainWindow*> (window->GetShell()->GetControl());
 
   QSettings settings(GetQSettingsFile(), QSettings::IniFormat);
   settings.setValue("ToolbarPosition", mainWindow->saveState());
 }
 
 QString QmitkExtWorkbenchWindowAdvisor::GetQSettingsFile() const
 {
   QFileInfo settingsInfo = QmitkCommonExtPlugin::getContext()->getDataFile(QT_SETTINGS_FILENAME);
   return settingsInfo.canonicalFilePath();
 }
diff --git a/Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.h b/Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.h
index f40185a35d..061c651798 100644
--- a/Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.h
+++ b/Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.h
@@ -1,180 +1,180 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef QMITKEXTWORKBENCHWINDOWADVISOR_H_
 #define QMITKEXTWORKBENCHWINDOWADVISOR_H_
 
 #include <berryWorkbenchWindowAdvisor.h>
 
 #include <berryIPartListener.h>
 #include <berryIEditorPart.h>
 #include <berryIWorkbenchPage.h>
 #include <berryWorkbenchAdvisor.h>
 #include <berryWorkbenchWindowAdvisor.h>
 
 #include <org_mitk_gui_qt_ext_Export.h>
 
 #include <QList>
 
 class QAction;
 class QMenu;
 
 class MITK_QT_COMMON_EXT_EXPORT QmitkExtWorkbenchWindowAdvisor : public QObject, public berry::WorkbenchWindowAdvisor
 {
   Q_OBJECT
 
 public:
 
     QmitkExtWorkbenchWindowAdvisor(berry::WorkbenchAdvisor* wbAdvisor,
         berry::IWorkbenchWindowConfigurer::Pointer configurer);
 
     ~QmitkExtWorkbenchWindowAdvisor();
 
     berry::SmartPointer<berry::ActionBarAdvisor> CreateActionBarAdvisor(
         berry::SmartPointer<berry::IActionBarConfigurer> configurer);
 
     void* CreateEmptyWindowContents(void* parent);
 
     void PostWindowCreate();
 
     void PreWindowOpen();
 
     void PostWindowOpen();
 
     void PostWindowClose();
 
     void ShowViewToolbar(bool show);
 
     void ShowPerspectiveToolbar(bool show);
 
     void ShowVersionInfo(bool show);
 
     void ShowMitkVersionInfo(bool show);
 
     void ShowViewMenuItem(bool show);
 
     void ShowNewWindowMenuItem(bool show);
 
     void ShowClosePerspectiveMenuItem(bool show);
 
     bool GetShowClosePerspectiveMenuItem();
 
     void ShowMemoryIndicator(bool show);
 
     bool GetShowMemoryIndicator();
 
     //TODO should be removed when product support is here
     void SetProductName(const QString& product);
     void SetWindowIcon(const QString& wndIcon);
 
     void SetPerspectiveExcludeList(const QList<QString> &v);
     QList<QString> GetPerspectiveExcludeList();
 
     void SetViewExcludeList(const QList<QString> &v);
     QList<QString> GetViewExcludeList();
 
 protected slots:
 
     virtual void onIntro();
     virtual void onHelp();
     virtual void onHelpOpenHelpPerspective();
     virtual void onAbout();
 
 private:
 
   /**
    * Hooks the listeners needed on the window
    *
    * @param configurer
    */
   void HookTitleUpdateListeners(berry::IWorkbenchWindowConfigurer::Pointer configurer);
 
   QString ComputeTitle();
 
   void RecomputeTitle();
 
   QString GetQSettingsFile() const;
 
   /**
    * Updates the window title. Format will be: [pageInput -]
    * [currentPerspective -] [editorInput -] [workspaceLocation -] productName
    * @param editorHidden TODO
    */
   void UpdateTitle(bool editorHidden);
 
   void PropertyChange(const berry::Object::Pointer& /*source*/, int propId);
 
   static QString QT_SETTINGS_FILENAME;
 
-  berry::IPartListener::Pointer titlePartListener;
-  berry::IPerspectiveListener::Pointer titlePerspectiveListener;
-  berry::IPerspectiveListener::Pointer menuPerspectiveListener;
-  berry::IPartListener::Pointer imageNavigatorPartListener;
-  berry::IPartListener::Pointer viewNavigatorPartListener;
+  QScopedPointer<berry::IPartListener> titlePartListener;
+  QScopedPointer<berry::IPerspectiveListener> titlePerspectiveListener;
+  QScopedPointer<berry::IPerspectiveListener> menuPerspectiveListener;
+  QScopedPointer<berry::IPartListener> imageNavigatorPartListener;
+  QScopedPointer<berry::IPartListener> viewNavigatorPartListener;
   QScopedPointer<berry::IPropertyChangeListener> editorPropertyListener;
   friend struct berry::PropertyChangeIntAdapter<QmitkExtWorkbenchWindowAdvisor>;
   friend class PartListenerForTitle;
   friend class PerspectiveListenerForTitle;
   friend class PerspectiveListenerForMenu;
   friend class PartListenerForImageNavigator;
   friend class PartListenerForViewNavigator;
 
   berry::IEditorPart::WeakPtr lastActiveEditor;
   berry::IPerspectiveDescriptor::WeakPtr lastPerspective;
   berry::IWorkbenchPage::WeakPtr lastActivePage;
   QString lastEditorTitle;
   berry::IAdaptable* lastInput;
 
   berry::WorkbenchAdvisor* wbAdvisor;
   bool showViewToolbar;
   bool showPerspectiveToolbar;
   bool showVersionInfo;
   bool showMitkVersionInfo;
   bool showViewMenuItem;
   bool showNewWindowMenuItem;
   bool showClosePerspectiveMenuItem;
   bool viewNavigatorFound;
   bool showMemoryIndicator;
   QString productName;
   QString windowIcon;
 
   // enables DnD on the editor area
-  berry::SmartPointer<berry::IDropTargetListener> dropTargetListener;
+  QScopedPointer<berry::IDropTargetListener> dropTargetListener;
 
   // stringlist for excluding perspectives from the perspective menu entry (e.g. Welcome Perspective)
   QList<QString> perspectiveExcludeList;
 
   // stringlist for excluding views from the menu entry
   QList<QString> viewExcludeList;
 
   // maps perspective ids to QAction objects
   QHash<QString, QAction*> mapPerspIdToAction;
 
   // actions which will be enabled/disabled depending on the application state
   QList<QAction*> viewActions;
   QAction* fileSaveProjectAction;
   QAction* closeProjectAction;
   QAction* undoAction;
   QAction* redoAction;
   QAction* imageNavigatorAction;
   QAction* viewNavigatorAction;
   QAction* resetPerspAction;
   QAction* closePerspAction;
   QAction* openDicomEditorAction;
   QAction* openXnatEditorAction;
 };
 
 #endif /*QMITKEXTWORKBENCHWINDOWADVISOR_H_*/
diff --git a/Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/src/QmitkStdMultiWidgetEditor.cpp b/Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/src/QmitkStdMultiWidgetEditor.cpp
index 345e728cab..53f687e611 100644
--- a/Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/src/QmitkStdMultiWidgetEditor.cpp
+++ b/Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/src/QmitkStdMultiWidgetEditor.cpp
@@ -1,559 +1,559 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "QmitkStdMultiWidgetEditor.h"
 
 #include <berryUIException.h>
 #include <berryIWorkbenchPage.h>
 #include <berryIPreferencesService.h>
 #include <berryIPartListener.h>
 #include <berryIPreferences.h>
 
 #include <QWidget>
 
 #include <mitkColorProperty.h>
 #include <mitkGlobalInteraction.h>
 #include <mitkNodePredicateNot.h>
 #include <mitkNodePredicateProperty.h>
 
 #include <mitkDataStorageEditorInput.h>
 #include <mitkIDataStorageService.h>
 
 #include <QmitkMouseModeSwitcher.h>
 #include <QmitkStdMultiWidget.h>
 
 #include <mbilogo.h>
 
 class QmitkStdMultiWidgetEditorPrivate
 {
 public:
 
   QmitkStdMultiWidgetEditorPrivate();
   ~QmitkStdMultiWidgetEditorPrivate();
 
   QmitkStdMultiWidget* m_StdMultiWidget;
   QmitkMouseModeSwitcher* m_MouseModeToolbar;
   /**
   * @brief Members for the MultiWidget decorations.
   */
   std::string m_WidgetBackgroundColor1[4];
   std::string m_WidgetBackgroundColor2[4];
   std::string m_WidgetDecorationColor[4];
   std::string m_WidgetAnnotation[4];
   bool m_MenuWidgetsEnabled;
-  berry::IPartListener::Pointer m_PartListener;
+  QScopedPointer<berry::IPartListener> m_PartListener;
 
   QHash<QString, QmitkRenderWindow*> m_RenderWindows;
 
 };
 
 struct QmitkStdMultiWidgetPartListener : public berry::IPartListener
 {
   berryObjectMacro(QmitkStdMultiWidgetPartListener)
 
   QmitkStdMultiWidgetPartListener(QmitkStdMultiWidgetEditorPrivate* dd)
     : d(dd)
   {}
 
   Events::Types GetPartEventTypes() const
   {
     return Events::CLOSED | Events::HIDDEN | Events::VISIBLE;
   }
 
-  void PartClosed (berry::IWorkbenchPartReference::Pointer partRef)
+  void PartClosed(const berry::IWorkbenchPartReference::Pointer& partRef)
   {
     if (partRef->GetId() == QmitkStdMultiWidgetEditor::EDITOR_ID)
     {
       QmitkStdMultiWidgetEditor::Pointer stdMultiWidgetEditor = partRef->GetPart(false).Cast<QmitkStdMultiWidgetEditor>();
 
       if (d->m_StdMultiWidget == stdMultiWidgetEditor->GetStdMultiWidget())
       {
         d->m_StdMultiWidget->RemovePlanesFromDataStorage();
         stdMultiWidgetEditor->RequestActivateMenuWidget(false);
       }
     }
   }
 
-  void PartHidden (berry::IWorkbenchPartReference::Pointer partRef)
+  void PartHidden(const berry::IWorkbenchPartReference::Pointer& partRef)
   {
     if (partRef->GetId() == QmitkStdMultiWidgetEditor::EDITOR_ID)
     {
       QmitkStdMultiWidgetEditor::Pointer stdMultiWidgetEditor = partRef->GetPart(false).Cast<QmitkStdMultiWidgetEditor>();
 
       if (d->m_StdMultiWidget == stdMultiWidgetEditor->GetStdMultiWidget())
       {
         d->m_StdMultiWidget->RemovePlanesFromDataStorage();
         stdMultiWidgetEditor->RequestActivateMenuWidget(false);
       }
     }
   }
 
-  void PartVisible (berry::IWorkbenchPartReference::Pointer partRef)
+  void PartVisible(const berry::IWorkbenchPartReference::Pointer& partRef)
   {
     if (partRef->GetId() == QmitkStdMultiWidgetEditor::EDITOR_ID)
     {
       QmitkStdMultiWidgetEditor::Pointer stdMultiWidgetEditor = partRef->GetPart(false).Cast<QmitkStdMultiWidgetEditor>();
 
       if (d->m_StdMultiWidget == stdMultiWidgetEditor->GetStdMultiWidget())
       {
         d->m_StdMultiWidget->AddPlanesToDataStorage();
         stdMultiWidgetEditor->RequestActivateMenuWidget(true);
       }
     }
   }
 
 private:
 
   QmitkStdMultiWidgetEditorPrivate* const d;
 
 };
 
 QmitkStdMultiWidgetEditorPrivate::QmitkStdMultiWidgetEditorPrivate()
   : m_StdMultiWidget(0), m_MouseModeToolbar(0)
   , m_MenuWidgetsEnabled(false)
   , m_PartListener(new QmitkStdMultiWidgetPartListener(this))
 {}
 
 QmitkStdMultiWidgetEditorPrivate::~QmitkStdMultiWidgetEditorPrivate()
 {
 }
 
 const QString QmitkStdMultiWidgetEditor::EDITOR_ID = "org.mitk.editors.stdmultiwidget";
 
 QmitkStdMultiWidgetEditor::QmitkStdMultiWidgetEditor()
   : d(new QmitkStdMultiWidgetEditorPrivate)
 {
 }
 
 QmitkStdMultiWidgetEditor::~QmitkStdMultiWidgetEditor()
 {
-  this->GetSite()->GetPage()->RemovePartListener(d->m_PartListener);
+  this->GetSite()->GetPage()->RemovePartListener(d->m_PartListener.data());
 }
 
 QmitkStdMultiWidget* QmitkStdMultiWidgetEditor::GetStdMultiWidget()
 {
   return d->m_StdMultiWidget;
 }
 
 QmitkRenderWindow *QmitkStdMultiWidgetEditor::GetActiveQmitkRenderWindow() const
 {
   if (d->m_StdMultiWidget) return d->m_StdMultiWidget->GetRenderWindow1();
   return 0;
 }
 
 QHash<QString, QmitkRenderWindow *> QmitkStdMultiWidgetEditor::GetQmitkRenderWindows() const
 {
   return d->m_RenderWindows;
 }
 
 QmitkRenderWindow *QmitkStdMultiWidgetEditor::GetQmitkRenderWindow(const QString &id) const
 {
   if (d->m_RenderWindows.contains(id))
     return d->m_RenderWindows[id];
 
   return 0;
 }
 
 mitk::Point3D QmitkStdMultiWidgetEditor::GetSelectedPosition(const QString & /*id*/) const
 {
   return d->m_StdMultiWidget->GetCrossPosition();
 }
 
 void QmitkStdMultiWidgetEditor::SetSelectedPosition(const mitk::Point3D &pos, const QString &/*id*/)
 {
   d->m_StdMultiWidget->MoveCrossToPosition(pos);
 }
 
 void QmitkStdMultiWidgetEditor::EnableDecorations(bool enable, const QStringList &decorations)
 {
   if (decorations.isEmpty() || decorations.contains(DECORATION_BORDER))
   {
     enable ? d->m_StdMultiWidget->EnableColoredRectangles()
            : d->m_StdMultiWidget->DisableColoredRectangles();
   }
   if (decorations.isEmpty() || decorations.contains(DECORATION_LOGO))
   {
     enable ? d->m_StdMultiWidget->EnableDepartmentLogo()
            : d->m_StdMultiWidget->DisableDepartmentLogo();
   }
   if (decorations.isEmpty() || decorations.contains(DECORATION_MENU))
   {
     d->m_StdMultiWidget->ActivateMenuWidget(enable);
   }
   if (decorations.isEmpty() || decorations.contains(DECORATION_BACKGROUND))
   {
     enable ? d->m_StdMultiWidget->EnableGradientBackground()
            : d->m_StdMultiWidget->DisableGradientBackground();
   }
 }
 
 bool QmitkStdMultiWidgetEditor::IsDecorationEnabled(const QString &decoration) const
 {
   if (decoration == DECORATION_BORDER)
   {
     return d->m_StdMultiWidget->IsColoredRectanglesEnabled();
   }
   else if (decoration == DECORATION_LOGO)
   {
     return d->m_StdMultiWidget->IsColoredRectanglesEnabled();
   }
   else if (decoration == DECORATION_MENU)
   {
     return d->m_StdMultiWidget->IsMenuWidgetEnabled();
   }
   else if (decoration == DECORATION_BACKGROUND)
   {
     return d->m_StdMultiWidget->GetGradientBackgroundFlag();
   }
   return false;
 }
 
 QStringList QmitkStdMultiWidgetEditor::GetDecorations() const
 {
   QStringList decorations;
   decorations << DECORATION_BORDER << DECORATION_LOGO << DECORATION_MENU << DECORATION_BACKGROUND;
   return decorations;
 }
 
 mitk::SlicesRotator* QmitkStdMultiWidgetEditor::GetSlicesRotator() const
 {
   return d->m_StdMultiWidget->GetSlicesRotator();
 }
 
 mitk::SlicesSwiveller* QmitkStdMultiWidgetEditor::GetSlicesSwiveller() const
 {
   return d->m_StdMultiWidget->GetSlicesSwiveller();
 }
 
 void QmitkStdMultiWidgetEditor::EnableSlicingPlanes(bool enable)
 {
   d->m_StdMultiWidget->SetWidgetPlanesVisibility(enable);
 }
 
 bool QmitkStdMultiWidgetEditor::IsSlicingPlanesEnabled() const
 {
   mitk::DataNode::Pointer node = this->d->m_StdMultiWidget->GetWidgetPlane1();
   if (node.IsNotNull())
   {
     bool visible = false;
     node->GetVisibility(visible, 0);
     return visible;
   }
   else
   {
     return false;
   }
 }
 
 void QmitkStdMultiWidgetEditor::EnableLinkedNavigation(bool enable)
 {
   enable ? d->m_StdMultiWidget->EnableNavigationControllerEventListening()
          : d->m_StdMultiWidget->DisableNavigationControllerEventListening();
 }
 
 bool QmitkStdMultiWidgetEditor::IsLinkedNavigationEnabled() const
 {
   return d->m_StdMultiWidget->IsCrosshairNavigationEnabled();
 }
 
 void QmitkStdMultiWidgetEditor::CreateQtPartControl(QWidget* parent)
 {
   if (d->m_StdMultiWidget == 0)
   {
     QHBoxLayout* layout = new QHBoxLayout(parent);
     layout->setContentsMargins(0,0,0,0);
 
     if (d->m_MouseModeToolbar == NULL)
     {
       d->m_MouseModeToolbar = new QmitkMouseModeSwitcher(parent); // delete by Qt via parent
       layout->addWidget(d->m_MouseModeToolbar);
     }
 
     berry::IPreferences::Pointer prefs = this->GetPreferences();
 
     mitk::BaseRenderer::RenderingMode::Type renderingMode = static_cast<mitk::BaseRenderer::RenderingMode::Type>(prefs->GetInt( "Rendering Mode" , 0 ));
 
     d->m_StdMultiWidget = new QmitkStdMultiWidget(parent,0,0,renderingMode);
     d->m_RenderWindows.insert("axial", d->m_StdMultiWidget->GetRenderWindow1());
     d->m_RenderWindows.insert("sagittal", d->m_StdMultiWidget->GetRenderWindow2());
     d->m_RenderWindows.insert("coronal", d->m_StdMultiWidget->GetRenderWindow3());
     d->m_RenderWindows.insert("3d", d->m_StdMultiWidget->GetRenderWindow4());
 
     d->m_MouseModeToolbar->setMouseModeSwitcher( d->m_StdMultiWidget->GetMouseModeSwitcher() );
     connect( d->m_MouseModeToolbar, SIGNAL( MouseModeSelected(mitk::MouseModeSwitcher::MouseMode) ),
       d->m_StdMultiWidget, SLOT( MouseModeSelected(mitk::MouseModeSwitcher::MouseMode) ) );
 
     layout->addWidget(d->m_StdMultiWidget);
 
     mitk::DataStorage::Pointer ds = this->GetDataStorage();
 
     // Tell the multiWidget which (part of) the tree to render
     d->m_StdMultiWidget->SetDataStorage(ds);
 
     // Initialize views as axial, sagittal, coronar to all data objects in DataStorage
     // (from top-left to bottom)
     mitk::TimeGeometry::Pointer geo = ds->ComputeBoundingGeometry3D(ds->GetAll());
     mitk::RenderingManager::GetInstance()->InitializeViews(geo);
 
     // Initialize bottom-right view as 3D view
     d->m_StdMultiWidget->GetRenderWindow4()->GetRenderer()->SetMapperID(
       mitk::BaseRenderer::Standard3D );
 
     // Enable standard handler for levelwindow-slider
     d->m_StdMultiWidget->EnableStandardLevelWindow();
 
     // Add the displayed views to the tree to see their positions
     // in 2D and 3D
     d->m_StdMultiWidget->AddDisplayPlaneSubTree();
 
     d->m_StdMultiWidget->EnableNavigationControllerEventListening();
 
     // Store the initial visibility status of the menu widget.
     d->m_MenuWidgetsEnabled = d->m_StdMultiWidget->IsMenuWidgetEnabled();
 
-    this->GetSite()->GetPage()->AddPartListener(d->m_PartListener);
+    this->GetSite()->GetPage()->AddPartListener(d->m_PartListener.data());
 
     berry::IBerryPreferences* berryprefs = dynamic_cast<berry::IBerryPreferences*>(prefs.GetPointer());
     InitializePreferences(berryprefs);
     this->OnPreferencesChanged(berryprefs);
 
     this->RequestUpdate();
   }
 }
 
 void QmitkStdMultiWidgetEditor::OnPreferencesChanged(const berry::IBerryPreferences* prefs)
 {
   // Enable change of logo. If no DepartmentLogo was set explicitly, MBILogo is used.
   // Set new department logo by prefs->Set("DepartmentLogo", "PathToImage");
 
   // If no logo was set for this plug-in specifically, walk the parent preference nodes
   // and lookup a logo value there.
 
   const berry::IPreferences* currentNode = prefs;
 
   while(currentNode)
   {
     bool logoFound = false;
     foreach (const QString& key, prefs->Keys())
     {
       if( key == "DepartmentLogo")
       {
         QString departmentLogoLocation = prefs->Get("DepartmentLogo", "");
 
         if (departmentLogoLocation.isEmpty())
         {
           d->m_StdMultiWidget->DisableDepartmentLogo();
         }
         else
         {
           // we need to disable the logo first, otherwise setting a new logo will have
           // no effect due to how mitkManufacturerLogo works...
           d->m_StdMultiWidget->DisableDepartmentLogo();
           d->m_StdMultiWidget->SetDepartmentLogoPath(qPrintable(departmentLogoLocation));
           d->m_StdMultiWidget->EnableDepartmentLogo();
         }
         logoFound = true;
         break;
       }
     }
 
     if (logoFound) break;
     currentNode = currentNode->Parent().GetPointer();
   }
 
   //Update internal members
   this->FillMembersWithCurrentDecorations();
   this->GetPreferenceDecorations(prefs);
   //Now the members can be used to modify the stdmultiwidget
   mitk::Color upper = HexColorToMitkColor(d->m_WidgetBackgroundColor1[0]);
   mitk::Color lower = HexColorToMitkColor(d->m_WidgetBackgroundColor2[0]);
   d->m_StdMultiWidget->SetGradientBackgroundColorForRenderWindow(upper, lower, 0);
   upper = HexColorToMitkColor(d->m_WidgetBackgroundColor1[1]);
   lower = HexColorToMitkColor(d->m_WidgetBackgroundColor2[1]);
   d->m_StdMultiWidget->SetGradientBackgroundColorForRenderWindow(upper, lower, 1);
   upper = HexColorToMitkColor(d->m_WidgetBackgroundColor1[2]);
   lower = HexColorToMitkColor(d->m_WidgetBackgroundColor2[2]);
   d->m_StdMultiWidget->SetGradientBackgroundColorForRenderWindow(upper, lower, 2);
   upper = HexColorToMitkColor(d->m_WidgetBackgroundColor1[3]);
   lower = HexColorToMitkColor(d->m_WidgetBackgroundColor2[3]);
   d->m_StdMultiWidget->SetGradientBackgroundColorForRenderWindow(upper, lower, 3);
   d->m_StdMultiWidget->EnableGradientBackground();
 
   // preferences for renderWindows
   mitk::Color colorDecorationWidget1 = HexColorToMitkColor(d->m_WidgetDecorationColor[0]);
   mitk::Color colorDecorationWidget2 = HexColorToMitkColor(d->m_WidgetDecorationColor[1]);
   mitk::Color colorDecorationWidget3 = HexColorToMitkColor(d->m_WidgetDecorationColor[2]);
   mitk::Color colorDecorationWidget4 = HexColorToMitkColor(d->m_WidgetDecorationColor[3]);
   d->m_StdMultiWidget->SetDecorationColor(0, colorDecorationWidget1);
   d->m_StdMultiWidget->SetDecorationColor(1, colorDecorationWidget2);
   d->m_StdMultiWidget->SetDecorationColor(2, colorDecorationWidget3);
   d->m_StdMultiWidget->SetDecorationColor(3, colorDecorationWidget4);
 
   for(unsigned int i = 0; i < 4; ++i)
   {
     d->m_StdMultiWidget->SetCornerAnnotation(d->m_WidgetAnnotation[i],
                                              HexColorToMitkColor(d->m_WidgetDecorationColor[i]), i);
   }
   //The crosshair gap
   int crosshairgapsize = prefs->GetInt("crosshair gap size", 32);
   d->m_StdMultiWidget->GetWidgetPlane1()->SetIntProperty("Crosshair.Gap Size", crosshairgapsize);
   d->m_StdMultiWidget->GetWidgetPlane2()->SetIntProperty("Crosshair.Gap Size", crosshairgapsize);
   d->m_StdMultiWidget->GetWidgetPlane3()->SetIntProperty("Crosshair.Gap Size", crosshairgapsize);
 
   //refresh colors of rectangles
   d->m_StdMultiWidget->EnableColoredRectangles();
 
   // Set preferences respecting zooming and padding
   bool constrainedZooming = prefs->GetBool("Use constrained zooming and padding", false);
 
   mitk::RenderingManager::GetInstance()->SetConstrainedPaddingZooming(constrainedZooming);
 
   mitk::RenderingManager::GetInstance()->InitializeViewsByBoundingObjects(this->GetDataStorage());
 
   mitk::RenderingManager::GetInstance()->RequestUpdateAll();
 
   // level window setting
   bool showLevelWindowWidget = prefs->GetBool("Show level/window widget", true);
   if (showLevelWindowWidget)
   {
     d->m_StdMultiWidget->EnableStandardLevelWindow();
   }
   else
   {
     d->m_StdMultiWidget->DisableStandardLevelWindow();
   }
 
   // mouse modes toolbar
   bool newMode = prefs->GetBool("PACS like mouse interaction", false);
   d->m_MouseModeToolbar->setVisible( newMode );
   d->m_StdMultiWidget->GetMouseModeSwitcher()->SetInteractionScheme( newMode ? mitk::MouseModeSwitcher::PACS : mitk::MouseModeSwitcher::MITK );
 }
 
 mitk::Color QmitkStdMultiWidgetEditor::HexColorToMitkColor(std::string widgetColorInHex)
 {
   QString widgetColorQt = QString::fromStdString(widgetColorInHex);
   QColor qColor(widgetColorQt);
   mitk::Color returnColor;
   float colorMax = 255.0f;
   if (widgetColorQt=="") // default value
   {
     returnColor[0] = 1.0;
     returnColor[1] = 1.0;
     returnColor[2] = 1.0;
     MITK_ERROR << "Using default color for unknown widget " << widgetColorInHex;
   }
   else
   {
     returnColor[0] = qColor.red() / colorMax;
     returnColor[1] = qColor.green() / colorMax;
     returnColor[2] = qColor.blue() / colorMax;
   }
   return returnColor;
 }
 
 std::string QmitkStdMultiWidgetEditor::MitkColorToHex(mitk::Color color)
 {
   QColor returnColor;
   float colorMax = 255.0f;
   returnColor.setRed(static_cast<int>(color[0]* colorMax + 0.5));
   returnColor.setGreen(static_cast<int>(color[1]* colorMax + 0.5));
   returnColor.setBlue(static_cast<int>(color[2]* colorMax + 0.5));
   return returnColor.name().toStdString();
 }
 
 void QmitkStdMultiWidgetEditor::FillMembersWithCurrentDecorations()
 {
   //fill members with current values (or default values) from the std multi widget
   for(unsigned int i = 0; i < 4; ++i)
   {
     d->m_WidgetDecorationColor[i] = MitkColorToHex(d->m_StdMultiWidget->GetDecorationColor(i));
     d->m_WidgetBackgroundColor1[i] = MitkColorToHex(d->m_StdMultiWidget->GetGradientColors(i).first);
     d->m_WidgetBackgroundColor2[i] = MitkColorToHex(d->m_StdMultiWidget->GetGradientColors(i).second);
     d->m_WidgetAnnotation[i] = d->m_StdMultiWidget->GetCornerAnnotationText(i);
   }
 }
 
 void QmitkStdMultiWidgetEditor::GetPreferenceDecorations(const berry::IBerryPreferences * preferences)
 {
   //overwrite members with values from the preferences, if they the prefrence is defined
   d->m_WidgetBackgroundColor1[0] = preferences->GetByteArray("widget1 first background color", d->m_WidgetBackgroundColor1[0]);
   d->m_WidgetBackgroundColor2[0] = preferences->GetByteArray("widget1 second background color", d->m_WidgetBackgroundColor2[0]);
   d->m_WidgetBackgroundColor1[1] = preferences->GetByteArray("widget2 first background color", d->m_WidgetBackgroundColor1[1]);
   d->m_WidgetBackgroundColor2[1] = preferences->GetByteArray("widget2 second background color", d->m_WidgetBackgroundColor2[1]);
   d->m_WidgetBackgroundColor1[2] = preferences->GetByteArray("widget3 first background color", d->m_WidgetBackgroundColor1[2]);
   d->m_WidgetBackgroundColor2[2] = preferences->GetByteArray("widget3 second background color", d->m_WidgetBackgroundColor2[2]);
   d->m_WidgetBackgroundColor1[3] = preferences->GetByteArray("widget4 first background color", d->m_WidgetBackgroundColor1[3]);
   d->m_WidgetBackgroundColor2[3] = preferences->GetByteArray("widget4 second background color", d->m_WidgetBackgroundColor2[3]);
 
   d->m_WidgetDecorationColor[0] = preferences->GetByteArray("widget1 decoration color", d->m_WidgetDecorationColor[0]);
   d->m_WidgetDecorationColor[1] = preferences->GetByteArray("widget2 decoration color", d->m_WidgetDecorationColor[1]);
   d->m_WidgetDecorationColor[2] = preferences->GetByteArray("widget3 decoration color", d->m_WidgetDecorationColor[2]);
   d->m_WidgetDecorationColor[3] = preferences->GetByteArray("widget4 decoration color", d->m_WidgetDecorationColor[3]);
 
   d->m_WidgetAnnotation[0] = preferences->GetByteArray("widget1 corner annotation", d->m_WidgetAnnotation[0]);
   d->m_WidgetAnnotation[1] = preferences->GetByteArray("widget2 corner annotation", d->m_WidgetAnnotation[1]);
   d->m_WidgetAnnotation[2] = preferences->GetByteArray("widget3 corner annotation", d->m_WidgetAnnotation[2]);
   d->m_WidgetAnnotation[3] = preferences->GetByteArray("widget4 corner annotation", d->m_WidgetAnnotation[3]);
 }
 
 void QmitkStdMultiWidgetEditor::InitializePreferences(berry::IBerryPreferences * preferences)
 {
   this->FillMembersWithCurrentDecorations(); //fill members
   this->GetPreferenceDecorations(preferences); //overwrite if preferences are defined
 
   //create new preferences
   preferences->PutByteArray("widget1 corner annotation", d->m_WidgetAnnotation[0]);
   preferences->PutByteArray("widget2 corner annotation", d->m_WidgetAnnotation[1]);
   preferences->PutByteArray("widget3 corner annotation", d->m_WidgetAnnotation[2]);
   preferences->PutByteArray("widget4 corner annotation", d->m_WidgetAnnotation[3]);
 
   preferences->PutByteArray("widget1 decoration color", d->m_WidgetDecorationColor[0]);
   preferences->PutByteArray("widget2 decoration color", d->m_WidgetDecorationColor[1]);
   preferences->PutByteArray("widget3 decoration color", d->m_WidgetDecorationColor[2]);
   preferences->PutByteArray("widget4 decoration color", d->m_WidgetDecorationColor[3]);
 
   preferences->PutByteArray("widget1 first background color", d->m_WidgetBackgroundColor1[0]);
   preferences->PutByteArray("widget2 first background color", d->m_WidgetBackgroundColor1[1]);
   preferences->PutByteArray("widget3 first background color", d->m_WidgetBackgroundColor1[2]);
   preferences->PutByteArray("widget4 first background color", d->m_WidgetBackgroundColor1[3]);
   preferences->PutByteArray("widget1 second background color", d->m_WidgetBackgroundColor2[0]);
   preferences->PutByteArray("widget2 second background color", d->m_WidgetBackgroundColor2[1]);
   preferences->PutByteArray("widget3 second background color", d->m_WidgetBackgroundColor2[2]);
   preferences->PutByteArray("widget4 second background color", d->m_WidgetBackgroundColor2[3]);
 }
 
 void QmitkStdMultiWidgetEditor::SetFocus()
 {
   if (d->m_StdMultiWidget != 0)
     d->m_StdMultiWidget->setFocus();
 }
 
 void QmitkStdMultiWidgetEditor::RequestActivateMenuWidget(bool on)
 {
   if (d->m_StdMultiWidget)
   {
     if (on)
     {
       d->m_StdMultiWidget->ActivateMenuWidget(d->m_MenuWidgetsEnabled);
     }
     else
     {
       d->m_MenuWidgetsEnabled = d->m_StdMultiWidget->IsMenuWidgetEnabled();
       d->m_StdMultiWidget->ActivateMenuWidget(false);
     }
   }
 }