diff --git a/core/libs/template/subjectedit.cpp b/core/libs/template/subjectedit.cpp
index 304e0a5c46..69795e2894 100644
--- a/core/libs/template/subjectedit.cpp
+++ b/core/libs/template/subjectedit.cpp
@@ -1,101 +1,103 @@
 /* ============================================================
  *
  * This file is a part of digiKam project
  * https://www.digikam.org
  *
  * Date        : 2009-07-09
  * Description : Subjects panel.
  *
  * Copyright (C) 2009-2020 by Gilles Caulier <caulier dot gilles at gmail dot com>
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
  * Public License as published by the Free Software Foundation;
  * either version 2, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * ============================================================ */
 
 #include "subjectedit.h"
 
 // Qt includes
 
 #include <QCheckBox>
 #include <QLabel>
 #include <QValidator>
 
 // KDE includes
 
 #include <klocalizedstring.h>
 
 namespace Digikam
 {
 
 SubjectEdit::SubjectEdit(QWidget* const parent)
     : SubjectWidget(parent)
 {
     m_iprDefault = QLatin1String("XMP");
 
     // Subject string do not accept these characters:
     // - '*' (\x2A)
     // - ':' (\x3A)
     // - '?' (\x3F)
+
     QRegExp subjectRx(QLatin1String("[^*:?]+$"));
     QValidator* const subjectValidator = new QRegExpValidator(subjectRx, this);
 
     // --------------------------------------------------------
 
     m_iprEdit->setText(m_iprDefault);
     m_iprEdit->setValidator(subjectValidator);
     m_iprEdit->setWhatsThis(i18n("Enter the Informative Provider Reference here. "
                                  "I.P.R is a name registered with the XMP/NAA, identifying the "
                                  "provider that provides an indicator of the content. "
                                  "The default value for the I.P.R is \"XMP\" if a standard Reference "
                                  "Code is used."));
 
     m_refEdit->setWhatsThis(i18n("Enter the Subject Reference Number here. "
                                  "Provides a numeric code to indicate the Subject Name plus "
                                  "optional Subject Matter and Subject Detail Names in the "
                                  "language of the service. Subject Reference is a number "
                                  "from the range 01000000 to 17999999 and represent a "
                                  "language independent international reference to "
                                  "a Subject. A Subject is identified by its Reference Number "
                                  "and corresponding Names taken from a standard lists given "
                                  "by XMP/NAA. If a standard reference code is used, these lists "
                                  "are the English language reference versions. "
                                  "This field is limited to 8 digit code."));
 
     m_nameEdit->setValidator(subjectValidator);
     m_nameEdit->setWhatsThis(i18n("Enter the Subject Name here. English language is used "
                                   "if you selected a standard XMP/NAA reference code."));
 
     m_matterEdit->setValidator(subjectValidator);
     m_matterEdit->setWhatsThis(i18n("Enter the Subject Matter Name here. English language is used "
                                     "if you selected a standard XMP/NAA reference code."));
 
     m_detailEdit->setValidator(subjectValidator);
     m_detailEdit->setWhatsThis(i18n("Enter the Subject Detail Name here. English language is used "
                                     "if you selected a standard XMP/NAA reference code."));
 
     // reset the note label, not used in XMP view
+
     if (m_note)
     {
         delete m_note;
     }
 }
 
 SubjectEdit::~SubjectEdit()
 {
 }
 
 void SubjectEdit::slotRefChanged()
 {
     SubjectWidget::slotRefChanged();
     m_iprEdit->setText(QLatin1String("XMP"));
 }
 
 } // namespace Digikam
