Additional k => tde renaming and fixes

25 files changed, 72 insertions, 72 deletions

diff --git a/lib/compatibility/tdemdi/qextmdi/Makefile.am b/lib/compatibility/tdemdi/qextmdi/Makefile.am
index fb8e6d02..ee283c68 100644
--- a/lib/compatibility/tdemdi/qextmdi/Makefile.am
+++ b/lib/compatibility/tdemdi/qextmdi/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/lib/compatibility/tdemdi/qextmdi/res -I$(top_builddir
 
 noinst_LTLIBRARIES = libquantaqextmdi.la
 libquantaqextmdi_la_LDFLAGS = $(all_libraries)
-libquantaqextmdi_la_LIBADD = $(LIB_KPARTS)
+libquantaqextmdi_la_LIBADD = $(LIB_TDEPARTS)
 
 libquantaqextmdi_la_SOURCES =    tdemdichildarea.cpp tdemdichildfrm.cpp tdemdichildfrmcaption.cpp \
 				tdemdichildview.cpp tdemdimainfrm.cpp tdemditaskbar.cpp  \
diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.h b/lib/compatibility/tdemdi/qextmdi/kdockwidget.h
index bf54a5c0..db43c908 100644
--- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.h
+++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.h
@@ -1,6 +1,6 @@
 /* This file is part of the KDE libraries
    Copyright (C) 2000 Max Judin <novaprint@mtu-net.ru>
-   Copyright (C) 2000 Falk Brettschneider <falk@tdevelop.org>
+   Copyright (C) 2000 Falk Brettschneider <falk@kdevelop.org>
    Copyright (C) 2002,2003 Joseph Wenninger <jowenn@kde.org>
 
    This library is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@
    -----------
    05/2001 -               : useful patches, bugfixes by Christoph Cullmann <crossfire@babylon2k.de>,
                              Joseph Wenninger <jowenn@bigfoot.com> and  Falk Brettschneider
-   03/2001 - 05/2001       : maintained and enhanced by Falk Brettschneider <falk@tdevelop.org>
+   03/2001 - 05/2001       : maintained and enhanced by Falk Brettschneider <falk@kdevelop.org>
    03/2000                 : class documentation added by Falk Brettschneider <gigafalk@yahoo.com>
    10/1999 - 03/2000       : programmed by Max Judin <novaprint@mtu-net.ru>
 
diff --git a/lib/compatibility/tdemdi/qextmdi/tdelibs_export.h b/lib/compatibility/tdemdi/qextmdi/tdelibs_export.h
index 0b05df5b..42d3d199 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdelibs_export.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdelibs_export.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef _KDELIBS_EXPORT_H
-#define _KDELIBS_EXPORT_H
+#ifndef _TDELIBS_EXPORT_H
+#define _TDELIBS_EXPORT_H
 
 /* needed for KDE_EXPORT macros */
 #include <kdemacros.h>
@@ -39,10 +39,10 @@
 #define TDEUI_EXPORT KDE_EXPORT
 #define TDEFX_EXPORT KDE_EXPORT
 #define TDEPRINT_EXPORT KDE_EXPORT
-#define KDNSSD_EXPORT KDE_EXPORT
+#define TDEDNSSD_EXPORT KDE_EXPORT
 #define TDEIO_EXPORT KDE_EXPORT
 #define DCOP_EXPORT KDE_EXPORT
-#define KPARTS_EXPORT KDE_EXPORT
+#define TDEPARTS_EXPORT KDE_EXPORT
 #define KTEXTEDITOR_EXPORT KDE_EXPORT
 #define KABC_EXPORT KDE_EXPORT
 #define TDESU_EXPORT KDE_EXPORT
@@ -51,11 +51,11 @@
 #define KSTYLE_EXPORT KDE_EXPORT
 #define TDEHTML_EXPORT KDE_EXPORT
 #define KMDI_EXPORT KDE_EXPORT
-#define KUTILS_EXPORT KDE_EXPORT
+#define TDEUTILS_EXPORT KDE_EXPORT
 #define KATEPARTINTERFACES_EXPORT KDE_EXPORT
 #define KATEPART_EXPORT KDE_EXPORT
 #define KMID_EXPORT KDE_EXPORT
-#define KIMPROXY_EXPORT KDE_EXPORT
+#define TDEIMPROXY_EXPORT KDE_EXPORT
 #define KDE_ARTS_EXPORT KDE_EXPORT
 
 #define KPATH_SEPARATOR ':'
@@ -66,7 +66,7 @@
 
 #endif
 
-#endif /*_KDELIBS_EXPORT_H*/
+#endif /*_TDELIBS_EXPORT_H*/
 
 /* workaround for tdecore: stupid moc's grammar doesn't accept two macros
    between 'class' keyword and <classname>: */
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp
index e1cab53e..4b3940be 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp
@@ -13,7 +13,7 @@
 //    copyright            : (C) 1999-2003 by Szymon Stefanek (stefanek@tin.it)
 //                                         and
 //                                         Falk Brettschneider
-//    email                :  falkbr@tdevelop.org (Falk Brettschneider)
+//    email                :  falkbr@kdevelop.org (Falk Brettschneider)
 //----------------------------------------------------------------------------
 //
 //----------------------------------------------------------------------------
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.h b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.h
index 137ef275..0a85b26b 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.h
@@ -13,7 +13,7 @@
 //    copyright            : (C) 1999-2003 by Falk Brettschneider
 //                                         and
 //                                         Szymon Stefanek (stefanek@tin.it)
-//    email                :  falkbr@tdevelop.org (Falk Brettschneider)
+//    email                :  falkbr@kdevelop.org (Falk Brettschneider)
 //----------------------------------------------------------------------------
 //
 //----------------------------------------------------------------------------
@@ -25,8 +25,8 @@
 //
 //----------------------------------------------------------------------------
 
-#ifndef _KMDI_CHILD_AREA_H_
-#define _KMDI_CHILD_AREA_H_
+#ifndef _TDEMDI_CHILD_AREA_H_
+#define _TDEMDI_CHILD_AREA_H_
 
 #include <tqframe.h>
 #include <tqptrlist.h>
@@ -302,6 +302,6 @@ private:
 	KMdiChildAreaPrivate *d;
 };
 
