diff --git a/Modules/XNAT/include/QmitkXnatExperimentWidget.h b/Modules/XNAT/include/QmitkXnatExperimentWidget.h
index 87ad4f5388..e6f11b408a 100644
--- a/Modules/XNAT/include/QmitkXnatExperimentWidget.h
+++ b/Modules/XNAT/include/QmitkXnatExperimentWidget.h
@@ -1,58 +1,58 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological rmatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef QMITKXNATEXPERIMENTWIDGET_H
 #define QMITKXNATEXPERIMENTWIDGET_H
 
 // XNATUI
 #include <ui_QmitkXnatExperimentWidgetControls.h>
 #include <MitkXNATExports.h>
 
 // Qt
 #include <QWidget>
 
 // CTK XNAT Core
 class ctkXnatExperiment;
 
 class MITKXNAT_EXPORT QmitkXnatExperimentWidget : public QWidget
 {
   Q_OBJECT
 
 public:
 
   enum Mode
   {
     INFO,
     CREATE
   };
 
-  QmitkXnatExperimentWidget(QWidget* parent = 0);
-  QmitkXnatExperimentWidget(Mode mode, QWidget* parent = 0);
+  QmitkXnatExperimentWidget(QWidget* parent = nullptr);
+  QmitkXnatExperimentWidget(Mode mode, QWidget* parent = nullptr);
   ~QmitkXnatExperimentWidget();
 
   void SetExperiment(ctkXnatExperiment* experiment);
   ctkXnatExperiment* GetExperiment() const;
 
 protected:
   Ui::QmitkXnatExperimentWidgetControls m_Controls;
 
 private:
   void Init();
   Mode m_Mode;
   ctkXnatExperiment* m_Experiment;
 };
 
 #endif // QMITKXNATEXPERIMENTWIDGET_H
diff --git a/Modules/XNAT/include/QmitkXnatProjectWidget.h b/Modules/XNAT/include/QmitkXnatProjectWidget.h
index 6cf95f9320..f64b5d5a8b 100644
--- a/Modules/XNAT/include/QmitkXnatProjectWidget.h
+++ b/Modules/XNAT/include/QmitkXnatProjectWidget.h
@@ -1,59 +1,59 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological rmatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef QMITKXNATPROJECTWIDGET_H
 #define QMITKXNATPROJECTWIDGET_H
 
 // XNATUI
 #include <ui_QmitkXnatProjectWidgetControls.h>
 #include <MitkXNATExports.h>
 
 // Qt
 #include <QWidget>
 
 // CTK XNAT Core
 class ctkXnatProject;
 
 class MITKXNAT_EXPORT QmitkXnatProjectWidget : public QWidget
 {
   Q_OBJECT
 
 public:
 
   enum Mode
   {
     INFO,
     CREATE
   };
 
-  QmitkXnatProjectWidget(QWidget* parent = 0);
-  QmitkXnatProjectWidget(Mode mode, QWidget* parent = 0);
+  QmitkXnatProjectWidget(QWidget* parent = nullptr);
+  QmitkXnatProjectWidget(Mode mode, QWidget* parent = nullptr);
   ~QmitkXnatProjectWidget();
 
   void SetProject(ctkXnatProject* project);
   ctkXnatProject* GetProject() const;
 
 protected:
   Ui::QmitkXnatProjectWidgetControls m_Controls;
 
 private:
 
   void Init();
   Mode m_Mode;
   ctkXnatProject* m_Project;
 };
 
 #endif // QMITKXNATPROJECTWIDGET_H