diff --git a/core/libs/template/templatemanager.cpp b/core/libs/template/templatemanager.cpp
index 777d801155..bc72736b6d 100644
--- a/core/libs/template/templatemanager.cpp
+++ b/core/libs/template/templatemanager.cpp
@@ -1,579 +1,580 @@
 /* ============================================================
  *
  * This file is a part of digiKam project
  * https://www.digikam.org
  *
  * Date        : 2009-06-20
  * Description : metadata template manager.
  *
  * Copyright (C) 2009-2020 by Gilles Caulier <caulier dot gilles at gmail dot com>
  * Copyright (C) 2009-2010 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
  * Public License as published by the Free Software Foundation;
  * either version 2, or (at your option)
  * any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * ============================================================ */
 
 #include "templatemanager.h"
 
 // Qt includes
 
 #include <QFile>
 #include <QDomDocument>
 #include <QDomElement>
 #include <QMutex>
 #include <QTextStream>
 #include <QTextCodec>
 #include <QStandardPaths>
 
 // Local includes
 
 #include "template.h"
 
 namespace Digikam
 {
 
 class Q_DECL_HIDDEN TemplateManager::Private
 {
 public:
 
     explicit Private()
-        :mutex()
+        : modified(false),
+          mutex()
     {
-        modified = false;
     }
 
     bool            modified;
 
     QList<Template> pList;
     QString         file;
 
     QMutex          mutex;
 };
 
 class Q_DECL_HIDDEN TemplateManagerCreator
 {
 public:
 
     TemplateManager object;
 };
 
 Q_GLOBAL_STATIC(TemplateManagerCreator, creator)
 
 TemplateManager* TemplateManager::defaultManager()
 {
     return &creator->object;
 }
 
 TemplateManager::TemplateManager()
     : d(new Private)
 {
     d->file = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/template.xml");
 
     load();
 }
 
 TemplateManager::~TemplateManager()
 {
     save();
     clear();
     delete d;
 }
 
 bool TemplateManager::load()
 {
     d->modified = false;
 
     QFile file(d->file);
 
     if (!file.open(QIODevice::ReadOnly))
     {
         return false;
     }
 
     QDomDocument doc(QLatin1String("templatelist"));
 
     if (!doc.setContent(&file))
     {
         return false;
     }
 
     QDomElement docElem = doc.documentElement();
 
     if (docElem.tagName() != QLatin1String("templatelist"))
     {
         return false;
     }
 
     for (QDomNode n = docElem.firstChild(); !n.isNull(); n = n.nextSibling())
     {
         QDomElement e = n.toElement();
 
         if (e.isNull())
         {
             continue;
         }
 
         if (e.tagName() != QLatin1String("template"))
         {
             continue;
         }
 
         Template             t;
         IptcCoreLocationInfo locationInf;
         IptcCoreContactInfo  contactInf;
 
-        for (QDomNode n2 = e.firstChild(); !n2.isNull(); n2 = n2.nextSibling())
+        for (QDomNode n2 = e.firstChild() ; !n2.isNull() ; n2 = n2.nextSibling())
         {
             QDomElement e2 = n2.toElement();
 
             if (e2.isNull())
             {
                 continue;
             }
 
             QString name2  = e2.tagName();
             QString val2   = e2.attribute(QLatin1String("value"));
 
-            if (name2 == QLatin1String("templatetitle"))
+            if      (name2 == QLatin1String("templatetitle"))
             {
                 t.setTemplateTitle(val2);
             }
             else if (name2 == QLatin1String("authorsposition"))
             {
                 t.setAuthorsPosition(val2);
             }
             else if (name2 == QLatin1String("credit"))
             {
                 t.setCredit(val2);
             }
             else if (name2 == QLatin1String("source"))
             {
                 t.setSource(val2);
             }
             else if (name2 == QLatin1String("instructions"))
             {
                 t.setInstructions(val2);
             }
             else if (name2 == QLatin1String("authors"))
             {
                 QStringList list;
 
-                for (QDomNode n3 = e2.firstChild(); !n3.isNull(); n3 = n3.nextSibling())
+                for (QDomNode n3 = e2.firstChild() ; !n3.isNull() ; n3 = n3.nextSibling())
                 {
                     QDomElement e3 = n3.toElement();
                     QString key    = e3.tagName();
                     QString val    = e3.attribute(QLatin1String("value"));
 
                     if (key == QLatin1String("name"))
                     {
                         if (val.isEmpty())
                         {
                             continue;
                         }
 
                         list.append(val);
                     }
                 }
 
                 t.setAuthors(list);
             }
             else if (name2 == QLatin1String("copyright"))
             {
                 MetaEngine::AltLangMap copyrights;
 
-                for (QDomNode n3 = e2.firstChild(); !n3.isNull(); n3 = n3.nextSibling())
+                for (QDomNode n3 = e2.firstChild() ; !n3.isNull() ; n3 = n3.nextSibling())
                 {
                     QDomElement e3 = n3.toElement();
                     QString key    = e3.tagName();
                     QString val    = e3.attribute(QLatin1String("value"));
                     copyrights.insert(key, val);
                 }
 
                 t.setCopyright(copyrights);
             }
             else if (name2 == QLatin1String("rightusageterms"))
             {
                 MetaEngine::AltLangMap usages;
 
-                for (QDomNode n3 = e2.firstChild(); !n3.isNull(); n3 = n3.nextSibling())
+                for (QDomNode n3 = e2.firstChild() ; !n3.isNull() ; n3 = n3.nextSibling())
                 {
                     QDomElement e3 = n3.toElement();
                     QString key    = e3.tagName();
                     QString val    = e3.attribute(QLatin1String("value"));
                     usages.insert(key, val);
                 }
 
                 t.setRightUsageTerms(usages);
             }
             else if (name2 == QLatin1String("locationcountry"))
             {
                 locationInf.country = val2;
             }
             else if (name2 == QLatin1String("locationcountrycode"))
             {
                 locationInf.countryCode = val2;
             }
             else if (name2 == QLatin1String("locationprovincestate"))
             {
                 locationInf.provinceState = val2;
             }
             else if (name2 == QLatin1String("locationcity"))
             {
                 locationInf.city = val2;
             }
             else if (name2 == QLatin1String("locationlocation"))
             {
                 locationInf.location = val2;
             }
             else if (name2 == QLatin1String("contactcity"))
             {
                 contactInf.city = val2;
             }
             else if (name2 == QLatin1String("contactcountry"))
             {
                 contactInf.country = val2;
             }
             else if (name2 == QLatin1String("contactaddress"))
             {
                 contactInf.address = val2;
             }
             else if (name2 == QLatin1String("contactpostalcode"))
             {
                 contactInf.postalCode = val2;
             }
             else if (name2 == QLatin1String("contactprovincestate"))
             {
                 contactInf.provinceState = val2;
             }
             else if (name2 == QLatin1String("contactemail"))
             {
                 contactInf.email = val2;
             }
             else if (name2 == QLatin1String("contactphone"))
             {
                 contactInf.phone = val2;
             }
             else if (name2 == QLatin1String("contactweburl"))
             {
                 contactInf.webUrl = val2;
             }
             else if (name2 == QLatin1String("subjects"))
             {
                 QStringList list;
 
                 for (QDomNode n3 = e2.firstChild(); !n3.isNull(); n3 = n3.nextSibling())
                 {
                     QDomElement e3 = n3.toElement();
                     QString key    = e3.tagName();
                     QString val    = e3.attribute(QLatin1String("value"));
 
                     if (key == QLatin1String("subject"))
                     {
                         if (val.isEmpty())
                         {
                             continue;
                         }
 
                         list.append(val);
                     }
                 }
 
                 t.setIptcSubjects(list);
             }
         }
 
         t.setLocationInfo(locationInf);
         t.setContactInfo(contactInf);
         insertPrivate(t);
     }
 
     return true;
 }
 
 bool TemplateManager::save()
 {
     // If not modified don't save the file
+
     if (!d->modified)
     {
         return true;
     }
 
     QDomDocument doc(QLatin1String("templatelist"));
     doc.setContent(QLatin1String("<!DOCTYPE XMLTemplateList><templatelist version=\"2.0\" client=\"digikam\" encoding=\"UTF-8\"/>"));
     QDomElement docElem = doc.documentElement();
 
     {
         QMutexLocker lock(&d->mutex);
 
         foreach (const Template& t, d->pList)
         {
             QDomElement elem = doc.createElement(QLatin1String("template"));
 
             QDomElement templatetitle = doc.createElement(QLatin1String("templatetitle"));
             templatetitle.setAttribute(QLatin1String("value"), t.templateTitle());
             elem.appendChild(templatetitle);
 
             QDomElement authorsposition = doc.createElement(QLatin1String("authorsposition"));
             authorsposition.setAttribute(QLatin1String("value"), t.authorsPosition());
             elem.appendChild(authorsposition);
 
             QDomElement credit = doc.createElement(QLatin1String("credit"));
             credit.setAttribute(QLatin1String("value"), t.credit());
             elem.appendChild(credit);
 
             QDomElement source = doc.createElement(QLatin1String("source"));
             source.setAttribute(QLatin1String("value"), t.source());
             elem.appendChild(source);
 
             QDomElement instructions = doc.createElement(QLatin1String("instructions"));
             instructions.setAttribute(QLatin1String("value"), t.instructions());
             elem.appendChild(instructions);
 
             QDomElement authors = doc.createElement(QLatin1String("authors"));
             elem.appendChild(authors);
 
             foreach (const QString& name, t.authors())
             {
                 QDomElement e = doc.createElement(QLatin1String("name"));
                 e.setAttribute(QLatin1String("value"), name);
                 authors.appendChild(e);
             }
 
             QDomElement copyright = doc.createElement(QLatin1String("copyright"));
             elem.appendChild(copyright);
             MetaEngine::AltLangMap rights = t.copyright();
             MetaEngine::AltLangMap::const_iterator it;
 
             for (it = rights.constBegin() ; it != rights.constEnd() ; ++it)
             {
                 QDomElement e = doc.createElement(it.key());
                 e.setAttribute(QLatin1String("value"), it.value());
                 copyright.appendChild(e);
             }
 
             QDomElement rightusageterms = doc.createElement(QLatin1String("rightusageterms"));
             elem.appendChild(rightusageterms);
             MetaEngine::AltLangMap usages   = t.rightUsageTerms();
             MetaEngine::AltLangMap::const_iterator it2;
 
             for (it2 = usages.constBegin() ; it2 != usages.constEnd() ; ++it2)
             {
                 QDomElement e = doc.createElement(it2.key());
                 e.setAttribute(QLatin1String("value"), it2.value());
                 rightusageterms.appendChild(e);
             }
 
             docElem.appendChild(elem);
 
             QDomElement locationcountry = doc.createElement(QLatin1String("locationcountry"));
             locationcountry.setAttribute(QLatin1String("value"), t.locationInfo().country);
             elem.appendChild(locationcountry);
 
             QDomElement locationcountrycode = doc.createElement(QLatin1String("locationcountrycode"));
             locationcountrycode.setAttribute(QLatin1String("value"), t.locationInfo().countryCode);
             elem.appendChild(locationcountrycode);
 
             QDomElement locationprovincestate = doc.createElement(QLatin1String("locationprovincestate"));
             locationprovincestate.setAttribute(QLatin1String("value"), t.locationInfo().provinceState);
             elem.appendChild(locationprovincestate);
 
             QDomElement locationcity = doc.createElement(QLatin1String("locationcity"));
             locationcity.setAttribute(QLatin1String("value"), t.locationInfo().city);
             elem.appendChild(locationcity);
 
             QDomElement locationlocation = doc.createElement(QLatin1String("locationlocation"));
             locationlocation.setAttribute(QLatin1String("value"), t.locationInfo().location);
             elem.appendChild(locationlocation);
 
             QDomElement contactcity = doc.createElement(QLatin1String("contactcity"));
             contactcity.setAttribute(QLatin1String("value"), t.contactInfo().city);
             elem.appendChild(contactcity);
 
             QDomElement contactcountry = doc.createElement(QLatin1String("contactcountry"));
             contactcountry.setAttribute(QLatin1String("value"), t.contactInfo().country);
             elem.appendChild(contactcountry);
 
             QDomElement contactaddress = doc.createElement(QLatin1String("contactaddress"));
             contactaddress.setAttribute(QLatin1String("value"), t.contactInfo().address);
             elem.appendChild(contactaddress);
 
             QDomElement contactpostalcode = doc.createElement(QLatin1String("contactpostalcode"));
             contactpostalcode.setAttribute(QLatin1String("value"), t.contactInfo().postalCode);
             elem.appendChild(contactpostalcode);
 
             QDomElement contactprovincestate = doc.createElement(QLatin1String("contactprovincestate"));
             contactprovincestate.setAttribute(QLatin1String("value"), t.contactInfo().provinceState);
             elem.appendChild(contactprovincestate);
 
             QDomElement contactemail = doc.createElement(QLatin1String("contactemail"));
             contactemail.setAttribute(QLatin1String("value"), t.contactInfo().email);
             elem.appendChild(contactemail);
 
             QDomElement contactphone = doc.createElement(QLatin1String("contactphone"));
             contactphone.setAttribute(QLatin1String("value"), t.contactInfo().phone);
             elem.appendChild(contactphone);
 
             QDomElement contactweburl = doc.createElement(QLatin1String("contactweburl"));
             contactweburl.setAttribute(QLatin1String("value"), t.contactInfo().webUrl);
             elem.appendChild(contactweburl);
 
             QDomElement subjects = doc.createElement(QLatin1String("subjects"));
             elem.appendChild(subjects);
 
             foreach (const QString& subject, t.IptcSubjects())
             {
                 QDomElement e = doc.createElement(QLatin1String("subject"));
                 e.setAttribute(QLatin1String("value"), subject);
                 subjects.appendChild(e);
             }
         }
     }
 
     QFile file(d->file);
 
     if (!file.open(QIODevice::WriteOnly))
     {
         return false;
     }
 
     QTextStream stream(&file);
     stream.setCodec(QTextCodec::codecForName("UTF-8"));
     stream.setAutoDetectUnicode(true);
     stream << doc.toString();
     file.close();
 
     return true;
 }
 
 void TemplateManager::insert(const Template& t)
 {
     if (t.isNull())
     {
         return;
     }
 
     d->modified = true;
     insertPrivate(t);
 }
 
 void TemplateManager::remove(const Template& t)
 {
     if (t.isNull())
     {
         return;
     }
 
     d->modified = true;
     removePrivate(t);
 }
 
 void TemplateManager::insertPrivate(const Template& t)
 {
     if (t.isNull())
     {
         return;
     }
 
     {
         QMutexLocker lock(&d->mutex);
         d->pList.append(t);
     }
 
     emit signalTemplateAdded(t);
 }
 
 void TemplateManager::removePrivate(const Template& t)
 {
     if (t.isNull())
     {
         return;
     }
 
     {
         QMutexLocker lock(&d->mutex);
 
-        for (QList<Template>::iterator it = d->pList.begin(); it != d->pList.end(); ++it)
+        for (QList<Template>::iterator it = d->pList.begin() ; it != d->pList.end() ; ++it)
         {
             if (it->templateTitle() == t.templateTitle())
             {
                 it = d->pList.erase(it);
                 break;
             }
         }
     }
 
     emit signalTemplateRemoved(t);
 }
 
 void TemplateManager::clear()
 {
     QList<Template> oldTemplates = d->pList;
 
     {
         QMutexLocker lock(&d->mutex);
         d->pList.clear();
     }
 
     foreach (const Template& t, d->pList)
     {
         emit signalTemplateRemoved(t);
     }
 }
 
 QList<Template> TemplateManager::templateList() const
 {
     return d->pList;
 }
 
 Template TemplateManager::findByTitle(const QString& title) const
 {
     QMutexLocker lock(&d->mutex);
 
     foreach (const Template& t, d->pList)
     {
         if (t.templateTitle() == title)
         {
             return t;
         }
     }
 
     return Template();
 }
 
 Template TemplateManager::findByContents(const Template& tref) const
 {
     QMutexLocker lock(&d->mutex);
 
     foreach (const Template& t, d->pList)
     {
         if (t == tref)
         {
             return t;
         }
     }
 
     return Template();
 }
 
 Template TemplateManager::fromIndex(int index) const
 {
     QMutexLocker lock(&d->mutex);
 
-    if (index >= 0 && index < d->pList.size())
+    if ((index >= 0) && (index < d->pList.size()))
     {
         return d->pList.at(index);
     }
 
     return Template();
 }
 
 } // namespace Digikam
