37 files changed, 142 insertions, 142 deletions
diff --git a/kmailcvt/CMakeLists.txt b/kmailcvt/CMakeLists.txt
index 9a566690c..ac96928a8 100644
--- a/kmailcvt/CMakeLists.txt
+++ b/kmailcvt/CMakeLists.txt
@@ -38,12 +38,12 @@ install(
 tde_add_executable( kmailcvt AUTOMOC
   SOURCES
     kimportpagedlg.ui kimportpage.cpp kselfilterpagedlg.ui
-    kselfilterpage.cpp filters.cxx filter_oe.cxx kmailcvt.cpp main.cpp
-    filter_pmail.cxx filter_plain.cxx filter_outlook.cxx filter_mbox.cxx
-    filter_evolution.cxx filter_mailapp.cxx filter_evolution_v2.cxx
-    filter_opera.cxx filter_thunderbird.cxx filter_kmail_maildir.cxx
-    filter_sylpheed.cxx filter_thebat.cxx filter_lnotes.cxx
-    filter_kmail_archive.cxx
+    kselfilterpage.cpp filters.cpp filter_oe.cpp kmailcvt.cpp main.cpp
+    filter_pmail.cpp filter_plain.cpp filter_outlook.cpp filter_mbox.cpp
+    filter_evolution.cpp filter_mailapp.cpp filter_evolution_v2.cpp
+    filter_opera.cpp filter_thunderbird.cpp filter_kmail_maildir.cpp
+    filter_sylpheed.cpp filter_thebat.cpp filter_lnotes.cpp
+    filter_kmail_archive.cpp
   LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kmailcvt/Makefile.am b/kmailcvt/Makefile.am
index 84777d75b..af5a8feb6 100644
--- a/kmailcvt/Makefile.am
+++ b/kmailcvt/Makefile.am
@@ -1,32 +1,32 @@
 
 bin_PROGRAMS = kmailcvt
 kmailcvt_SOURCES = kimportpagedlg.ui kimportpage.cpp kselfilterpagedlg.ui \
-                   kselfilterpage.cpp filters.cxx filter_oe.cxx kmailcvt.cpp \
-                   main.cpp filter_pmail.cxx filter_plain.cxx filter_outlook.cxx \
-                   filter_mbox.cxx filter_evolution.cxx filter_mailapp.cxx \
-                   filter_evolution_v2.cxx filter_opera.cxx filter_thunderbird.cxx \
-                   filter_kmail_maildir.cxx filter_sylpheed.cxx filter_thebat.cxx \
-                   filter_lnotes.cxx filter_kmail_archive.cxx
+                   kselfilterpage.cpp filters.cpp filter_oe.cpp kmailcvt.cpp \
+                   main.cpp filter_pmail.cpp filter_plain.cpp filter_outlook.cpp \
+                   filter_mbox.cpp filter_evolution.cpp filter_mailapp.cpp \
+                   filter_evolution_v2.cpp filter_opera.cpp filter_thunderbird.cpp \
+                   filter_kmail_maildir.cpp filter_sylpheed.cpp filter_thebat.cpp \
+                   filter_lnotes.cpp filter_kmail_archive.cpp
                 
 kmailcvt_LDADD   = $(LIB_TDEFILE)
 
 EXTRA_DIST = main.cpp kmailcvt.cpp kimportpage.cpp kimportpage.h \
              kselfilterpage.cpp kselfilterpage.h kmailcvt.h \
-             kmailcvt.desktop filter_oe.cxx filter_oe.hxx \
-             filters.cxx filters.hxx \
+             kmailcvt.desktop filter_oe.cpp filter_oe.h \
+             filters.cpp filters.h \
              PAB_format.html sv9429424.gif \
-             filter_pmail.cxx filter_pmail.hxx \
-             filter_plain.cxx filter_plain.hxx \
-             filter_mbox.cxx filter_mbox.hxx \
-             filter_evolution.cxx filter_evolution.hxx \
-             filter_mailapp.hxx filter_mailapp.cxx \
-             filter_opera.hxx filter_opera.cxx \
-             filter_evolution_v2.hxx filter_evolution_v2.cxx \
-             filter_thunderbird.hxx filter_thunderbird.cxx \
-             filter_kmail_maildir.hxx filter_kmail_maildir.cxx \
-             filter_sylpheed.hxx filter_sylpheed.cxx \
-             filter_thebat.hxx filter_thebat.cxx filter_lnotes.hxx filter_lnotes.cxx \
-             filter_kmail_archive.cxx fitler_kmail_archive.hxx
+             filter_pmail.cpp filter_pmail.h \
+             filter_plain.cpp filter_plain.h \
+             filter_mbox.cpp filter_mbox.h \
+             filter_evolution.cpp filter_evolution.h \
+             filter_mailapp.h filter_mailapp.cpp \
+             filter_opera.h filter_opera.cpp \
+             filter_evolution_v2.h filter_evolution_v2.cpp \
+             filter_thunderbird.h filter_thunderbird.cpp \
+             filter_kmail_maildir.h filter_kmail_maildir.cpp \
+             filter_sylpheed.h filter_sylpheed.cpp \
+             filter_thebat.h filter_thebat.cpp filter_lnotes.h filter_lnotes.cpp \
+             filter_kmail_archive.cpp fitler_kmail_archive.h
 
 install-data-local: uninstall.desktop
 	$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Utilities
@@ -45,7 +45,7 @@ kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE
 KDE_ICON=AUTO
 
 messages: rc.cpp
-	LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
+	LIST=`find . -name \*.h -o -name \*.cpp`; \
 	if test -n "$$LIST"; then \
 	 $(XGETTEXT) $$LIST -o $(podir)/kmailcvt.pot; \
 	fi
diff --git a/kmailcvt/README b/kmailcvt/README
index d8322ed49..d1105fe45 100644
--- a/kmailcvt/README
+++ b/kmailcvt/README
@@ -7,9 +7,9 @@ with KMail via its DCOP interface to add messages.
 Writing a filter
 ----------------
 
-...is very easy. Create two files filter_myformat.cxx and filter_myformat.hxx
-and add "filter_myformat.cxx" to the end of the kmailcvt_SOURCES line in
-Makefile.am and "filter_myformat.cxx filter_myformat.hxx" to the end of the
+...is very easy. Create two files filter_myformat.cpp and filter_myformat.h
+and add "filter_myformat.cpp" to the end of the kmailcvt_SOURCES line in
+Makefile.am and "filter_myformat.cpp filter_myformat.h" to the end of the
 EXTRA_DIST line in Makefile.am. Now run "make -f Makefile.cvs; ./configure" in
 your tdepim source directory.
 
diff --git a/kmailcvt/filter_evolution.cxx b/kmailcvt/filter_evolution.cpp
index b4443d143..a372058e3 100644
--- a/kmailcvt/filter_evolution.cxx
+++ b/kmailcvt/filter_evolution.cpp
@@ -1,5 +1,5 @@
 /*
- *  filter_evolution.cxx
+ *  filter_evolution.cpp
  *  Author : Simon MARTIN <simartin@users.sourceforge.net>
  *  Copyright (c) 2004 Simon MARTIN
  *
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include "filter_evolution.hxx"
+#include "filter_evolution.h"
 
 #include <config.h>
 #include <tdelocale.h>
diff --git a/kmailcvt/filter_evolution.hxx b/kmailcvt/filter_evolution.h
index 1aa5184f1..83fb41554 100644
--- a/kmailcvt/filter_evolution.hxx
+++ b/kmailcvt/filter_evolution.h
@@ -1,5 +1,5 @@
 /*
- *  filter_evolution.hxx
+ *  filter_evolution.h
  *  Author : Simon MARTIN <simartin@users.sourceforge.net>
  *  Copyright (c) 2004 Simon MARTIN
  *
@@ -18,10 +18,10 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef FILTER_EVOLUTION_HXX
-#define FILTER_EVOLUTION_HXX
+#ifndef FILTER_EVOLUTION_H
+#define FILTER_EVOLUTION_H
 
-#include "filters.hxx"
+#include "filters.h"
 
 /**
  * Imports Evolution mboxes recursively, keeping the folder structure.
diff --git a/kmailcvt/filter_evolution_v2.cxx b/kmailcvt/filter_evolution_v2.cpp
index b6ee8a577..a4c6203c9 100644
--- a/kmailcvt/filter_evolution_v2.cxx
+++ b/kmailcvt/filter_evolution_v2.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-            filter_evolution_v2.cxx  -  Evolution 2.0.x mail import
+            filter_evolution_v2.cpp  -  Evolution 2.0.x mail import
                              -------------------
     begin                : Januar 26 2005
     copyright            : (C) 2005 by Danny Kukawka
@@ -16,7 +16,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "filter_evolution_v2.hxx"
+#include "filter_evolution_v2.h"
 
 #include <config.h>
 #include <tdelocale.h>
diff --git a/kmailcvt/filter_evolution_v2.hxx b/kmailcvt/filter_evolution_v2.h
index da58b4fe2..2c93bba8e 100644
--- a/kmailcvt/filter_evolution_v2.hxx
+++ b/kmailcvt/filter_evolution_v2.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-            filter_evolution_v2.hxx  -  Evolution 2.0.x mail import
+            filter_evolution_v2.h  -  Evolution 2.0.x mail import
                              -------------------
     begin                : Januar 26 2005
     copyright            : (C) 2005 by Danny Kukawka
@@ -16,10 +16,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef FILTER_EVOLUTION_V2_HXX
-#define FILTER_EVOLUTION_V2_HXX
+#ifndef FILTER_EVOLUTION_V2_H
+#define FILTER_EVOLUTION_V2_H
 
-#include "filters.hxx"
+#include "filters.h"
 
 /**
  * Imports Evolution v2.x mail folder recursively, keeping the folder structure.
diff --git a/kmailcvt/filter_kmail_archive.cxx b/kmailcvt/filter_kmail_archive.cpp
index 3c7c20d00..49325d2a8 100644
--- a/kmailcvt/filter_kmail_archive.cxx
+++ b/kmailcvt/filter_kmail_archive.cpp
@@ -16,7 +16,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "filter_kmail_archive.hxx"
+#include "filter_kmail_archive.h"
 
 #include <tdelocale.h>
 
diff --git a/kmailcvt/filter_kmail_archive.hxx b/kmailcvt/filter_kmail_archive.h
index 755d3cc28..a1f749256 100644
--- a/kmailcvt/filter_kmail_archive.hxx
+++ b/kmailcvt/filter_kmail_archive.h
@@ -16,10 +16,10 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FILTER_KMAIL_ARCHIVE_HXX
-#define FILTER_KMAIL_ARCHIVE_HXX
+#ifndef FILTER_KMAIL_ARCHIVE_H
+#define FILTER_KMAIL_ARCHIVE_H
 
-#include "filters.hxx"
+#include "filters.h"
 
 class FilterKMailArchive : public Filter
 {
diff --git a/kmailcvt/filter_kmail_maildir.cxx b/kmailcvt/filter_kmail_maildir.cpp
index 9d642814d..f24ef7aff 100644
--- a/kmailcvt/filter_kmail_maildir.cxx
+++ b/kmailcvt/filter_kmail_maildir.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-           filter_kmail_maildir.cxx  -  Kmail maildir mail import
+           filter_kmail_maildir.cpp  -  Kmail maildir mail import
                             -------------------
    begin                : April 06 2005
    copyright            : (C) 2005 by Danny Kukawka
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "filter_kmail_maildir.hxx"
+#include "filter_kmail_maildir.h"
 
 #include <config.h>
 #include <tdelocale.h>
diff --git a/kmailcvt/filter_kmail_maildir.hxx b/kmailcvt/filter_kmail_maildir.h
index 66f444907..f0d8c6ac6 100644
--- a/kmailcvt/filter_kmail_maildir.hxx
+++ b/kmailcvt/filter_kmail_maildir.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-            filter_kmail_maildir.hxx  -  Kmail maildir mail import
+            filter_kmail_maildir.h  -  Kmail maildir mail import
                              -------------------
     begin                : April 06 2005
     copyright            : (C) 2005 by Danny Kukawka
@@ -14,10 +14,10 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef FILTER_KMAIL_MAILDIR_HXX
-#define FILTER_KMAIL_MAILDIR_HXX
+#ifndef FILTER_KMAIL_MAILDIR_H
+#define FILTER_KMAIL_MAILDIR_H
 
-#include "filters.hxx"
+#include "filters.h"
 
 /**
  * Imports KMail mail folder with maildir format recursively, recreating the folder structure.
diff --git a/kmailcvt/filter_lnotes.cxx b/kmailcvt/filter_lnotes.cpp
index af92e1b41..7733c1c14 100644
--- a/kmailcvt/filter_lnotes.cxx
+++ b/kmailcvt/filter_lnotes.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-             filter_lnotes.cxx  -  Lotus Notes Structured Text mail import
+             filter_lnotes.cpp  -  Lotus Notes Structured Text mail import
                              -------------------
     begin                : Wed Feb 16, 2005
     copyright            : (C) 2005 by Robert Rockers
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 #include <tqfileinfo.h>
 
-#include "filter_lnotes.hxx"
+#include "filter_lnotes.h"
 
 /** Default constructor. */
 FilterLNotes::FilterLNotes() :
@@ -57,7 +57,7 @@ void FilterLNotes::import(FilterInfo *info) {
     totalFiles = filenames.count();
     inf->setOverall(0);
 
-    // See filter_mbox.cxx for better reference.
+    // See filter_mbox.cpp for better reference.
     for ( TQStringList::Iterator filename = filenames.begin(); filename != filenames.end(); ++filename ) {
 
         ++currentFile;
@@ -75,7 +75,7 @@ void FilterLNotes::import(FilterInfo *info) {
  */
 void FilterLNotes::ImportLNotes(const TQString& file) {
 
-    // See Filter_pmail.cxx for better reference
+    // See Filter_pmail.cpp for better reference
 
     // Format of a Lotus Notes 5 Structured Text Document w form feed
     // Each email begins with a custom Header Principal:
diff --git a/kmailcvt/filter_lnotes.hxx b/kmailcvt/filter_lnotes.h
index 430ae83e8..bf5cd91c4 100644
--- a/kmailcvt/filter_lnotes.hxx
+++ b/kmailcvt/filter_lnotes.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          filter_lnotes.hxx  -  Lotus Notes Structured Text mail import
+                          filter_lnotes.h  -  Lotus Notes Structured Text mail import
                              -------------------
     begin                : Wed Feb 16, 2005
     copyright            : (C) 2005 by Robert Rockers
@@ -15,10 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef FILTER_LNOTES_HXX
-#define FILTER_LNOTES_HXX
+#ifndef FILTER_LNOTES_H
+#define FILTER_LNOTES_H
 
-#include "filters.hxx"
+#include "filters.h"
 
 /**imports Lotus Notes Structured Text Archives and archvies messages into KMail
  *@author Robert Rockers
diff --git a/kmailcvt/filter_mailapp.cxx b/kmailcvt/filter_mailapp.cpp
index fded411da..1da632ec6 100644
--- a/kmailcvt/filter_mailapp.cxx
+++ b/kmailcvt/filter_mailapp.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          filter_mailapp.cxx  -  OS X Mail App import
+                          filter_mailapp.cpp  -  OS X Mail App import
                              -------------------
     copyright            : (C) 2004 by Chris Howells
     email                : howells@kde.org
@@ -26,7 +26,7 @@
 #include <tdetempfile.h>
 #include <kdebug.h>
 
-#include "filter_mailapp.hxx"
+#include "filter_mailapp.h"
 
 FilterMailApp::FilterMailApp() :
         Filter( i18n("Import From OS X Mail"),
diff --git a/kmailcvt/filter_mailapp.hxx b/kmailcvt/filter_mailapp.h
index 571f77ff0..e562dbf7b 100644
--- a/kmailcvt/filter_mailapp.hxx
+++ b/kmailcvt/filter_mailapp.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          filter_mailapp.hxx  -  OS X Mail App import
+                          filter_mailapp.h  -  OS X Mail App import
                              -------------------
     copyright            : (C) 2004 by Chris Howells
     email                : howells@kde.org
@@ -10,10 +10,10 @@
  
  ***************************************************************************/
 
-#ifndef FILTER_MAILAPP_HXX
-#define FILTER_MAILAPP_HXX
+#ifndef FILTER_MAILAPP_H
+#define FILTER_MAILAPP_H
 
-#include "filters.hxx"
+#include "filters.h"
 
 /**
  *imports mbox archives messages into KMail
diff --git a/kmailcvt/filter_mbox.cxx b/kmailcvt/filter_mbox.cpp
index 19afccf22..c5f87e515 100644
--- a/kmailcvt/filter_mbox.cxx
+++ b/kmailcvt/filter_mbox.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          filter_mbox.cxx  -  mbox mail import
+                          filter_mbox.cpp  -  mbox mail import
                              -------------------
     begin                : Sat Apr 5 2003
     copyright            : (C) 2003 by Laurence Anderson
@@ -21,7 +21,7 @@
 #include <tdetempfile.h>
 #include <kdebug.h>
 
-#include "filter_mbox.hxx"
+#include "filter_mbox.h"
 
 
 FilterMBox::FilterMBox() :
diff --git a/kmailcvt/filter_mbox.hxx b/kmailcvt/filter_mbox.h
index e1c5e9672..f1f376de3 100644
--- a/kmailcvt/filter_mbox.hxx
+++ b/kmailcvt/filter_mbox.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          filter_mbox.hxx  -  mbox mail import
+                          filter_mbox.h  -  mbox mail import
                              -------------------
     begin                : Sat Apr 5 2003
     copyright            : (C) 2003 by Laurence Anderson
@@ -15,10 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef FILTER_MBOX_HXX
-#define FILTER_MBOX_HXX
+#ifndef FILTER_MBOX_H
+#define FILTER_MBOX_H
 
-#include "filters.hxx"
+#include "filters.h"
 
 /**
  * imports mbox archives messages into KMail
diff --git a/kmailcvt/filter_oe.cxx b/kmailcvt/filter_oe.cpp
index afd96527b..47002d969 100644
--- a/kmailcvt/filter_oe.cxx
+++ b/kmailcvt/filter_oe.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          filter_oe.cxx  -  Outlook Express mail import
+                          filter_oe.cpp  -  Outlook Express mail import
                              -------------------
     begin                : Sat Feb 1 2003
     copyright            : (C) 2003 by Laurence Anderson
@@ -25,7 +25,7 @@
 #include <tdetempfile.h>
 #include <kdebug.h>
 
-#include "filter_oe.hxx"
+#include "filter_oe.h"
 
 #define OE4_SIG_1 0x36464d4a
 #define OE4_SIG_2 0x00010003
diff --git a/kmailcvt/filter_oe.hxx b/kmailcvt/filter_oe.h
index 821aa5dfa..2a46854f2 100644
--- a/kmailcvt/filter_oe.hxx
+++ b/kmailcvt/filter_oe.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          filter_oe.hxx  -  Outlook Express mail import
+                          filter_oe.h  -  Outlook Express mail import
                              -------------------
     begin                : Sat Feb 1 2003
     copyright            : (C) 2003 by Laurence Anderson
@@ -15,10 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef FILTER_OE_HXX
-#define FILTER_OE_HXX
+#ifndef FILTER_OE_H
+#define FILTER_OE_H
 
-#include "filters.hxx"
+#include "filters.h"
 
 /**
  *imports outlook text messages into KMail
diff --git a/kmailcvt/filter_opera.cxx b/kmailcvt/filter_opera.cpp
index 90aef3820..ff5376957 100644
--- a/kmailcvt/filter_opera.cxx
+++ b/kmailcvt/filter_opera.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                  filter_opera.cxx  -  Opera mail import
+                  filter_opera.cpp  -  Opera mail import
                              -------------------
     begin                : Januar 26 2005
     copyright            : (C) 2005 by Danny Kukawka
@@ -21,7 +21,7 @@
 #include <tdetempfile.h>
 #include <kdebug.h>
 
-#include "filter_opera.hxx"
+#include "filter_opera.h"
 
 
 FilterOpera::FilterOpera() :
diff --git a/kmailcvt/filter_opera.hxx b/kmailcvt/filter_opera.h
index 27ded4ccd..7da80afa9 100644
--- a/kmailcvt/filter_opera.hxx
+++ b/kmailcvt/filter_opera.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                  filter_opera.hxx  -  Opera mail import
+                  filter_opera.h  -  Opera mail import
                              -------------------
     begin                : Januar 26 2005
     copyright            : (C) 2005 by Danny Kukawka
@@ -15,10 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef FILTER_OPERA_HXX
-#define FILTER_OPERA_HXX
+#ifndef FILTER_OPERA_H
+#define FILTER_OPERA_H
 
-#include "filters.hxx"
+#include "filters.h"
 
 /**
  *imports opera account-archives into KMail
diff --git a/kmailcvt/filter_outlook.cxx b/kmailcvt/filter_outlook.cpp
index 10483d090..bb3959181 100644
--- a/kmailcvt/filter_outlook.cxx
+++ b/kmailcvt/filter_outlook.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                  filter_opera.cxx  -  Outlook mail import
+                  filter_opera.cpp  -  Outlook mail import
                              -------------------
     begin                : February 01  2005
     copyright            : (C) 2005 by Danny Kukawka
@@ -22,7 +22,7 @@
 #include <tdetempfile.h>
 #include <kdebug.h>
 
-#include "filter_outlook.hxx"
+#include "filter_outlook.h"
 
 FilterOutlook::FilterOutlook() :
         Filter( i18n("Import Outlook Emails"),
diff --git a/kmailcvt/filter_outlook.hxx b/kmailcvt/filter_outlook.h
index bad7d5ee1..ec7620663 100644
--- a/kmailcvt/filter_outlook.hxx
+++ b/kmailcvt/filter_outlook.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                  filter_opera.hxx  -  Outlook mail import
+                  filter_opera.h  -  Outlook mail import
                              -------------------
     begin                : Januar 26 2005
     copyright            : (C) 2005 by Danny Kukawka
@@ -15,10 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef FILTER_OUTLOOK_HXX
-#define FILTER_OUTLOOK_HXX
+#ifndef FILTER_OUTLOOK_H
+#define FILTER_OUTLOOK_H
 
-#include "filters.hxx"
+#include "filters.h"
 
 /**
  * imports mails from Outlook pst-files into KMail
diff --git a/kmailcvt/filter_plain.cxx b/kmailcvt/filter_plain.cpp
index 9f78b939c..01554c87f 100644
--- a/kmailcvt/filter_plain.cxx
+++ b/kmailcvt/filter_plain.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          FilterPlain.cxx  -  Plain mail import
+                          FilterPlain.cpp  -  Plain mail import
                              -------------------
     begin                : Fri Jun 14 2002
     copyright            : (C) 2002 by Laurence Anderson
@@ -20,7 +20,7 @@
 #include <tdefiledialog.h>
 #include <libgen.h>
 
-#include "filter_plain.hxx"
+#include "filter_plain.h"
 
 
 FilterPlain::FilterPlain() :
diff --git a/kmailcvt/filter_plain.hxx b/kmailcvt/filter_plain.h
index ddd9d494f..2319e8887 100644
--- a/kmailcvt/filter_plain.hxx
+++ b/kmailcvt/filter_plain.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          FilterPlain.hxx  -  Plain mail import
+                          FilterPlain.h  -  Plain mail import
                              -------------------
     begin                : Fri Jun 24 2002
     copyright            : (C) 2002 by Laurence Anderson
@@ -15,10 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef FILTER_PLAIN_HXX
-#define FILTER_PLAIN_HXX
+#ifndef FILTER_PLAIN_H
+#define FILTER_PLAIN_H
 
-#include "filters.hxx"
+#include "filters.h"
 
 /**
  *imports Plain text messages into KMail
diff --git a/kmailcvt/filter_pmail.cxx b/kmailcvt/filter_pmail.cpp
index e48e062de..b45a0be41 100644
--- a/kmailcvt/filter_pmail.cxx
+++ b/kmailcvt/filter_pmail.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          FilterPMail.cxx  -  Pegasus-Mail import
+                          FilterPMail.cpp  -  Pegasus-Mail import
                              -------------------
     begin                : Sat Jan 6 2001
     copyright            : (C) 2001 by Holger Schurig
@@ -24,7 +24,7 @@
 #include <tdetempfile.h>
 #include <kdebug.h>
 
-#include "filter_pmail.hxx"
+#include "filter_pmail.h"
 
 
 FilterPMail::FilterPMail() :
diff --git a/kmailcvt/filter_pmail.hxx b/kmailcvt/filter_pmail.h
index 664fdcc1b..07f62a36b 100644
--- a/kmailcvt/filter_pmail.hxx
+++ b/kmailcvt/filter_pmail.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          FilterPMail.hxx  -  Pegasus-Mail import
+                          FilterPMail.h  -  Pegasus-Mail import
                              -------------------
     begin                : Sat Jan 6 2001
     copyright            : (C) 2001 by Holger Schurig
@@ -15,13 +15,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef FILTER_PMAIL_HXX
-#define FILTER_PMAIL_HXX
+#ifndef FILTER_PMAIL_H
+#define FILTER_PMAIL_H
 
 #include <tqdir.h>
 #include <tqvaluelist.h>
 
-#include "filters.hxx"
+#include "filters.h"
 
 class FilterPMail : public Filter
 {
diff --git a/kmailcvt/filter_sylpheed.cxx b/kmailcvt/filter_sylpheed.cpp
index 1fc008d42..e8f4a66a7 100644
--- a/kmailcvt/filter_sylpheed.cxx
+++ b/kmailcvt/filter_sylpheed.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-            filter_sylpheed.hxx  -  Sylpheed maildir mail import
+            filter_sylpheed.h  -  Sylpheed maildir mail import
                              -------------------
     begin                : April 07 2005
    copyright            : (C) 2005 by Danny Kukawka
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "filter_sylpheed.hxx"
+#include "filter_sylpheed.h"
 
 #include <config.h>
 #include <tdelocale.h>
diff --git a/kmailcvt/filter_sylpheed.hxx b/kmailcvt/filter_sylpheed.h
index fcc3af851..1d92adf01 100644
--- a/kmailcvt/filter_sylpheed.hxx
+++ b/kmailcvt/filter_sylpheed.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-            filter_sylpheed.hxx  -  Sylpheed maildir mail import
+            filter_sylpheed.h  -  Sylpheed maildir mail import
                              -------------------
     begin                : April 07 2005
     copyright            : (C) 2005 by Danny Kukawka
@@ -14,12 +14,12 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef FILTER_SYLPHEED_HXX
-#define FILTER_SYLPHEED_HXX
+#ifndef FILTER_SYLPHEED_H
+#define FILTER_SYLPHEED_H
 
 #include <tqdict.h>
 
-#include "filters.hxx"
+#include "filters.h"
 
 /**
  * Imports Sylpheed mail folder with maildir format recursively, recreating the folder structure.
diff --git a/kmailcvt/filter_thebat.cxx b/kmailcvt/filter_thebat.cpp
index eaf16461a..a255f352c 100644
--- a/kmailcvt/filter_thebat.cxx
+++ b/kmailcvt/filter_thebat.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-            filter_thebat.hxx  -  TheBat! mail import
+            filter_thebat.h  -  TheBat! mail import
                              -------------------
     begin                : April 07 2005
    copyright            : (C) 2005 by Danny Kukawka
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "filter_thebat.hxx"
+#include "filter_thebat.h"
 
 #include <config.h>
 
diff --git a/kmailcvt/filter_thebat.hxx b/kmailcvt/filter_thebat.h
index 7d62018d4..ef69c2314 100644
--- a/kmailcvt/filter_thebat.hxx
+++ b/kmailcvt/filter_thebat.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-            filter_thebat.hxx  -  TheBat! mail import
+            filter_thebat.h  -  TheBat! mail import
                              -------------------
     begin                : April 07 2005
     copyright            : (C) 2005 by Danny Kukawka
@@ -14,10 +14,10 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef FILTER_THEBAT_HXX
-#define FILTER_THEBAT_HXX
+#ifndef FILTER_THEBAT_H
+#define FILTER_THEBAT_H
 
-#include "filters.hxx"
+#include "filters.h"
 
 /**
  * Imports The Bat! mail folder recursively, recreating the folder structure.
diff --git a/kmailcvt/filter_thunderbird.cxx b/kmailcvt/filter_thunderbird.cpp
index 50f6355f3..e5f21d148 100644
--- a/kmailcvt/filter_thunderbird.cxx
+++ b/kmailcvt/filter_thunderbird.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-            filter_thunderbird.cxx  -  Thunderbird mail import
+            filter_thunderbird.cpp  -  Thunderbird mail import
                              -------------------
     begin                : Januar 26 2005
     copyright            : (C) 2005 by Danny Kukawka
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "filter_thunderbird.hxx"
+#include "filter_thunderbird.h"
 
 #include <config.h>
 #include <tdelocale.h>
diff --git a/kmailcvt/filter_thunderbird.hxx b/kmailcvt/filter_thunderbird.h
index d3bcd7f96..333e2380f 100644
--- a/kmailcvt/filter_thunderbird.hxx
+++ b/kmailcvt/filter_thunderbird.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-            filter_thunderbird.hxx  -  Thunderbird mail import
+            filter_thunderbird.h  -  Thunderbird mail import
                              -------------------
     begin                : Januar 26 2005
     copyright            : (C) 2005 by Danny Kukawka
@@ -15,10 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef FILTER_THUNDERBIRD_HXX
-#define FILTER_THUNDERBIRD_HXX
+#ifndef FILTER_THUNDERBIRD_H
+#define FILTER_THUNDERBIRD_H
 
-#include "filters.hxx"
+#include "filters.h"
 
 /**
  * Imports Thinderbird mail folder recursively, keeping the folder structure.
diff --git a/kmailcvt/filters.cxx b/kmailcvt/filters.cpp
index 6aeb4fdea..2c43ff435 100644
--- a/kmailcvt/filters.cxx
+++ b/kmailcvt/filters.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          filters.cxx  -  description
+                          filters.cpp  -  description
                              -------------------
     begin                : Fri Jun 30 2000
     copyright            : (C) 2000 by Hans Dijkema
@@ -22,7 +22,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 
-#include "filters.hxx"
+#include "filters.h"
 #include "kmailcvt.h"
 
 
diff --git a/kmailcvt/filters.hxx b/kmailcvt/filters.h
index d6c33f422..f9261bcb8 100644
--- a/kmailcvt/filters.hxx
+++ b/kmailcvt/filters.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          filters.hxx  -  description
+                          filters.h  -  description
                              -------------------
     begin                : Fri Jun 30 2000
     copyright            : (C) 2000 by Hans Dijkema
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef FILTERS_HXX
-#define FILTERS_HXX
+#ifndef FILTERS_H
+#define FILTERS_H
 
 #ifndef MAX_LINE
 #define MAX_LINE 4096
diff --git a/kmailcvt/kmailcvt.cpp b/kmailcvt/kmailcvt.cpp
index d34e0641d..39ba423e9 100644
--- a/kmailcvt/kmailcvt.cpp
+++ b/kmailcvt/kmailcvt.cpp
@@ -20,7 +20,7 @@
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <kdebug.h>
-#include "filters.hxx"
+#include "filters.h"
 
 KMailCVT::KMailCVT(TQWidget *parent, const char *name)
 	: KWizard(parent, name, true) {
diff --git a/kmailcvt/kselfilterpage.cpp b/kmailcvt/kselfilterpage.cpp
index 7d97fcfd9..118124f77 100644
--- a/kmailcvt/kselfilterpage.cpp
+++ b/kmailcvt/kselfilterpage.cpp
@@ -19,23 +19,23 @@
 #include <tqtextedit.h>
 #include <tqcheckbox.h> 
 #include <tdelocale.h>
-#include "filters.hxx"
+#include "filters.h"
 
-#include "filter_mbox.hxx"
-#include "filter_oe.hxx"
-#include "filter_outlook.hxx"
-#include "filter_pmail.hxx"
-#include "filter_plain.hxx"
-#include "filter_evolution.hxx"
-#include "filter_mailapp.hxx"
-#include "filter_evolution_v2.hxx"
-#include "filter_opera.hxx"
-#include "filter_thunderbird.hxx"
-#include "filter_kmail_maildir.hxx"
-#include "filter_kmail_archive.hxx"
-#include "filter_sylpheed.hxx"
-#include "filter_thebat.hxx"
-#include "filter_lnotes.hxx"
+#include "filter_mbox.h"
+#include "filter_oe.h"
+#include "filter_outlook.h"
+#include "filter_pmail.h"
+#include "filter_plain.h"
+#include "filter_evolution.h"
+#include "filter_mailapp.h"
+#include "filter_evolution_v2.h"
+#include "filter_opera.h"
+#include "filter_thunderbird.h"
+#include "filter_kmail_maildir.h"
+#include "filter_kmail_archive.h"
+#include "filter_sylpheed.h"
+#include "filter_thebat.h"
+#include "filter_lnotes.h"
 
 #include "kselfilterpage.h"