diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index caace06286a882c8cba9cd40a00989ebaf1389c8..b98a378805d53e72d2753afc5702a4a9e1635a28 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -216,4 +216,4 @@ install( TARGETS qtsflphone
   ARCHIVE DESTINATION lib
   LIBRARY DESTINATION lib
   DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS}
-)
\ No newline at end of file
+)
diff --git a/src/abstractcontactbackend.h b/src/abstractcontactbackend.h
index 86c46769e4e762d9d9e4a5c2c7648ae963092483..3f6bbf553e4e403e0fbfeb3ff5c41ae77b147eb7 100644
--- a/src/abstractcontactbackend.h
+++ b/src/abstractcontactbackend.h
@@ -16,7 +16,6 @@
  *   You should have received a copy of the GNU General Public License      *
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
  ***************************************************************************/
-
 #ifndef ABSTRACTION_CONTACT_BACKEND_H
 #define ABSTRACTION_CONTACT_BACKEND_H
 
diff --git a/src/call.cpp b/src/call.cpp
index 33cf412e930d75ccba722029b38f28737e421c38..71586ec95f8e7ad3663519a9fe51d8c6db4c3d92 100644
--- a/src/call.cpp
+++ b/src/call.cpp
@@ -293,7 +293,7 @@ Call* Call::buildRingingCall(const QString & callId)
 ///Build a call that is already over
 Call* Call::buildHistoryCall(const QString & callId, uint startTimeStamp, uint stopTimeStamp, QString account, QString name, QString number, QString type)
 {
-   if(name == "empty") name = QString();
+   if(name == "empty") name.clear();
    Call* call            = new Call(Call::State::OVER, callId, name, number, account );
 
    call->m_pStopTimeStamp  = stopTimeStamp ;
@@ -728,7 +728,7 @@ Call::State Call::stateChanged(const QString& newStateName)
       connect(m_pTimer,SIGNAL(timeout()),this,SLOT(updated()));
       m_pTimer->start();
    }
-   m_CallNumber = QString();
+   m_CallNumber.clear();
    emit changed();
    emit changed(this);
    qDebug() << "Calling stateChanged " << newStateName << " -> " << toDaemonCallState(newStateName) << " on call with state " << previousState << ". Become " << m_CurrentState;
@@ -999,7 +999,7 @@ void Call::start()
    ::time(&curTime);
    emit changed();
    emit changed(this);
-   m_CallNumber = QString();
+   m_CallNumber.clear();
    m_pStartTimeStamp = curTime;
 }
 
diff --git a/src/callmodel.cpp b/src/callmodel.cpp
index 30c3381228ec9ee8e7ed4188718fa0d05b587921..8a5204a13edc6de950c4add4f5cc69476e3a64b3 100644
--- a/src/callmodel.cpp
+++ b/src/callmodel.cpp
@@ -956,4 +956,4 @@ void CallModel::slotDTMFPlayed( const QString& str )
    }
    const QModelIndex& idx = getIndex(call);
    setData(idx,50, Call::Role::DTMFAnimState);
-}
\ No newline at end of file
+}
diff --git a/src/contact.h b/src/contact.h
index 9d504b99b415e432a1121d29b3bd8e78f05d481b..2487f5ad687f6f343365cbdd7395d18171bed067 100644
--- a/src/contact.h
+++ b/src/contact.h
@@ -79,7 +79,7 @@ public:
    class  PhoneNumbers : public QList<Contact::PhoneNumber*>, public ContactTreeBackend {
    public:
       virtual QObject* self() __attribute__ ((const));
-      PhoneNumbers(Contact* parent);
+      explicit PhoneNumbers(Contact* parent);
       PhoneNumbers(Contact* parent, const QList<Contact::PhoneNumber*>& list);
       Contact* contact() const;
    private:
diff --git a/src/dbus/instancemanager.h b/src/dbus/instancemanager.h
index d17170c996d9412738da71f5c8d1b3a1d46563c8..845389096c4f77104767bc4bedf4367ee67d811d 100644
--- a/src/dbus/instancemanager.h
+++ b/src/dbus/instancemanager.h
@@ -16,9 +16,8 @@
  *   You should have received a copy of the GNU General Public License      *
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
  ***************************************************************************/
-
-#ifndef INSTANCE_INTERFACE_SINGLETON_H
-#define INSTANCE_INTERFACE_SINGLETON_H
+#ifndef INSTANCEMANAGER_H
+#define INSTANCEMANAGER_H
 
 #include "instance_dbus_interface.h"
 #include "../typedefs.h"
diff --git a/src/dbus/videomanager.h b/src/dbus/videomanager.h
index 3beae23b817b9bc27ff46f9d916b425c8ee862a4..81911f9bf9c54d4a480002ed9dfae1d864ea59fc 100644
--- a/src/dbus/videomanager.h
+++ b/src/dbus/videomanager.h
@@ -15,8 +15,8 @@
  *   You should have received a copy of the GNU General Public License      *
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
  ***************************************************************************/
-#ifndef VIDEO_INTERFACE_SINGLETON_H
-#define VIDEO_INTERFACE_SINGLETON_H
+#ifndef VIDEOMANAGER_H
+#define VIDEOMANAGER_H
 
 #include "video_dbus_interface.h"
 #include "../typedefs.h"
diff --git a/src/historymodel.cpp b/src/historymodel.cpp
index 78eb443e2d2e7428ee8ae87d6442703e46a2ec29..425ca57baeff51ffae35bb1b3625ba49394dc722 100644
--- a/src/historymodel.cpp
+++ b/src/historymodel.cpp
@@ -84,6 +84,10 @@ HistoryModel::TopLevelItem::TopLevelItem(int name) :
    HistoryTreeBackend(HistoryTreeBackend::TOP_LEVEL),QObject(nullptr),m_Name(name),m_NameStr(m_slHistoryConstStr[name])
 {}
 
+HistoryModel::~TopLevelItem() {
+   m_spInstance->m_lCategoryCounter.removeAll(this);
+}
+
 
 /*****************************************************************************
  *                                                                           *
diff --git a/src/historymodel.h b/src/historymodel.h
index 9796de67a5e53e59f7d26861ec5923bd28df5b99..c9d2b40e6e0fd42c8bd303d7946cbbd8898ed936 100644
--- a/src/historymodel.h
+++ b/src/historymodel.h
@@ -101,7 +101,7 @@ public:
 private:
 
    //Constructor
-   HistoryModel();
+   explicit HistoryModel();
    ~HistoryModel();
 
    bool initHistory ();
@@ -121,9 +121,7 @@ private:
    friend class HistoryModel;
    public:
       virtual QObject* getSelf() {return this;}
-      virtual ~TopLevelItem() {
-         m_spInstance->m_lCategoryCounter.removeAll(this);
-      }
+      virtual ~TopLevelItem();
    private:
       TopLevelItem(int name);
       CallList m_lChildren;
diff --git a/src/visitors/phonenumberselector.cpp b/src/visitors/phonenumberselector.cpp
index 1c495947214cd9284e473080fa314e5db12fce8b..a2bf84e0dc8dd8f0260ed51445a5e3bea95a8bab 100644
--- a/src/visitors/phonenumberselector.cpp
+++ b/src/visitors/phonenumberselector.cpp
@@ -28,4 +28,4 @@ void PhoneNumberSelector::setDefaultVisitor(PhoneNumberSelector* v)
 PhoneNumberSelector* PhoneNumberSelector::defaultVisitor()
 {
    return m_spDefaultVisitor;
-}
\ No newline at end of file
+}