-#endif   // _KMDICHILDAREA_H_
+#endif   // _TDEMDI_CHILDAREA_H_
 
 // kate: indent-mode csands; tab-width 4; auto-insert-doxygen on;
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp
index 47c81c0a..8108bd75 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp
@@ -15,7 +15,7 @@
 //    copyright            : (C) 1999-2003 by Szymon Stefanek (stefanek@tin.it)
 //                                         and
 //                                         Falk Brettschneider
-//    email                :  falkbr@tdevelop.org (Falk Brettschneider)
+//    email                :  falkbr@kdevelop.org (Falk Brettschneider)
 //----------------------------------------------------------------------------
 //
 //----------------------------------------------------------------------------
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.h b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.h
index 54bdbe84..6de8b922 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.h
@@ -14,7 +14,7 @@
 //    copyright            : (C) 1999-2003 by Falk Brettschneider
 //                                         and
 //                                         Szymon Stefanek (stefanek@tin.it)
-//    email                :  falkbr@tdevelop.org (Falk Brettschneider)
+//    email                :  falkbr@kdevelop.org (Falk Brettschneider)
 //----------------------------------------------------------------------------
 //
 //----------------------------------------------------------------------------
@@ -25,8 +25,8 @@
 //    License, or (at your option) any later version.
 //
 //------------------------------------------------------------------------------
-#ifndef _KMDI_CHILD_FRM_H_
-#define _KMDI_CHILD_FRM_H_
+#ifndef _TDEMDI_CHILD_FRM_H_
+#define _TDEMDI_CHILD_FRM_H_
 
 #include <tqptrlist.h>
 #include <tqpixmap.h>
@@ -443,6 +443,6 @@ private:
 	KMdiChildFrmPrivate *d;
 };
 
