From cf916d8af78db19e0df37b12e63f35bf21f2da5b Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sun, 27 Sep 2020 23:31:40 +0900
Subject: Removed code formatting modelines.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 kmail/about/kmail.css                 | 3 ---
 kmail/about/main.html                 | 1 -
 kmail/aboutdata.cpp                   | 2 +-
 kmail/aboutdata.h                     | 2 +-
 kmail/accountcombobox.cpp             | 2 +-
 kmail/accountcombobox.h               | 2 +-
 kmail/accountdialog.h                 | 2 +-
 kmail/accountmanager.h                | 2 +-
 kmail/actionscheduler.h               | 2 +-
 kmail/antispamconfig.cpp              | 2 +-
 kmail/antispamconfig.h                | 2 +-
 kmail/antispamwizard.h                | 2 +-
 kmail/app_octetstream.cpp             | 2 +-
 kmail/attachmentcollector.cpp         | 2 +-
 kmail/attachmentcollector.h           | 2 +-
 kmail/attachmentlistview.cpp          | 2 +-
 kmail/attachmentlistview.h            | 2 +-
 kmail/attachmentstrategy.cpp          | 2 +-
 kmail/attachmentstrategy.h            | 2 +-
 kmail/bodypartformatter.cpp           | 2 +-
 kmail/bodypartformatter.h             | 2 +-
 kmail/bodypartformatterfactory.cpp    | 2 +-
 kmail/bodypartformatterfactory.h      | 2 +-
 kmail/bodypartformatterfactory_p.h    | 2 +-
 kmail/bodyvisitor.h                   | 2 +-
 kmail/cachedimapjob.cpp               | 2 +-
 kmail/cachedimapjob.h                 | 2 +-
 kmail/callback.cpp                    | 2 +-
 kmail/callback.h                      | 2 +-
 kmail/composer.h                      | 2 +-
 kmail/configuredialog.cpp             | 2 +-
 kmail/configuredialog.h               | 2 +-
 kmail/configuredialog_p.h             | 1 -
 kmail/csshelper.cpp                   | 2 +-
 kmail/csshelper.h                     | 2 +-
 kmail/customtemplates.cpp             | 2 +-
 kmail/customtemplates.h               | 2 +-
 kmail/dictionarycombobox.cpp          | 2 +-
 kmail/dictionarycombobox.h            | 2 +-
 kmail/expirejob.h                     | 2 +-
 kmail/filehtmlwriter.cpp              | 2 +-
 kmail/filehtmlwriter.h                | 2 +-
 kmail/folderIface.cpp                 | 2 +-
 kmail/folderIface.h                   | 2 +-
 kmail/folderdiaacltab.cpp             | 1 -
 kmail/folderdiaacltab.h               | 1 -
 kmail/folderdiaquotatab.cpp           | 1 -
 kmail/folderdiaquotatab.h             | 1 -
 kmail/folderjob.cpp                   | 2 +-
 kmail/folderjob.h                     | 2 +-
 kmail/headerlistquicksearch.h         | 2 +-
 kmail/headerstrategy.cpp              | 2 +-
 kmail/headerstrategy.h                | 2 +-
 kmail/headerstyle.cpp                 | 2 +-
 kmail/headerstyle.h                   | 2 +-
 kmail/htmlstatusbar.cpp               | 2 +-
 kmail/htmlstatusbar.h                 | 2 +-
 kmail/identitydialog.cpp              | 2 +-
 kmail/identitydialog.h                | 2 +-
 kmail/identitydrag.cpp                | 2 +-
 kmail/identitydrag.h                  | 2 +-
 kmail/identitylistview.cpp            | 2 +-
 kmail/identitylistview.h              | 2 +-
 kmail/imapaccountbase.cpp             | 2 +-
 kmail/imapaccountbase.h               | 2 +-
 kmail/imapjob.cpp                     | 2 +-
 kmail/imapjob.h                       | 2 +-
 kmail/interfaces/bodypart.h           | 2 +-
 kmail/interfaces/bodypartformatter.h  | 2 +-
 kmail/interfaces/bodyparturlhandler.h | 2 +-
 kmail/interfaces/htmlwriter.h         | 2 +-
 kmail/interfaces/observable.h         | 2 +-
 kmail/interfaces/observer.h           | 2 +-
 kmail/interfaces/rulewidgethandler.h  | 2 +-
 kmail/interfaces/urlhandler.h         | 2 +-
 kmail/isubject.h                      | 2 +-
 kmail/kcm_kmail.cpp                   | 2 +-
 kmail/keyresolver.cpp                 | 2 +-
 kmail/keyresolver.h                   | 2 +-
 kmail/kleo_util.h                     | 2 +-
 kmail/kmaccount.h                     | 2 +-
 kmail/kmacctimap.h                    | 2 +-
 kmail/kmaddrbook.cpp                  | 2 +-
 kmail/kmail_options.h                 | 1 -
 kmail/kmail_part.cpp                  | 3 +--
 kmail/kmatmlistview.cpp               | 1 -
 kmail/kmatmlistview.h                 | 2 +-
 kmail/kmcommands.cpp                  | 2 +-
 kmail/kmcommands.h                    | 2 --
 kmail/kmcomposewin.cpp                | 1 -
 kmail/kmcomposewin.h                  | 2 +-
 kmail/kmdebug.h                       | 2 --
 kmail/kmedit.cpp                      | 1 -
 kmail/kmedit.h                        | 2 +-
 kmail/kmfilter.cpp                    | 2 +-
 kmail/kmfilter.h                      | 2 +-
 kmail/kmfilterdlg.cpp                 | 1 -
 kmail/kmfiltermgr.cpp                 | 1 -
 kmail/kmfolder.cpp                    | 2 +-
 kmail/kmfolder.h                      | 2 +-
 kmail/kmfolderdia.cpp                 | 1 -
 kmail/kmfolderdia.h                   | 1 -
 kmail/kmfolderindex.cpp               | 2 +-
 kmail/kmfolderindex.h                 | 2 +-
 kmail/kmfoldermaildir.cpp             | 1 -
 kmail/kmfoldermbox.cpp                | 2 +-
 kmail/kmfoldertree.h                  | 2 +-
 kmail/kmheaders.cpp                   | 1 -
 kmail/kmheaders.h                     | 2 --
 kmail/kmkernel.cpp                    | 1 -
 kmail/kmkernel.h                      | 2 --
 kmail/kmlineeditspell.cpp             | 1 -
 kmail/kmlineeditspell.h               | 2 +-
 kmail/kmmainwidget.cpp                | 1 -
 kmail/kmmainwidget.h                  | 2 +-
 kmail/kmmessage.cpp                   | 1 -
 kmail/kmmessage.h                     | 1 -
 kmail/kmmimeparttree.cpp              | 2 +-
 kmail/kmmimeparttree.h                | 6 +-----
 kmail/kmmsgpart.h                     | 2 +-
 kmail/kmreadermainwin.h               | 2 --
 kmail/kmreaderwin.cpp                 | 1 -
 kmail/kmreaderwin.h                   | 1 -
 kmail/kmsearchpattern.cpp             | 1 -
 kmail/kmsearchpattern.h               | 1 -
 kmail/kmsearchpatternedit.cpp         | 1 -
 kmail/kmsearchpatternedit.h           | 1 -
 kmail/kmservertest.cpp                | 2 +-
 kmail/kmservertest.h                  | 2 +-
 kmail/kmsystemtray.cpp                | 1 -
 kmail/localsubscriptiondialog.cpp     | 2 +-
 kmail/localsubscriptiondialog.h       | 2 +-
 kmail/maildirjob.cpp                  | 2 +-
 kmail/maildirjob.h                    | 2 +-
 kmail/mailinglist-magic.cpp           | 1 -
 kmail/mailinglist-magic.h             | 1 -
 kmail/mailserviceimpl.cpp             | 2 +-
 kmail/mailserviceimpl.h               | 2 +-
 kmail/mailsourceviewer.cpp            | 2 +-
 kmail/mailsourceviewer.h              | 2 +-
 kmail/main.cpp                        | 2 +-
 kmail/mboxjob.cpp                     | 2 +-
 kmail/mboxjob.h                       | 2 +-
 kmail/networkaccount.cpp              | 2 +-
 kmail/networkaccount.h                | 2 +-
 kmail/objecttreeparser.cpp            | 2 +-
 kmail/objecttreeparser.h              | 2 +-
 kmail/objecttreeparser_p.cpp          | 2 +-
 kmail/objecttreeparser_p.h            | 2 +-
 kmail/partNode.cpp                    | 2 +-
 kmail/partNode.h                      | 2 +-
 kmail/partmetadata.h                  | 2 +-
 kmail/partnodebodypart.cpp            | 2 +-
 kmail/partnodebodypart.h              | 2 +-
 kmail/popaccount.h                    | 1 -
 kmail/protocols.h                     | 1 -
 kmail/redirectdialog.h                | 2 +-
 kmail/regexplineedit.cpp              | 2 +-
 kmail/regexplineedit.h                | 2 +-
 kmail/rulewidgethandlermanager.cpp    | 2 +-
 kmail/rulewidgethandlermanager.h      | 2 +-
 kmail/secondarywindow.cpp             | 2 +-
 kmail/secondarywindow.h               | 2 +-
 kmail/sieveconfig.cpp                 | 2 +-
 kmail/sieveconfig.h                   | 2 +-
 kmail/sievejob.cpp                    | 5 +----
 kmail/sievejob.h                      | 5 +----
 kmail/signatureconfigurator.cpp       | 2 +-
 kmail/signatureconfigurator.h         | 2 +-
 kmail/simplestringlisteditor.cpp      | 2 +-
 kmail/simplestringlisteditor.h        | 2 +-
 kmail/spamheaderanalyzer.cpp          | 2 +-
 kmail/spamheaderanalyzer.h            | 2 +-
 kmail/stl_util.h                      | 2 +-
 kmail/subscriptiondialog.cpp          | 2 +-
 kmail/subscriptiondialog.h            | 2 +-
 kmail/tdehtmlparthtmlwriter.cpp       | 2 +-
 kmail/tdehtmlparthtmlwriter.h         | 2 +-
 kmail/teehtmlwriter.cpp               | 2 +-
 kmail/teehtmlwriter.h                 | 2 +-
 kmail/templateparser.cpp              | 2 +-
 kmail/templateparser.h                | 2 +-
 kmail/templatesconfiguration.cpp      | 2 +-
 kmail/templatesconfiguration.h        | 2 +-
 kmail/templatesinsertcommand.cpp      | 2 +-
 kmail/templatesinsertcommand.h        | 2 +-
 kmail/urlhandlermanager.cpp           | 2 +-
 kmail/urlhandlermanager.h             | 2 +-
 kmail/vacation.cpp                    | 2 +-
 kmail/vacation.h                      | 2 +-
 kmail/vacationdialog.cpp              | 2 +-
 kmail/vacationdialog.h                | 2 +-
 kmail/xfaceconfigurator.h             | 2 +-
 193 files changed, 155 insertions(+), 211 deletions(-)

