diff --git a/Modules/IGT/TrackingDevices/mitkMicronTrackerTypeInformation.cpp b/Modules/IGT/TrackingDevices/mitkMicronTrackerTypeInformation.cpp
index 125642ac1b..7b6793b8a3 100644
--- a/Modules/IGT/TrackingDevices/mitkMicronTrackerTypeInformation.cpp
+++ b/Modules/IGT/TrackingDevices/mitkMicronTrackerTypeInformation.cpp
@@ -1,69 +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.
 
 ===================================================================*/
 
 #include "mitkMicronTrackerTypeInformation.h"
 
 #include "mitkClaronTrackingDevice.h"
 
 namespace mitk
 {
   std::string MicronTrackerTypeInformation::GetTrackingDeviceName()
   {
     return "Claron Micron";
   }
 
   TrackingDeviceData MicronTrackerTypeInformation::GetDeviceDataMicronTrackerH40()
   {
-    return{ MicronTrackerTypeInformation::GetTrackingDeviceName(), "Micron Tracker H40", "ClaronMicron.stl", "X" };
+    TrackingDeviceData data = { MicronTrackerTypeInformation::GetTrackingDeviceName(), "Micron Tracker H40", "ClaronMicron.stl", "X" };
+    return data;
   }
 
   MicronTrackerTypeInformation::MicronTrackerTypeInformation()
   {
     m_DeviceName = MicronTrackerTypeInformation::GetTrackingDeviceName();
     m_TrackingDeviceData.push_back(GetDeviceDataMicronTrackerH40());
   }
 
   MicronTrackerTypeInformation::~MicronTrackerTypeInformation()
   {
   }
 
   mitk::TrackingDeviceSource::Pointer MicronTrackerTypeInformation::CreateTrackingDeviceSource(
     mitk::TrackingDevice::Pointer trackingDevice,
     mitk::NavigationToolStorage::Pointer navigationTools,
     std::string* errorMessage,
     std::vector<int>* toolCorrespondencesInToolStorage)
   {
     mitk::TrackingDeviceSource::Pointer returnValue = mitk::TrackingDeviceSource::New();
     mitk::ClaronTrackingDevice::Pointer thisDevice = dynamic_cast<mitk::ClaronTrackingDevice*>(trackingDevice.GetPointer());
     *toolCorrespondencesInToolStorage = std::vector<int>();
     //add the tools to the tracking device
     for (int i = 0; i < navigationTools->GetToolCount(); i++)
     {
       mitk::NavigationTool::Pointer thisNavigationTool = navigationTools->GetTool(i);
       toolCorrespondencesInToolStorage->push_back(i);
       bool toolAddSuccess = thisDevice->AddTool(thisNavigationTool->GetToolName().c_str(), thisNavigationTool->GetCalibrationFile().c_str());
       if (!toolAddSuccess)
       {
         //todo error handling
         errorMessage->append("Can't add tool, is the toolfile valid?");
         return NULL;
       }
       thisDevice->GetTool(i)->SetToolTip(thisNavigationTool->GetToolTipPosition(), thisNavigationTool->GetToolTipOrientation());
     }
     returnValue->SetTrackingDevice(thisDevice);
     return returnValue;
   }
 }
