diff --git a/ark/ar.h b/ark/ar.h
index 281702d..896ea73 100644
--- a/ark/ar.h
+++ b/ark/ar.h
@@ -1,4 +1,3 @@
-//  -*-C++-*-           emacs magic for .h files
 /*
 
  $Id$
diff --git a/ark/arkutils.h b/ark/arkutils.h
index c53791f..d0f4955 100644
--- a/ark/arkutils.h
+++ b/ark/arkutils.h
@@ -1,4 +1,3 @@
-//  -*-C++-*-           emacs magic for .h files
 /*
 
  $Id$
diff --git a/ark/extractiondialog.cpp b/ark/extractiondialog.cpp
index f4b5196..d456744 100644
--- a/ark/extractiondialog.cpp
+++ b/ark/extractiondialog.cpp
@@ -192,4 +192,3 @@ void ExtractionDialog::extractDirChanged(const TQString &text )
 }
 
 #include "extractiondialog.moc"
-// kate: space-indent off; tab-width 4;
diff --git a/ark/extractiondialog.h b/ark/extractiondialog.h
index aae9e99..da2f6e9 100644
--- a/ark/extractiondialog.h
+++ b/ark/extractiondialog.h
@@ -94,5 +94,3 @@ class ExtractionDialog : public KDialogBase
 };
 
 #endif //  EXTRACTIONDIALOG_H
-// kate: space-indent off; tab-width 4;
-
diff --git a/ark/filelistview.cpp b/ark/filelistview.cpp
index c1e6f3f..47a4d6f 100644
--- a/ark/filelistview.cpp
+++ b/ark/filelistview.cpp
@@ -617,4 +617,3 @@ TQStringList FileListView::childrenOf( FileLVI* parent )
 }
 
 #include "filelistview.moc"
-// kate: space-indent off; tab-width 4;
diff --git a/ark/filelistview.h b/ark/filelistview.h
index 022ab86..d4f7438 100644
--- a/ark/filelistview.h
+++ b/ark/filelistview.h
@@ -171,4 +171,3 @@ class FileListView: public TDEListView
 };
 
 #endif
-// kate: space-indent off; tab-width 4;
diff --git a/ark/main.cpp b/ark/main.cpp
index 48589b6..c5e4f13 100644
--- a/ark/main.cpp
+++ b/ark/main.cpp
@@ -124,5 +124,3 @@ extern "C" KDE_EXPORT int kdemain( int argc, char *argv[]  )
 
 	return ArkApplication::getInstance()->exec();
 }
-
-// kate: space-indent off; tab-width 4;
diff --git a/ark/tar.cpp b/ark/tar.cpp
index cef9596..52e8adb 100644
--- a/ark/tar.cpp
+++ b/ark/tar.cpp
@@ -821,4 +821,3 @@ void TarArch::test()
 }
 
 #include "tar.moc"
-// kate: space-indent on;
diff --git a/doc/KRegExpEditor/index.docbook b/doc/KRegExpEditor/index.docbook
index 42bc277..4be07dc 100644
--- a/doc/KRegExpEditor/index.docbook
+++ b/doc/KRegExpEditor/index.docbook
@@ -632,21 +632,3 @@
 
 
 </book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-namecase-general:t
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/ark/index.docbook b/doc/ark/index.docbook
index b3588d4..7e3289f 100644
--- a/doc/ark/index.docbook
+++ b/doc/ark/index.docbook
@@ -783,12 +783,3 @@ and <command>lha</command>.  </para>
 
 &documentation.index; 
 </book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-End:
--->
-
diff --git a/doc/kcalc/commands.docbook b/doc/kcalc/commands.docbook
index 22f20e7..d368359 100644
--- a/doc/kcalc/commands.docbook
+++ b/doc/kcalc/commands.docbook
@@ -241,14 +241,3 @@ standard default buttons.</action>
 </sect1>
 
 </chapter>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-parent-document: ("index.docbook" "book" "chapter")
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
--->
diff --git a/doc/kcalc/index.docbook b/doc/kcalc/index.docbook
index 81e10d6..bcf55ff 100644
--- a/doc/kcalc/index.docbook
+++ b/doc/kcalc/index.docbook
@@ -762,13 +762,3 @@ double IEEE precision. </para>
 </appendix>
 
 </book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
--->
diff --git a/doc/kdf/index.docbook b/doc/kdf/index.docbook
index d7a3c4e..807c51f 100644
--- a/doc/kdf/index.docbook
+++ b/doc/kdf/index.docbook
@@ -252,15 +252,3 @@ command prompt).</para></listitem>
 
 &documentation.index; 
 </book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-// vim:ts=2:sw=2:tw=78:noet
--->
diff --git a/doc/kedit/index.docbook b/doc/kedit/index.docbook
index 68213ad..ed87dce 100644
--- a/doc/kedit/index.docbook
+++ b/doc/kedit/index.docbook
@@ -1252,15 +1252,3 @@ Bernd Johannes Wuebben <email>wuebben@math.cornell.edu</email></para>
 </appendix>
 
 </book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-// vim:ts=2:sw=2:tw=78:noet
--->
diff --git a/doc/kfloppy/index.docbook b/doc/kfloppy/index.docbook
index 68c44fa..fe972a3 100644
--- a/doc/kfloppy/index.docbook
+++ b/doc/kfloppy/index.docbook
@@ -600,15 +600,3 @@ After it, it is too late.</para></warning>
 </appendix>
 
 </book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-// vim:ts=2:sw=2:tw=78:noet
--->
diff --git a/doc/kgpg/index.docbook b/doc/kgpg/index.docbook
index 1d0d8bd..ea4454f 100644
--- a/doc/kgpg/index.docbook
+++ b/doc/kgpg/index.docbook
@@ -339,15 +339,3 @@ directly related to gpg and are documented in it's man page. </para>
 &documentation.index;
 
 </book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-intent-step:0
-sgml-indent-data:nil
-End:
--->
-
-
diff --git a/doc/khexedit/index.docbook b/doc/khexedit/index.docbook
index c7faea4..78382b3 100644
--- a/doc/khexedit/index.docbook
+++ b/doc/khexedit/index.docbook
@@ -1049,15 +1049,3 @@ of the toolbar or the <guimenuitem>Permissions</guimenuitem> command in the
 
 &documentation.index; 
 </book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-// vim:ts=2:sw=2:tw=78:noet
--->
diff --git a/doc/kjots/index.docbook b/doc/kjots/index.docbook
index 9da4fd5..49d056e 100644
--- a/doc/kjots/index.docbook
+++ b/doc/kjots/index.docbook
@@ -538,15 +538,3 @@ before running it.</para>
 
 &documentation.index;
 </book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-// vim:ts=2:sw=2:tw=78:noet
--->
diff --git a/doc/superkaramba/index.docbook b/doc/superkaramba/index.docbook
index 2e31962..27dc9a8 100644
--- a/doc/superkaramba/index.docbook
+++ b/doc/superkaramba/index.docbook
@@ -251,11 +251,3 @@ solution. Your theme should work fine otherwise.</para>
 </chapter>
 
 </book>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-general-insert-case: lower
-End:
--->
diff --git a/doc/tdelirc/irkick/index.docbook b/doc/tdelirc/irkick/index.docbook
index 0155cd1..e32d246 100644
--- a/doc/tdelirc/irkick/index.docbook
+++ b/doc/tdelirc/irkick/index.docbook
@@ -117,15 +117,3 @@ control framework.
 
 </appendix>
 </book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-// vim:ts=2:sw=2:tw=78:noet
--->
diff --git a/doc/tdelirc/kcmlirc/index.docbook b/doc/tdelirc/kcmlirc/index.docbook
index c60e125..d134d7a 100644
--- a/doc/tdelirc/kcmlirc/index.docbook
+++ b/doc/tdelirc/kcmlirc/index.docbook
@@ -151,15 +151,3 @@ By clicking on an entry you can see information on it such as the author's detai
 
 </appendix>
 </book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-// vim:ts=2:sw=2:tw=78:noet
--->
diff --git a/doc/tdewallet/index.docbook b/doc/tdewallet/index.docbook
index 2e40079..1dd4439 100644
--- a/doc/tdewallet/index.docbook
+++ b/doc/tdewallet/index.docbook
@@ -386,15 +386,3 @@ copying of data to portable devices.</para>
 &documentation.index;
 
 </book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-// vim:ts=2:sw=2:tw=78:noet
--->
diff --git a/kcalc/knumber/knumber.cpp b/kcalc/knumber/knumber.cpp
index a0fcaec..d9bfd8d 100644
--- a/kcalc/knumber/knumber.cpp
+++ b/kcalc/knumber/knumber.cpp
@@ -1,4 +1,3 @@
-// -*- c-basic-offset: 2 -*-
 /* This file is part of the KDE libraries
    Copyright (c) 2005 Klaus Niederkrueger <kniederk@math.uni-koeln.de>
 
diff --git a/kcalc/knumber/knumber.h b/kcalc/knumber/knumber.h
index f52e5c9..2bccc35 100644
--- a/kcalc/knumber/knumber.h
+++ b/kcalc/knumber/knumber.h
@@ -1,4 +1,3 @@
-// -*- c-basic-offset: 2 -*-
 /* This file is part of the KDE libraries
     Copyright (C) 2005 Klaus Niederkrueger <kniederk@math.uni-koeln.de>
 
diff --git a/kedit/ktextfiledlg.cpp b/kedit/ktextfiledlg.cpp
index a5b5b13..6df31be 100644
--- a/kedit/ktextfiledlg.cpp
+++ b/kedit/ktextfiledlg.cpp
@@ -1,4 +1,3 @@
-// -*- c++ -*-
 /* This file is part of the KDE libraries
     Copyright (C) 2001 Wolfram Diestel <wolfram@steloj.de>
 
diff --git a/kedit/ktextfiledlg.h b/kedit/ktextfiledlg.h
index ae16ae9..d6d7ad6 100644
--- a/kedit/ktextfiledlg.h
+++ b/kedit/ktextfiledlg.h
@@ -1,4 +1,3 @@
-// -*- c++ -*-
 /* This file is part of the KDE libraries
     Copyright (C) 2001 Wolfram Diestel <wolfram@steloj.de>
 
diff --git a/khexedit/toplevel.cc b/khexedit/toplevel.cc
index ab4a211..c09bef8 100644
--- a/khexedit/toplevel.cc
+++ b/khexedit/toplevel.cc
@@ -17,9 +17,6 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
-
 #include <tqptrlist.h>
 #include <tqsignalmapper.h>
 #include <tqtimer.h>
diff --git a/kjots/main.cpp b/kjots/main.cpp
index c9d158b..48c55fa 100644
--- a/kjots/main.cpp
+++ b/kjots/main.cpp
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 //
 //  kjots
 //
diff --git a/kmilo/generic/generic_monitor.cpp b/kmilo/generic/generic_monitor.cpp
index 44d540c..216cee0 100644
--- a/kmilo/generic/generic_monitor.cpp
+++ b/kmilo/generic/generic_monitor.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*-
 /*
    This file is part of the KDE project
 
diff --git a/kmilo/generic/generic_monitor.h b/kmilo/generic/generic_monitor.h
index ea75593..d7d7fb4 100644
--- a/kmilo/generic/generic_monitor.h
+++ b/kmilo/generic/generic_monitor.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*-
 /*
    This file is part of the KDE project
 
diff --git a/kmilo/kmilo_kvaio/kmilo_kvaio.cpp b/kmilo/kmilo_kvaio/kmilo_kvaio.cpp
index 87de2da..155df33 100644
--- a/kmilo/kmilo_kvaio/kmilo_kvaio.cpp
+++ b/kmilo/kmilo_kvaio/kmilo_kvaio.cpp
@@ -1,5 +1,4 @@
-/* -*- C++ -*-
-
+/*
    This file implements the KVaio module for KMilo.
 
    $ Author: Mirko Boehm $
diff --git a/kmilo/kmilo_kvaio/kmilo_kvaio.h b/kmilo/kmilo_kvaio/kmilo_kvaio.h
index 851a74e..dcef77f 100644
--- a/kmilo/kmilo_kvaio/kmilo_kvaio.h
+++ b/kmilo/kmilo_kvaio/kmilo_kvaio.h
@@ -1,5 +1,4 @@
-/* -*- C++ -*-
-
+/*
    This file declares the KVaio module for KMilo.
 
    $ Author: Mirko Boehm $
diff --git a/kmilo/kmilo_kvaio/kvaio.cpp b/kmilo/kmilo_kvaio/kvaio.cpp
index a7c28d5..63f50da 100644
--- a/kmilo/kmilo_kvaio/kvaio.cpp
+++ b/kmilo/kmilo_kvaio/kvaio.cpp
@@ -1,5 +1,4 @@
-/* -*- C++ -*-
-
+/*
    This file implements the KVaio class.
 
    $ Author: Mirko Boehm $
diff --git a/kmilo/kmilo_kvaio/kvaio.h b/kmilo/kmilo_kvaio/kvaio.h
index 5f6170b..867ef4c 100644
--- a/kmilo/kmilo_kvaio/kvaio.h
+++ b/kmilo/kmilo_kvaio/kvaio.h
@@ -1,5 +1,4 @@
-/* -*- C++ -*-
-
+/*
    This file declares the KVaio class.
 
    $ Author: Mirko Boehm $
diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp
index 088ae51..c10c11c 100644
--- a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp
+++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp
@@ -1,5 +1,4 @@
-/* -*- C++ -*-
-
+/*
    This file implements the KVaioDriverInterface class.
    It provides an event-oriented wrapper for the kernel sonypi driver.
 
diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.h b/kmilo/kmilo_kvaio/kvaiodriverinterface.h
index 3371786..2ca7a46 100644
--- a/kmilo/kmilo_kvaio/kvaiodriverinterface.h
+++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.h
@@ -1,5 +1,4 @@
-/* -*- C++ -*-
-
+/*
    This file declares the KVaioDrierInterface class.
    It provides an event-oriented wrapper for the kernel sonypi driver. 
 
diff --git a/kmilo/kmilod/defaultskin.cpp b/kmilo/kmilod/defaultskin.cpp
index 1320f25..ac983fd 100644
--- a/kmilo/kmilod/defaultskin.cpp
+++ b/kmilo/kmilod/defaultskin.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*-
 /*
    This file is part of the KDE project
 
diff --git a/kmilo/kmilod/defaultskin.h b/kmilo/kmilod/defaultskin.h
index 2399d83..48badba 100644
--- a/kmilo/kmilod/defaultskin.h
+++ b/kmilo/kmilod/defaultskin.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*-
 /*
    This file is part of the KDE project
 
diff --git a/kmilo/kmilod/displayskin.h b/kmilo/kmilod/displayskin.h
index 46bd445..dbeebe6 100644
--- a/kmilo/kmilod/displayskin.h
+++ b/kmilo/kmilod/displayskin.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*-
 /*
    This file is part of the KDE project
 
diff --git a/kmilo/kmilod/kmilod.cpp b/kmilo/kmilod/kmilod.cpp
index 3535ee0..07d72aa 100644
--- a/kmilo/kmilod/kmilod.cpp
+++ b/kmilo/kmilod/kmilod.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*-
 /*
    This file is part of the KDE project
 
diff --git a/kmilo/kmilod/kmilod.h b/kmilo/kmilod/kmilod.h
index d58ea01..232a4b5 100644
--- a/kmilo/kmilod/kmilod.h
+++ b/kmilo/kmilod/kmilod.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*-
 /*
    This file is part of the KDE project
 
diff --git a/kmilo/kmilod/kmilointerface.cpp b/kmilo/kmilod/kmilointerface.cpp
index 21a6430..ce1b219 100644
--- a/kmilo/kmilod/kmilointerface.cpp
+++ b/kmilo/kmilod/kmilointerface.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*-
 /*
    This file is part of the KDE project
 
diff --git a/kmilo/kmilod/kmilointerface.h b/kmilo/kmilod/kmilointerface.h
index 4d21185..d420543 100644
--- a/kmilo/kmilod/kmilointerface.h
+++ b/kmilo/kmilod/kmilointerface.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*-
 /*
    This file is part of the KDE project
 
diff --git a/kmilo/kmilod/monitor.h b/kmilo/kmilod/monitor.h
index e646a7e..9dc9127 100644
--- a/kmilo/kmilod/monitor.h
+++ b/kmilo/kmilod/monitor.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*-
 /*
    This file is part of the KDE project
 
diff --git a/kmilo/powerbook2/pb_monitor.cpp b/kmilo/powerbook2/pb_monitor.cpp
index 313a32d..b43cef0 100644
--- a/kmilo/powerbook2/pb_monitor.cpp
+++ b/kmilo/powerbook2/pb_monitor.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*-
 /*
    This file is part of the KDE project
 
diff --git a/kmilo/powerbook2/pb_monitor.h b/kmilo/powerbook2/pb_monitor.h
index e9dfb71..dc8a4c0 100644
--- a/kmilo/powerbook2/pb_monitor.h
+++ b/kmilo/powerbook2/pb_monitor.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: t; tab-width: 2; -*-
 /*
    This file is part of the KDE project
 
diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp
index 979c682..21d0c9e 100644
--- a/ksim/monitors/i8k/ksimi8k.cpp
+++ b/ksim/monitors/i8k/ksimi8k.cpp
@@ -252,6 +252,3 @@ void I8TDEConfig::saveConfig()
 }
 
 #include "ksimi8k.moc"
-
-/* vim: et sw=2 ts=2
-*/
diff --git a/ksim/monitors/i8k/ksimi8k.h b/ksim/monitors/i8k/ksimi8k.h
index 9c1ce1a..e7eb3df 100644
--- a/ksim/monitors/i8k/ksimi8k.h
+++ b/ksim/monitors/i8k/ksimi8k.h
@@ -99,6 +99,3 @@ class I8TDEConfig : public KSim::PluginPage
 };
 
 #endif // KSIMI8K_H