(limited to 'kmail')

diff --git a/kmail/about/kmail.css b/kmail/about/kmail.css
index 38db9987..0444430b 100644
--- a/kmail/about/kmail.css
+++ b/kmail/about/kmail.css
@@ -20,6 +20,3 @@
   background-repeat: no-repeat;
   background-position: bottom right;
 }
-
-/* vim:set sw=2 et nocindent smartindent: */
-
diff --git a/kmail/about/main.html b/kmail/about/main.html
index 634b5f00..52876f21 100644
--- a/kmail/about/main.html
+++ b/kmail/about/main.html
@@ -64,4 +64,3 @@
   <div id="footer"><div id="footerL"/><div id="footerR"/></div>
 </body>
 </html>
-<!-- vim:set sw=2 et nocindent smartindent: -->
diff --git a/kmail/aboutdata.cpp b/kmail/aboutdata.cpp
index 91bc1607..89521c09 100644
--- a/kmail/aboutdata.cpp
+++ b/kmail/aboutdata.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     aboutdata.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/aboutdata.h b/kmail/aboutdata.h
index 5c5b08ae..02c0a7c4 100644
--- a/kmail/aboutdata.h
+++ b/kmail/aboutdata.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     aboutdata.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/accountcombobox.cpp b/kmail/accountcombobox.cpp
index 7ae3d2a3..97f95b11 100644
--- a/kmail/accountcombobox.cpp
+++ b/kmail/accountcombobox.cpp
@@ -1,4 +1,4 @@
-/** -*- mode: C++ -*-
+/*
  * Copyright (c) 2004 David Faure <faure@kde.org>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/kmail/accountcombobox.h b/kmail/accountcombobox.h
index c2e85cf6..2fa27f39 100644
--- a/kmail/accountcombobox.h
+++ b/kmail/accountcombobox.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++ -*-
+/*
  * Copyright (c) 2004 David Faure <faure@kde.org>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/kmail/accountdialog.h b/kmail/accountdialog.h
index bf79f096..fb15cb38 100644
--- a/kmail/accountdialog.h
+++ b/kmail/accountdialog.h
@@ -1,4 +1,4 @@
-/*   -*- c++ -*-
+/*
  *   accountdialog.h
  *
  *   kmail: KDE mail client
diff --git a/kmail/accountmanager.h b/kmail/accountmanager.h
index 4afe8bb9..9097d351 100644
--- a/kmail/accountmanager.h
+++ b/kmail/accountmanager.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++ -*-
+/*
  * kmail: KDE mail client
  * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
  *
diff --git a/kmail/actionscheduler.h b/kmail/actionscheduler.h
index 54303960..4551b3d2 100644
--- a/kmail/actionscheduler.h
+++ b/kmail/actionscheduler.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++ -*-
+/*
     Action Scheduler
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/antispamconfig.cpp b/kmail/antispamconfig.cpp
index 2563e4ee..f187dcd6 100644
--- a/kmail/antispamconfig.cpp
+++ b/kmail/antispamconfig.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     antispamconfig.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/antispamconfig.h b/kmail/antispamconfig.h
index 9c344993..922d49db 100644
--- a/kmail/antispamconfig.h
+++ b/kmail/antispamconfig.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     antispamconfig.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/antispamwizard.h b/kmail/antispamwizard.h
index 7248b9e5..e93480c1 100644
--- a/kmail/antispamwizard.h
+++ b/kmail/antispamwizard.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++ -*-
+/*
     This file is part of KMail.
     Copyright (c) 2003 Andreas Gungl <a.gungl@gmx.de>
 
diff --git a/kmail/app_octetstream.cpp b/kmail/app_octetstream.cpp
index 526fbb54..5fe9348e 100644
--- a/kmail/app_octetstream.cpp
+++ b/kmail/app_octetstream.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     app_octetstream.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/attachmentcollector.cpp b/kmail/attachmentcollector.cpp
index b902f596..6fbab33d 100644
--- a/kmail/attachmentcollector.cpp
+++ b/kmail/attachmentcollector.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     attachmentcollector.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/attachmentcollector.h b/kmail/attachmentcollector.h
index 6930e07e..a0069d51 100644
--- a/kmail/attachmentcollector.h
+++ b/kmail/attachmentcollector.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     attachmentcollector.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/attachmentlistview.cpp b/kmail/attachmentlistview.cpp
index a03cd32f..9e99e640 100644
--- a/kmail/attachmentlistview.cpp
+++ b/kmail/attachmentlistview.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     attachmentlistview.cpp
 
     KMail, the KDE mail client.
diff --git a/kmail/attachmentlistview.h b/kmail/attachmentlistview.h
index 881f8b28..d0a0b63e 100644
--- a/kmail/attachmentlistview.h
+++ b/kmail/attachmentlistview.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     attachmentlistview.h
 
     KMail, the KDE mail client.
diff --git a/kmail/attachmentstrategy.cpp b/kmail/attachmentstrategy.cpp
index 87157ed4..2f12f39b 100644
--- a/kmail/attachmentstrategy.cpp
+++ b/kmail/attachmentstrategy.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     attachmentstrategy.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/attachmentstrategy.h b/kmail/attachmentstrategy.h
index 268a4330..66fb6b85 100644
--- a/kmail/attachmentstrategy.h
+++ b/kmail/attachmentstrategy.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     attachmentstrategy.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/bodypartformatter.cpp b/kmail/bodypartformatter.cpp
index bd6da060..8435ef25 100644
--- a/kmail/bodypartformatter.cpp
+++ b/kmail/bodypartformatter.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     bodypartformatter.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/bodypartformatter.h b/kmail/bodypartformatter.h
index 1c296582..2664be0d 100644
--- a/kmail/bodypartformatter.h
+++ b/kmail/bodypartformatter.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     bodypartformatter.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/bodypartformatterfactory.cpp b/kmail/bodypartformatterfactory.cpp
index 62a92953..fbae5a44 100644
--- a/kmail/bodypartformatterfactory.cpp
+++ b/kmail/bodypartformatterfactory.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     bodypartformatterfactory.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/bodypartformatterfactory.h b/kmail/bodypartformatterfactory.h
index dd89eb34..7606a5c1 100644
--- a/kmail/bodypartformatterfactory.h
+++ b/kmail/bodypartformatterfactory.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     bodypartformatterfactory.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/bodypartformatterfactory_p.h b/kmail/bodypartformatterfactory_p.h
index 088a17f2..60067cd7 100644
--- a/kmail/bodypartformatterfactory_p.h
+++ b/kmail/bodypartformatterfactory_p.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     bodypartformatterfactory.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/bodyvisitor.h b/kmail/bodyvisitor.h
index a436fb44..cfe43b49 100644
--- a/kmail/bodyvisitor.h
+++ b/kmail/bodyvisitor.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2003 Carsten Burghardt <burghardt@kde.org>
diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp
index e4a29d6e..bba5b1b6 100644
--- a/kmail/cachedimapjob.cpp
+++ b/kmail/cachedimapjob.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2002-2004  Bo Thorsen <bo@sonofthor.dk>
diff --git a/kmail/cachedimapjob.h b/kmail/cachedimapjob.h
index bdf64541..f2daa6c7 100644
--- a/kmail/cachedimapjob.h
+++ b/kmail/cachedimapjob.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2002-2003  Bo Thorsen <bo@sonofthor.dk>
diff --git a/kmail/callback.cpp b/kmail/callback.cpp
index b6e0e938..66bcd12f 100644
--- a/kmail/callback.cpp
+++ b/kmail/callback.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     callback.cpp
 
     This file is used by KMail's plugin interface.
diff --git a/kmail/callback.h b/kmail/callback.h
index a3fccc4e..560d5ddc 100644
--- a/kmail/callback.h
+++ b/kmail/callback.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     callback.h
 
     This file is used by KMail's plugin interface.
diff --git a/kmail/composer.h b/kmail/composer.h
index 30cf0b28..709bfb73 100644
--- a/kmail/composer.h
+++ b/kmail/composer.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
  * KMComposeWin Header File
  * Author: Markus Wuebben <markus.wuebben@kde.org>
  */
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index 0f92eab5..7dcf8ce2 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -1,4 +1,4 @@
-/*   -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *   kmail: KDE mail client
  *   This file: Copyright (C) 2000 Espen Sand, espen@kde.org
  *              Copyright (C) 2001-2003 Marc Mutz, mutz@kde.org
diff --git a/kmail/configuredialog.h b/kmail/configuredialog.h
index 265bc957..acd0bc5a 100644
--- a/kmail/configuredialog.h
+++ b/kmail/configuredialog.h
@@ -1,4 +1,4 @@
-/*   -*- c++ -*-
+/*
  *   kmail: KDE mail client
  *   This file: Copyright (C) 2000 Espen Sand, espen@kde.org
  *              Copyright (C) 2001-2002 Marc Mutz <mutz@kde.org>
diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h
index 6ba969de..10e9b8df 100644
--- a/kmail/configuredialog_p.h
+++ b/kmail/configuredialog_p.h
@@ -1,4 +1,3 @@
-// -*- c++ -*-
 // configuredialog_p.h: classes internal to ConfigureDialog
 // see configuredialog.h for details.
 
diff --git a/kmail/csshelper.cpp b/kmail/csshelper.cpp
index e5bfb7bf..c4f58390 100644
--- a/kmail/csshelper.cpp
+++ b/kmail/csshelper.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     csshelper.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/csshelper.h b/kmail/csshelper.h
index 9bff99ca..cba58adc 100644
--- a/kmail/csshelper.h
+++ b/kmail/csshelper.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     csshelper.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp
index 644f5fa9..5daf001d 100644
--- a/kmail/customtemplates.cpp
+++ b/kmail/customtemplates.cpp
@@ -1,4 +1,4 @@
-/*   -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *   kmail: KDE mail client
  *   This file: Copyright (C) 2006 Dmitry Morozhnikov
  *
diff --git a/kmail/customtemplates.h b/kmail/customtemplates.h
index 1af43734..b117dd69 100644
--- a/kmail/customtemplates.h
+++ b/kmail/customtemplates.h
@@ -1,4 +1,4 @@
-/*   -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *   kmail: KDE mail client
  *   This file: Copyright (C) 2006 Dmitry Morozhnikov
  *
diff --git a/kmail/dictionarycombobox.cpp b/kmail/dictionarycombobox.cpp
index 6eb1b493..be705d3d 100644
--- a/kmail/dictionarycombobox.cpp
+++ b/kmail/dictionarycombobox.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     dictionarycombobox.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/dictionarycombobox.h b/kmail/dictionarycombobox.h
index 0a8d5c0f..a6d3584a 100644
--- a/kmail/dictionarycombobox.h
+++ b/kmail/dictionarycombobox.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     dictionarycombobox.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/expirejob.h b/kmail/expirejob.h
index dbec3d52..dbdb6a3a 100644
--- a/kmail/expirejob.h
+++ b/kmail/expirejob.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++ -*-
+/*
  * Copyright (c) 2004 David Faure <faure@kde.org>
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/kmail/filehtmlwriter.cpp b/kmail/filehtmlwriter.cpp
index c4f2d214..abad6420 100644
--- a/kmail/filehtmlwriter.cpp
+++ b/kmail/filehtmlwriter.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     filehtmlwriter.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/filehtmlwriter.h b/kmail/filehtmlwriter.h
index 87914322..768e0c58 100644
--- a/kmail/filehtmlwriter.h
+++ b/kmail/filehtmlwriter.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     filehtmlwriter.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/folderIface.cpp b/kmail/folderIface.cpp
index 981e1b37..a95e3e13 100644
--- a/kmail/folderIface.cpp
+++ b/kmail/folderIface.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2003 Zack Rusin <zack@kde.org>
diff --git a/kmail/folderIface.h b/kmail/folderIface.h
index e348ea6b..c8593d2c 100644
--- a/kmail/folderIface.h
+++ b/kmail/folderIface.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2003 Zack Rusin <zack@kde.org>
diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp
index 6b2e85fc..35b72784 100644
--- a/kmail/folderdiaacltab.cpp
+++ b/kmail/folderdiaacltab.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 /**
  * folderdiaacltab.cpp
  *
diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h
index bc619c4e..0a5d6465 100644
--- a/kmail/folderdiaacltab.h
+++ b/kmail/folderdiaacltab.h
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 /**
  * folderdiaacltab.h
  *
diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp
index 3fdb308f..2fd950b2 100644
--- a/kmail/folderdiaquotatab.cpp
+++ b/kmail/folderdiaquotatab.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 /**
  * folderdiaquotatab.cpp
  *
diff --git a/kmail/folderdiaquotatab.h b/kmail/folderdiaquotatab.h
index 6b260035..fe7af431 100644
--- a/kmail/folderdiaquotatab.h
+++ b/kmail/folderdiaquotatab.h
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 /**
  * folderdiaquotatab.h
  *
diff --git a/kmail/folderjob.cpp b/kmail/folderjob.cpp
index 657d1a9b..2472df3a 100644
--- a/kmail/folderjob.cpp
+++ b/kmail/folderjob.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2003 Zack Rusin <zack@kde.org>
diff --git a/kmail/folderjob.h b/kmail/folderjob.h
index 47838044..5b7f4037 100644
--- a/kmail/folderjob.h
+++ b/kmail/folderjob.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2003 Zack Rusin <zack@kde.org>
diff --git a/kmail/headerlistquicksearch.h b/kmail/headerlistquicksearch.h
index f159c69f..4a3aa098 100644
--- a/kmail/headerlistquicksearch.h
+++ b/kmail/headerlistquicksearch.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++ -*-
+/*
     This file is part of KMail, the KDE mail client.
     Copyright (c) 2004 Till Adam <adam@kde.org>
 
diff --git a/kmail/headerstrategy.cpp b/kmail/headerstrategy.cpp
index afa581a1..ff2b82ae 100644
--- a/kmail/headerstrategy.cpp
+++ b/kmail/headerstrategy.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     headerstrategy.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/headerstrategy.h b/kmail/headerstrategy.h
index ebb61012..9f49f1ac 100644
--- a/kmail/headerstrategy.h
+++ b/kmail/headerstrategy.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     headerstrategy.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp
index f7c2973e..44f12b38 100644
--- a/kmail/headerstyle.cpp
+++ b/kmail/headerstyle.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     headerstyle.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/headerstyle.h b/kmail/headerstyle.h
index ff7228d3..88143909 100644
--- a/kmail/headerstyle.h
+++ b/kmail/headerstyle.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     headerstyle.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/htmlstatusbar.cpp b/kmail/htmlstatusbar.cpp
index fecda8de..61205a7f 100644
--- a/kmail/htmlstatusbar.cpp
+++ b/kmail/htmlstatusbar.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     htmlstatusbar.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/htmlstatusbar.h b/kmail/htmlstatusbar.h
index 95af5206..9a86302f 100644
--- a/kmail/htmlstatusbar.h
+++ b/kmail/htmlstatusbar.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     htmlstatusbar.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp
index 90b4ffdd..91b108c9 100644
--- a/kmail/identitydialog.cpp
+++ b/kmail/identitydialog.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     identitydialog.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/identitydialog.h b/kmail/identitydialog.h
index 29b50f05..fc9b4594 100644
--- a/kmail/identitydialog.h
+++ b/kmail/identitydialog.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     identitydialog.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/identitydrag.cpp b/kmail/identitydrag.cpp
index 88df48f6..f3c6435d 100644
--- a/kmail/identitydrag.cpp
+++ b/kmail/identitydrag.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     identitydrag.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/identitydrag.h b/kmail/identitydrag.h
index 1c2ddb0d..295c83ad 100644
--- a/kmail/identitydrag.h
+++ b/kmail/identitydrag.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     identitydrag.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/identitylistview.cpp b/kmail/identitylistview.cpp
index c13b9d1f..f10edf7d 100644
--- a/kmail/identitylistview.cpp
+++ b/kmail/identitylistview.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     identitylistview.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/identitylistview.h b/kmail/identitylistview.h
index abe12127..586767c7 100644
--- a/kmail/identitylistview.h
+++ b/kmail/identitylistview.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     identitylistview.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp
index 1350da29..40ff81f7 100644
--- a/kmail/imapaccountbase.cpp
+++ b/kmail/imapaccountbase.cpp
@@ -1,4 +1,4 @@
-/** -*- c++ -*-
+/*
  * imapaccountbase.cpp
  *
  * Copyright (c) 2000-2002 Michael Haeckel <haeckel@kde.org>
diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h
index 3a4c4bff..1c022044 100644
--- a/kmail/imapaccountbase.h
+++ b/kmail/imapaccountbase.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
  * imapaccountbase.h
  *
  * Copyright (c) 2000-2002 Michael Haeckel <haeckel@kde.org>
diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp
index dc9a98f5..1f7682b5 100644
--- a/kmail/imapjob.cpp
+++ b/kmail/imapjob.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2002-2003 Zack Rusin <zack@kde.org>
diff --git a/kmail/imapjob.h b/kmail/imapjob.h
index c8e00e14..e348b2df 100644
--- a/kmail/imapjob.h
+++ b/kmail/imapjob.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2002-2003 Zack Rusin <zack@kde.org>
diff --git a/kmail/interfaces/bodypart.h b/kmail/interfaces/bodypart.h
index 43490632..c70441cf 100644
--- a/kmail/interfaces/bodypart.h
+++ b/kmail/interfaces/bodypart.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     bodypart.h
 
     This file is part of KMail's plugin interface.
diff --git a/kmail/interfaces/bodypartformatter.h b/kmail/interfaces/bodypartformatter.h
index 14fedc61..7fb3d19a 100644
--- a/kmail/interfaces/bodypartformatter.h
+++ b/kmail/interfaces/bodypartformatter.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     bodypartformatter.h
 
     This file is part of KMail's plugin interface.
diff --git a/kmail/interfaces/bodyparturlhandler.h b/kmail/interfaces/bodyparturlhandler.h
index 78d566c1..885e55d0 100644
--- a/kmail/interfaces/bodyparturlhandler.h
+++ b/kmail/interfaces/bodyparturlhandler.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     interfaces/bodyparturlhandler.h
 
     This file is part of KMail's plugin interface.
diff --git a/kmail/interfaces/htmlwriter.h b/kmail/interfaces/htmlwriter.h
index 179841c1..f7a76ad5 100644
--- a/kmail/interfaces/htmlwriter.h
+++ b/kmail/interfaces/htmlwriter.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     interfaces/htmlwriter.h
 
     This file is part of KMail's plugin interface.
diff --git a/kmail/interfaces/observable.h b/kmail/interfaces/observable.h
index 10d14dfa..3e004ba6 100644
--- a/kmail/interfaces/observable.h
+++ b/kmail/interfaces/observable.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     observable.h
 
     This file is part of KMail's plugin interface.
diff --git a/kmail/interfaces/observer.h b/kmail/interfaces/observer.h
index 31cbc80a..75d28c35 100644
--- a/kmail/interfaces/observer.h
+++ b/kmail/interfaces/observer.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     observer.h
 
     This file is part of KMail's plugin interface.
diff --git a/kmail/interfaces/rulewidgethandler.h b/kmail/interfaces/rulewidgethandler.h
index 33095223..edc581b1 100644
--- a/kmail/interfaces/rulewidgethandler.h
+++ b/kmail/interfaces/rulewidgethandler.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     interfaces/rulewidgethandler.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/interfaces/urlhandler.h b/kmail/interfaces/urlhandler.h
index 1eb0e365..2ad9295e 100644
--- a/kmail/interfaces/urlhandler.h
+++ b/kmail/interfaces/urlhandler.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     interfaces/urlhandler.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/isubject.h b/kmail/isubject.h
index 8bad40c4..10fc7b37 100644
--- a/kmail/isubject.h
+++ b/kmail/isubject.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2003 Carsten Burghardt <burghardt@kde.org>
diff --git a/kmail/kcm_kmail.cpp b/kmail/kcm_kmail.cpp
index fa0e2fed..07dc1d72 100644
--- a/kmail/kcm_kmail.cpp
+++ b/kmail/kcm_kmail.cpp
@@ -1,4 +1,4 @@
-/*   -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *   kmail: KDE mail client
  *   This file: Copyright (C) 2000 Espen Sand, espen@kde.org
  *              Copyright (C) 2001-2003 Marc Mutz, mutz@kde.org
diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp
index 76d4ae8f..fcd2f279 100644
--- a/kmail/keyresolver.cpp
+++ b/kmail/keyresolver.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     keyresolver.cpp
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/kmail/keyresolver.h b/kmail/keyresolver.h
index c7bdfe25..2f7bd936 100644
--- a/kmail/keyresolver.h
+++ b/kmail/keyresolver.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     keyresolver.h
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/kmail/kleo_util.h b/kmail/kleo_util.h
index 663f0b63..c7cfd99b 100644
--- a/kmail/kleo_util.h
+++ b/kmail/kleo_util.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kleo_util.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h
index f0455b3b..8445d55e 100644
--- a/kmail/kmaccount.h
+++ b/kmail/kmaccount.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++ -*-
+/*
  * kmail: KDE mail client
  * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
  *
diff --git a/kmail/kmacctimap.h b/kmail/kmacctimap.h
index 3e10332a..6be22c01 100644
--- a/kmail/kmacctimap.h
+++ b/kmail/kmacctimap.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++ -*-
+/*
  * kmacctimap.h
  *
  * Copyright (c) 2000-2002 Michael Haeckel <haeckel@kde.org>
diff --git a/kmail/kmaddrbook.cpp b/kmail/kmaddrbook.cpp
index 6b774738..dcc58e02 100644
--- a/kmail/kmaddrbook.cpp
+++ b/kmail/kmaddrbook.cpp
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
  * kmail: KDE mail client
  * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
  *
diff --git a/kmail/kmail_options.h b/kmail/kmail_options.h
index c0489b7f..e5b327ec 100644
--- a/kmail/kmail_options.h
+++ b/kmail/kmail_options.h
@@ -1,4 +1,3 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*- */
 #ifndef KMAIL_OPTIONS_H
 #define KMAIL_OPTIONS_H
 
diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp
index 23918a04..4d665422 100644
--- a/kmail/kmail_part.cpp
+++ b/kmail/kmail_part.cpp
@@ -1,5 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
-
+/*
     This file is part of KMail.
     Copyright (c) 2002-2003 Don Sanders <sanders@kde.org>,
     Copyright (c) 2003      Zack Rusin  <zack@kde.org>,
diff --git a/kmail/kmatmlistview.cpp b/kmail/kmatmlistview.cpp
index 4d9fc42d..d6a9c4c4 100644
--- a/kmail/kmatmlistview.cpp
+++ b/kmail/kmatmlistview.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmatmlistview.cpp
 // Author: Markus Wuebben <markus.wuebben@kde.org>
 // This code is published under the GPL.
diff --git a/kmail/kmatmlistview.h b/kmail/kmatmlistview.h
index f4d86595..30f0bd5f 100644
--- a/kmail/kmatmlistview.h
+++ b/kmail/kmatmlistview.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
  * KMAtmListViewItem Header File
  * Author: Markus Wuebben <markus.wuebben@kde.org>
  */
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index 3194cee1..5239ceda 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
     This file is part of KMail, the KDE mail client.
     Copyright (c) 2002 Don Sanders <sanders@kde.org>
 
diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h
index 25c0a117..dcafbf3d 100644
--- a/kmail/kmcommands.h
+++ b/kmail/kmcommands.h
@@ -1,5 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
-
 #ifndef KMCommands_h
 #define KMCommands_h
 
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index bcdbe4a6..9125f56f 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmcomposewin.cpp
 // Author: Markus Wuebben <markus.wuebben@kde.org>
 // This code is published under the GPL.
diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h
index 123f112b..b9fbe1c7 100644
--- a/kmail/kmcomposewin.h
+++ b/kmail/kmcomposewin.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
  * KMComposeWin Header File
  * Author: Markus Wuebben <markus.wuebben@kde.org>
  */
diff --git a/kmail/kmdebug.h b/kmail/kmdebug.h
index 46262aeb..142d0b9e 100644
--- a/kmail/kmdebug.h
+++ b/kmail/kmdebug.h
@@ -1,5 +1,3 @@
-// -*- c++ -*- convenience wrappers around kdDebug/kdWarning/etc
-
 #ifndef __KMAIL_KMDEBUG_H__
 #define __KMAIL_KMDEBUG_H__
 
diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp
index afe854de..1fe54648 100644
--- a/kmail/kmedit.cpp
+++ b/kmail/kmedit.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmcomposewin.cpp
 // Author: Markus Wuebben <markus.wuebben@kde.org>
 // This code is published under the GPL.
diff --git a/kmail/kmedit.h b/kmail/kmedit.h
index f545a136..c42734dc 100644
--- a/kmail/kmedit.h
+++ b/kmail/kmedit.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
  * KMComposeWin Header File
  * Author: Markus Wuebben <markus.wuebben@kde.org>
  */
diff --git a/kmail/kmfilter.cpp b/kmail/kmfilter.cpp
index d681c6a6..df6a5543 100644
--- a/kmail/kmfilter.cpp
+++ b/kmail/kmfilter.cpp
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
  * kmail: KDE mail client
  * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
  *
