diff --git a/src/qtgui/advsearch_w.h b/src/qtgui/advsearch_w.h
index 6a21c631..cdeb9a75 100644
--- a/src/qtgui/advsearch_w.h
+++ b/src/qtgui/advsearch_w.h
@@ -39,10 +39,9 @@ class AdvSearch : public QDialog, public Ui::AdvSearchBase
 
 public:
     AdvSearch(QDialog* parent = 0) 
-    : QDialog(parent)
-    {
-    setupUi(this);
-    init();
+        : QDialog(parent) {
+        setupUi(this);
+        init();
     }
 
 public slots:
diff --git a/src/qtgui/crontool.cpp b/src/qtgui/crontool.cpp
index 6fd2ce33..e5da5277 100644
--- a/src/qtgui/crontool.cpp
+++ b/src/qtgui/crontool.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 J.F.Dockes
+/* Copyright (C) 2005-2020 J.F.Dockes
  *   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 of the License, or
@@ -48,12 +48,12 @@ void CronToolW::init()
 
     // Try to read the current values
     if (!theconfig)
-    return;
+        return;
 
     if (checkCrontabUnmanaged(marker, "recollindex")) {
-    QMessageBox::warning(0, "Recoll", 
-                 tr("It seems that manually edited entries exist for recollindex, cannot edit crontab"));
-    QTimer::singleShot(0, this, SLOT(close()));
+        QMessageBox::warning(0, "Recoll", 
+                             tr("It seems that manually edited entries exist for recollindex, cannot edit crontab"));
+        QTimer::singleShot(0, this, SLOT(close()));
     }
     
     string id = idstring(theconfig->getConfDir());
@@ -77,7 +77,7 @@ void CronToolW::disableCron()
 void CronToolW::changeCron(bool enable)
 {
     if (!theconfig)
-    return;
+        return;
 
     string id = idstring(theconfig->getConfDir());
     string cmd("recollindex");
@@ -85,18 +85,18 @@ void CronToolW::changeCron(bool enable)
     string reason;
 
     if (!enable) {
-    editCrontab(marker, id, "", "", reason);
-    accept();
+        editCrontab(marker, id, "", "", reason);
+        accept();
     } else {
         string mins(qs2utf8s(minsLE->text().remove(QChar(' '))));
         string hours(qs2utf8s(hoursLE->text().remove(QChar(' '))));
         string days(qs2utf8s(daysLE->text().remove(QChar(' '))));
-    string sched = mins + " " + hours + "  * * " + days;
-    if (editCrontab(marker, id, sched, cmd, reason)) {
-        accept();
-    }  else {
-        QMessageBox::warning(0, "Recoll", 
-             tr("Error installing cron entry. Bad syntax in fields ?"));
-    }        
+        string sched = mins + " " + hours + "  * * " + days;
+        if (editCrontab(marker, id, sched, cmd, reason)) {
+            accept();
+        }  else {
+            QMessageBox::warning(0, "Recoll", 
+                                 tr("Error installing cron entry. Bad syntax in fields ?"));
+        }        
     }
 }
diff --git a/src/qtgui/crontool.h b/src/qtgui/crontool.h
index 58ec0b1e..3423d768 100644
--- a/src/qtgui/crontool.h
+++ b/src/qtgui/crontool.h
@@ -1,4 +1,4 @@
-/*
+/* Copyright (C) 2005-2020 J.F.Dockes
  *   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 of the License, or
@@ -23,14 +23,11 @@ class QPushButton;
 
 class CronToolW : public QDialog, public Ui::CronToolW {
     Q_OBJECT
-    public:
+public:
     CronToolW(QWidget * parent = 0) 
-    : QDialog(parent),
-      enableButton(0),
-      disableButton(0)
-    {
-    setupUi(this);
-    init();
+        : QDialog(parent), enableButton(0), disableButton(0) {
+        setupUi(this);
+        init();
     }
     QPushButton *enableButton;
     QPushButton *disableButton;
@@ -41,7 +38,6 @@ private slots:
 private:
     void init();
     void changeCron(bool enable);
-    
 };
 
 
diff --git a/src/qtgui/firstidx.h b/src/qtgui/firstidx.h
index 9cee5bab..1fb7f3df 100644
--- a/src/qtgui/firstidx.h
+++ b/src/qtgui/firstidx.h
@@ -1,4 +1,4 @@
-/*
+/* Copyright (C) 2005-2020 J.F.Dockes 
  *   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 of the License, or
@@ -21,11 +21,10 @@
 
 class FirstIdxDialog : public QDialog, public Ui::FirstIdxDialog {
     Q_OBJECT
-    public:
+public:
     FirstIdxDialog(QWidget * parent = 0) 
-    : QDialog(parent)
-    {
-    setupUi(this);
+        : QDialog(parent) {
+        setupUi(this);
     }
 };
 
diff --git a/src/qtgui/fragbuts.h b/src/qtgui/fragbuts.h
index 1ca19707..55b4591d 100644
--- a/src/qtgui/fragbuts.h
+++ b/src/qtgui/fragbuts.h
@@ -62,7 +62,6 @@ private:
     std::string m_fn;
     time_t m_reftime; 
     bool m_ok;
- };
-
+};
 
 #endif /* _FRAGBUTS_H_INCLUDED_ */
diff --git a/src/qtgui/guiutils.h b/src/qtgui/guiutils.h
index c80dc66e..26dce1d2 100644
--- a/src/qtgui/guiutils.h
+++ b/src/qtgui/guiutils.h
@@ -37,7 +37,7 @@ using std::vector;
 
 /** Holder for preferences (gets saved to user Qt prefs) */
 class PrefsPack {
- public:
+public:
     // Simple search entry behaviour
     bool ssearchNoComplete;
     bool ssearchStartOnComplete;
@@ -70,7 +70,7 @@ class PrefsPack {
     int pvwidth; // Preview window geom
     int pvheight;
     bool ssearchTypSav; // Remember last search mode (else always
-            // start with same)
+    // start with same)
     int ssearchTyp{0};
     // Use single app (default: xdg-open), instead of per-mime settings
     bool useDesktopOpen; 
diff --git a/src/qtgui/idxsched.h b/src/qtgui/idxsched.h
index 46b0dcdd..36a8bbd3 100644
--- a/src/qtgui/idxsched.h
+++ b/src/qtgui/idxsched.h
@@ -1,4 +1,4 @@
-/*
+/* Copyright (C) 2005-2020 J.F.Dockes
  *   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 of the License, or
@@ -22,14 +22,13 @@
 
 class IdxSchedW : public QDialog, public Ui::IdxSchedW {
     Q_OBJECT
-    public:
+public:
     IdxSchedW(QWidget * parent = 0) 
-    : QDialog(parent)
-    {
-    setupUi(this);
-    (void)new HelpClient(this);
-    HelpClient::installMap((const char *)this->objectName().toUtf8(), 
-               "RCL.INDEXING");
+        : QDialog(parent) {
+        setupUi(this);
+        (void)new HelpClient(this);
+        HelpClient::installMap((const char *)this->objectName().toUtf8(), 
+                               "RCL.INDEXING");
     }
 };
 
diff --git a/src/qtgui/multisave.h b/src/qtgui/multisave.h
index f5448176..5c7c8983 100644
--- a/src/qtgui/multisave.h
+++ b/src/qtgui/multisave.h
@@ -1,4 +1,4 @@
-/*
+/* Copyright (C) 2005-2020 J.F.Dockes
  *   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 of the License, or
diff --git a/src/qtgui/ptrans_w.h b/src/qtgui/ptrans_w.h
index 44082f95..729b70f4 100644
--- a/src/qtgui/ptrans_w.h
+++ b/src/qtgui/ptrans_w.h
@@ -32,10 +32,9 @@ class EditTrans : public QDialog, public Ui::EditTransBase
 
 public:
     EditTrans(const std::string& dbdir, QWidget* parent = 0)
-    : QDialog(parent) 
-    {
-    setupUi(this);
-    init(dbdir);
+        : QDialog(parent) {
+        setupUi(this);
+        init(dbdir);
     }
 
 public slots:
diff --git a/src/qtgui/rclhelp.h b/src/qtgui/rclhelp.h
index 9a75f40e..aa7c4800 100644
--- a/src/qtgui/rclhelp.h
+++ b/src/qtgui/rclhelp.h
@@ -1,4 +1,4 @@
-/*
+/* Copyright (C) 2005-2020 J.F.Dockes
  *   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 of the License, or
diff --git a/src/qtgui/rclmain_w.h b/src/qtgui/rclmain_w.h
index 73f3fd8d..23e21864 100644
--- a/src/qtgui/rclmain_w.h
+++ b/src/qtgui/rclmain_w.h
@@ -1,4 +1,4 @@
-/*
+/* Copyright (C) 2005-2020 J.F.Dockes
  *   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 of the License, or
diff --git a/src/qtgui/recoll.h b/src/qtgui/recoll.h
index 1f40c7f0..6cfa29f4 100644
--- a/src/qtgui/recoll.h
+++ b/src/qtgui/recoll.h
@@ -76,9 +76,9 @@ inline std::string qs2path(const QString& qs)
 }
 
 /** Specialized version of the qt file dialog. Can't use getOpenFile()
-   etc. cause they hide dot files... */
+    etc. cause they hide dot files... */
 extern QString myGetFileName(bool isdir, QString caption = QString(),
-                 bool filenosave = false,
+                             bool filenosave = false,
                              QString dirlocation = QString(),
                              QString dlftnm = QString()
     );
diff --git a/src/qtgui/rtitool.h b/src/qtgui/rtitool.h
index 955f26aa..25be8629 100644
--- a/src/qtgui/rtitool.h
+++ b/src/qtgui/rtitool.h
@@ -1,4 +1,4 @@
-/*
+/* Copyright (C) 2005-2020 J.F.Dockes
  *   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 of the License, or
@@ -23,12 +23,11 @@ class QPushButton;
 
 class RTIToolW : public QDialog, public Ui::RTIToolW {
     Q_OBJECT
-    public:
+public:
     RTIToolW(QWidget * parent = 0) 
-    : QDialog(parent)
-    {
-    setupUi(this);
-    init();
+        : QDialog(parent) {
+        setupUi(this);
+        init();
     }
 public slots:
 #ifdef _WIN32
diff --git a/src/qtgui/searchclause_w.h b/src/qtgui/searchclause_w.h
index 60cdb66e..85db1041 100644
--- a/src/qtgui/searchclause_w.h
+++ b/src/qtgui/searchclause_w.h
@@ -1,4 +1,4 @@
-/*
+/* Copyright (C) 2005-2020 J.F.Dockes
  *   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 of the License, or
diff --git a/src/qtgui/specialindex.h b/src/qtgui/specialindex.h
index e2ed5dd7..321cac24 100644
--- a/src/qtgui/specialindex.h
+++ b/src/qtgui/specialindex.h
@@ -1,4 +1,4 @@
-/*
+/* Copyright (C) 2005-2020 J.F.Dockes
  *   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 of the License, or
@@ -30,9 +30,8 @@ class SpecIdxW : public QDialog, public Ui::SpecIdxW {
 public:
 
     SpecIdxW(QWidget * parent = 0) 
-    : QDialog(parent)
-    {
-    setupUi(this);
+        : QDialog(parent) {
+        setupUi(this);
         selPatsLE->setEnabled(false);
         connect(browsePB, SIGNAL(clicked()), this, SLOT(onBrowsePB_clicked()));
         connect(targLE, SIGNAL(textChanged(const QString&)), 
diff --git a/src/qtgui/spell_w.h b/src/qtgui/spell_w.h
index 33a1c938..3041d93e 100644
--- a/src/qtgui/spell_w.h
+++ b/src/qtgui/spell_w.h
@@ -28,15 +28,15 @@ class SpellW : public QWidget, public Ui::SpellBase
     Q_OBJECT;
 public:
     SpellW(QWidget* parent = 0) 
-    : QWidget(parent), m_prevmode(TYPECMB_NONE) {
-    setupUi(this);
-    init();
+        : QWidget(parent), m_prevmode(TYPECMB_NONE) {
+        setupUi(this);
+        init();
     }
     
     virtual bool eventFilter(QObject *target, QEvent *event );
 
     enum comboboxchoice {TYPECMB_NONE, TYPECMB_WILD, TYPECMB_REG, TYPECMB_STEM, 
-             TYPECMB_SPELL, TYPECMB_STATS, TYPECMB_FAILED};
+                         TYPECMB_SPELL, TYPECMB_STATS, TYPECMB_FAILED};
 public slots:
     virtual void doExpand();
     virtual void wordChanged(const QString&);
diff --git a/src/qtgui/systray.cpp b/src/qtgui/systray.cpp
index a3e65ad2..d58265da 100644
--- a/src/qtgui/systray.cpp
+++ b/src/qtgui/systray.cpp
@@ -1,4 +1,4 @@
-/*
+/* Copyright (C) 2005-2020 J.F.Dockes
  *   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 of the License, or
diff --git a/src/qtgui/systray.h b/src/qtgui/systray.h
index 73f054b9..f89387f0 100644
--- a/src/qtgui/systray.h
+++ b/src/qtgui/systray.h
@@ -1,4 +1,4 @@
-/*
+/* Copyright (C) 2005-2020 J.F.Dockes
  *   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 of the License, or
@@ -25,7 +25,7 @@ class RclMain;
 class RclTrayIcon : public QSystemTrayIcon {
     Q_OBJECT
 
-    public:
+public:
 
     RclTrayIcon(RclMain *mainw, const QIcon& icon, QObject* parent = 0)
         : QSystemTrayIcon(icon, parent), m_mainw(mainw) { 
diff --git a/src/qtgui/uiprefs_w.h b/src/qtgui/uiprefs_w.h
index 45533813..b0d77144 100644
--- a/src/qtgui/uiprefs_w.h
+++ b/src/qtgui/uiprefs_w.h
@@ -31,8 +31,7 @@ class UIPrefsDialog : public QDialog, public Ui::uiPrefsDialogBase
 
 public:
     UIPrefsDialog(RclMain* parent)
-    : QDialog((QWidget*)parent), m_mainWindow(parent)
-    {
+        : QDialog((QWidget*)parent), m_mainWindow(parent) {
         setupUi(this);
         init();
     }
diff --git a/src/qtgui/xmltosd.cpp b/src/qtgui/xmltosd.cpp
index 7b1c8f95..c9f72107 100644
--- a/src/qtgui/xmltosd.cpp
+++ b/src/qtgui/xmltosd.cpp
@@ -33,8 +33,8 @@ class SDHXMLHandler : public PicoXMLParser {
 public:
     SDHXMLHandler(const std::string& in)
         : PicoXMLParser(in) {
-            resetTemps();
-        }
+        resetTemps();
+    }
     void startElement(
         const std::string& nm,
         const std::map<std::string, std::string>& attrs) {
@@ -219,7 +219,7 @@ class SSHXMLHandler : public PicoXMLParser {
 public:
     SSHXMLHandler(const std::string& in)
         : PicoXMLParser(in) {
-            resetTemps();
+        resetTemps();
     }
 
     void startElement(const std::string &nm,