Merge branch 'T24196-Integration'
14d85f7ed63e
Actions

Description

Merge branch 'T24196-Integration'

Details

Provenance

floca	Authored on May 25 2018, 5:02 PM
floca	Pushed on May 25 2018, 5:04 PM

Parents

rMITK6dd7c847e6a0: Merge additional fixes brought up by review D126
rMITKa668342973e8: Fixed some warnings

Branches

Unknown

Tags

Unknown

Event Timeline

floca committed rMITK14d85f7ed63e: Merge branch 'T24196-Integration' (authored by floca).May 25 2018, 5:02 PM

Merged Changes

6dd7c847e6a0 Merge additional fixes brought up by review D126
Author
floca
Browse Repository
No Builds
No Audits
7b24ac13aee1 Fixed some additional issues brought up by review D126
Author
floca
Browse Repository
No Builds
No Audits

Changes (21)

Path

Size

Packages

Modules/

QtWidgets/

files.cmake

O3: MITK Reviewer Group II

include/

QmitkDataStorageInspectorGenerator.h

O3: MITK Reviewer Group II

QmitkDataStorageInspectorProviderBase.h

O3: MITK Reviewer Group II

QmitkDataStorageListInspector.h

O3: MITK Reviewer Group II

QmitkDataStorageTreeInspector.h

O3: MITK Reviewer Group II

QmitkIDataStorageInspectorProvider.h

O3: MITK Reviewer Group II

mitkDataStorageInspectorGenerator.h

O3: MITK Reviewer Group II

	mitkIDataStorageInspectorProvider.h
	QmitkIDataStorageInspectorProvider.h

O3: MITK Reviewer Group II

src/

QmitkDataStorageInspectorGenerator.cpp

O3: MITK Reviewer Group II

QmitkIDataStorageInspectorProvider.cpp

O3: MITK Reviewer Group II

	mitkDataStorageInspectorGenerator.cpp
	QmitkDataStorageInspectorGenerator.cpp

O3: MITK Reviewer Group II

	mitkIDataStorageInspectorProvider.cpp
	QmitkIDataStorageInspectorProvider.cpp

O3: MITK Reviewer Group II

Plugins/

org.mitk.gui.qt.common/

src/

QmitkAbstractNodeSelectionWidget.cpp

O1: MITK Reviewer Group I

QmitkAbstractNodeSelectionWidget.h

O1: MITK Reviewer Group I

QmitkMultiNodeSelectionWidget.cpp

O1: MITK Reviewer Group I

QmitkMultiNodeSelectionWidget.h

O1: MITK Reviewer Group I

QmitkNodeSelectionDialog.cpp

O1: MITK Reviewer Group I

QmitkSingleNodeSelectionWidget.cpp

O1: MITK Reviewer Group I

QmitkSingleNodeSelectionWidget.h

O1: MITK Reviewer Group I

internal/

QmitkNodeSelectionPreferencePage.cpp

O1: MITK Reviewer Group I

QmitkNodeSelectionPreferencePage.h

O1: MITK Reviewer Group I

rMITK14d85f7ed63e

View Options

Modules/QtWidgets/files.cmake

View Options

Modules/QtWidgets/include/QmitkDataStorageInspectorGenerator.h

View Options

Modules/QtWidgets/include/QmitkDataStorageInspectorProviderBase.h

View Options

Modules/QtWidgets/include/QmitkDataStorageListInspector.h

View Options

Modules/QtWidgets/include/QmitkDataStorageTreeInspector.h

View Options

Modules/QtWidgets/include/QmitkIDataStorageInspectorProvider.h

View Options

Modules/QtWidgets/include/mitkDataStorageInspectorGenerator.h

View Options

Modules/QtWidgets/include/mitkIDataStorageInspectorProvider.h

View Options

Modules/QtWidgets/src/QmitkDataStorageInspectorGenerator.cpp

View Options

Modules/QtWidgets/src/QmitkIDataStorageInspectorProvider.cpp

View Options

Modules/QtWidgets/src/mitkDataStorageInspectorGenerator.cpp

View Options

Modules/QtWidgets/src/mitkIDataStorageInspectorProvider.cpp

View Options

Plugins/org.mitk.gui.qt.common/src/QmitkAbstractNodeSelectionWidget.cpp

View Options

Plugins/org.mitk.gui.qt.common/src/QmitkAbstractNodeSelectionWidget.h

View Options

Plugins/org.mitk.gui.qt.common/src/QmitkMultiNodeSelectionWidget.cpp

View Options

Plugins/org.mitk.gui.qt.common/src/QmitkMultiNodeSelectionWidget.h

View Options

Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionDialog.cpp

View Options

Plugins/org.mitk.gui.qt.common/src/QmitkSingleNodeSelectionWidget.cpp

View Options

Plugins/org.mitk.gui.qt.common/src/QmitkSingleNodeSelectionWidget.h

View Options

Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionPreferencePage.cpp

View Options

Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionPreferencePage.h

Merge branch 'T24196-Integration'14d85f7ed63eActions

Description

Details

Event Timeline

Merged Changes

Changes (21)

rMITK14d85f7ed63e

Modules/QtWidgets/files.cmake

Modules/QtWidgets/include/QmitkDataStorageInspectorGenerator.h

Modules/QtWidgets/include/QmitkDataStorageInspectorProviderBase.h

Modules/QtWidgets/include/QmitkDataStorageListInspector.h

Modules/QtWidgets/include/QmitkDataStorageTreeInspector.h

Modules/QtWidgets/include/QmitkIDataStorageInspectorProvider.h

Modules/QtWidgets/include/mitkDataStorageInspectorGenerator.h

Modules/QtWidgets/include/mitkIDataStorageInspectorProvider.h

Modules/QtWidgets/src/QmitkDataStorageInspectorGenerator.cpp

Modules/QtWidgets/src/QmitkIDataStorageInspectorProvider.cpp

Modules/QtWidgets/src/mitkDataStorageInspectorGenerator.cpp

Modules/QtWidgets/src/mitkIDataStorageInspectorProvider.cpp

Plugins/org.mitk.gui.qt.common/src/QmitkAbstractNodeSelectionWidget.cpp

Plugins/org.mitk.gui.qt.common/src/QmitkAbstractNodeSelectionWidget.h

Plugins/org.mitk.gui.qt.common/src/QmitkMultiNodeSelectionWidget.cpp

Plugins/org.mitk.gui.qt.common/src/QmitkMultiNodeSelectionWidget.h

Plugins/org.mitk.gui.qt.common/src/QmitkNodeSelectionDialog.cpp

Plugins/org.mitk.gui.qt.common/src/QmitkSingleNodeSelectionWidget.cpp

Plugins/org.mitk.gui.qt.common/src/QmitkSingleNodeSelectionWidget.h

Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionPreferencePage.cpp

Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionPreferencePage.h

Merge branch 'T24196-Integration'
14d85f7ed63e
Actions