-
-/* vim: et sw=2 ts=2
-*/
diff --git a/ksim/monitors/mail/ksimmail.cpp b/ksim/monitors/mail/ksimmail.cpp
index 942397b..bf67d46 100644
--- a/ksim/monitors/mail/ksimmail.cpp
+++ b/ksim/monitors/mail/ksimmail.cpp
@@ -156,5 +156,3 @@ void MailConfig::saveConfig()
 void MailConfig::readConfig()
 {
 }
-
-// vim: ts=4 sw=4 noet
diff --git a/ksim/monitors/mail/ksimmail.h b/ksim/monitors/mail/ksimmail.h
index 8f9dc9c..d40ee33 100644
--- a/ksim/monitors/mail/ksimmail.h
+++ b/ksim/monitors/mail/ksimmail.h
@@ -89,5 +89,3 @@ public:
 };
 
 #endif
-
-// vim: ts=4 sw=4 noet
diff --git a/ksim/monitors/snmp/browsedialog.cpp b/ksim/monitors/snmp/browsedialog.cpp
index 8627c59..6a4381d 100644
--- a/ksim/monitors/snmp/browsedialog.cpp
+++ b/ksim/monitors/snmp/browsedialog.cpp
@@ -143,5 +143,3 @@ void BrowseDialog::applyFilter( TQListViewItem *item )
 }
 
 #include "browsedialog.moc"
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/browsedialog.h b/ksim/monitors/snmp/browsedialog.h
index 1bd641f..a6a7904 100644
--- a/ksim/monitors/snmp/browsedialog.h
+++ b/ksim/monitors/snmp/browsedialog.h
@@ -68,5 +68,3 @@ private:
 }
 
 #endif // BROWSEDIALOG_H
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/chartmonitor.cpp b/ksim/monitors/snmp/chartmonitor.cpp
index 5b8438f..a13be36 100644
--- a/ksim/monitors/snmp/chartmonitor.cpp
+++ b/ksim/monitors/snmp/chartmonitor.cpp
@@ -78,6 +78,3 @@ TQ_UINT64 ChartMonitor::convertToInt( const Value &data )
 }
 
 #include "chartmonitor.moc"