diff --git a/core/libs/template/templatepanel.cpp b/core/libs/template/templatepanel.cpp
index 06e19a7d4e..6bf98d4d2d 100644
--- a/core/libs/template/templatepanel.cpp
+++ b/core/libs/template/templatepanel.cpp
@@ -1,515 +1,512 @@
 /* ============================================================
  *
  * This file is a part of digiKam project
  * https://www.digikam.org
  *
  * Date        : 2009-07-06
  * Description : metadata template settings panel.
  *
  * Copyright (C) 2009-2020 by Gilles Caulier <caulier dot gilles at gmail dot com>
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
  * Public License as published by the Free Software Foundation;
  * either version 2, or (at your option)
  * any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * ============================================================ */
 
 #include "templatepanel.h"
 
 // Qt includes
 
 #include <QLabel>
 #include <QGridLayout>
 #include <QFrame>
 #include <QIcon>
 #include <QLineEdit>
 #include <QApplication>
 #include <QStyle>
 
 // KDE includes
 
 #include <klocalizedstring.h>
 
 // Local includes
 
 #include "templatelist.h"
 #include "subjectedit.h"
 #include "altlangstredit.h"
 #include "countryselector.h"
 
 namespace Digikam
 {
 
 class Q_DECL_HIDDEN TemplatePanel::Private
 {
 
 public:
 
     explicit Private()
+      : authorsEdit(nullptr),
+        authorsPositionEdit(nullptr),
+        creditEdit(nullptr),
+        sourceEdit(nullptr),
+        instructionsEdit(nullptr),
+        copyrightEdit(nullptr),
+        rightUsageEdit(nullptr),
+        locationCountryCodeEdit(nullptr),
+        locationProvinceStateEdit(nullptr),
+        locationCityEdit(nullptr),
+        locationSublocationEdit(nullptr),
+        contactCityEdit(nullptr),
+        contactCountryEdit(nullptr),
+        contactAddressEdit(nullptr),
+        contactPostalCodeEdit(nullptr),
+        contactProvinceStateEdit(nullptr),
+        contactEmailEdit(nullptr),
+        contactPhoneEdit(nullptr),
+        contactWebUrlEdit(nullptr),
+        subjects(nullptr)
     {
-        authorsEdit               = nullptr;
-        authorsPositionEdit       = nullptr;
-        creditEdit                = nullptr;
-        sourceEdit                = nullptr;
-        copyrightEdit             = nullptr;
-        rightUsageEdit            = nullptr;
-        instructionsEdit          = nullptr;
-
-        locationCountryCodeEdit   = nullptr;
-        locationProvinceStateEdit = nullptr;
-        locationCityEdit          = nullptr;
-        locationSublocationEdit   = nullptr;
-
-        contactCityEdit           = nullptr;
-        contactCountryEdit        = nullptr;
-        contactAddressEdit        = nullptr;
-        contactPostalCodeEdit     = nullptr;
-        contactProvinceStateEdit  = nullptr;
-        contactEmailEdit          = nullptr;
-        contactPhoneEdit          = nullptr;
-        contactWebUrlEdit         = nullptr;
-
-        subjects                  = nullptr;
     }
 
-    // Rights template information panel.
+    /// Rights template information panel.
     QLineEdit*       authorsEdit;
     QLineEdit*       authorsPositionEdit;
     QLineEdit*       creditEdit;
     QLineEdit*       sourceEdit;
     QLineEdit*       instructionsEdit;
 
     AltLangStrEdit*  copyrightEdit;
     AltLangStrEdit*  rightUsageEdit;
 
-    // Location template information panel.
+    /// Location template information panel.
     CountrySelector* locationCountryCodeEdit;
     QLineEdit*       locationProvinceStateEdit;
     QLineEdit*       locationCityEdit;
     QLineEdit*       locationSublocationEdit;
 
-    // Contact template information panel.
+    /// Contact template information panel.
     QLineEdit*       contactCityEdit;
     QLineEdit*       contactCountryEdit;
     QLineEdit*       contactAddressEdit;
     QLineEdit*       contactPostalCodeEdit;
     QLineEdit*       contactProvinceStateEdit;
     QLineEdit*       contactEmailEdit;
     QLineEdit*       contactPhoneEdit;
     QLineEdit*       contactWebUrlEdit;
 
-    // Subjects template information panel.
+    //// Subjects template information panel.
     SubjectEdit*     subjects;
 };
 
 TemplatePanel::TemplatePanel(QWidget* const parent)
     : QTabWidget(parent),
       d(new Private)
 {
     // -- Rights Template information panel -------------------------------------------------------------
 
     QWidget* const page1     = new QWidget(this);
     QGridLayout* const grid1 = new QGridLayout(page1);
 
     QLabel* const label1 = new QLabel(i18n("Author Names:"), page1);
     d->authorsEdit       = new QLineEdit(page1);
     d->authorsEdit->setClearButtonEnabled(true);
     d->authorsEdit->setPlaceholderText(i18n("Enter the names of the photograph's creators. Use semi-colons as separator here."));
     label1->setBuddy(d->authorsEdit);
     d->authorsEdit->setWhatsThis(i18n("<p>This field should contain the names of the persons who created the photograph. "
                                       "If it is not appropriate to add the name of the photographer (for example, if the identity of "
                                       "the photographer needs to be protected) the name of a company or organization can also be used. "
                                       "Once saved, this field should not be changed by anyone.</p>"
                                       "<p>To enter more than one name, use <b>semi-colons as separators</b>.</p>"
                                       "<p>With IPTC, this field is limited to 32 ASCII characters.</p>"));
 
     // --------------------------------------------------------
 
     QLabel* const label2   = new QLabel(i18n("Authors' Positions:"), page1);
     d->authorsPositionEdit = new QLineEdit(page1);
     d->authorsPositionEdit->setClearButtonEnabled(true);
     d->authorsPositionEdit->setPlaceholderText(i18n("Enter the job titles of the authors here."));
     label2->setBuddy(d->authorsPositionEdit);
     d->authorsPositionEdit->setWhatsThis(i18n("<p>This field should contain the job titles of the authors. Examples might include "
                                          "titles such as: Staff Photographer, Freelance Photographer, or Independent Commercial "
                                          "Photographer. Since this is a qualifier for the Author field, the Author field must also "
                                          "be filled out.</p>"
                                          "<p>With IPTC, this field is limited to 32 ASCII characters.</p>"));
 
     // --------------------------------------------------------
 
     QLabel* const label3 = new QLabel(i18n("Credit:"), page1);
     d->creditEdit        = new QLineEdit(page1);
     d->creditEdit->setClearButtonEnabled(true);
     d->creditEdit->setPlaceholderText(i18n("Enter the photograph credit here."));
     label3->setBuddy(d->creditEdit);
     d->creditEdit->setWhatsThis(i18n("<p>(synonymous to Provider): Use the Provider field to identify who is providing the photograph. "
                                      "This does not necessarily have to be the author. If a photographer is working for a news agency "
                                      "such as Reuters or the Associated Press, these organizations could be listed here as they are "
                                      "\"providing\" the image for use by others. If the image is a stock photograph, then the group "
                                      "(agency) involved in supplying the image should be listed here.</p>"
                                      "<p>With IPTC, this field is limited to 32 ASCII characters.</p>"));
 
     // --------------------------------------------------------
 
     d->copyrightEdit = new AltLangStrEdit(page1);
     d->copyrightEdit->setTitle(i18n("Copyright:"));
     d->copyrightEdit->setFixedHeight(75);
     d->copyrightEdit->setPlaceholderText(i18n("Enter the copyright notice to identify the current owner(s) of the copyright here."));
     d->copyrightEdit->setWhatsThis(i18n("<p>The Copyright Notice should contain any necessary copyright notice for claiming the intellectual "
                                         "property, and should identify the current owner(s) of the copyright for the photograph. Usually, "
                                         "this would be the photographer, but if the image was done by an employee or as work-for-hire, "
                                         "then the agency or company should be listed. Use the form appropriate to your country. USA: "
                                         "&copy; {date of first publication} name of copyright owner, as in \"&copy;2005 John Doe.\" "
                                         "Note, the word \"copyright\" or the abbreviation \"copr\" may be used in place of the &copy; symbol. "
                                         "In some foreign countries only the copyright symbol is recognized and the abbreviation does not work. "
                                         "Furthermore the copyright symbol must be a full circle with a \"c\" inside; using something like (c) "
                                         "where the parentheses form a partial circle is not sufficient. For additional protection worldwide, "
                                         "use of the phrase, \"all rights reserved\" following the notice above is encouraged. \nIn Europe "
                                         "you would use: Copyright {Year} {Copyright owner}, all rights reserved. \nIn Japan, for maximum "
                                         "protection, the following three items should appear in the copyright field of the IPTC Core: "
                                         "(a) the word, Copyright; (b) year of the first publication; and (c) name of the author. "
                                         "You may also wish to include the phrase \"all rights reserved\".</p>"
                                         "<p>With XMP, you can include more than one copyright string using different languages.</p>"
                                         "<p>With IPTC, this field is limited to 128 ASCII characters.</p>"));
 
     // --------------------------------------------------------
 
     d->rightUsageEdit = new AltLangStrEdit(page1);
     d->rightUsageEdit->setTitle(i18n("Right Usage Terms:"));
     d->rightUsageEdit->setFixedHeight(75);
     d->rightUsageEdit->setPlaceholderText(i18n("Enter the list of instructions on how a resource can be legally used here."));
     d->rightUsageEdit->setWhatsThis(i18n("<p>The Right Usage Terms field should be used to list instructions on how "
                                          "a resource can be legally used.</p>"
                                          "<p>With XMP, you can include more than one right usage terms string using "
                                          "different languages.</p>"
                                          "<p>This field does not exist with IPTC.</p>"));
 
     // --------------------------------------------------------
 
     QLabel* const label6 = new QLabel(i18n("Source:"), page1);
     d->sourceEdit        = new QLineEdit(page1);
     d->sourceEdit->setClearButtonEnabled(true);
     d->sourceEdit->setPlaceholderText(i18n("Enter the original owner of the photograph here."));
     label6->setBuddy(d->sourceEdit);
     d->sourceEdit->setWhatsThis(i18n("<p>The Source field should be used to identify the original owner or copyright holder of the "
                                      "photograph. The value of this field should never be changed after the information is entered "
                                      "following the image's creation. While not yet enforced by the custom panels, you should consider "
                                      "this to be a \"write-once\" field. The source could be an individual, an agency, or a "
                                      "member of an agency. To aid in later searches, it is suggested to separate any slashes "
                                      "\"/\" with a blank space. Use the form \"photographer / agency\" rather than "
                                      "\"photographer/agency.\" Source may also be different from Creator and from the names "
                                      "listed in the Copyright Notice.</p>"
                                      "<p>With IPTC, this field is limited to 32 ASCII characters.</p>"));
 
     // --------------------------------------------------------
 
     QLabel* const label7 = new QLabel(i18n("Instructions:"), page1);
     d->instructionsEdit  = new QLineEdit(page1);
     d->instructionsEdit->setClearButtonEnabled(true);
     d->instructionsEdit->setPlaceholderText(i18n("Enter the editorial notice here."));
     label7->setBuddy(d->instructionsEdit);
     d->instructionsEdit->setWhatsThis(i18n("<p>The Instructions field should be used to list editorial "
                                            "instructions concerning the use of photograph.</p>"
                                            "<p>With IPTC, this field is limited to 256 ASCII characters.</p>"));
 
     // --------------------------------------------------------
 
     const int spacing = QApplication::style()->pixelMetric(QStyle::PM_DefaultLayoutSpacing);
 
     grid1->setContentsMargins(spacing, spacing, spacing, spacing);
     grid1->setSpacing(spacing);
     grid1->setAlignment(Qt::AlignTop);
     grid1->setColumnStretch(1, 10);
     grid1->addWidget(label1,                 0, 0, 1, 1);
     grid1->addWidget(d->authorsEdit,         0, 1, 1, 2);
     grid1->addWidget(label2,                 1, 0, 1, 1);
     grid1->addWidget(d->authorsPositionEdit, 1, 1, 1, 2);
     grid1->addWidget(label3,                 2, 0, 1, 1);
     grid1->addWidget(d->creditEdit,          2, 1, 1, 2);
     grid1->addWidget(d->copyrightEdit,       3, 0, 1, 2);
     grid1->addWidget(d->rightUsageEdit,      4, 0, 1, 2);
     grid1->addWidget(label6,                 5, 0, 1, 1);
     grid1->addWidget(d->sourceEdit,          5, 1, 1, 2);
     grid1->addWidget(label7,                 6, 0, 1, 1);
     grid1->addWidget(d->instructionsEdit,    6, 1, 1, 2);
 
     insertTab(RIGHTS, page1, QIcon::fromTheme(QLatin1String("flag")), i18n("Rights"));
 
     // -- Location Template information panel -------------------------------------------------------------
 
     QWidget* const page2 = new QWidget(this);
 
     // --------------------------------------------------------
 
     QLabel* const label9 = new QLabel(i18n("City:"));
     d->locationCityEdit  = new QLineEdit;
     d->locationCityEdit->setClearButtonEnabled(true);
     d->locationCityEdit->setPlaceholderText(i18n("Enter the city of contents here."));
     label9->setBuddy(d->locationCityEdit);
     d->locationCityEdit->setWhatsThis(i18n("<p>This field should contain the name of the city "
                                            "where the photograph was taken.</p>"));
 
     // --------------------------------------------------------
 
     QLabel* const label10      = new QLabel(i18n("Sublocation:"));
     d->locationSublocationEdit = new QLineEdit;
     d->locationSublocationEdit->setClearButtonEnabled(true);
     d->locationSublocationEdit->setPlaceholderText(i18n("Enter the city sublocation of contents here."));
     label10->setBuddy(d->locationSublocationEdit);
     d->locationSublocationEdit->setWhatsThis(i18n("<p>This field should contain the sublocation of the city "
             "where the photograph was taken.</p>"));
 
     // --------------------------------------------------------
 
     QLabel* const label11        = new QLabel(i18n("Province/State:"));
     d->locationProvinceStateEdit = new QLineEdit;
     d->locationProvinceStateEdit->setClearButtonEnabled(true);
     d->locationProvinceStateEdit->setPlaceholderText(i18n("Enter the province or state of contents here."));
     label11->setBuddy(d->locationProvinceStateEdit);
     d->locationProvinceStateEdit->setWhatsThis(i18n("<p>This field should contain the province or state "
             "where the photograph was taken.</p>"));
 
     // --------------------------------------------------------
 
     QLabel* const label12      = new QLabel(i18n("Country:"));
     d->locationCountryCodeEdit = new CountrySelector(page2);
     label12->setBuddy(d->locationCountryCodeEdit);
     d->locationCountryCodeEdit->setWhatsThis(i18n("<p>Select here the country "
             "where the photograph was taken.</p>"));
 
     // --------------------------------------------------------
 
     QGridLayout* grid2 = new QGridLayout;
     grid2->addWidget(label9,                       0, 0, 1, 1);
     grid2->addWidget(d->locationCityEdit,          0, 1, 1, 2);
     grid2->addWidget(label10,                      1, 0, 1, 1);
     grid2->addWidget(d->locationSublocationEdit,   1, 1, 1, 2);
     grid2->addWidget(label11,                      2, 0, 1, 1);
     grid2->addWidget(d->locationProvinceStateEdit, 2, 1, 1, 2);
     grid2->addWidget(label12,                      3, 0, 1, 1);
     grid2->addWidget(d->locationCountryCodeEdit,   3, 1, 1, 2);
     grid2->setContentsMargins(spacing, spacing, spacing, spacing);
     grid2->setSpacing(spacing);
     grid2->setAlignment(Qt::AlignTop);
     grid2->setColumnStretch(1, 10);
     grid2->setRowStretch(4, 10);
     page2->setLayout(grid2);
 
     page2->setTabOrder(d->locationCityEdit, d->locationSublocationEdit);
     page2->setTabOrder(d->locationSublocationEdit, d->locationProvinceStateEdit);
     page2->setTabOrder(d->locationProvinceStateEdit, d->locationCountryCodeEdit);
 
     insertTab(LOCATION, page2, QIcon::fromTheme(QLatin1String("globe")), i18n("Location"));
 
     // -- Contact Template information panel -------------------------------------------------------------
 
     QWidget* const page3  = new QWidget(this);
 
     QLabel* const label13 = new QLabel(i18n("City:"), page3);
     d->contactCityEdit    = new QLineEdit(page3);
     d->contactCityEdit->setClearButtonEnabled(true);
     d->contactCityEdit->setPlaceholderText(i18n("Enter the city name of the lead author here."));
     label13->setBuddy(d->contactCityEdit);
     d->contactCityEdit->setWhatsThis(i18n("<p>This field should contain the city name "
                                           "where the lead author lives.</p>"));
 
     // --------------------------------------------------------
 
     QLabel* const label14 = new QLabel(i18n("Country:"), page3);
     d->contactCountryEdit = new QLineEdit(page3);
     d->contactCountryEdit->setClearButtonEnabled(true);
     d->contactCountryEdit->setPlaceholderText(i18n("Enter the country name of the lead author here."));
     label14->setBuddy(d->contactCountryEdit);
     d->contactCountryEdit->setWhatsThis(i18n("<p>This field should contain the country name "
                                         "where the lead author lives.</p>"));
 
     // --------------------------------------------------------
 
     QLabel* const label15 = new QLabel(i18n("Address:"), page3);
     d->contactAddressEdit = new QLineEdit(page3);
     d->contactAddressEdit->setClearButtonEnabled(true);
     d->contactAddressEdit->setPlaceholderText(i18n("Enter the address of the lead author here."));
     label15->setBuddy(d->contactAddressEdit);
     d->contactAddressEdit->setWhatsThis(i18n("<p>This field should contain the address "
                                         "where the lead author lives.</p>"));
 
     // --------------------------------------------------------
 
     QLabel* const label16    = new QLabel(i18n("Postal Code:"), page3);
     d->contactPostalCodeEdit = new QLineEdit(page3);
     d->contactPostalCodeEdit->setClearButtonEnabled(true);
     d->contactPostalCodeEdit->setPlaceholderText(i18n("Enter the postal code of the lead author here."));
     label16->setBuddy(d->contactPostalCodeEdit);
     d->contactPostalCodeEdit->setWhatsThis(i18n("<p>This field should contain the postal code "
                                            "where the lead author lives.</p>"));
 
     // --------------------------------------------------------
 
     QLabel* const label17       = new QLabel(i18n("Province:"), page3);
     d->contactProvinceStateEdit = new QLineEdit(page3);
     d->contactProvinceStateEdit->setClearButtonEnabled(true);
     d->contactProvinceStateEdit->setPlaceholderText(i18n("Enter the province of the lead author here."));
     label17->setBuddy(d->contactProvinceStateEdit);
     d->contactProvinceStateEdit->setWhatsThis(i18n("<p>This field should contain the province "
             "where the lead author lives.</p>"));
 
     // --------------------------------------------------------
 
     QLabel* const label18 = new QLabel(i18n("Email:"), page3);
     d->contactEmailEdit   = new QLineEdit(page3);
     d->contactEmailEdit->setClearButtonEnabled(true);
     d->contactEmailEdit->setPlaceholderText(i18n("Enter the email of the lead author here."));
     label18->setBuddy(d->contactEmailEdit);
     d->contactEmailEdit->setWhatsThis(i18n("<p>This field should contain the email "
                                            "of the lead author.</p>"));
 
     // --------------------------------------------------------
 
     QLabel* const label19 = new QLabel(i18n("Phone:"), page3);
     d->contactPhoneEdit   = new QLineEdit(page3);
     d->contactPhoneEdit->setClearButtonEnabled(true);
     d->contactPhoneEdit->setPlaceholderText(i18n("Enter the phone number of the lead author here."));
     label19->setBuddy(d->contactPhoneEdit);
     d->contactPhoneEdit->setWhatsThis(i18n("<p>This field should contain the phone number "
                                            "of the lead author.</p>"));
 
     // --------------------------------------------------------
 
     QLabel* const label20 = new QLabel(i18n("URL:"), page3);
     d->contactWebUrlEdit  = new QLineEdit(page3);
     d->contactWebUrlEdit->setClearButtonEnabled(true);
     d->contactWebUrlEdit->setPlaceholderText(i18n("Enter the web site URL of the lead author here."));
     label20->setBuddy(d->contactWebUrlEdit);
     d->contactWebUrlEdit->setWhatsThis(i18n("<p>This field should contain the web site URL "
                                             "of the lead author.</p>"));
 
     // --------------------------------------------------------
 
     QGridLayout* const grid3 = new QGridLayout;
     grid3->addWidget(label15,                     0, 0, 1, 1);
     grid3->addWidget(d->contactAddressEdit,       0, 1, 1, 2);
     grid3->addWidget(label16,                     1, 0, 1, 1);
     grid3->addWidget(d->contactPostalCodeEdit,    1, 1, 1, 2);
     grid3->addWidget(label13,                     2, 0, 1, 1);
     grid3->addWidget(d->contactCityEdit,          2, 1, 1, 2);
     grid3->addWidget(label17,                     3, 0, 1, 1);
     grid3->addWidget(d->contactProvinceStateEdit, 3, 1, 1, 2);
     grid3->addWidget(label14,                     4, 0, 1, 1);
     grid3->addWidget(d->contactCountryEdit,       4, 1, 1, 2);
     grid3->addWidget(label19,                     5, 0, 1, 1);
     grid3->addWidget(d->contactPhoneEdit,         5, 1, 1, 2);
     grid3->addWidget(label18,                     6, 0, 1, 1);
     grid3->addWidget(d->contactEmailEdit,         6, 1, 1, 2);
     grid3->addWidget(label20,                     7, 0, 1, 1);
     grid3->addWidget(d->contactWebUrlEdit,        7, 1, 1, 2);
     grid3->setContentsMargins(spacing, spacing, spacing, spacing);
     grid3->setSpacing(spacing);
     grid3->setAlignment(Qt::AlignTop);
     grid3->setColumnStretch(1, 10);
     grid3->setRowStretch(8, 10);
     page3->setLayout(grid3);
 
     page3->setTabOrder(d->contactAddressEdit, d->contactPostalCodeEdit);
     page3->setTabOrder(d->contactPostalCodeEdit, d->contactCityEdit);
     page3->setTabOrder(d->contactCityEdit, d->contactProvinceStateEdit);
     page3->setTabOrder(d->contactProvinceStateEdit, d->contactCountryEdit);
     page3->setTabOrder(d->contactCountryEdit, d->contactPhoneEdit);
     page3->setTabOrder(d->contactPhoneEdit, d->contactEmailEdit);
     page3->setTabOrder(d->contactEmailEdit, d->contactWebUrlEdit);
 
     insertTab(CONTACT, page3, QIcon::fromTheme(QLatin1String("view-pim-contacts")), i18n("Contact"));
 
     // -- Subjects Template information panel -------------------------------------------------------------
 
     QWidget* const page4     = new QWidget(this);
     QGridLayout* const grid4 = new QGridLayout(page4);
     d->subjects              = new SubjectEdit(page4);
 
     grid4->setContentsMargins(spacing, spacing, spacing, spacing);
     grid4->setSpacing(spacing);
     grid4->setAlignment(Qt::AlignTop);
     grid4->addWidget(d->subjects, 0, 0, 1, 1);
     grid4->setRowStretch(1, 10);
 
     insertTab(SUBJECTS, page4, QIcon::fromTheme(QLatin1String("feed-subscribe")), i18n("Subjects"));
 }
 
 TemplatePanel::~TemplatePanel()
 {
     delete d;
 }
 
 void TemplatePanel::setTemplate(const Template& t)
 {
     d->authorsEdit->setText(t.authors().join(QLatin1Char(';')));
     d->authorsPositionEdit->setText(t.authorsPosition());
     d->creditEdit->setText(t.credit());
     d->copyrightEdit->setValues(t.copyright());
     d->rightUsageEdit->setValues(t.rightUsageTerms());
     d->sourceEdit->setText(t.source());
     d->instructionsEdit->setText(t.instructions());
 
     d->locationCountryCodeEdit->setCountry(t.locationInfo().countryCode);
     d->locationProvinceStateEdit->setText(t.locationInfo().provinceState);
     d->locationCityEdit->setText(t.locationInfo().city);
     d->locationSublocationEdit->setText(t.locationInfo().location);
 
     d->contactCityEdit->setText(t.contactInfo().city);
     d->contactCountryEdit->setText(t.contactInfo().country);
     d->contactAddressEdit->setText(t.contactInfo().address);
     d->contactPostalCodeEdit->setText(t.contactInfo().postalCode);
     d->contactProvinceStateEdit->setText(t.contactInfo().provinceState);
     d->contactEmailEdit->setText(t.contactInfo().email);
     d->contactPhoneEdit->setText(t.contactInfo().phone);
     d->contactWebUrlEdit->setText(t.contactInfo().webUrl);
 
     d->subjects->setSubjectsList(t.IptcSubjects());
 }
 
 Template TemplatePanel::getTemplate() const
 {
     Template t;
     t.setAuthors(d->authorsEdit->text().split(QLatin1Char(';'), QString::SkipEmptyParts));
     t.setAuthorsPosition(d->authorsPositionEdit->text());
     t.setCredit(d->creditEdit->text());
     t.setCopyright(d->copyrightEdit->values());
     t.setRightUsageTerms(d->rightUsageEdit->values());
     t.setSource(d->sourceEdit->text());
     t.setInstructions(d->instructionsEdit->text());
 
     IptcCoreLocationInfo inf1;
     d->locationCountryCodeEdit->country(inf1.countryCode, inf1.country);
     inf1.provinceState = d->locationProvinceStateEdit->text();
     inf1.city          = d->locationCityEdit->text();
     inf1.location      = d->locationSublocationEdit->text();
     t.setLocationInfo(inf1);
 
     IptcCoreContactInfo inf2;
     inf2.city          = d->contactCityEdit->text();
     inf2.country       = d->contactCountryEdit->text();
     inf2.address       = d->contactAddressEdit->text();
     inf2.postalCode    = d->contactPostalCodeEdit->text();
     inf2.provinceState = d->contactProvinceStateEdit->text();
     inf2.email         = d->contactEmailEdit->text();
     inf2.phone         = d->contactPhoneEdit->text();
     inf2.webUrl        = d->contactWebUrlEdit->text();
     t.setContactInfo(inf2);
 
     t.setIptcSubjects(d->subjects->subjectsList());
 
     return t;
 }
 
 void TemplatePanel::apply()
 {
 }
 
 } // namespace Digikam