\ No newline at end of file
diff --git a/Modules/IGT/TrackingDevices/mitkNDIAuroraTypeInformation.cpp b/Modules/IGT/TrackingDevices/mitkNDIAuroraTypeInformation.cpp
index 565d56503c..debf5a1631 100644
--- a/Modules/IGT/TrackingDevices/mitkNDIAuroraTypeInformation.cpp
+++ b/Modules/IGT/TrackingDevices/mitkNDIAuroraTypeInformation.cpp
@@ -1,145 +1,149 @@
 /*===================================================================
 
 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 "mitkNDIAuroraTypeInformation.h"
 
 #include "mitkIGTHardwareException.h"
 #include "mitkNDITrackingDevice.h"
 
 namespace mitk
 {
   std::string NDIAuroraTypeInformation::GetTrackingDeviceName()
   {
     return "NDI Aurora";
   }
 
   TrackingDeviceData NDIAuroraTypeInformation::GetDeviceDataAuroraCompact()
   {
-    return{ NDIAuroraTypeInformation::GetTrackingDeviceName(), "Aurora Compact", "NDIAuroraCompactFG_Dome.stl", "A" };
+    TrackingDeviceData data = { NDIAuroraTypeInformation::GetTrackingDeviceName(), "Aurora Compact", "NDIAuroraCompactFG_Dome.stl", "A" };
+    return data;
   }
 
   TrackingDeviceData NDIAuroraTypeInformation::GetDeviceDataAuroraPlanarCube()
   {
-    return{ NDIAuroraTypeInformation::GetTrackingDeviceName(), "Aurora Planar (Cube)", "NDIAurora.stl", "9" };
+    TrackingDeviceData data = { NDIAuroraTypeInformation::GetTrackingDeviceName(), "Aurora Planar (Cube)", "NDIAurora.stl", "9" };
+    return data;
   }
 
   TrackingDeviceData NDIAuroraTypeInformation::GetDeviceDataAuroraPlanarDome()
   {
-    return{ NDIAuroraTypeInformation::GetTrackingDeviceName(), "Aurora Planar (Dome)", "NDIAuroraPlanarFG_Dome.stl", "A" };
+    TrackingDeviceData data = { NDIAuroraTypeInformation::GetTrackingDeviceName(), "Aurora Planar (Dome)", "NDIAuroraPlanarFG_Dome.stl", "A" };
+    return data;
   }
 
   TrackingDeviceData NDIAuroraTypeInformation::GetDeviceDataAuroraTabletop()
   {
-    return{ NDIAuroraTypeInformation::GetTrackingDeviceName(), "Aurora Tabletop", "NDIAuroraTabletopFG_Dome.stl", "A" };
+    TrackingDeviceData data = { NDIAuroraTypeInformation::GetTrackingDeviceName(), "Aurora Tabletop", "NDIAuroraTabletopFG_Dome.stl", "A" };
+    return data;
   }
 
   NDIAuroraTypeInformation::NDIAuroraTypeInformation()
   {
     m_DeviceName = NDIAuroraTypeInformation::GetTrackingDeviceName();
     m_TrackingDeviceData.push_back(GetDeviceDataAuroraCompact());
     m_TrackingDeviceData.push_back(GetDeviceDataAuroraPlanarCube());
     m_TrackingDeviceData.push_back(GetDeviceDataAuroraPlanarDome());
     m_TrackingDeviceData.push_back(GetDeviceDataAuroraTabletop());
   }
 
   NDIAuroraTypeInformation::~NDIAuroraTypeInformation()
   {
   }
 
   mitk::TrackingDeviceSource::Pointer NDIAuroraTypeInformation::CreateTrackingDeviceSource(
     mitk::TrackingDevice::Pointer trackingDevice,
     mitk::NavigationToolStorage::Pointer navigationTools,
     std::string* errorMessage,
     std::vector<int>* toolCorrespondencesInToolStorage)
   {
     MITK_DEBUG << "Creating Aurora tracking device.";
     mitk::TrackingDeviceSource::Pointer returnValue = mitk::TrackingDeviceSource::New();
     mitk::NDITrackingDevice::Pointer thisDevice = dynamic_cast<mitk::NDITrackingDevice*>(trackingDevice.GetPointer());
 
     try
     {
       //connect to aurora to dectect tools automatically
       thisDevice->OpenConnection();
     }
     catch (mitk::IGTHardwareException& e)
     {
       errorMessage->append("Hardware error on opening the connection (");
       errorMessage->append(e.GetDescription());
       errorMessage->append(")");
       return NULL;
     }
     catch (mitk::IGTException& e)
     {
       errorMessage->append("Error on opening the connection (");
       errorMessage->append(e.GetDescription());
       errorMessage->append(")");
       return NULL;
     }
 
     //now search for automatically detected tools in the tool storage and save them
     mitk::NavigationToolStorage::Pointer newToolStorageInRightOrder = mitk::NavigationToolStorage::New();
     std::vector<int> alreadyFoundTools = std::vector<int>();
     *toolCorrespondencesInToolStorage = std::vector<int>();
     for (unsigned int i = 0; i < thisDevice->GetToolCount(); i++)
     {
       bool toolFound = false;
       for (int j = 0; j < navigationTools->GetToolCount(); j++)
       {
         //check if the serial number is the same to identify the tool
         if ((dynamic_cast<mitk::NDIPassiveTool*>(thisDevice->GetTool(i)))->GetSerialNumber() == navigationTools->GetTool(j)->GetSerialNumber())
         {
           //check if this tool was already added to make sure that every tool is only added once (in case of same serial numbers)
           bool toolAlreadyAdded = false;
           for (unsigned int k = 0; k < alreadyFoundTools.size(); k++) if (alreadyFoundTools.at(k) == j) toolAlreadyAdded = true;
 
           if (!toolAlreadyAdded)
           {
             //add tool in right order
             newToolStorageInRightOrder->AddTool(navigationTools->GetTool(j));
             toolCorrespondencesInToolStorage->push_back(j);
             //adapt name of tool
             dynamic_cast<mitk::NDIPassiveTool*>(thisDevice->GetTool(i))->SetToolName(navigationTools->GetTool(j)->GetToolName());
             //set tip of tool
             dynamic_cast<mitk::NDIPassiveTool*>(thisDevice->GetTool(i))->SetToolTip(navigationTools->GetTool(j)->GetToolTipPosition(), navigationTools->GetTool(j)->GetToolTipOrientation());
             //rember that this tool was already found
             alreadyFoundTools.push_back(j);
 
             toolFound = true;
             break;
           }
         }
       }
       if (!toolFound)
       {
         errorMessage->append("Error: did not find every automatically detected tool in the loaded tool storage: aborting initialization.");
         return NULL;
       }
     }
 
     //delete all tools from the tool storage
     navigationTools->DeleteAllTools();
 
     //and add only the detected tools in the right order
     for (int i = 0; i < newToolStorageInRightOrder->GetToolCount(); i++)
     {
       navigationTools->AddTool(newToolStorageInRightOrder->GetTool(i));
     }
     returnValue->SetTrackingDevice(thisDevice);
     MITK_DEBUG << "Number of tools of created tracking device: " << thisDevice->GetToolCount();
     MITK_DEBUG << "Number of outputs of created source: " << returnValue->GetNumberOfOutputs();
     return returnValue;
   }
 }
\ No newline at end of file
diff --git a/Modules/IGT/TrackingDevices/mitkNDIPolarisTypeInformation.cpp b/Modules/IGT/TrackingDevices/mitkNDIPolarisTypeInformation.cpp
index 0954271f3a..6af519ac61 100644
--- a/Modules/IGT/TrackingDevices/mitkNDIPolarisTypeInformation.cpp
+++ b/Modules/IGT/TrackingDevices/mitkNDIPolarisTypeInformation.cpp
@@ -1,88 +1,92 @@
 /*===================================================================
 
 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 "mitkNDIPolarisTypeInformation.h"
 
 #include "mitkNDITrackingDevice.h"
 
 namespace mitk
 {
   std::string NDIPolarisTypeInformation::GetTrackingDeviceName()
   {
     return "NDI Polaris"; ///< Polaris: optical Tracker from NDI;
   }
   TrackingDeviceData NDIPolarisTypeInformation::GetDeviceDataPolarisOldModel()
   {
-    return{ NDIPolarisTypeInformation::GetTrackingDeviceName(), "Polaris (Old Model)", "NDIPolarisOldModel.stl", "0" };
+    TrackingDeviceData data = { NDIPolarisTypeInformation::GetTrackingDeviceName(), "Polaris (Old Model)", "NDIPolarisOldModel.stl", "0" };
+    return data;
   }
   TrackingDeviceData NDIPolarisTypeInformation::GetDeviceDataPolarisSpectra()
   {
     //full hardware code of polaris spectra: 5-240000-153200-095000+057200+039800+056946+024303+029773+999999+99999924
-    return{ NDIPolarisTypeInformation::GetTrackingDeviceName(), "Polaris Spectra", "NDIPolarisSpectra.stl", "5-2" };
+    TrackingDeviceData data = { NDIPolarisTypeInformation::GetTrackingDeviceName(), "Polaris Spectra", "NDIPolarisSpectra.stl", "5-2" };
+    return data;
   }
 
   TrackingDeviceData NDIPolarisTypeInformation::GetDeviceDataSpectraExtendedPyramid()
   {
     //full hardware code of polaris spectra (extended pyramid): 5-300000-153200-095000+057200+039800+056946+024303+029773+999999+07350024
-    return{ NDIPolarisTypeInformation::GetTrackingDeviceName(), "Polaris Spectra (Extended Pyramid)", "NDIPolarisSpectraExtendedPyramid.stl", "5-3" };
+    TrackingDeviceData data = { NDIPolarisTypeInformation::GetTrackingDeviceName(), "Polaris Spectra (Extended Pyramid)", "NDIPolarisSpectraExtendedPyramid.stl", "5-3" };
+    return data;
   }
   TrackingDeviceData NDIPolarisTypeInformation::GetDeviceDataPolarisVicra()
   {
-    return{ NDIPolarisTypeInformation::GetTrackingDeviceName(), "Polaris Vicra", "NDIPolarisVicra.stl", "7" };
+    TrackingDeviceData data = { NDIPolarisTypeInformation::GetTrackingDeviceName(), "Polaris Vicra", "NDIPolarisVicra.stl", "7" };
+    return data;
   }
 
   NDIPolarisTypeInformation::NDIPolarisTypeInformation()
     //: m_DeviceName("Polaris")
     //, m_Widget(nullptr)
   {
     m_DeviceName = NDIPolarisTypeInformation::GetTrackingDeviceName();
     m_TrackingDeviceData.push_back(GetDeviceDataPolarisOldModel());
     m_TrackingDeviceData.push_back(GetDeviceDataSpectraExtendedPyramid());
     m_TrackingDeviceData.push_back(GetDeviceDataPolarisSpectra());
     m_TrackingDeviceData.push_back(GetDeviceDataPolarisVicra());
   }
 
   NDIPolarisTypeInformation::~NDIPolarisTypeInformation()
   {
   }
 
   mitk::TrackingDeviceSource::Pointer NDIPolarisTypeInformation::CreateTrackingDeviceSource(
     mitk::TrackingDevice::Pointer trackingDevice,
     mitk::NavigationToolStorage::Pointer navigationTools,
     std::string* errorMessage,
     std::vector<int>* toolCorrespondencesInToolStorage)
   {
     mitk::TrackingDeviceSource::Pointer returnValue = mitk::TrackingDeviceSource::New();
     mitk::NDITrackingDevice::Pointer thisDevice = dynamic_cast<mitk::NDITrackingDevice*>(trackingDevice.GetPointer());
     *toolCorrespondencesInToolStorage = std::vector<int>();
     //add the tools to the tracking device
     for (int i = 0; i < navigationTools->GetToolCount(); i++)
     {
       mitk::NavigationTool::Pointer thisNavigationTool = navigationTools->GetTool(i);
       toolCorrespondencesInToolStorage->push_back(i);
       bool toolAddSuccess = thisDevice->AddTool(thisNavigationTool->GetToolName().c_str(), thisNavigationTool->GetCalibrationFile().c_str());
       if (!toolAddSuccess)
       {
         //todo: error handling
         errorMessage->append("Can't add tool, is the SROM-file valid?");
         return NULL;
       }
       thisDevice->GetTool(i)->SetToolTip(thisNavigationTool->GetToolTipPosition(), thisNavigationTool->GetToolTipOrientation());
     }
     returnValue->SetTrackingDevice(thisDevice);
     return returnValue;
   }
 }
\ No newline at end of file
diff --git a/Modules/IGT/TrackingDevices/mitkNPOptitrackTrackingTypeInformation.cpp b/Modules/IGT/TrackingDevices/mitkNPOptitrackTrackingTypeInformation.cpp
index 50cc4d1367..974d2c4230 100644
--- a/Modules/IGT/TrackingDevices/mitkNPOptitrackTrackingTypeInformation.cpp
+++ b/Modules/IGT/TrackingDevices/mitkNPOptitrackTrackingTypeInformation.cpp
@@ -1,74 +1,75 @@
 /*===================================================================
 
 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 "mitkNPOptitrackTrackingTypeInformation.h"
 
 #include "mitkOptitrackTrackingDevice.h"
 
 namespace mitk
 {
   std::string NPOptitrackTrackingTypeInformation::GetTrackingDeviceName()
   {
     return "NP Optitrack";
   }
 
   TrackingDeviceData NPOptitrackTrackingTypeInformation::GetDeviceDataNPOptitrack()
   {
-    return{ NPOptitrackTrackingTypeInformation::GetTrackingDeviceName(), "Optitrack", "cube", "X" };
+    TrackingDeviceData data = { NPOptitrackTrackingTypeInformation::GetTrackingDeviceName(), "Optitrack", "cube", "X" };
+    return data;
   }
 
   NPOptitrackTrackingTypeInformation::NPOptitrackTrackingTypeInformation()
   {
     m_DeviceName = NPOptitrackTrackingTypeInformation::GetTrackingDeviceName();
     m_TrackingDeviceData.push_back(GetDeviceDataNPOptitrack());
   }
 
   NPOptitrackTrackingTypeInformation::~NPOptitrackTrackingTypeInformation()
   {
   }
 
   TrackingDeviceSource::Pointer NPOptitrackTrackingTypeInformation::CreateTrackingDeviceSource(
     TrackingDevice::Pointer trackingDevice,
     NavigationToolStorage::Pointer navigationTools,
     std::string* errorMessage,
     std::vector<int>* toolCorrespondencesInToolStorage)
   {
     mitk::TrackingDeviceSource::Pointer returnValue = mitk::TrackingDeviceSource::New();
     mitk::OptitrackTrackingDevice::Pointer thisDevice = dynamic_cast<mitk::OptitrackTrackingDevice*>(trackingDevice.GetPointer());
     *toolCorrespondencesInToolStorage = std::vector<int>();
 
     //OpenConnection with Optitrack
     thisDevice->OpenConnection();
 
     //add the tools to the tracking device
     for (int i = 0; i < navigationTools->GetToolCount(); i++)
     {
       mitk::NavigationTool::Pointer thisNavigationTool = navigationTools->GetTool(i);
       toolCorrespondencesInToolStorage->push_back(i);
       bool toolAddSuccess = thisDevice->AddToolByDefinitionFile(thisNavigationTool->GetCalibrationFile());
       thisDevice->GetOptitrackTool(i)->SetToolName(thisNavigationTool->GetToolName().c_str());
       if (!toolAddSuccess)
       {
         //todo error handling
         errorMessage->append("Can't add tool, is the toolfile valid?");
         return NULL;
       }
       //thisDevice->GetTool(i)->SetToolTip(thisNavigationTool->GetToolTipPosition(),thisNavigationTool->GetToolTipOrientation());
     }
     returnValue->SetTrackingDevice(thisDevice);
     return returnValue;
   }
 }
\ No newline at end of file
diff --git a/Modules/IGT/TrackingDevices/mitkOpenIGTLinkTypeInformation.cpp b/Modules/IGT/TrackingDevices/mitkOpenIGTLinkTypeInformation.cpp
index 124aea17de..2abed0dad7 100644
--- a/Modules/IGT/TrackingDevices/mitkOpenIGTLinkTypeInformation.cpp
+++ b/Modules/IGT/TrackingDevices/mitkOpenIGTLinkTypeInformation.cpp
@@ -1,59 +1,60 @@
 /*===================================================================
 
 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 "mitkOpenIGTLinkTypeInformation.h"
 
 #include "mitkOpenIGTLinkTrackingDevice.h"
 
 namespace mitk
 {
   std::string OpenIGTLinkTypeInformation::GetTrackingDeviceName()
   {
     return "Open IGT Link Tracking Device Connection";
   }
 
   TrackingDeviceData OpenIGTLinkTypeInformation::GetDeviceDataOpenIGTLinkTrackingDeviceConnection(){
-    return{ OpenIGTLinkTypeInformation::GetTrackingDeviceName(), "OpenIGTLink Tracking Device", "cube", "X" };
+    TrackingDeviceData data = { OpenIGTLinkTypeInformation::GetTrackingDeviceName(), "OpenIGTLink Tracking Device", "cube", "X" };
+    return data;
   }
 
   OpenIGTLinkTypeInformation::OpenIGTLinkTypeInformation()
   {
     m_DeviceName = OpenIGTLinkTypeInformation::GetTrackingDeviceName();
     m_TrackingDeviceData.push_back(GetDeviceDataOpenIGTLinkTrackingDeviceConnection());
   }
 
   OpenIGTLinkTypeInformation::~OpenIGTLinkTypeInformation()
   {
   }
 
   mitk::TrackingDeviceSource::Pointer OpenIGTLinkTypeInformation::CreateTrackingDeviceSource(
     mitk::TrackingDevice::Pointer trackingDevice,
     mitk::NavigationToolStorage::Pointer navigationTools,
     std::string* errorMessage,
     std::vector<int>* /*toolCorrespondencesInToolStorage*/)
   {
     mitk::TrackingDeviceSource::Pointer returnValue = mitk::TrackingDeviceSource::New();
     mitk::OpenIGTLinkTrackingDevice::Pointer thisDevice = dynamic_cast<mitk::OpenIGTLinkTrackingDevice*>(trackingDevice.GetPointer());
     thisDevice->DiscoverTools();
     if (thisDevice->GetToolCount() != navigationTools->GetToolCount())
     {
       errorMessage->append("The number of tools in the connected device differs from the tool storage, cannot add tools.");
       return NULL;
     }
     returnValue->SetTrackingDevice(thisDevice);
     return returnValue;
   }
 }
