diff --git a/graphics/VP1/VP1Base/src/IVP1System.cxx b/graphics/VP1/VP1Base/src/IVP1System.cxx
index 2537ead3394ea2e5f24de98b77c0be8a0e107991..ad2b04bb1cca4312856a3bbb34dd307b8849e4a7 100644
--- a/graphics/VP1/VP1Base/src/IVP1System.cxx
+++ b/graphics/VP1/VP1Base/src/IVP1System.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -85,10 +85,8 @@ IVP1System::~IVP1System()
   assert(m_d->state==UNCREATED||m_d->state==CONSTRUCTED);
   assert(!m_d->controller);
 
-  if(!m_d==0) {
-	  delete m_d;
-	  m_d=0;
-  }
+  delete m_d;
+  m_d=nullptr;
   VP1Msg::messageDebug("IVP1System() Destructor. END.");
 }
 
diff --git a/graphics/VP1/VP1Base/src/VP1Controller.cxx b/graphics/VP1/VP1Base/src/VP1Controller.cxx
index 1001d2adc4856e66e68e949f903380accf5e95d1..f1fa3d96a4f3c6b02f34e8f4422ebccea1b23bb7 100644
--- a/graphics/VP1/VP1Base/src/VP1Controller.cxx
+++ b/graphics/VP1/VP1Base/src/VP1Controller.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -393,7 +393,6 @@ void VP1Controller::restoreSettings(QByteArray ba)
   if (m_d->collWidget)
     s.ignoreWidget(m_d->collWidget);
   s.warnUnrestored((QWidget*)(this));
-  QPair<QPushButton*,QWidget*> b2d;
   foreach (Imp::DialogInfo* di,m_d->dialogs)
     s.warnUnrestored(di->dialogWidget);
 
@@ -415,7 +414,6 @@ QByteArray VP1Controller::saveSettings() const
     s.ignoreWidget(m_d->collWidget);
 
   s.warnUnsaved((QWidget*)(this));
-  QPair<QPushButton*,QWidget*> b2d;
   foreach (Imp::DialogInfo* di,m_d->dialogs)
     s.warnUnsaved(di->dialogWidget);
 
diff --git a/graphics/VP1/VP1Base/src/VP1ExaminerViewer.cxx b/graphics/VP1/VP1Base/src/VP1ExaminerViewer.cxx
index f26fba8ef6b6868d1fc4acad06cfdce987244ed3..c5cba06d102a9a84120d4ff06e8088ae5bc1b101 100644
--- a/graphics/VP1/VP1Base/src/VP1ExaminerViewer.cxx
+++ b/graphics/VP1/VP1Base/src/VP1ExaminerViewer.cxx
@@ -482,8 +482,10 @@ void debugCameraClipPlanes(void * data, const SbVec2f & nearfar)
 
 	SoPathList &cameras = action.getPaths();
 
-	for (int i = 0, e = cameras.getLength(); i != e; ++i)
-		std::cerr << "Camera #" << i << " = " << (void *) cameras[i]->getTail() << "(" << typeid(*cameras[i]->getTail()).name() << ")\n";
+	for (int i = 0, e = cameras.getLength(); i != e; ++i) {
+                auto* tail = cameras[i]->getTail();
+		std::cerr << "Camera #" << i << " = " << (void *) tail << "(" << typeid(*tail).name() << ")\n";
+        }
 
 	std::cerr << "Calculated clip-planes. Near: " << nearfar[0] << ". Far: " << nearfar[1] << "\n"
 			<< "Current camera clip-planes. Near: " << camera->nearDistance.getValue() << ", Far: " << camera->farDistance.getValue() << "\n"
@@ -1279,7 +1281,7 @@ void VP1ExaminerViewer::Imp::detectorZoomButtonClicked(std::pair<REGION,VIEW> p)
 {
 	grabFocus();
 
-	VP1Msg::messageVerbose("detectorZoomButtonClicked region = "+toString(p.first)+", from "+QString(p.second +" Z axis") );
+	VP1Msg::messageVerbose("detectorZoomButtonClicked region = "+toString(p.first)+", from "+QString((std::to_string(p.second) +" Z axis").c_str()));
 
 	SoNode * rootnode = theclass->getSceneGraph();
 	if (!rootnode) {