diff --git a/Modules/XNAT/include/QmitkXnatSubjectWidget.h b/Modules/XNAT/include/QmitkXnatSubjectWidget.h
index feb19f4ea0..044ad9c804 100644
--- a/Modules/XNAT/include/QmitkXnatSubjectWidget.h
+++ b/Modules/XNAT/include/QmitkXnatSubjectWidget.h
@@ -1,57 +1,57 @@
 /*===================================================================
 
 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 QMITKXNATSUBJECTWIDGET_H
 #define QMITKXNATSUBJECTWIDGET_H
 
 #include <ui_QmitkXnatSubjectWidgetControls.h>
 #include <MitkXNATExports.h>
 
 // Qt
 #include <QWidget>
 
 // CTK XNAT Core
 class ctkXnatSubject;
 
 class MITKXNAT_EXPORT QmitkXnatSubjectWidget : public QWidget
 {
   Q_OBJECT
 
 public:
 
   enum Mode
   {
     INFO,
     CREATE
   };
 
-  QmitkXnatSubjectWidget(QWidget* parent = 0);
-  QmitkXnatSubjectWidget(Mode mode, QWidget* parent = 0);
+  QmitkXnatSubjectWidget(QWidget* parent = nullptr);
+  QmitkXnatSubjectWidget(Mode mode, QWidget* parent = nullptr);
   ~QmitkXnatSubjectWidget();
 
   void SetSubject(ctkXnatSubject* subject);
   ctkXnatSubject* GetSubject() const;
 
 protected:
   Ui::QmitkXnatSubjectWidgetControls m_Controls;
 
 private:
   void Init();
   Mode m_Mode;
   ctkXnatSubject* m_Subject;
 };
 
 #endif // QMITKXNATSUBJECTWIDGET_H
diff --git a/Modules/XNAT/src/QmitkXnatProjectWidget.cpp b/Modules/XNAT/src/QmitkXnatProjectWidget.cpp
index 0e96ea18fc..771bfc3ef1 100644
--- a/Modules/XNAT/src/QmitkXnatProjectWidget.cpp
+++ b/Modules/XNAT/src/QmitkXnatProjectWidget.cpp
@@ -1,85 +1,85 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological rmatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY 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 "QmitkXnatProjectWidget.h"
 
 #include <ctkXnatProject.h>
 
 QmitkXnatProjectWidget::QmitkXnatProjectWidget(QWidget* parent)
   : QWidget(parent)
 {
   m_Mode = INFO;
   Init();
 }
 
 QmitkXnatProjectWidget::QmitkXnatProjectWidget(Mode mode, QWidget* parent)
-  : m_Mode(mode)
-  , QWidget(parent)
+  : QWidget(parent)
+  , m_Mode(mode)
 {
   Init();
 }
 
 QmitkXnatProjectWidget::~QmitkXnatProjectWidget()
 {
 }
 
 void QmitkXnatProjectWidget::Init()
 {
   // Create GUI widgets from the Qt Designer's .ui file
   m_Controls.setupUi(this);
 
   if (m_Mode == Mode::INFO)
   {
     // make not needed row invisible
     m_Controls.idLabel->setVisible(false);
     m_Controls.idLineEdit->setVisible(false);
     m_Controls.mandatoryLabel->setVisible(false);
   }
 }
 
 void QmitkXnatProjectWidget::SetProject(ctkXnatProject* project)
 {
   m_Project = project;
 
   // Set the UI labels
   m_Controls.nameLineEdit->setText(m_Project->property("name"));
   m_Controls.descriptionLineEdit->setText(m_Project->property("description"));
   if (!m_Project->property("pi_lastname").isEmpty())
   {
     m_Controls.piLineEdit->setText(m_Project->property("pi_lastname") + ", " + m_Project->property("pi_firstname"));
   }
 }
 
 ctkXnatProject* QmitkXnatProjectWidget::GetProject() const
 {
   if (m_Mode == Mode::CREATE)
   {
     if (!m_Controls.idLineEdit->text().isEmpty())
     {
       m_Project->setProperty("ID", m_Controls.idLineEdit->text());
     }
     if (!m_Controls.nameLineEdit->text().isEmpty())
     {
       m_Project->setProperty("name", m_Controls.nameLineEdit->text());
     }
     if (!m_Controls.descriptionLineEdit->text().isEmpty())
     {
       m_Project->setProperty("description", m_Controls.descriptionLineEdit->text());
     }
     // pi name needs to be inserted separated
   }
   return m_Project;
 }