diff --git a/kmail/kmfilter.h b/kmail/kmfilter.h
index 35fdecda..fd993e3c 100644
--- a/kmail/kmfilter.h
+++ b/kmail/kmfilter.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
  * kmail: KDE mail client
  * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
  *
diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp
index d9065f6d..b1bbb9ab 100644
--- a/kmail/kmfilterdlg.cpp
+++ b/kmail/kmfilterdlg.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmfilterdlg.cpp
 // Author: Marc Mutz <Marc@Mutz.com>
 // based on work by Stefan Taferner <taferner@kde.org>
diff --git a/kmail/kmfiltermgr.cpp b/kmail/kmfiltermgr.cpp
index e91a44a6..8c47afc0 100644
--- a/kmail/kmfiltermgr.cpp
+++ b/kmail/kmfiltermgr.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmfiltermgr.cpp
 
 // my header
diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp
index 45738939..b1b9c261 100644
--- a/kmail/kmfolder.cpp
+++ b/kmail/kmfolder.cpp
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
  * kmail: KDE mail client
  * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
  *
diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h
index dd04d9f2..e8de8207 100644
--- a/kmail/kmfolder.h
+++ b/kmail/kmfolder.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++ -*-
+/*
  * kmail: KDE mail client
  * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
  *
diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp
index 265b1ee9..da4671bf 100644
--- a/kmail/kmfolderdia.cpp
+++ b/kmail/kmfolderdia.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 /**
  * kmfolderdia.cpp
  *
diff --git a/kmail/kmfolderdia.h b/kmail/kmfolderdia.h
index 5f3ea967..e7c6b1d1 100644
--- a/kmail/kmfolderdia.h
+++ b/kmail/kmfolderdia.h
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 /**
  * kmfolderdia.h
  *
diff --git a/kmail/kmfolderindex.cpp b/kmail/kmfolderindex.cpp
index 7bb77f0d..9b60b25c 100644
--- a/kmail/kmfolderindex.cpp
+++ b/kmail/kmfolderindex.cpp
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
     This file is part of KMail, the KDE mail client.
     Copyright (c) 2000 Don Sanders <sanders@kde.org>
 
diff --git a/kmail/kmfolderindex.h b/kmail/kmfolderindex.h
index 8a8176e6..ae67d7db 100644
--- a/kmail/kmfolderindex.h
+++ b/kmail/kmfolderindex.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
     This file is part of KMail, the KDE mail client.
     Copyright (c) 2000 Don Sanders <sanders@kde.org>
 
diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp
index 5242060a..29f9aacc 100644
--- a/kmail/kmfoldermaildir.cpp
+++ b/kmail/kmfoldermaildir.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmfoldermaildir.cpp
 // Author: Kurt Granroth <granroth@kde.org>
 
diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp
index 6692f54c..43c9a913 100644
--- a/kmail/kmfoldermbox.cpp
+++ b/kmail/kmfoldermbox.cpp
@@ -1,4 +1,4 @@
-/* -*- c-basic-offset: 2 -*-
+/*
  * kmail: KDE mail client
  * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
  *
diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h
index 11e7584f..b41c2b55 100644
--- a/kmail/kmfoldertree.h
+++ b/kmail/kmfoldertree.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++ -*-
+/*
    This file is part of the KDE libraries
 
    This library is free software; you can redistribute it and/or
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index 3196e627..1b29fd29 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmheaders.cpp
 
 #include <config.h>
diff --git a/kmail/kmheaders.h b/kmail/kmheaders.h
index 423ec3dc..112b1cde 100644
--- a/kmail/kmheaders.h
+++ b/kmail/kmheaders.h
@@ -1,5 +1,3 @@
-// -*- mode: C++ -*-
-
 #ifndef __KMHEADERS
 #define __KMHEADERS
 
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index f998a74c..cfb28ab2 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -1,4 +1,3 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*- */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index 610ab476..d9226683 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -1,5 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
-
 #ifndef _KMCONTROL
 #define _KMCONTROL
 
diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp
index 20421ec9..45585147 100644
--- a/kmail/kmlineeditspell.cpp
+++ b/kmail/kmlineeditspell.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmcomposewin.cpp
 // Author: Markus Wuebben <markus.wuebben@kde.org>
 // This code is published under the GPL.
diff --git a/kmail/kmlineeditspell.h b/kmail/kmlineeditspell.h
index 536d3158..06bfce5e 100644
--- a/kmail/kmlineeditspell.h
+++ b/kmail/kmlineeditspell.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
  * KMComposeWin Header File
  * Author: Markus Wuebben <markus.wuebben@kde.org>
  */
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 1d2661f5..d5ba1f31 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmmainwidget.cpp
 //#define MALLOC_DEBUG 1
 
diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h
index f790ff0f..d90dda24 100644
--- a/kmail/kmmainwidget.h
+++ b/kmail/kmmainwidget.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
     This file is part of KMail, the KDE mail client.
     Copyright (c) 2002 Don Sanders <sanders@kde.org>
 
diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp
index d9961478..f9a7f388 100644
--- a/kmail/kmmessage.cpp
+++ b/kmail/kmmessage.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmmessage.cpp
 
 // if you do not want GUI elements in here then set ALLOW_GUI to 0.
diff --git a/kmail/kmmessage.h b/kmail/kmmessage.h
index 3a61a11f..dfe96116 100644
--- a/kmail/kmmessage.h
+++ b/kmail/kmmessage.h
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 /* kmmessage.h: Mime Message Class
  *
  */
diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp
index 200e7736..779fffd4 100644
--- a/kmail/kmmimeparttree.cpp
+++ b/kmail/kmmimeparttree.cpp
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
     kmmimeparttree.h A MIME part tree viwer.
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/kmmimeparttree.h b/kmail/kmmimeparttree.h
index 395694fe..1b4fc4f5 100644
--- a/kmail/kmmimeparttree.h
+++ b/kmail/kmmimeparttree.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
     kmmimeparttree.cpp A MIME part tree viwer.
 
     This file is part of KMail, the KDE mail client.
@@ -28,10 +28,6 @@
     you do not wish to do so, delete this exception statement from
     your version.
 */
-
-
-
-// -*- c++ -*-
 #ifndef KMMIMEPARTTREE_H
 #define KMMIMEPARTTREE_H
 