-
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/chartmonitor.h b/ksim/monitors/snmp/chartmonitor.h
index 803f97e..bcf5f19 100644
--- a/ksim/monitors/snmp/chartmonitor.h
+++ b/ksim/monitors/snmp/chartmonitor.h
@@ -51,5 +51,3 @@ private:
 }
 
 #endif // CHARTMONITOR_H
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/configpage.cpp b/ksim/monitors/snmp/configpage.cpp
index d1f24a5..e1dfcca 100644
--- a/ksim/monitors/snmp/configpage.cpp
+++ b/ksim/monitors/snmp/configpage.cpp
@@ -309,5 +309,3 @@ TQStringList ConfigPage::monitorsForHost( const HostConfig &host ) const
 }
 
 #include "configpage.moc"
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/configpage.h b/ksim/monitors/snmp/configpage.h
index b0d1331..3311284 100644
--- a/ksim/monitors/snmp/configpage.h
+++ b/ksim/monitors/snmp/configpage.h
@@ -117,5 +117,3 @@ private:
 }
 
 #endif // CONFIGPAGE_H
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/hostconfig.cpp b/ksim/monitors/snmp/hostconfig.cpp
index 844bee5..51f6b01 100644
--- a/ksim/monitors/snmp/hostconfig.cpp
+++ b/ksim/monitors/snmp/hostconfig.cpp
@@ -147,6 +147,3 @@ TQStringList HostConfigMap::save( TDEConfigBase &config ) const
 
     return hostList;
 }