-#endif //_KMDICHILDFRM_H_
+#endif //_TDEMDI_CHILD_FRM_H_
 
 // kate: space-indent off; replace-tabs off; tab-width 4; indent-mode csands;
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp
index 96099c69..5b069a47 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp
@@ -13,7 +13,7 @@
 //    copyright            : (C) 1999-2003 by Szymon Stefanek (stefanek@tin.it)
 //                                         and
 //                                         Falk Brettschneider
-//    email                :  falkbr@tdevelop.org (Falk Brettschneider)
+//    email                :  falkbr@kdevelop.org (Falk Brettschneider)
 //----------------------------------------------------------------------------
 //
 //----------------------------------------------------------------------------
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.h b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.h
index f25fe4b4..984fe00f 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.h
@@ -13,7 +13,7 @@
 //    copyright            : (C) 1999-2003 by Falk Brettschneider
 //                                         and
 //                                         Szymon Stefanek (stefanek@tin.it)
-//    email                :  falkbr@tdevelop.org (Falk Brettschneider)
+//    email                :  falkbr@kdevelop.org (Falk Brettschneider)
 //----------------------------------------------------------------------------
 //
 //----------------------------------------------------------------------------
@@ -24,8 +24,8 @@
 //    License, or (at your option) any later version.
 //
 //----------------------------------------------------------------------------
-#ifndef _KMDI_CHILD_FRM_CAPTION_H_
-#define _KMDI_CHILD_FRM_CAPTION_H_
+#ifndef _TDEMDI_CHILD_FRM_CAPTION_H_
+#define _TDEMDI_CHILD_FRM_CAPTION_H_
 
 #include <tqwidget.h>
 
@@ -141,6 +141,6 @@ private:
 	KMdiChildFrmCaptionPrivate *d;
 };
 
-#endif //_KMDICAPTION_H_
+#endif //_TDEMDI_CHILD_FRM_CAPTION_H_
 
 // kate: space-indent off; replace-tabs off; indent-mode csands; tab-width 4;
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp
index e743fc1e..ddc313ab 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp
@@ -17,7 +17,7 @@
 //    copyright            : (C) 1999-2003 by Szymon Stefanek (stefanek@tin.it)
 //                                         and
 //                                         Falk Brettschneider
-//    email                :  falkbr@tdevelop.org (Falk Brettschneider)
+//    email                :  falkbr@kdevelop.org (Falk Brettschneider)
 //----------------------------------------------------------------------------
 //
 //----------------------------------------------------------------------------
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildview.h b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.h
index d459f663..42251495 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildview.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.h
@@ -17,7 +17,7 @@
 //    copyright            : (C) 1999-2003 by Falk Brettschneider
 //                                         and
 //                                         Szymon Stefanek (stefanek@tin.it)
-//    email                :  falkbr@tdevelop.org (Falk Brettschneider)
+//    email                :  falkbr@kdevelop.org (Falk Brettschneider)
 //----------------------------------------------------------------------------
 //
 //----------------------------------------------------------------------------
@@ -28,8 +28,8 @@
 //    License, or (at your option) any later version.
 //
 //----------------------------------------------------------------------------
-#ifndef _KMDI_CHILD_VIEW_H_
-#define _KMDI_CHILD_VIEW_H_
+#ifndef _TDEMDI_CHILD_VIEW_H_
+#define _TDEMDI_CHILD_VIEW_H_
 
 #include <tqwidget.h>
 #include <tqpixmap.h>
@@ -611,6 +611,6 @@ inline KMdiChildFrm *KMdiChildView::mdiParent() const
 	return 0L;
 }
 
-#endif //_KMDICHILDVIEW_H_
+#endif //_TDEMDI_CHILD_VIEW_H_
 
 // kate: space-indent off; replace-tabs off; indent-mode csands; tab-width 4;
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidefines.h b/lib/compatibility/tdemdi/qextmdi/tdemdidefines.h
index 389304f6..b00bcb27 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdidefines.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdidefines.h
@@ -13,7 +13,7 @@
 //    copyright            : (C) 1999-2003 by Falk Brettschneider
 //                                         and
 //                                         Szymon Stefanek (stefanek@tin.it)