diff --git a/kmail/kmmsgpart.h b/kmail/kmmsgpart.h
index 4994800b..452114d4 100644
--- a/kmail/kmmsgpart.h
+++ b/kmail/kmmsgpart.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++ -*-
+/*
  * kmail: KDE mail client
  * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
  *
diff --git a/kmail/kmreadermainwin.h b/kmail/kmreadermainwin.h
index 2fa3462f..2101fcb5 100644
--- a/kmail/kmreadermainwin.h
+++ b/kmail/kmreadermainwin.h
@@ -1,5 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
-
 #ifndef KMReaderMainWin_h
 #define KMReaderMainWin_h
 
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 927a5d59..184167b0 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmreaderwin.cpp
 // Author: Markus Wuebben <markus.wuebben@kde.org>
 
diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h
index c9f78aec..dfc4490c 100644
--- a/kmail/kmreaderwin.h
+++ b/kmail/kmreaderwin.h
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // Header for kmreaderwin the kmail reader
 // written by Markus Wuebben <markus.wuebben@kde.org>
 
diff --git a/kmail/kmsearchpattern.cpp b/kmail/kmsearchpattern.cpp
index d1d47daf..114f4e8d 100644
--- a/kmail/kmsearchpattern.cpp
+++ b/kmail/kmsearchpattern.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmsearchpattern.cpp
 // Author: Marc Mutz <Marc@Mutz.com>
 // This code is under GPL!
diff --git a/kmail/kmsearchpattern.h b/kmail/kmsearchpattern.h
index 9b521c1f..9d517fdf 100644
--- a/kmail/kmsearchpattern.h
+++ b/kmail/kmsearchpattern.h
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmsearchpattern.h
 // Author: Marc Mutz <Marc@Mutz.com>
 // This code is under GPL!
diff --git a/kmail/kmsearchpatternedit.cpp b/kmail/kmsearchpatternedit.cpp
index 88f3609b..21ade7b2 100644
--- a/kmail/kmsearchpatternedit.cpp
+++ b/kmail/kmsearchpatternedit.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmsearchpatternedit.cpp
 // Author: Marc Mutz <Marc@Mutz.com>
 // This code is under GPL
diff --git a/kmail/kmsearchpatternedit.h b/kmail/kmsearchpatternedit.h
index 77089df4..86d890bb 100644
--- a/kmail/kmsearchpatternedit.h
+++ b/kmail/kmsearchpatternedit.h
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // kmfilterrulesedit.h
 // Author: Marc Mutz <Marc@Mutz.com>
 // This code is under GPL
diff --git a/kmail/kmservertest.cpp b/kmail/kmservertest.cpp
index 446c739e..5c11f075 100644
--- a/kmail/kmservertest.cpp
+++ b/kmail/kmservertest.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kmservertest.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/kmservertest.h b/kmail/kmservertest.h
index 5d5cddf1..db8535a0 100644
--- a/kmail/kmservertest.h
+++ b/kmail/kmservertest.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     kmservertest.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp
index f3ff58a4..1d1ce933 100644
--- a/kmail/kmsystemtray.cpp
+++ b/kmail/kmsystemtray.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 /***************************************************************************
                           kmsystemtray.cpp  -  description
                              -------------------
diff --git a/kmail/localsubscriptiondialog.cpp b/kmail/localsubscriptiondialog.cpp
index c2d4e555..2f6e839e 100644
--- a/kmail/localsubscriptiondialog.cpp
+++ b/kmail/localsubscriptiondialog.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     localsubscriptiondialog.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/localsubscriptiondialog.h b/kmail/localsubscriptiondialog.h
index 601a8463..eb977908 100644
--- a/kmail/localsubscriptiondialog.h
+++ b/kmail/localsubscriptiondialog.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     localsubscriptiondialog.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/maildirjob.cpp b/kmail/maildirjob.cpp
index b507d927..4c3b520c 100644
--- a/kmail/maildirjob.cpp
+++ b/kmail/maildirjob.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2003 Zack Rusin <zack@kde.org>
diff --git a/kmail/maildirjob.h b/kmail/maildirjob.h
index 1d5a9710..878c5d78 100644
--- a/kmail/maildirjob.h
+++ b/kmail/maildirjob.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2003 Zack Rusin <zack@kde.org>
diff --git a/kmail/mailinglist-magic.cpp b/kmail/mailinglist-magic.cpp
index 1f927084..37600d50 100644
--- a/kmail/mailinglist-magic.cpp
+++ b/kmail/mailinglist-magic.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/kmail/mailinglist-magic.h b/kmail/mailinglist-magic.h
index eaa64592..8eed4f8f 100644
--- a/kmail/mailinglist-magic.h
+++ b/kmail/mailinglist-magic.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
 #ifndef MAILINGLIST_MAGIC_H
 #define MAILINGLIST_MAGIC_H
 
diff --git a/kmail/mailserviceimpl.cpp b/kmail/mailserviceimpl.cpp
index f5b810a3..79af5eaf 100644
--- a/kmail/mailserviceimpl.cpp
+++ b/kmail/mailserviceimpl.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2003 Zack Rusin <zack@kde.org>
diff --git a/kmail/mailserviceimpl.h b/kmail/mailserviceimpl.h
index 6dc5224a..842b4e4e 100644
--- a/kmail/mailserviceimpl.h
+++ b/kmail/mailserviceimpl.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2003 Zack Rusin <zack@kde.org>
diff --git a/kmail/mailsourceviewer.cpp b/kmail/mailsourceviewer.cpp
index eff69cce..7a06f970 100644
--- a/kmail/mailsourceviewer.cpp
+++ b/kmail/mailsourceviewer.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *
diff --git a/kmail/mailsourceviewer.h b/kmail/mailsourceviewer.h
index 0c29175b..68f82c23 100644
--- a/kmail/mailsourceviewer.h
+++ b/kmail/mailsourceviewer.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *
diff --git a/kmail/main.cpp b/kmail/main.cpp
index bb3e0a8a..8b40e555 100644
--- a/kmail/main.cpp
+++ b/kmail/main.cpp
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
  * kmail: KDE mail client
  * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
  *
diff --git a/kmail/mboxjob.cpp b/kmail/mboxjob.cpp
index 7fb22ddb..df25a8ad 100644
--- a/kmail/mboxjob.cpp
+++ b/kmail/mboxjob.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2003 Zack Rusin <zack@kde.org>
diff --git a/kmail/mboxjob.h b/kmail/mboxjob.h
index 9b1d2dea..c9b1e37c 100644
--- a/kmail/mboxjob.h
+++ b/kmail/mboxjob.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *
  *  This file is part of KMail, the KDE mail client.
  *  Copyright (c) 2003 Zack Rusin <zack@kde.org>
diff --git a/kmail/networkaccount.cpp b/kmail/networkaccount.cpp
index 7f4c53b3..9a5f5e99 100644
--- a/kmail/networkaccount.cpp
+++ b/kmail/networkaccount.cpp
@@ -1,4 +1,4 @@
-/** -*- c++ -*-
+/*
  * networkaccount.cpp
  *
  * Copyright (c) 2000-2002 Michael Haeckel <haeckel@kde.org>
diff --git a/kmail/networkaccount.h b/kmail/networkaccount.h
index 1c5dde6e..2ed8e452 100644
--- a/kmail/networkaccount.h
+++ b/kmail/networkaccount.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
  * networkaccount.h
  *
  * Copyright (c) 2000-2002 Michael Haeckel <haeckel@kde.org>
diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp
index 71858bd1..39b7ac00 100644
--- a/kmail/objecttreeparser.cpp
+++ b/kmail/objecttreeparser.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     objecttreeparser.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/objecttreeparser.h b/kmail/objecttreeparser.h
index f9e71427..cd4adfae 100644
--- a/kmail/objecttreeparser.h
+++ b/kmail/objecttreeparser.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     objecttreeparser.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/objecttreeparser_p.cpp b/kmail/objecttreeparser_p.cpp
index a645b398..683d3c4c 100644
--- a/kmail/objecttreeparser_p.cpp
+++ b/kmail/objecttreeparser_p.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     objecttreeparser_p.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/objecttreeparser_p.h b/kmail/objecttreeparser_p.h
index 44a1e9af..04e1c2c3 100644
--- a/kmail/objecttreeparser_p.h
+++ b/kmail/objecttreeparser_p.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     objecttreeparser_p.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp
index 012c6e18..b39bc65f 100644
--- a/kmail/partNode.cpp
+++ b/kmail/partNode.cpp
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
     partNode.cpp A node in a MIME tree.
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/partNode.h b/kmail/partNode.h
index 20328dde..918f3f31 100644
--- a/kmail/partNode.h
+++ b/kmail/partNode.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
     partNode.h A node in a MIME tree.
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/partmetadata.h b/kmail/partmetadata.h
index ee6f51d3..e5b060b9 100644
--- a/kmail/partmetadata.h
+++ b/kmail/partmetadata.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     partmetadata.h
 
     KMail, the KDE mail client.
diff --git a/kmail/partnodebodypart.cpp b/kmail/partnodebodypart.cpp
index 45ce2862..4f095ee8 100644
--- a/kmail/partnodebodypart.cpp
+++ b/kmail/partnodebodypart.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     partnodebodypart.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/partnodebodypart.h b/kmail/partnodebodypart.h
index 3591286e..6ce17615 100644
--- a/kmail/partnodebodypart.h
+++ b/kmail/partnodebodypart.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     partnodebodypart.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/popaccount.h b/kmail/popaccount.h
index f8cb0e92..f6acfee7 100644
--- a/kmail/popaccount.h
+++ b/kmail/popaccount.h
@@ -1,4 +1,3 @@
-// -*- c++ -*-
 #ifndef KMAcctExpPop_h
 #define KMAcctExpPop_h
 
diff --git a/kmail/protocols.h b/kmail/protocols.h
index ab5aa38d..f24730f8 100644
--- a/kmail/protocols.h
+++ b/kmail/protocols.h
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 /**
  * protocols.h
  *
diff --git a/kmail/redirectdialog.h b/kmail/redirectdialog.h
index aa46404f..b4893298 100644
--- a/kmail/redirectdialog.h
+++ b/kmail/redirectdialog.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++ -*-
+/*
     This file is part of KMail.
     Copyright (c) 2003 Andreas Gungl <a.gungl@gmx.de>
 
diff --git a/kmail/regexplineedit.cpp b/kmail/regexplineedit.cpp
index 1b14fb4f..1ce0237b 100644
--- a/kmail/regexplineedit.cpp
+++ b/kmail/regexplineedit.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     regexplineedit.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/regexplineedit.h b/kmail/regexplineedit.h
index 4db2e922..732f5449 100644
--- a/kmail/regexplineedit.h
+++ b/kmail/regexplineedit.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     regexplineedit.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/rulewidgethandlermanager.cpp b/kmail/rulewidgethandlermanager.cpp
index fac482ee..ae04af88 100644
--- a/kmail/rulewidgethandlermanager.cpp
+++ b/kmail/rulewidgethandlermanager.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     rulewidgethandlermanager.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/rulewidgethandlermanager.h b/kmail/rulewidgethandlermanager.h
index 431731e4..8043243c 100644
--- a/kmail/rulewidgethandlermanager.h
+++ b/kmail/rulewidgethandlermanager.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     rulewidgethandlermanager.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/secondarywindow.cpp b/kmail/secondarywindow.cpp
index 5a689633..a421209a 100644
--- a/kmail/secondarywindow.cpp
+++ b/kmail/secondarywindow.cpp
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
     secondarywindow.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/secondarywindow.h b/kmail/secondarywindow.h
index 560b707d..cd7e6f45 100644
--- a/kmail/secondarywindow.h
+++ b/kmail/secondarywindow.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     secondarywindow.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/sieveconfig.cpp b/kmail/sieveconfig.cpp
index ff3e156d..a787e06a 100644
--- a/kmail/sieveconfig.cpp
+++ b/kmail/sieveconfig.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     sieveconfig.cpp
 
     KMail, the KDE mail client.
diff --git a/kmail/sieveconfig.h b/kmail/sieveconfig.h
index ac296375..d7b9b8dc 100644
--- a/kmail/sieveconfig.h
+++ b/kmail/sieveconfig.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     sieveconfig.h
 
     KMail, the KDE mail client.
diff --git a/kmail/sievejob.cpp b/kmail/sievejob.cpp
index 96f0a608..290e2d71 100644
--- a/kmail/sievejob.cpp
+++ b/kmail/sievejob.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     sievejob.h
 
     KMail, the KDE mail client.
@@ -290,6 +290,3 @@ namespace KMail {
 } // namespace KMail
 
 #include "sievejob.moc"
-
-// vim: set noet sts=2 ts=8 sw=2:
-
diff --git a/kmail/sievejob.h b/kmail/sievejob.h
index fb1d3a90..d57e7176 100644
--- a/kmail/sievejob.h
+++ b/kmail/sievejob.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     sievejob.h
 
     KMail, the KDE mail client.
@@ -127,6 +127,3 @@ namespace KMail {
 } // namespace KMail
 
 #endif // __KMAIL_SIEVE_JOB_H__
-
-// vim: set noet sts=2 ts=8 sw=2:
-
diff --git a/kmail/signatureconfigurator.cpp b/kmail/signatureconfigurator.cpp
index 81131956..209e18c1 100644
--- a/kmail/signatureconfigurator.cpp
+++ b/kmail/signatureconfigurator.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     signatureconfigurator.cpp
 
     KMail, the KDE mail client.
diff --git a/kmail/signatureconfigurator.h b/kmail/signatureconfigurator.h
index 48e6c5d6..222a2a98 100644
--- a/kmail/signatureconfigurator.h
+++ b/kmail/signatureconfigurator.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     signatureconfigurator.cpp
 
     KMail, the KDE mail client.
diff --git a/kmail/simplestringlisteditor.cpp b/kmail/simplestringlisteditor.cpp
index b96a1ad8..c37ea13f 100644
--- a/kmail/simplestringlisteditor.cpp
+++ b/kmail/simplestringlisteditor.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     simplestringlisteditor.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/simplestringlisteditor.h b/kmail/simplestringlisteditor.h
index cb28d57b..a2361c32 100644
--- a/kmail/simplestringlisteditor.h
+++ b/kmail/simplestringlisteditor.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     simplestringlisteditor.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/spamheaderanalyzer.cpp b/kmail/spamheaderanalyzer.cpp
index 427aa4d1..debc64b0 100644
--- a/kmail/spamheaderanalyzer.cpp
+++ b/kmail/spamheaderanalyzer.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     spamheaderanalyzer.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/spamheaderanalyzer.h b/kmail/spamheaderanalyzer.h
index ddb9bf1b..391edbcf 100644
--- a/kmail/spamheaderanalyzer.h
+++ b/kmail/spamheaderanalyzer.h
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     spamheaderanalyzer.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/stl_util.h b/kmail/stl_util.h
index 8a273895..f72512c5 100644
--- a/kmail/stl_util.h
+++ b/kmail/stl_util.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     stl_util.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/subscriptiondialog.cpp b/kmail/subscriptiondialog.cpp
index cf4572b2..93f92a79 100644
--- a/kmail/subscriptiondialog.cpp
+++ b/kmail/subscriptiondialog.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     subscriptiondialog.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/subscriptiondialog.h b/kmail/subscriptiondialog.h
index 30a06d9f..bfae617c 100644
--- a/kmail/subscriptiondialog.h
+++ b/kmail/subscriptiondialog.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     subscriptiondialog.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/tdehtmlparthtmlwriter.cpp b/kmail/tdehtmlparthtmlwriter.cpp
index 5450509e..2fcf29ba 100644
--- a/kmail/tdehtmlparthtmlwriter.cpp
+++ b/kmail/tdehtmlparthtmlwriter.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     tdehtmlparthtmlwriter.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/tdehtmlparthtmlwriter.h b/kmail/tdehtmlparthtmlwriter.h
index 5d9af2e1..dc07b578 100644
--- a/kmail/tdehtmlparthtmlwriter.h
+++ b/kmail/tdehtmlparthtmlwriter.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     tdehtmlparthtmlwriter.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/teehtmlwriter.cpp b/kmail/teehtmlwriter.cpp
index b162059e..339eea28 100644
--- a/kmail/teehtmlwriter.cpp
+++ b/kmail/teehtmlwriter.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     teehtmlwriter.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/teehtmlwriter.h b/kmail/teehtmlwriter.h
index a55fd589..2aaa20d5 100644
--- a/kmail/teehtmlwriter.h
+++ b/kmail/teehtmlwriter.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     teehtmlwriter.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp
index f94be954..d2dbd318 100644
--- a/kmail/templateparser.cpp
+++ b/kmail/templateparser.cpp
@@ -1,4 +1,4 @@
-/*   -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *   kmail: KDE mail client
  *   This file: Copyright (C) 2006 Dmitry Morozhnikov <dmiceman@mail.ru>
  *
diff --git a/kmail/templateparser.h b/kmail/templateparser.h
index c7551c0f..ae0f9f84 100644
--- a/kmail/templateparser.h
+++ b/kmail/templateparser.h
@@ -1,4 +1,4 @@
-/*   -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *   kmail: KDE mail client
  *   This file: Copyright (C) 2006 Dmitry Morozhnikov <dmiceman@mail.ru>
  *
diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp
index 9a90ca5a..1b79c521 100644
--- a/kmail/templatesconfiguration.cpp
+++ b/kmail/templatesconfiguration.cpp
@@ -1,4 +1,4 @@
-/*   -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *   kmail: KDE mail client
  *   This file: Copyright (C) 2006 Dmitry Morozhnikov
  *
diff --git a/kmail/templatesconfiguration.h b/kmail/templatesconfiguration.h
index a0196c8e..6a268c60 100644
--- a/kmail/templatesconfiguration.h
+++ b/kmail/templatesconfiguration.h
@@ -1,4 +1,4 @@
-/*   -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *   kmail: KDE mail client
  *   This file: Copyright (C) 2006 Dmitry Morozhnikov
  *
diff --git a/kmail/templatesinsertcommand.cpp b/kmail/templatesinsertcommand.cpp
index b89fd2a1..2b195c6d 100644
--- a/kmail/templatesinsertcommand.cpp
+++ b/kmail/templatesinsertcommand.cpp
@@ -1,4 +1,4 @@
-/*   -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *   kmail: KDE mail client
  *   This file: Copyright (C) 2006 Dmitry Morozhnikov <dmiceman@mail.ru>
  *
diff --git a/kmail/templatesinsertcommand.h b/kmail/templatesinsertcommand.h
index 437ad8bd..c928dd67 100644
--- a/kmail/templatesinsertcommand.h
+++ b/kmail/templatesinsertcommand.h
@@ -1,4 +1,4 @@
-/*   -*- mode: C++; c-file-style: "gnu" -*-
+/*
  *   kmail: KDE mail client
  *   This file: Copyright (C) 2006 Dmitry Morozhnikov <dmiceman@mail.ru>
  *
diff --git a/kmail/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp
index c17c1859..32469118 100644
--- a/kmail/urlhandlermanager.cpp
+++ b/kmail/urlhandlermanager.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     urlhandlermanager.cpp
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/urlhandlermanager.h b/kmail/urlhandlermanager.h
index 2e0959ed..191213b0 100644
--- a/kmail/urlhandlermanager.h
+++ b/kmail/urlhandlermanager.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     urlhandlermanager.h
 
     This file is part of KMail, the KDE mail client.
diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp
index 3066b559..383daa94 100644
--- a/kmail/vacation.cpp
+++ b/kmail/vacation.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     vacation.cpp
 
     KMail, the KDE mail client.
diff --git a/kmail/vacation.h b/kmail/vacation.h
index eac3bd9d..2bf55d3e 100644
--- a/kmail/vacation.h
+++ b/kmail/vacation.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     vacation.cpp
 
     KMail, the KDE mail client.
diff --git a/kmail/vacationdialog.cpp b/kmail/vacationdialog.cpp
index 19229895..6e74ab5b 100644
--- a/kmail/vacationdialog.cpp
+++ b/kmail/vacationdialog.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     vacationdialog.cpp
 
     KMail, the KDE mail client.
diff --git a/kmail/vacationdialog.h b/kmail/vacationdialog.h
index d38c75d0..9d80e5f7 100644
--- a/kmail/vacationdialog.h
+++ b/kmail/vacationdialog.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     vacationdialog.h
 
     KMail, the KDE mail client.
diff --git a/kmail/xfaceconfigurator.h b/kmail/xfaceconfigurator.h
index e6530714..c107299f 100644
--- a/kmail/xfaceconfigurator.h
+++ b/kmail/xfaceconfigurator.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     xfaceconfigurator.cpp
 
     KMail, the KDE mail client.
-- 
cgit v1.2.3