-
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/hostconfig.h b/ksim/monitors/snmp/hostconfig.h
index 3726eb5..bf704cd 100644
--- a/ksim/monitors/snmp/hostconfig.h
+++ b/ksim/monitors/snmp/hostconfig.h
@@ -82,5 +82,3 @@ struct HostConfigMap : public TQMap< TQString, HostConfig >
 }
 
 #endif // HOSTCONFIG_H
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/hostdialog.cpp b/ksim/monitors/snmp/hostdialog.cpp
index 0712e54..0f32df9 100644
--- a/ksim/monitors/snmp/hostdialog.cpp
+++ b/ksim/monitors/snmp/hostdialog.cpp
@@ -188,6 +188,3 @@ void HostDialog::loadSettingsFromHostConfig( const HostConfig &src )
 }
 
 #include "hostdialog.moc"
-
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/hostdialog.h b/ksim/monitors/snmp/hostdialog.h
index 5a856e8..9508d77 100644
--- a/ksim/monitors/snmp/hostdialog.h
+++ b/ksim/monitors/snmp/hostdialog.h
@@ -56,5 +56,3 @@ private:
 }
 
 #endif // HOSTDIALOG_H
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/identifier.cpp b/ksim/monitors/snmp/identifier.cpp
index 355f019..b867757 100644
--- a/ksim/monitors/snmp/identifier.cpp
+++ b/ksim/monitors/snmp/identifier.cpp
@@ -124,6 +124,3 @@ bool Identifier::isNull() const
 {
     return d->length == 0;
 }
