# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

re #14657

* remove any mention of workspace
* use camelCase naming rather than underscore naming
Refs #9946

Refs #9946

This is required as Qt4 is not completely C++11 compliant.  I think that these will no longer be needed when we move to Qt5.
Should only be required for files up to and including API.
Refs #7284

Refs #9059

Amend size(), getObjectNames() & getObjects() to include 'hidden'
objects if the corresponding ConfigService setting (MantidOptions.InvisibleWorkspaces)
is set to true (1).

size(), getObjectNames() & getObjects() exclude hidden objects/workspaces.
This will mainly affect corresponding python methods.

This may change the behaviour of the workspace dock, but then it was
broken anyway.