\ No newline at end of file
diff --git a/Modules/IGT/TrackingDevices/mitkUnspecifiedTrackingTypeInformation.cpp b/Modules/IGT/TrackingDevices/mitkUnspecifiedTrackingTypeInformation.cpp
index d0faa326d4..6dc7b81b65 100644
--- a/Modules/IGT/TrackingDevices/mitkUnspecifiedTrackingTypeInformation.cpp
+++ b/Modules/IGT/TrackingDevices/mitkUnspecifiedTrackingTypeInformation.cpp
@@ -1,58 +1,60 @@
 /*===================================================================
 
 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 "mitkUnspecifiedTrackingTypeInformation.h"
 
 #include "mitkIGTHardwareException.h"
 #include "mitkNDITrackingDevice.h"
 
 namespace mitk
 {
   std::string UnspecifiedTrackingTypeInformation::GetTrackingDeviceName()
   {
     return "Tracking System Not Specified";
   }
 
   TrackingDeviceData UnspecifiedTrackingTypeInformation::GetDeviceDataUnspecified()
   {
-    return{ UnspecifiedTrackingTypeInformation::GetTrackingDeviceName(), "Unspecified System", "cube", "X" };
+    TrackingDeviceData data = { UnspecifiedTrackingTypeInformation::GetTrackingDeviceName(), "Unspecified System", "cube", "X" };
+    return data;
   }
   // Careful when changing the "invalid" device: The mitkTrackingTypeTest is using it's data.
   TrackingDeviceData UnspecifiedTrackingTypeInformation::GetDeviceDataInvalid()
   {
-    return{ UnspecifiedTrackingTypeInformation::GetTrackingDeviceName(), "Invalid Tracking System", "", "X" };
+    TrackingDeviceData data = { UnspecifiedTrackingTypeInformation::GetTrackingDeviceName(), "Invalid Tracking System", "", "X" };
+    return data;
   }
 
   UnspecifiedTrackingTypeInformation::UnspecifiedTrackingTypeInformation()
   {
     m_DeviceName = UnspecifiedTrackingTypeInformation::GetTrackingDeviceName();
     m_TrackingDeviceData.push_back(GetDeviceDataUnspecified());
     m_TrackingDeviceData.push_back(GetDeviceDataInvalid());
   }
 
   UnspecifiedTrackingTypeInformation::~UnspecifiedTrackingTypeInformation()
   {
   }
 
   mitk::TrackingDeviceSource::Pointer UnspecifiedTrackingTypeInformation::CreateTrackingDeviceSource(
     mitk::TrackingDevice::Pointer trackingDevice,
     mitk::NavigationToolStorage::Pointer navigationTools,
     std::string* errorMessage,
     std::vector<int>* toolCorrespondencesInToolStorage)
   {
     return nullptr;
   }
 }
\ No newline at end of file
diff --git a/Modules/IGT/TrackingDevices/mitkVirtualTrackerTypeInformation.cpp b/Modules/IGT/TrackingDevices/mitkVirtualTrackerTypeInformation.cpp
index 08098b85cf..efb9b54a34 100644
--- a/Modules/IGT/TrackingDevices/mitkVirtualTrackerTypeInformation.cpp
+++ b/Modules/IGT/TrackingDevices/mitkVirtualTrackerTypeInformation.cpp
@@ -1,69 +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.
 
 ===================================================================*/
 
 #include "mitkVirtualTrackerTypeInformation.h"
 
 #include "mitkVirtualTrackingDevice.h"
 
 namespace mitk
 {
   std::string VirtualTrackerTypeInformation::GetTrackingDeviceName()
   {
     return "Virtual Tracker";
   }
 
   TrackingDeviceData VirtualTrackerTypeInformation::GetDeviceDataVirtualTracker()
   {
-    return{ VirtualTrackerTypeInformation::GetTrackingDeviceName(), "Virtual Tracker", "cube", "X" };
+    TrackingDeviceData data = { VirtualTrackerTypeInformation::GetTrackingDeviceName(), "Virtual Tracker", "cube", "X" };
+    return data;
   }
 
   VirtualTrackerTypeInformation::VirtualTrackerTypeInformation()
   {
     m_DeviceName = VirtualTrackerTypeInformation::GetTrackingDeviceName();
     m_TrackingDeviceData.push_back(GetDeviceDataVirtualTracker());
   }
 
   VirtualTrackerTypeInformation::~VirtualTrackerTypeInformation()
   {
   }
 
   mitk::TrackingDeviceSource::Pointer VirtualTrackerTypeInformation::CreateTrackingDeviceSource(
     mitk::TrackingDevice::Pointer trackingDevice,
     mitk::NavigationToolStorage::Pointer navigationTools,
     std::string* errorMessage,
     std::vector<int>* toolCorrespondencesInToolStorage)
   {
     mitk::TrackingDeviceSource::Pointer returnValue = mitk::TrackingDeviceSource::New();
     mitk::VirtualTrackingDevice::Pointer thisDevice = dynamic_cast<mitk::VirtualTrackingDevice*>(trackingDevice.GetPointer());
     *toolCorrespondencesInToolStorage = std::vector<int>();
 
     //add the tools to the tracking device
     for (int i = 0; i < navigationTools->GetToolCount(); i++)
     {
       mitk::NavigationTool::Pointer thisNavigationTool = navigationTools->GetTool(i);
       toolCorrespondencesInToolStorage->push_back(i);
       bool toolAddSuccess = thisDevice->AddTool(thisNavigationTool->GetToolName().c_str());
       if (!toolAddSuccess)
       {
         //todo error handling
         errorMessage->append("Can't add tool, is the toolfile valid?");
         return NULL;
       }
     }
     returnValue->SetTrackingDevice(thisDevice);
     return returnValue;
   }
 }
\ No newline at end of file