diff --git a/core/libs/template/templateselector.cpp b/core/libs/template/templateselector.cpp
index 3a28f9d169..2b9adf9bdc 100644
--- a/core/libs/template/templateselector.cpp
+++ b/core/libs/template/templateselector.cpp
@@ -1,203 +1,203 @@
 /* ============================================================
  *
  * This file is a part of digiKam project
  * https://www.digikam.org
  *
  * Date        : 2009-06-23
  * Description : a widget to select metadata template.
  *
  * Copyright (C) 2009-2020 by Gilles Caulier <caulier dot gilles at gmail dot com>
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
  * Public License as published by the Free Software Foundation;
  * either version 2, or (at your option)
  * any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * ============================================================ */
 
 #include "templateselector.h"
 
 // Qt includes
 
 #include <QAbstractItemView>
 #include <QLabel>
 #include <QToolButton>
 #include <QApplication>
 #include <QStyle>
 #include <QIcon>
 
 // KDE includes
 
 #include <klocalizedstring.h>
 
 // Local includes
 
 #include "setup.h"
 #include "template.h"
 #include "templatemanager.h"
 #include "squeezedcombobox.h"
 
 namespace Digikam
 {
 
 class Q_DECL_HIDDEN TemplateSelector::Private
 {
 public:
 
     explicit Private()
+      : label(nullptr),
+        setupButton(nullptr),
+        templateCombo(nullptr)
     {
-        label         = nullptr;
-        setupButton   = nullptr;
-        templateCombo = nullptr;
     }
 
     QLabel*           label;
 
     QToolButton*      setupButton;
 
     SqueezedComboBox* templateCombo;
 
     Template          metadataTemplate;
 };
 
 TemplateSelector::TemplateSelector(QWidget* const parent)
     : DHBox(parent), d(new Private)
 {
     d->label         = new QLabel(i18n("Template: "), this);
     d->templateCombo = new SqueezedComboBox(this);
     d->setupButton   = new QToolButton(this);
     d->setupButton->setIcon(QIcon::fromTheme(QLatin1String("document-edit")));
     d->setupButton->setWhatsThis(i18n("Open metadata template editor"));
     d->templateCombo->setWhatsThis(i18n("<p>Select here the action to perform using the metadata template.</p>"
                                         "<p><b>To remove</b>: delete already-assigned template.</p>"
                                         "<p><b>Do not change</b>: Do not touch template information.</p>"
                                         "<p>All other values are template titles managed by digiKam. "
                                         "Selecting one will assign information as well.</p>"));
 
     setSpacing(QApplication::style()->pixelMetric(QStyle::PM_DefaultLayoutSpacing));
     setContentsMargins(QMargins());
     setStretchFactor(d->templateCombo, 10);
 
     connect(d->templateCombo, SIGNAL(activated(int)),
             this, SIGNAL(signalTemplateSelected()));
 
     connect(d->setupButton, SIGNAL(clicked()),
             this, SLOT(slotOpenSetup()));
 
     TemplateManager* tm = TemplateManager::defaultManager();
 
     if (tm)
     {
         connect(tm, SIGNAL(signalTemplateAdded(Template)),
                 this, SLOT(slotTemplateListChanged()));
 
         connect(tm, SIGNAL(signalTemplateRemoved(Template)),
                 this, SLOT(slotTemplateListChanged()));
     }
 
     populateTemplates();
 }
 
 TemplateSelector::~TemplateSelector()
 {
     delete d;
 }
 
 void TemplateSelector::populateTemplates()
 {
     d->templateCombo->clear();
     d->templateCombo->insertSqueezedItem(i18n("To remove"),     REMOVETEMPLATE);
     d->templateCombo->insertSqueezedItem(i18n("Do not change"), DONTCHANGE);
     d->templateCombo->insertSeparator(DONTCHANGE + 1);
 
-    TemplateManager* tm = TemplateManager::defaultManager();
+    TemplateManager* const tm = TemplateManager::defaultManager();
 
     if (tm)
     {
         int i                 = DONTCHANGE + 2;
         QList<Template> list  = tm->templateList();
 
         foreach (const Template& t, list)
         {
             d->templateCombo->insertSqueezedItem(t.templateTitle(), i);
             ++i;
         }
     }
 }
 
 Template TemplateSelector::getTemplate() const
 {
     switch (d->templateCombo->currentIndex())
     {
         case REMOVETEMPLATE:
         {
             Template t;
             t.setTemplateTitle(Template::removeTemplateTitle());
             return t;
         }
 
         case DONTCHANGE:
         {
             return Template();
         }
 
         default:
         {
-            TemplateManager* tm = TemplateManager::defaultManager();
+            TemplateManager* const tm = TemplateManager::defaultManager();
 
             if (tm)
             {
                 return tm->fromIndex(d->templateCombo->currentIndex() - 3);
             }
 
             break;
         }
     }
 
     return Template();
 }
 
 void TemplateSelector::setTemplate(const Template& t)
 {
     d->metadataTemplate = t;
     QString title       = d->metadataTemplate.templateTitle();
 
-    if (title == Template::removeTemplateTitle())
+    if      (title == Template::removeTemplateTitle())
     {
         d->templateCombo->setCurrentIndex(REMOVETEMPLATE);
     }
     else if (title.isEmpty())
     {
         d->templateCombo->setCurrentIndex(DONTCHANGE);
     }
 
     d->templateCombo->setCurrent(title);
 }
 
 int TemplateSelector::getTemplateIndex() const
 {
     return d->templateCombo->currentIndex();
 }
 
 void TemplateSelector::setTemplateIndex(int i)
 {
     d->templateCombo->setCurrentIndex(i);
 }
 
 void TemplateSelector::slotOpenSetup()
 {
     Setup::execTemplateEditor(this, d->metadataTemplate);
 }
 
 void TemplateSelector::slotTemplateListChanged()
 {
     populateTemplates();
 }
 
 } // namespace Digikam