-
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/identifier.h b/ksim/monitors/snmp/identifier.h
index e14e58a..8415d31 100644
--- a/ksim/monitors/snmp/identifier.h
+++ b/ksim/monitors/snmp/identifier.h
@@ -68,5 +68,3 @@ typedef TQMap<Identifier, Value> ValueMap;
 }
 
 #endif // IDENTIFIER_H
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/labelmonitor.cpp b/ksim/monitors/snmp/labelmonitor.cpp
index 2245a09..7738401 100644
--- a/ksim/monitors/snmp/labelmonitor.cpp
+++ b/ksim/monitors/snmp/labelmonitor.cpp
@@ -40,6 +40,3 @@ void LabelMonitor::setData( const Value &data )
 }
 
 #include "labelmonitor.moc"
-
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/labelmonitor.h b/ksim/monitors/snmp/labelmonitor.h
index ef7f91b..a6f277c 100644
--- a/ksim/monitors/snmp/labelmonitor.h
+++ b/ksim/monitors/snmp/labelmonitor.h
@@ -49,5 +49,3 @@ private:
 }
 
 #endif // LABELMONITOR_H
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/monitor.cpp b/ksim/monitors/snmp/monitor.cpp
index 052d2c0..aa645cf 100644
--- a/ksim/monitors/snmp/monitor.cpp
+++ b/ksim/monitors/snmp/monitor.cpp
@@ -91,6 +91,3 @@ bool Monitor::performSyncSnmpRequest( Value &data, ErrorInfo *errorInfo )
 }
 
 #include "monitor.moc"