-//    email                :  falkbr@tdevelop.org (Falk Brettschneider)
+//    email                :  falkbr@kdevelop.org (Falk Brettschneider)
 //----------------------------------------------------------------------------
 //
 //----------------------------------------------------------------------------
@@ -24,8 +24,8 @@
 //    License, or (at your option) any later version.
 //
 //----------------------------------------------------------------------------
-#ifndef _KMDI_DEFINES_H_
-#define _KMDI_DEFINES_H_
+#ifndef _TDEMDI_DEFINES_H_
+#define _TDEMDI_DEFINES_H_
 
 #include <tdelibs_export.h>
 
@@ -114,4 +114,4 @@ namespace KMdi
    };
 } //namespace
 
-#endif //_KMDIDEFINES_H_
+#endif //_TDEMDI_DEFINES_H_
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.h b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.h
index 5f1f5dcc..e6aeb5a0 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.h
@@ -17,8 +17,8 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifndef _KMDI_DOCK_CONTAINER_
-#define _KMDI_DOCK_CONTAINER_
+#ifndef _TDEMDI_DOCK_CONTAINER_
+#define _TDEMDI_DOCK_CONTAINER_
 
 #include <tqwidget.h>
 #include <tqstringlist.h>
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h
index abf853be..9c47cf27 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h
@@ -7,8 +7,8 @@
 //
 //----------------------------------------------------------------------------
 
-#ifndef _KMDI_DOCUMENT_VIEW_TAB_WIDGET_H_
-#define _KMDI_DOCUMENT_VIEW_TAB_WIDGET_H_
+#ifndef _TDEMDI_DOCUMENT_VIEW_TAB_WIDGET_H_
+#define _TDEMDI_DOCUMENT_VIEW_TAB_WIDGET_H_
 
 #include <ktabwidget.h>
 #include <tdemdidefines.h>
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h
index f55207b2..cf853428 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h
@@ -16,8 +16,8 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifndef KMDIGUICLIENT_H
-#define KMDIGUICLIENT_H
+#ifndef TDEMDIGUICLIENT_H
+#define TDEMDIGUICLIENT_H
 
 #include <tqobject.h>
 #include <tqguardedptr.h>
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiiterator.h b/lib/compatibility/tdemdi/qextmdi/tdemdiiterator.h
index 96a24ea4..57c49d0c 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdiiterator.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdiiterator.h
@@ -12,7 +12,7 @@
 //    copyright            : (C) 1999-2003 by Massimo Morin (mmorin@schedsys.com)
 //                                         and
 //                                         Falk Brettschneider
-//    email                :  falkbr@tdevelop.org (Falk Brettschneider)
+//    email                :  falkbr@kdevelop.org (Falk Brettschneider)
 //----------------------------------------------------------------------------
 //
 //----------------------------------------------------------------------------
@@ -24,8 +24,8 @@
 //
 //----------------------------------------------------------------------------
 
-#ifndef _KMDIITERATOR_H_
-#define _KMDIITERATOR_H_
+#ifndef _TDEMDIITERATOR_H_
+#define _TDEMDIITERATOR_H_
 
 
 template <class Item>
@@ -46,6 +46,6 @@ protected:
 }
 ;
 
-#endif // _KMDIITERATOR_H_ 
+#endif // _TDEMDIITERATOR_H_ 
 // kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
 
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdilistiterator.h b/lib/compatibility/tdemdi/qextmdi/tdemdilistiterator.h
index de7c8f9c..ead83413 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdilistiterator.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdilistiterator.h
@@ -12,7 +12,7 @@
 //    copyright            : (C) 1999-2003 by Massimo Morin (mmorin@schedsys.com)
 //                                         and
 //                                         Falk Brettschneider