diff --git a/core/libs/template/templateviewer.cpp b/core/libs/template/templateviewer.cpp
index ccab4be2dd..fef0764dd4 100644
--- a/core/libs/template/templateviewer.cpp
+++ b/core/libs/template/templateviewer.cpp
@@ -1,287 +1,284 @@
 /* ============================================================
  *
  * This file is a part of digiKam project
  * https://www.digikam.org
  *
  * Date        : 2009-06-29
  * Description : metadata template viewer.
  *
  * Copyright (C) 2009-2020 by Gilles Caulier <caulier dot gilles at gmail dot com>
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
  * Public License as published by the Free Software Foundation;
  * either version 2, or (at your option)
  * any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * ============================================================ */
 
 #include "templateviewer.h"
 
 // Qt includes
 
 #include <QGridLayout>
 #include <QUrl>
 #include <QIcon>
 
 // KDE includes
 
 #include <klocalizedstring.h>
 
 // Local includes
 
 #include "dlayoutbox.h"
 #include "itempropertiestxtlabel.h"
 #include "template.h"
 #include "templatemanager.h"
 #include "countryselector.h"
 
 namespace Digikam
 {
 
 class Q_DECL_HIDDEN TemplateViewer::Private
 {
 public:
 
     explicit Private()
+      : names(nullptr),
+        position(nullptr),
+        credit(nullptr),
+        copyright(nullptr),
+        usages(nullptr),
+        source(nullptr),
+        instructions(nullptr),
+        namesList(nullptr),
+        labelPosition(nullptr),
+        labelCredit(nullptr),
+        labelCopyright(nullptr),
+        labelUsages(nullptr),
+        labelSource(nullptr),
+        labelInstructions(nullptr),
+        locationCountry(nullptr),
+        locationProvinceState(nullptr),
+        locationCity(nullptr),
+        locationSublocation(nullptr),
+        labelLocationCountry(nullptr),
+        labelLocationProvinceState(nullptr),
+        labelLocationCity(nullptr),
+        labelLocationSublocation(nullptr),
+        contactCity(nullptr),
+        contactCountry(nullptr),
+        contactAddress(nullptr),
+        contactPostalCode(nullptr),
+        contactProvinceState(nullptr),
+        contactEmail(nullptr),
+        contactPhone(nullptr),
+        contactWebUrl(nullptr),
+        labelContactCity(nullptr),
+        labelContactCountry(nullptr),
+        labelContactAddress(nullptr),
+        labelContactPostalCode(nullptr),
+        labelContactProvinceState(nullptr),
+        labelContactPhone(nullptr),
+        labelContactEmail(nullptr),
+        labelContactWebUrl(nullptr),
+        subjectsList(nullptr)
     {
-        names                      = nullptr;
-        position                   = nullptr;
-        credit                     = nullptr;
-        copyright                  = nullptr;
-        usages                     = nullptr;
-        source                     = nullptr;
-        instructions               = nullptr;
-        namesList                  = nullptr;
-        labelPosition              = nullptr;
-        labelCredit                = nullptr;
-        labelCopyright             = nullptr;
-        labelUsages                = nullptr;
-        labelSource                = nullptr;
-        labelInstructions          = nullptr;
-        locationCountry            = nullptr;
-        locationProvinceState      = nullptr;
-        locationCity               = nullptr;
-        locationSublocation        = nullptr;
-        labelLocationCountry       = nullptr;
-        labelLocationProvinceState = nullptr;
-        labelLocationCity          = nullptr;
-        labelLocationSublocation   = nullptr;
-        contactCity                = nullptr;
-        contactCountry             = nullptr;
-        contactAddress             = nullptr;
-        contactPostalCode          = nullptr;
-        contactProvinceState       = nullptr;
-        contactEmail               = nullptr;
-        contactPhone               = nullptr;
-        contactWebUrl              = nullptr;
-        labelContactCity           = nullptr;
-        labelContactCountry        = nullptr;
-        labelContactAddress        = nullptr;
-        labelContactPostalCode     = nullptr;
-        labelContactProvinceState  = nullptr;
-        labelContactPhone          = nullptr;
-        labelContactEmail          = nullptr;
-        labelContactWebUrl         = nullptr;
-        subjectsList               = nullptr;
     }
 
-    // IPTC Rights info.
-
-    DTextLabelName* names;
-    DTextLabelName* position;
-    DTextLabelName* credit;
-    DTextLabelName* copyright;
-    DTextLabelName* usages;
-    DTextLabelName* source;
-    DTextLabelName* instructions;
+    /// IPTC Rights info.
+    DTextLabelName*  names;
+    DTextLabelName*  position;
+    DTextLabelName*  credit;
+    DTextLabelName*  copyright;
+    DTextLabelName*  usages;
+    DTextLabelName*  source;
+    DTextLabelName*  instructions;
 
     DTextList*       namesList;
     DTextBrowser*    labelPosition;
     DTextBrowser*    labelCredit;
     DTextBrowser*    labelCopyright;
     DTextBrowser*    labelUsages;
     DTextBrowser*    labelSource;
     DTextBrowser*    labelInstructions;
 
-    // IPTC Location info.
-
+    /// IPTC Location info.
     DTextLabelName*  locationCountry;
     DTextLabelName*  locationProvinceState;
     DTextLabelName*  locationCity;
     DTextLabelName*  locationSublocation;
 
     DTextBrowser*    labelLocationCountry;
     DTextBrowser*    labelLocationProvinceState;
     DTextBrowser*    labelLocationCity;
     DTextBrowser*    labelLocationSublocation;
 
-    // IPTC Contact info.
-
+    /// IPTC Contact info.
     DTextLabelName*  contactCity;
     DTextLabelName*  contactCountry;
     DTextLabelName*  contactAddress;
     DTextLabelName*  contactPostalCode;
     DTextLabelName*  contactProvinceState;
-    DTextLabelName*  contactPhone;
     DTextLabelName*  contactEmail;
+    DTextLabelName*  contactPhone;
     DTextLabelName*  contactWebUrl;
 
     DTextBrowser*    labelContactCity;
     DTextBrowser*    labelContactCountry;
     DTextBrowser*    labelContactAddress;
     DTextBrowser*    labelContactPostalCode;
     DTextBrowser*    labelContactProvinceState;
     DTextBrowser*    labelContactPhone;
     DTextLabelValue* labelContactEmail;
     DTextLabelValue* labelContactWebUrl;
 
-    // IPTC Subjects info.
+    /// IPTC Subjects info.
     DTextList*      subjectsList;
 };
 
 TemplateViewer::TemplateViewer(QWidget* const parent)
     : DExpanderBox(parent),
       d(new Private)
 {
     setFrameStyle(QFrame::NoFrame);
 
     DVBox* const w1      = new DVBox(this);
     d->names             = new DTextLabelName(i18n("Names:"), w1);
     d->namesList         = new DTextList(QStringList(), w1);
     d->position          = new DTextLabelName(i18n("Position:"), w1);
     d->labelPosition     = new DTextBrowser(QString(), w1);
     d->credit            = new DTextLabelName(i18n("Credit:"), w1);
     d->labelCredit       = new DTextBrowser(QString(), w1);
     d->copyright         = new DTextLabelName(i18n("Copyright:"), w1);
     d->labelCopyright    = new DTextBrowser(QString(), w1);
     d->usages            = new DTextLabelName(i18n("Usages:"), w1);
     d->labelUsages       = new DTextBrowser(QString(), w1);
     d->source            = new DTextLabelName(i18n("Source:"), w1);
     d->labelSource       = new DTextBrowser(QString(), w1);
     d->instructions      = new DTextLabelName(i18n("Instructions:"), w1);
     d->labelInstructions = new DTextBrowser(QString(), w1);
 
     d->names->setAlignment(Qt::AlignLeft | Qt::AlignTop);
     d->position->setAlignment(Qt::AlignLeft | Qt::AlignTop);
     d->credit->setAlignment(Qt::AlignLeft | Qt::AlignTop);
     d->copyright->setAlignment(Qt::AlignLeft | Qt::AlignTop);
     d->credit->setAlignment(Qt::AlignLeft | Qt::AlignTop);
     d->usages->setAlignment(Qt::AlignLeft | Qt::AlignTop);
     d->source->setAlignment(Qt::AlignLeft | Qt::AlignTop);
     d->instructions->setAlignment(Qt::AlignLeft | Qt::AlignTop);
 
     addItem(w1, QIcon::fromTheme(QLatin1String("flag")),
             i18n("Rights"), QLatin1String("Rights"), true);
 
     // ------------------------------------------------------------------
 
     DVBox* const w2               = new DVBox(this);
     d->locationCity               = new DTextLabelName(i18n("City:"), w2);
     d->labelLocationCity          = new DTextBrowser(QString(), w2);
     d->locationSublocation        = new DTextLabelName(i18n("Sublocation:"), w2);
     d->labelLocationSublocation   = new DTextBrowser(QString(), w2);
     d->locationProvinceState      = new DTextLabelName(i18n("Province/State:"), w2);
     d->labelLocationProvinceState = new DTextBrowser(QString(), w2);
     d->locationCountry            = new DTextLabelName(i18n("Country:"), w2);
     d->labelLocationCountry       = new DTextBrowser(QString(), w2);
 
     d->locationCity->setAlignment(Qt::AlignLeft | Qt::AlignTop);
     d->locationSublocation->setAlignment(Qt::AlignLeft | Qt::AlignTop);
     d->locationProvinceState->setAlignment(Qt::AlignLeft | Qt::AlignTop);
     d->locationCountry->setAlignment(Qt::AlignLeft | Qt::AlignTop);
 
     addItem(w2, QIcon::fromTheme(QLatin1String("globe")),
             i18n("Location"), QLatin1String("Location"), true);
 
     // ------------------------------------------------------------------
 
     DVBox* const w3              = new DVBox(this);
     d->contactAddress            = new DTextLabelName(i18n("Address:"), w3);
     d->labelContactAddress       = new DTextBrowser(QString(), w3);
     d->contactPostalCode         = new DTextLabelName(i18n("Postal Code:"), w3);
     d->labelContactPostalCode    = new DTextBrowser(QString(), w3);
     d->contactCity               = new DTextLabelName(i18n("City:"), w3);
     d->labelContactCity          = new DTextBrowser(QString(), w3);
     d->contactProvinceState      = new DTextLabelName(i18n("Province/State:"), w3);
     d->labelContactProvinceState = new DTextBrowser(QString(), w3);
     d->contactCountry            = new DTextLabelName(i18n("Country:"), w3);
     d->labelContactCountry       = new DTextBrowser(QString(), w3);
     d->contactPhone              = new DTextLabelName(i18n("Phone:"), w3);
     d->labelContactPhone         = new DTextBrowser(QString(), w3);
     d->contactEmail              = new DTextLabelName(i18n("Email:"), w3);
     d->labelContactEmail         = new DTextLabelValue(QString(), w3);
     d->contactWebUrl             = new DTextLabelName(i18n("URL:"), w3);
     d->labelContactWebUrl        = new DTextLabelValue(QString(), w3);
 
     d->labelContactEmail->setOpenExternalLinks(true);
     d->labelContactEmail->setTextFormat(Qt::RichText);
     d->labelContactEmail->setTextInteractionFlags(Qt::LinksAccessibleByMouse);
 
     d->labelContactWebUrl->setOpenExternalLinks(true);
     d->labelContactWebUrl->setTextFormat(Qt::RichText);
     d->labelContactWebUrl->setTextInteractionFlags(Qt::LinksAccessibleByMouse);
 
     d->contactAddress->setAlignment(Qt::AlignLeft | Qt::AlignTop);
     d->contactPostalCode->setAlignment(Qt::AlignLeft | Qt::AlignTop);
     d->contactCity->setAlignment(Qt::AlignLeft | Qt::AlignTop);
     d->contactProvinceState->setAlignment(Qt::AlignLeft | Qt::AlignTop);
     d->contactCountry->setAlignment(Qt::AlignLeft | Qt::AlignTop);
     d->contactPhone->setAlignment(Qt::AlignLeft | Qt::AlignTop);
     d->contactEmail->setAlignment(Qt::AlignLeft | Qt::AlignTop);
     d->contactWebUrl->setAlignment(Qt::AlignLeft | Qt::AlignTop);
 
     addItem(w3, QIcon::fromTheme(QLatin1String("view-pim-contacts")),
             i18n("Contact"), QLatin1String("Contact"), true);
 
     // ------------------------------------------------------------------
 
     DVBox* const w4 = new DVBox(this);
     d->subjectsList = new DTextList(QStringList(), w4);
 
     addItem(w4, QIcon::fromTheme(QLatin1String("feed-subscribe")),
             i18n("Subjects"), QLatin1String("Subjects"), true);
 
     addStretch();
 }
 
 TemplateViewer::~TemplateViewer()
 {
     delete d;
 }
 
 void TemplateViewer::setTemplate(const Template& t)
 {
     d->namesList->clear();
     d->namesList->addItems(t.authors());
     d->labelPosition->setText(t.authorsPosition());
     d->labelCredit->setText(t.credit());
     d->labelCopyright->setText(t.copyright()[QLatin1String("x-default")]);
     d->labelUsages->setText(t.rightUsageTerms()[QLatin1String("x-default")]);
     d->labelSource->setText(t.source());
     d->labelInstructions->setText(t.instructions());
 
     d->labelLocationCity->setText(t.locationInfo().city);
     d->labelLocationSublocation->setText(t.locationInfo().location);
     d->labelLocationProvinceState->setText(t.locationInfo().provinceState);
     d->labelLocationCountry->setText(CountrySelector::countryForCode(t.locationInfo().countryCode));
 
     d->labelContactAddress->setText(t.contactInfo().address);
     d->labelContactPostalCode->setText(t.contactInfo().postalCode);
     d->labelContactProvinceState->setText(t.contactInfo().provinceState);
     d->labelContactCity->setText(t.contactInfo().city);
     d->labelContactCountry->setText(t.contactInfo().country);
     d->labelContactPhone->setText(t.contactInfo().phone);
     d->labelContactEmail->setAdjustedText(QString::fromUtf8("<a href=\"mailto:%1\">%2</a>").arg(t.contactInfo().email).arg(t.contactInfo().email));
     d->labelContactWebUrl->setAdjustedText(QString::fromUtf8("<a href=\"%1\">%2</a>").arg(t.contactInfo().webUrl).arg(t.contactInfo().webUrl));
 
     d->subjectsList->clear();
     d->subjectsList->addItems(t.IptcSubjects());
 }
 
 } // namespace Digikam