-
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/monitor.h b/ksim/monitors/snmp/monitor.h
index f2eb1b9..56bd03b 100644
--- a/ksim/monitors/snmp/monitor.h
+++ b/ksim/monitors/snmp/monitor.h
@@ -74,5 +74,3 @@ private:
 }
 
 #endif // MONITOR_H
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/monitorconfig.cpp b/ksim/monitors/snmp/monitorconfig.cpp
index d2dee45..6f6575d 100644
--- a/ksim/monitors/snmp/monitorconfig.cpp
+++ b/ksim/monitors/snmp/monitorconfig.cpp
@@ -178,6 +178,3 @@ TQStringList MonitorConfigMap::save( TDEConfigBase &config ) const
 
     return names;
 }
-
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/monitorconfig.h b/ksim/monitors/snmp/monitorconfig.h
index 5ad6a32..5ff6c35 100644
--- a/ksim/monitors/snmp/monitorconfig.h
+++ b/ksim/monitors/snmp/monitorconfig.h
@@ -80,5 +80,3 @@ TQStringList allDisplayTypes();
 }
 
 #endif // MONITORCONFIG_H
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/monitordialog.cpp b/ksim/monitors/snmp/monitordialog.cpp
index bed4798..e9b3234 100644
--- a/ksim/monitors/snmp/monitordialog.cpp
+++ b/ksim/monitors/snmp/monitordialog.cpp
@@ -174,5 +174,3 @@ HostConfig MonitorDialog::currentHost() const
 }
 
 #include "monitordialog.moc"
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/monitordialog.h b/ksim/monitors/snmp/monitordialog.h
index 9f962e5..e778cd7 100644
--- a/ksim/monitors/snmp/monitordialog.h
+++ b/ksim/monitors/snmp/monitordialog.h
@@ -57,5 +57,3 @@ private:
 }
 
 #endif // MONITORDIALOG_H
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/pdu.cpp b/ksim/monitors/snmp/pdu.cpp
index 1619086..e06539a 100644
--- a/ksim/monitors/snmp/pdu.cpp
+++ b/ksim/monitors/snmp/pdu.cpp
@@ -93,6 +93,3 @@ ValueMap PDU::variables() const
 
     return result;
 }