-//    email                :  falkbr@tdevelop.org (Falk Brettschneider)
+//    email                :  falkbr@kdevelop.org (Falk Brettschneider)
 //----------------------------------------------------------------------------
 //
 //----------------------------------------------------------------------------
@@ -24,8 +24,8 @@
 //
 //----------------------------------------------------------------------------
 
-#ifndef _KMDILISTITERATOR_H_
-#define _KMDILISTITERATOR_H_
+#ifndef _TDEMDILISTITERATOR_H_
+#define _TDEMDILISTITERATOR_H_
 
 #include <tdemdiiterator.h>
 
@@ -56,6 +56,6 @@ private:
 	TQPtrListIterator<Item> *m_iterator;
 };
 
-#endif // _KMDILISTITERATOR_H_ 
+#endif // _TDEMDILISTITERATOR_H_ 
 // kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
 
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
index 050c0256..2b1dfea6 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
@@ -16,7 +16,7 @@
 //    copyright            : (C) 1999-2003 by Szymon Stefanek (stefanek@tin.it)
 //                                         and
 //                                         Falk Brettschneider
-//    email                :  falkbr@tdevelop.org (Falk Brettschneider)
+//    email                :  falkbr@kdevelop.org (Falk Brettschneider)
 //----------------------------------------------------------------------------
 //
 //----------------------------------------------------------------------------
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h
index 14996638..590a1538 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h
@@ -16,7 +16,7 @@
 //    copyright            : (C) 1999-2003 by Falk Brettschneider
 //                                         and
 //                                         Szymon Stefanek (stefanek@tin.it)
-//    email                :  falkbr@tdevelop.org (Falk Brettschneider)
+//    email                :  falkbr@kdevelop.org (Falk Brettschneider)
 //----------------------------------------------------------------------------
 //
 //----------------------------------------------------------------------------
@@ -28,8 +28,8 @@
 //
 //----------------------------------------------------------------------------
 
-#ifndef _KMDIMAINFRM_H_
-#define _KMDIMAINFRM_H_
+#ifndef _TDEMDIMAINFRM_H_
+#define _TDEMDIMAINFRM_H_
 
 #include <tdeparts/dockmainwindow.h>
 #include <tdemenubar.h>
@@ -868,6 +868,6 @@ signals:
 	void toggleBottom();
 };
 
-#endif //_KMDIMAINFRM_H_
+#endif //_TDEMDIMAINFRM_H_
 
 // kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdinulliterator.h b/lib/compatibility/tdemdi/qextmdi/tdemdinulliterator.h
index ff9a17c3..59ffed85 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdinulliterator.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdinulliterator.h
@@ -12,7 +12,7 @@
 //    copyright            : (C) 1999-2003 by Massimo Morin (mmorin@schedsys.com)
 //                                         and
 //                                         Falk Brettschneider
-//    email                :  falkbr@tdevelop.org (Falk Brettschneider)
+//    email                :  falkbr@kdevelop.org (Falk Brettschneider)
 //----------------------------------------------------------------------------
 //
 //----------------------------------------------------------------------------
@@ -24,8 +24,8 @@
 //
 //----------------------------------------------------------------------------
 
-#ifndef _KMDINULLITERATOR_H_
-#define _KMDINULLITERATOR_H_
+#ifndef _TDEMDINULLITERATOR_H_
+#define _TDEMDINULLITERATOR_H_
 
 #include "tdemdiiterator.h"
 
@@ -44,6 +44,6 @@ public:
    }
 };
 
-#endif // _KMDINULLITERATOR_H_
+#endif // _TDEMDINULLITERATOR_H_
 // kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
 
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp
index 6de04e4c..207217dc 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp
@@ -14,7 +14,7 @@
 //    copyright            : (C) 1999-2003 by Szymon Stefanek (stefanek@tin.it)
 //                                         and
 //                                         Falk Brettschneider
