summaryrefslogtreecommitdiffstats
path: root/kmail
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2020-09-27 23:31:40 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2020-09-27 23:32:24 +0900
commit679e6a56c73bad0db5360a1b51d3f517a93baa60 (patch)
treeff9192f0757a3dc08332850a6d61f06a9de6d710 /kmail
parent33b573ee2e2e2a4b8634f64bcb004fae45288181 (diff)
downloadtdepim-679e6a56c73bad0db5360a1b51d3f517a93baa60.tar.gz
tdepim-679e6a56c73bad0db5360a1b51d3f517a93baa60.zip
Removed code formatting modelines.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit cf916d8af78db19e0df37b12e63f35bf21f2da5b)
Diffstat (limited to 'kmail')
-rw-r--r--kmail/about/kmail.css3
-rw-r--r--kmail/about/main.html1
-rw-r--r--kmail/aboutdata.cpp2
-rw-r--r--kmail/aboutdata.h2
-rw-r--r--kmail/accountcombobox.cpp2
-rw-r--r--kmail/accountcombobox.h2
-rw-r--r--kmail/accountdialog.h2
-rw-r--r--kmail/accountmanager.h2
-rw-r--r--kmail/actionscheduler.h2
-rw-r--r--kmail/antispamconfig.cpp2
-rw-r--r--kmail/antispamconfig.h2
-rw-r--r--kmail/antispamwizard.h2
-rw-r--r--kmail/app_octetstream.cpp2
-rw-r--r--kmail/attachmentcollector.cpp2
-rw-r--r--kmail/attachmentcollector.h2
-rw-r--r--kmail/attachmentlistview.cpp2
-rw-r--r--kmail/attachmentlistview.h2
-rw-r--r--kmail/attachmentstrategy.cpp2
-rw-r--r--kmail/attachmentstrategy.h2
-rw-r--r--kmail/bodypartformatter.cpp2
-rw-r--r--kmail/bodypartformatter.h2
-rw-r--r--kmail/bodypartformatterfactory.cpp2
-rw-r--r--kmail/bodypartformatterfactory.h2
-rw-r--r--kmail/bodypartformatterfactory_p.h2
-rw-r--r--kmail/bodyvisitor.h2
-rw-r--r--kmail/cachedimapjob.cpp2
-rw-r--r--kmail/cachedimapjob.h2
-rw-r--r--kmail/callback.cpp2
-rw-r--r--kmail/callback.h2
-rw-r--r--kmail/composer.h2
-rw-r--r--kmail/configuredialog.cpp2
-rw-r--r--kmail/configuredialog.h2
-rw-r--r--kmail/configuredialog_p.h1
-rw-r--r--kmail/csshelper.cpp2
-rw-r--r--kmail/csshelper.h2
-rw-r--r--kmail/customtemplates.cpp2
-rw-r--r--kmail/customtemplates.h2
-rw-r--r--kmail/dictionarycombobox.cpp2
-rw-r--r--kmail/dictionarycombobox.h2
-rw-r--r--kmail/expirejob.h2
-rw-r--r--kmail/filehtmlwriter.cpp2
-rw-r--r--kmail/filehtmlwriter.h2
-rw-r--r--kmail/folderIface.cpp2
-rw-r--r--kmail/folderIface.h2
-rw-r--r--kmail/folderdiaacltab.cpp1
-rw-r--r--kmail/folderdiaacltab.h1
-rw-r--r--kmail/folderdiaquotatab.cpp1
-rw-r--r--kmail/folderdiaquotatab.h1
-rw-r--r--kmail/folderjob.cpp2
-rw-r--r--kmail/folderjob.h2
-rw-r--r--kmail/headerlistquicksearch.h2
-rw-r--r--kmail/headerstrategy.cpp2
-rw-r--r--kmail/headerstrategy.h2
-rw-r--r--kmail/headerstyle.cpp2
-rw-r--r--kmail/headerstyle.h2
-rw-r--r--kmail/htmlstatusbar.cpp2
-rw-r--r--kmail/htmlstatusbar.h2
-rw-r--r--kmail/identitydialog.cpp2
-rw-r--r--kmail/identitydialog.h2
-rw-r--r--kmail/identitydrag.cpp2
-rw-r--r--kmail/identitydrag.h2
-rw-r--r--kmail/identitylistview.cpp2
-rw-r--r--kmail/identitylistview.h2
-rw-r--r--kmail/imapaccountbase.cpp2
-rw-r--r--kmail/imapaccountbase.h2
-rw-r--r--kmail/imapjob.cpp2
-rw-r--r--kmail/imapjob.h2
-rw-r--r--kmail/interfaces/bodypart.h2
-rw-r--r--kmail/interfaces/bodypartformatter.h2
-rw-r--r--kmail/interfaces/bodyparturlhandler.h2
-rw-r--r--kmail/interfaces/htmlwriter.h2
-rw-r--r--kmail/interfaces/observable.h2
-rw-r--r--kmail/interfaces/observer.h2
-rw-r--r--kmail/interfaces/rulewidgethandler.h2
-rw-r--r--kmail/interfaces/urlhandler.h2
-rw-r--r--kmail/isubject.h2
-rw-r--r--kmail/kcm_kmail.cpp2
-rw-r--r--kmail/keyresolver.cpp2
-rw-r--r--kmail/keyresolver.h2
-rw-r--r--kmail/kleo_util.h2
-rw-r--r--kmail/kmaccount.h2
-rw-r--r--kmail/kmacctimap.h2
-rw-r--r--kmail/kmaddrbook.cpp2
-rw-r--r--kmail/kmail_options.h1
-rw-r--r--kmail/kmail_part.cpp3
-rw-r--r--kmail/kmatmlistview.cpp1
-rw-r--r--kmail/kmatmlistview.h2
-rw-r--r--kmail/kmcommands.cpp2
-rw-r--r--kmail/kmcommands.h2
-rw-r--r--kmail/kmcomposewin.cpp1
-rw-r--r--kmail/kmcomposewin.h2
-rw-r--r--kmail/kmdebug.h2
-rw-r--r--kmail/kmedit.cpp1
-rw-r--r--kmail/kmedit.h2
-rw-r--r--kmail/kmfilter.cpp2
-rw-r--r--kmail/kmfilter.h2
-rw-r--r--kmail/kmfilterdlg.cpp1
-rw-r--r--kmail/kmfiltermgr.cpp1
-rw-r--r--kmail/kmfolder.cpp2
-rw-r--r--kmail/kmfolder.h2
-rw-r--r--kmail/kmfolderdia.cpp1
-rw-r--r--kmail/kmfolderdia.h1
-rw-r--r--kmail/kmfolderindex.cpp2
-rw-r--r--kmail/kmfolderindex.h2
-rw-r--r--kmail/kmfoldermaildir.cpp1
-rw-r--r--kmail/kmfoldermbox.cpp2
-rw-r--r--kmail/kmfoldertree.h2
-rw-r--r--kmail/kmheaders.cpp1
-rw-r--r--kmail/kmheaders.h2
-rw-r--r--kmail/kmkernel.cpp1
-rw-r--r--kmail/kmkernel.h2
-rw-r--r--kmail/kmlineeditspell.cpp1
-rw-r--r--kmail/kmlineeditspell.h2
-rw-r--r--kmail/kmmainwidget.cpp1
-rw-r--r--kmail/kmmainwidget.h2
-rw-r--r--kmail/kmmessage.cpp1
-rw-r--r--kmail/kmmessage.h1
-rw-r--r--kmail/kmmimeparttree.cpp2
-rw-r--r--kmail/kmmimeparttree.h6
-rw-r--r--kmail/kmmsgpart.h2
-rw-r--r--kmail/kmreadermainwin.h2
-rw-r--r--kmail/kmreaderwin.cpp1
-rw-r--r--kmail/kmreaderwin.h1
-rw-r--r--kmail/kmsearchpattern.cpp1
-rw-r--r--kmail/kmsearchpattern.h1
-rw-r--r--kmail/kmsearchpatternedit.cpp1
-rw-r--r--kmail/kmsearchpatternedit.h1
-rw-r--r--kmail/kmservertest.cpp2
-rw-r--r--kmail/kmservertest.h2
-rw-r--r--kmail/kmsystemtray.cpp1
-rw-r--r--kmail/localsubscriptiondialog.cpp2
-rw-r--r--kmail/localsubscriptiondialog.h2
-rw-r--r--kmail/maildirjob.cpp2
-rw-r--r--kmail/maildirjob.h2
-rw-r--r--kmail/mailinglist-magic.cpp1
-rw-r--r--kmail/mailinglist-magic.h1
-rw-r--r--kmail/mailserviceimpl.cpp2
-rw-r--r--kmail/mailserviceimpl.h2
-rw-r--r--kmail/mailsourceviewer.cpp2
-rw-r--r--kmail/mailsourceviewer.h2
-rw-r--r--kmail/main.cpp2
-rw-r--r--kmail/mboxjob.cpp2
-rw-r--r--kmail/mboxjob.h2
-rw-r--r--kmail/networkaccount.cpp2
-rw-r--r--kmail/networkaccount.h2
-rw-r--r--kmail/objecttreeparser.cpp2
-rw-r--r--kmail/objecttreeparser.h2
-rw-r--r--kmail/objecttreeparser_p.cpp2
-rw-r--r--kmail/objecttreeparser_p.h2
-rw-r--r--kmail/partNode.cpp2
-rw-r--r--kmail/partNode.h2
-rw-r--r--kmail/partmetadata.h2
-rw-r--r--kmail/partnodebodypart.cpp2
-rw-r--r--kmail/partnodebodypart.h2
-rw-r--r--kmail/popaccount.h1
-rw-r--r--kmail/protocols.h1
-rw-r--r--kmail/redirectdialog.h2
-rw-r--r--kmail/regexplineedit.cpp2
-rw-r--r--kmail/regexplineedit.h2
-rw-r--r--kmail/rulewidgethandlermanager.cpp2
-rw-r--r--kmail/rulewidgethandlermanager.h2
-rw-r--r--kmail/secondarywindow.cpp2
-rw-r--r--kmail/secondarywindow.h2
-rw-r--r--kmail/sieveconfig.cpp2
-rw-r--r--kmail/sieveconfig.h2
-rw-r--r--kmail/sievejob.cpp5
-rw-r--r--kmail/sievejob.h5
-rw-r--r--kmail/signatureconfigurator.cpp2
-rw-r--r--kmail/signatureconfigurator.h2
-rw-r--r--kmail/simplestringlisteditor.cpp2
-rw-r--r--kmail/simplestringlisteditor.h2
-rw-r--r--kmail/spamheaderanalyzer.cpp2
-rw-r--r--kmail/spamheaderanalyzer.h2
-rw-r--r--kmail/stl_util.h2
-rw-r--r--kmail/subscriptiondialog.cpp2
-rw-r--r--kmail/subscriptiondialog.h2
-rw-r--r--kmail/tdehtmlparthtmlwriter.cpp2
-rw-r--r--kmail/tdehtmlparthtmlwriter.h2
-rw-r--r--kmail/teehtmlwriter.cpp2
-rw-r--r--kmail/teehtmlwriter.h2
-rw-r--r--kmail/templateparser.cpp2
-rw-r--r--kmail/templateparser.h2
-rw-r--r--kmail/templatesconfiguration.cpp2
-rw-r--r--kmail/templatesconfiguration.h2
-rw-r--r--kmail/templatesinsertcommand.cpp2
-rw-r--r--kmail/templatesinsertcommand.h2
-rw-r--r--kmail/urlhandlermanager.cpp2
-rw-r--r--kmail/urlhandlermanager.h2
-rw-r--r--kmail/vacation.cpp2
-rw-r--r--kmail/vacation.h2
-rw-r--r--kmail/vacationdialog.cpp2
-rw-r--r--kmail/vacationdialog.h2
-rw-r--r--kmail/xfaceconfigurator.h2
193 files changed, 155 insertions, 211 deletions
diff --git a/kmail/about/kmail.css b/kmail/about/kmail.css
index 38db99875..0444430ba 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 634b5f001..52876f210 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 91bc1607f..89521c09c 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 5c5b08ae0..02c0a7c46 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 7ae3d2a37..97f95b112 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 c2e85cf66..2fa27f396 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 bf79f0968..fb15cb383 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 4afe8bb99..9097d3510 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 54303960e..4551b3d28 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 2563e4eee..f187dcd6c 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 9c3449935..922d49dba 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 7248b9e51..e93480c1e 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 526fbb543..5fe9348ef 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 b902f596f..6fbab33d2 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 6930e07ea..a0069d515 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 a03cd32f7..9e99e6402 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 881f8b286..d0a0b63e2 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 87157ed4f..2f12f39b2 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 268a43309..66fb6b857 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 bd6da060a..8435ef25e 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 1c2965824..2664be0d2 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 62a929531..fbae5a448 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 dd89eb34e..7606a5c1e 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 088a17f29..60067cd72 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 a436fb443..cfe43b49f 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 e4a29d6e9..bba5b1b66 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 bdf645417..f2daa6c7f 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 b6e0e938b..66bcd12f7 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 a3fccc4ed..560d5ddcc 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 30cf0b284..709bfb730 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 0f92eab5e..7dcf8ce20 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 265bc9570..acd0bc5af 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 6ba969de1..10e9b8df7 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 e5bfb7bfe..c4f583904 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 9bff99ca3..cba58adcf 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 644f5fa99..5daf001db 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 1af437346..b117dd69f 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 6eb1b4934..be705d3df 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 0a8d5c0fd..a6d3584ab 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 dbec3d523..dbdb6a3a8 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 c4f2d214e..abad64207 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 879143228..768e0c582 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 981e1b373..a95e3e13e 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 e348ea6b5..c8593d2ca 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 6b2e85fc4..35b72784b 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 bc619c4eb..0a5d64654 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 3fdb308ff..2fd950b2b 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 6b260035e..fe7af4316 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 657d1a9b9..2472df3a3 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 47838044d..5b7f40373 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 f159c69f6..4a3aa0984 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 afa581a1b..ff2b82ae8 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 ebb610122..9f49f1ac5 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 f7c2973e4..44f12b384 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 ff7228d32..881439090 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 fecda8de5..61205a7fb 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 95af5206a..9a86302f5 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 90b4ffdd2..91b108c9a 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 29b50f05e..fc9b4594c 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 88df48f6a..f3c6435dc 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 1c2ddb0d7..295c83adc 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 c13b9d1fe..f10edf7dc 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 abe12127a..586767c7c 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 1350da290..40ff81f76 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 3a4c4bff9..1c022044f 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 dc9a98f56..1f7682b54 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 c8e00e14a..e348b2df4 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 434906321..c70441cfc 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 14fedc617..7fb3d19a1 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 78d566c1f..885e55d0d 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 179841c1a..f7a76ad54 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 10d14dfa4..3e004ba61 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 31cbc80a7..75d28c35e 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 330952238..edc581b1f 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 1eb0e365f..2ad9295e0 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 8bad40c46..10fc7b378 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 fa0e2fedb..07dc1d729 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 76d4ae8fa..fcd2f2792 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 c7bdfe25c..2f7bd936b 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 663f0b634..c7cfd99b5 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 f0455b3b9..8445d55ea 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 3e10332a1..6be22c010 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 6b7747382..dcc58e02c 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 c0489b7fe..e5b327ec0 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 23918a044..4d6654224 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 4d9fc42df..d6a9c4c44 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 f4d865953..30f0bd5f0 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 a61850132..9aef6e62e 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 25c0a1173..dcafbf3d1 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 2add2b3a8..692df779f 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 123f112b3..b9fbe1c73 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 46262aeb4..142d0b9e2 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 afe854dea..1fe546481 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 f545a1368..c42734dc5 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 d681c6a65..df6a55430 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 35fdecdac..fd993e3c8 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 d9065f6dc..b1bbb9aba 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 e91a44a6a..8c47afc0a 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 45738939c..b1b9c2618 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 dd04d9f24..e8de8207e 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 265b1ee9c..da4671bfd 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 5f3ea9678..e7c6b1d15 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 7bb77f0da..9b60b25ce 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 8a8176e6a..ae67d7db5 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 5242060aa..29f9aaccf 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 6692f54ca..43c9a9137 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 11e7584f4..b41c2b556 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 3196e6272..1b29fd299 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 423ec3dcf..112b1cdeb 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 f998a74c3..cfb28ab2c 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 610ab4768..d92266835 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 20421ec90..45585147c 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 536d3158c..06bfce5ea 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 0d845225b..8f883c58d 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 f790ff0f4..d90dda24f 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 d99614785..f9a7f3888 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 3a61a11fc..dfe96116f 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 200e77368..779fffd47 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 395694fe6..1b4fc4f56 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 4994800b3..452114d4f 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 2fa3462f6..2101fcb5f 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 b3c435703..1bd31129e 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 81256e8c5..239c0fc0e 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 d1d47daf0..114f4e8d7 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 9b521c1f1..9d517fdf8 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 88f3609b3..21ade7b2d 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 77089df40..86d890bb8 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 446c739e5..5c11f0757 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 5d5cddf13..db8535a0a 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 f3ff58a49..1d1ce9339 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 c2d4e5551..2f6e839e3 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 601a84639..eb977908a 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 b507d9272..4c3b520cb 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 1d5a97106..878c5d788 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 1f9270842..37600d504 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 eaa645929..8eed4f8f6 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 f5b810a3b..79af5eaf8 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 6dc5224a8..842b4e4e7 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 eff69cce1..7a06f9709 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 0c29175ba..68f82c238 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 bb3e0a8a2..8b40e555e 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 7fb22ddbe..df25a8ada 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 9b1d2deac..c9b1e37cd 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 7f4c53b32..9a5f5e993 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 1c5dde6e8..2ed8e452b 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 2b736d2c7..2d3ed9682 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 f9e71427a..cd4adfae2 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 a645b3989..683d3c4c4 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 44a1e9af6..04e1c2c38 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 012c6e18a..b39bc65f1 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 20328ddea..918f3f31b 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 ee6f51d34..e5b060b96 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 45ce28620..4f095ee89 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 3591286e5..6ce17615f 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 f8cb0e92a..f6acfee77 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 ab5aa38d3..f24730f8b 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 aa46404f8..b4893298d 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 1b14fb4f3..1ce0237b7 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 4db2e922a..732f5449a 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 fac482ee5..ae04af88e 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 431731e46..8043243c9 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 5a6896335..a421209a5 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 560b707de..cd7e6f45c 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 ff3e156d9..a787e06a5 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 ac296375f..d7b9b8dc0 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 96f0a6086..290e2d71d 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 fb1d3a90d..d57e71763 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 81131956f..209e18c1c 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 48e6c5d6b..222a2a98c 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 b96a1ad89..c37ea13f2 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 cb28d57bd..a2361c328 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 427aa4d16..debc64b09 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 ddb9bf1b1..391edbcf9 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 8a2738952..f72512c59 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 cf4572b23..93f92a799 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 30a06d9f1..bfae617c7 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 5450509ec..2fcf29ba0 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 5d9af2e10..dc07b5782 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 b162059e6..339eea282 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 a55fd5899..2aaa20d5a 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 f94be9549..d2dbd3188 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 c7551c0fa..ae0f9f841 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 9a90ca5ac..1b79c5217 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 a0196c8e8..6a268c60b 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 b89fd2a12..2b195c6d9 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 437ad8bdf..c928dd67d 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 c17c18595..324691183 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 2e0959ed0..191213b05 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 3066b559c..383daa94e 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 eac3bd9d7..2bf55d3e8 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 192298954..6e74ab5b5 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 d38c75d03..9d80e5f70 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 e65307145..c107299f0 100644
--- a/kmail/xfaceconfigurator.h
+++ b/kmail/xfaceconfigurator.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
xfaceconfigurator.cpp
KMail, the KDE mail client.