-
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/pdu.h b/ksim/monitors/snmp/pdu.h
index 2e648d4..21d8c74 100644
--- a/ksim/monitors/snmp/pdu.h
+++ b/ksim/monitors/snmp/pdu.h
@@ -56,5 +56,3 @@ private:
 }
 
 #endif // PDU_H
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/plugin.cpp b/ksim/monitors/snmp/plugin.cpp
index 90683a2..f79832d 100644
--- a/ksim/monitors/snmp/plugin.cpp
+++ b/ksim/monitors/snmp/plugin.cpp
@@ -47,6 +47,3 @@ KSim::PluginPage *Plugin::createConfigPage( const char *name )
 void Plugin::showAbout()
 {
 }
-
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/plugin.h b/ksim/monitors/snmp/plugin.h
index 3e0fb66..9bf741c 100644
--- a/ksim/monitors/snmp/plugin.h
+++ b/ksim/monitors/snmp/plugin.h
@@ -45,5 +45,3 @@ public:
 }
 
 #endif // KSIM_PLUGIN_H
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/probedialog.cpp b/ksim/monitors/snmp/probedialog.cpp
index 435ec9e..489080e 100644
--- a/ksim/monitors/snmp/probedialog.cpp
+++ b/ksim/monitors/snmp/probedialog.cpp
@@ -112,6 +112,3 @@ void ProbeDialog::nextProbe()
 }
 
 #include "probedialog.moc"
-
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/probedialog.h b/ksim/monitors/snmp/probedialog.h
index 7f8d0ab..cf5833a 100644
--- a/ksim/monitors/snmp/probedialog.h
+++ b/ksim/monitors/snmp/probedialog.h
@@ -84,5 +84,3 @@ private:
 }
 
 #endif // PROBEDIALOG_H
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/proberesultdialog.cpp b/ksim/monitors/snmp/proberesultdialog.cpp
index 7550447..d24577d 100644
--- a/ksim/monitors/snmp/proberesultdialog.cpp
+++ b/ksim/monitors/snmp/proberesultdialog.cpp
@@ -50,6 +50,3 @@ void ProbeResultDialog::addResultItem( const ProbeDialog::ProbeResult &result )
 }
 
 #include "proberesultdialog.moc"
-
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/proberesultdialog.h b/ksim/monitors/snmp/proberesultdialog.h
index 9d4884c..30529d7 100644
--- a/ksim/monitors/snmp/proberesultdialog.h
+++ b/ksim/monitors/snmp/proberesultdialog.h
@@ -46,5 +46,3 @@ private:
 
 }
 #endif // PROBERESULTDIALOG_H
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/session.cpp b/ksim/monitors/snmp/session.cpp
index 6d63fab..6839283 100644
--- a/ksim/monitors/snmp/session.cpp
+++ b/ksim/monitors/snmp/session.cpp
@@ -278,6 +278,3 @@ Session::~Session()
         SnmpLib::self()->snmp_close( d->session );
     delete d;
 }
-
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/session.h b/ksim/monitors/snmp/session.h
index b34bc68..6af8e1d 100644
--- a/ksim/monitors/snmp/session.h
+++ b/ksim/monitors/snmp/session.h
@@ -60,5 +60,3 @@ private:
 }
 
 #endif // SESSION_H
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/snmp.cpp b/ksim/monitors/snmp/snmp.cpp
index ae04b67..333f0d2 100644
--- a/ksim/monitors/snmp/snmp.cpp
+++ b/ksim/monitors/snmp/snmp.cpp
@@ -315,6 +315,3 @@ ErrorInfo::ErrorInfo( ErrorType error )
     if ( error != NoError && error != ErrUnknown )
         m_errorMessage = messageForErrorCode( convertErrorInfoToSnmpLibError( error ) );
 }