-//    email                :  falkbr@tdevelop.org (Falk Brettschneider)
+//    email                :  falkbr@kdevelop.org (Falk Brettschneider)
 //----------------------------------------------------------------------------
 //
 //----------------------------------------------------------------------------
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h
index 8ff55a74..59ccfadb 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h
@@ -13,7 +13,7 @@
 //    copyright            : (C) 1999-2003 by Falk Brettschneider
 //                                         and
 //                                         Szymon Stefanek (stefanek@tin.it)
-//    email                :  falkbr@tdevelop.org (Falk Brettschneider)
+//    email                :  falkbr@kdevelop.org (Falk Brettschneider)
 //----------------------------------------------------------------------------
 //
 //----------------------------------------------------------------------------
@@ -25,8 +25,8 @@
 //
 //----------------------------------------------------------------------------
 
-#ifndef _KMDITASKBAR_H_
-#define _KMDITASKBAR_H_
+#ifndef _TDEMDITASKBAR_H_
+#define _TDEMDITASKBAR_H_
 
 #include <tdetoolbar.h>
 #include <tqptrlist.h>
@@ -216,6 +216,6 @@ private:
 	KMdiTaskBarPrivate *d;
 };
 
-#endif //_KMDITASKBAR_H_ 
+#endif //_TDEMDITASKBAR_H_ 
 // kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
 
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.h b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.h
index d03bdfce..f5bbcf6c 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.h
@@ -18,8 +18,8 @@
 //    License, or (at your option) any later version.
 //
 //----------------------------------------------------------------------------
-#ifndef _KMDITOOLVIEWACCESSOR_H_
-#define _KMDITOOLVIEWACCESSOR_H_
+#ifndef _TDEMDITOOLVIEWACCESSOR_H_
+#define _TDEMDITOOLVIEWACCESSOR_H_
 
 #include <tqwidget.h>
 #include <tqpixmap.h>
@@ -82,6 +82,6 @@ protected:
 };
 
 
-#endif //_KMDITOOLVIEWACCESSOR_H_ 
+#endif //_TDEMDITOOLVIEWACCESSOR_H_ 
 // kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
 
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.h b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.h
index a299e8f5..edec8ee4 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.h
@@ -22,8 +22,8 @@
     Boston, MA 02110-1301, USA.
  ***************************************************************************/
 
-#ifndef _KMultitabbar_h_
-#define _KMultitabbar_h_
+#ifndef _TDEMultitabbar_h_
+#define _TDEMultitabbar_h_
 
 #include <tqscrollview.h>
 #include <tqvbox.h>
@@ -51,7 +51,7 @@ class KMultiTabBarInternal;
  * should be raisable is left to the "user".
  *@author Joseph Wenninger
  */
-class KUTILS_EXPORT KMultiTabBar: public TQWidget
+class TDEUTILS_EXPORT KMultiTabBar: public TQWidget
 {
 	Q_OBJECT
   
@@ -152,7 +152,7 @@ private:
 /**
  * This class should never be created except with the appendButton call of KMultiTabBar
  */
-class KUTILS_EXPORT KMultiTabBarButton: public TQPushButton
+class TDEUTILS_EXPORT KMultiTabBarButton: public TQPushButton
 {
 	Q_OBJECT
   
@@ -205,7 +205,7 @@ protected slots:
 /**
  * This class should never be created except with the appendTab call of KMultiTabBar
  */
-class KUTILS_EXPORT KMultiTabBarTab: public KMultiTabBarButton
+class TDEUTILS_EXPORT KMultiTabBarTab: public KMultiTabBarButton
 {
 	Q_OBJECT
   
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemultitabbar_p.h b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar_p.h
index 7a1c6714..878f3ff0 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemultitabbar_p.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar_p.h
@@ -22,8 +22,8 @@
     Boston, MA 02110-1301, USA.
  ***************************************************************************/
 
-#ifndef K_MULTI_TAB_BAR_P_H
-#define K_MULTI_TAB_BAR_P_H
+#ifndef TDE_MULTI_TAB_BAR_P_H
+#define TDE_MULTI_TAB_BAR_P_H
 #include <tqscrollview.h>
 #include <tdemultitabbar.h>