-
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/snmp.h b/ksim/monitors/snmp/snmp.h
index 213fa22..c00e110 100644
--- a/ksim/monitors/snmp/snmp.h
+++ b/ksim/monitors/snmp/snmp.h
@@ -161,5 +161,3 @@ private:
 }
 
 #endif // KSIMSNMP_H
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/snmp_p.h b/ksim/monitors/snmp/snmp_p.h
index 9d96868..a44fc6e 100644
--- a/ksim/monitors/snmp/snmp_p.h
+++ b/ksim/monitors/snmp/snmp_p.h
@@ -55,5 +55,3 @@ struct Identifier::Data
 }
 
 #endif // SNMP_P_H
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/snmplib.cpp b/ksim/monitors/snmp/snmplib.cpp
index b042c7f..ee091bc 100644
--- a/ksim/monitors/snmp/snmplib.cpp
+++ b/ksim/monitors/snmp/snmplib.cpp
@@ -146,6 +146,3 @@ int SnmpLib::generate_Ku( const oid * hashtype, u_int hashtype_len,
 {
     return ::generate_Ku( hashtype, hashtype_len, P, pplen, Ku, kulen );
 }
-
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/snmplib.h b/ksim/monitors/snmp/snmplib.h
index 388c918..2498e06 100644
--- a/ksim/monitors/snmp/snmplib.h
+++ b/ksim/monitors/snmp/snmplib.h
@@ -138,6 +138,3 @@ private:
 
 
 #endif // SNMPLIB_H
-/* vim: et sw=4 ts=4
- */
-
diff --git a/ksim/monitors/snmp/value.cpp b/ksim/monitors/snmp/value.cpp
index bb5b0c4..724082b 100644
--- a/ksim/monitors/snmp/value.cpp
+++ b/ksim/monitors/snmp/value.cpp
@@ -328,6 +328,3 @@ TQString Value::formatTimeTicks( int ticks, int conversionFlags )
 
     return result;
 }
-
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/value.h b/ksim/monitors/snmp/value.h
index d1461d8..921ce5f 100644
--- a/ksim/monitors/snmp/value.h
+++ b/ksim/monitors/snmp/value.h
@@ -102,5 +102,3 @@ private:
 }
 
 #endif // VALUE_H
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/value_p.h b/ksim/monitors/snmp/value_p.h
index 4ff2d8f..0727174 100644
--- a/ksim/monitors/snmp/value_p.h
+++ b/ksim/monitors/snmp/value_p.h
@@ -59,5 +59,3 @@ struct ValueImpl
 }
 
 #endif // VALUE_P_H
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/view.cpp b/ksim/monitors/snmp/view.cpp
index d109139..5456aa6 100644
--- a/ksim/monitors/snmp/view.cpp
+++ b/ksim/monitors/snmp/view.cpp
@@ -75,6 +75,3 @@ void View::reparseConfig()
 }
 
 #include "view.moc"
-
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/view.h b/ksim/monitors/snmp/view.h
index d40d44d..497001a 100644
--- a/ksim/monitors/snmp/view.h
+++ b/ksim/monitors/snmp/view.h
@@ -52,5 +52,3 @@ private:
 }
 
 #endif // VIEW_H
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/walker.cpp b/ksim/monitors/snmp/walker.cpp
index 0aa6c0a..81a36f4 100644
--- a/ksim/monitors/snmp/walker.cpp
+++ b/ksim/monitors/snmp/walker.cpp
@@ -117,5 +117,3 @@ void Walker::customEvent( TQCustomEvent * )
 }
 
 #include "walker.moc"
-/* vim: et sw=4 ts=4
- */
diff --git a/ksim/monitors/snmp/walker.h b/ksim/monitors/snmp/walker.h
index cda0ad8..cf9e145 100644
--- a/ksim/monitors/snmp/walker.h
+++ b/ksim/monitors/snmp/walker.h
@@ -79,5 +79,3 @@ private:
 }
 
 #endif // WALKER_H
-/* vim: et sw=4 ts=4
- */
diff --git a/tdessh/sshdlg.cpp b/tdessh/sshdlg.cpp
index df30045..3849bfc 100644
--- a/tdessh/sshdlg.cpp
+++ b/tdessh/sshdlg.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * $Id$
  *
diff --git a/tdessh/sshdlg.h b/tdessh/sshdlg.h
index 5f4f734..2856f7a 100644
--- a/tdessh/sshdlg.h
+++ b/tdessh/sshdlg.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * $Id$
  *
diff --git a/tdessh/tdessh.cpp b/tdessh/tdessh.cpp
index 042302e..4b46ac1 100644
--- a/tdessh/tdessh.cpp
+++ b/tdessh/tdessh.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * $Id$
  *