Rename a number of libraries and executables to avoid conflicts with KDE4

68 files changed, 156 insertions, 156 deletions

diff --git a/lib/compatibility/Makefile.am b/lib/compatibility/Makefile.am
index 63242e4b..0ea03547 100644
--- a/lib/compatibility/Makefile.am
+++ b/lib/compatibility/Makefile.am
@@ -1,5 +1,5 @@
 if include_qextmdi
-KMDI_SUBDIR = kmdi
+KMDI_SUBDIR = tdemdi
 endif
 
 if include_knewstuff
diff --git a/lib/compatibility/kmdi/qextmdi/Makefile.am b/lib/compatibility/kmdi/qextmdi/Makefile.am
deleted file mode 100644
index 9c683679..00000000
--- a/lib/compatibility/kmdi/qextmdi/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-# Here resides the qextmdi library.
-
-INCLUDES = -I$(top_srcdir)/lib/compatibility/kmdi/qextmdi/res -I$(top_builddir)/lib/compatibility/kmdi/qextmdi $(all_includes)
-
-noinst_LTLIBRARIES = libquantaqextmdi.la
-libquantaqextmdi_la_LDFLAGS = $(all_libraries)
-libquantaqextmdi_la_LIBADD = $(LIB_KPARTS)
-
-libquantaqextmdi_la_SOURCES =    kmdichildarea.cpp kmdichildfrm.cpp kmdichildfrmcaption.cpp \
-				kmdichildview.cpp kmdimainfrm.cpp kmditaskbar.cpp  \
-				kmultitabbar.cpp \
-				kmditoolviewaccessor.cpp kmdidocumentviewtabwidget.cpp kmdifocuslist.cpp \
-				kmdiguiclient.cpp \
-				ktabwidget.cpp ktabbar.cpp kdockwidget.cpp kdockwidget_private.cpp kmdidockcontainer.cpp
-
-METASOURCES = AUTO
-
-#AM_CXXFLAGS = -DNO_INCLUDE_MOCFILES
diff --git a/lib/compatibility/kmdi/Makefile.am b/lib/compatibility/tdemdi/Makefile.am
index 3fdc0cfb..8ec83abb 100644
--- a/lib/compatibility/kmdi/Makefile.am
+++ b/lib/compatibility/tdemdi/Makefile.am
@@ -5,10 +5,10 @@
 
 INCLUDES = $(all_includes)
 
-noinst_LTLIBRARIES = libquantakmdi.la
-libquantakmdi_la_LDFLAGS = $(all_libraries) -no-undefined
-libquantakmdi_la_LIBADD = $(top_builddir)/lib/compatibility/kmdi/qextmdi/libquantaqextmdi.la -lktexteditor $(LIB_KPARTS) $(LIB_KIO)
-libquantakmdi_la_SOURCES = dummy.cpp
+noinst_LTLIBRARIES = libquantatdemdi.la
+libquantatdemdi_la_LDFLAGS = $(all_libraries) -no-undefined
+libquantatdemdi_la_LIBADD = $(top_builddir)/lib/compatibility/tdemdi/qextmdi/libquantaqextmdi.la -ltdetexteditor $(LIB_KPARTS) $(LIB_KIO)
+libquantatdemdi_la_SOURCES = dummy.cpp
 
 
 SUBDIRS = qextmdi
diff --git a/lib/compatibility/kmdi/dummy.cpp b/lib/compatibility/tdemdi/dummy.cpp
index 8d1c8b69..8d1c8b69 100644
--- a/lib/compatibility/kmdi/dummy.cpp
+++ b/lib/compatibility/tdemdi/dummy.cpp
diff --git a/lib/compatibility/tdemdi/qextmdi/Makefile.am b/lib/compatibility/tdemdi/qextmdi/Makefile.am
new file mode 100644
index 00000000..fb8e6d02
--- /dev/null
+++ b/lib/compatibility/tdemdi/qextmdi/Makefile.am
@@ -0,0 +1,18 @@
+# Here resides the qextmdi library.
+
+INCLUDES = -I$(top_srcdir)/lib/compatibility/tdemdi/qextmdi/res -I$(top_builddir)/lib/compatibility/tdemdi/qextmdi $(all_includes)
+
+noinst_LTLIBRARIES = libquantaqextmdi.la
+libquantaqextmdi_la_LDFLAGS = $(all_libraries)
+libquantaqextmdi_la_LIBADD = $(LIB_KPARTS)
+
+libquantaqextmdi_la_SOURCES =    tdemdichildarea.cpp tdemdichildfrm.cpp tdemdichildfrmcaption.cpp \
+				tdemdichildview.cpp tdemdimainfrm.cpp tdemditaskbar.cpp  \
+				tdemultitabbar.cpp \
+				tdemditoolviewaccessor.cpp tdemdidocumentviewtabwidget.cpp tdemdifocuslist.cpp \
+				tdemdiguiclient.cpp \
+				ktabwidget.cpp ktabbar.cpp kdockwidget.cpp kdockwidget_private.cpp tdemdidockcontainer.cpp
+
+METASOURCES = AUTO
+
+#AM_CXXFLAGS = -DNO_INCLUDE_MOCFILES
diff --git a/lib/compatibility/kmdi/qextmdi/kdemacros.h.in b/lib/compatibility/tdemdi/qextmdi/kdemacros.h.in
index 008bac11..008bac11 100644
--- a/lib/compatibility/kmdi/qextmdi/kdemacros.h.in
+++ b/lib/compatibility/tdemdi/qextmdi/kdemacros.h.in
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
index 47e2d71d..47e2d71d 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.h b/lib/compatibility/tdemdi/qextmdi/kdockwidget.h
index 5b355867..5b355867 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget.h
+++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.h
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h b/lib/compatibility/tdemdi/qextmdi/kdockwidget_p.h
index 471c4d9b..471c4d9b 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h
+++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget_p.h
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.cpp
index ef60f031..ef60f031 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.cpp
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h b/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.h
index 1a4d021f..1a4d021f 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h
+++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.h
diff --git a/lib/compatibility/kmdi/qextmdi/ktabbar.cpp b/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp
index a3fa51c8..a3fa51c8 100644
--- a/lib/compatibility/kmdi/qextmdi/ktabbar.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp
diff --git a/lib/compatibility/kmdi/qextmdi/ktabbar.h b/lib/compatibility/tdemdi/qextmdi/ktabbar.h
index 53e87c8b..53e87c8b 100644
--- a/lib/compatibility/kmdi/qextmdi/ktabbar.h
+++ b/lib/compatibility/tdemdi/qextmdi/ktabbar.h
diff --git a/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp b/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp
index 2320fb90..041143d9 100644
--- a/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp
@@ -407,7 +407,7 @@ void KTabWidget::moveTab( int from, int to )
     blockSignals(true);
     removePage( w );
 
-    // Work-around kmdi brain damage which calls showPage() in insertTab()
+    // Work-around tdemdi brain damage which calls showPage() in insertTab()
     TQTab * t = new TQTab();
     t->setText(tablabel);
     TQTabWidget::insertTab( w, t, to );
diff --git a/lib/compatibility/kmdi/qextmdi/ktabwidget.h b/lib/compatibility/tdemdi/qextmdi/ktabwidget.h
index 5c9ba940..5c9ba940 100644
--- a/lib/compatibility/kmdi/qextmdi/ktabwidget.h
+++ b/lib/compatibility/tdemdi/qextmdi/ktabwidget.h
diff --git a/lib/compatibility/kmdi/qextmdi/res/filenew.xpm b/lib/compatibility/tdemdi/qextmdi/res/filenew.xpm
index b261800d..b261800d 100644
--- a/lib/compatibility/kmdi/qextmdi/res/filenew.xpm
+++ b/lib/compatibility/tdemdi/qextmdi/res/filenew.xpm
diff --git a/lib/compatibility/kmdi/qextmdi/res/kde2_closebutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde2_closebutton.xpm
index 5c05e714..5c05e714 100644
--- a/lib/compatibility/kmdi/qextmdi/res/kde2_closebutton.xpm
+++ b/lib/compatibility/tdemdi/qextmdi/res/kde2_closebutton.xpm
diff --git a/lib/compatibility/kmdi/qextmdi/res/kde2_maxbutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde2_maxbutton.xpm
index c8ef8113..c8ef8113 100644
--- a/lib/compatibility/kmdi/qextmdi/res/kde2_maxbutton.xpm
+++ b/lib/compatibility/tdemdi/qextmdi/res/kde2_maxbutton.xpm
diff --git a/lib/compatibility/kmdi/qextmdi/res/kde2_minbutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde2_minbutton.xpm
index 98669195..98669195 100644
--- a/lib/compatibility/kmdi/qextmdi/res/kde2_minbutton.xpm
+++ b/lib/compatibility/tdemdi/qextmdi/res/kde2_minbutton.xpm
diff --git a/lib/compatibility/kmdi/qextmdi/res/kde2_restorebutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde2_restorebutton.xpm
index a6e01fcb..a6e01fcb 100644
--- a/lib/compatibility/kmdi/qextmdi/res/kde2_restorebutton.xpm
+++ b/lib/compatibility/tdemdi/qextmdi/res/kde2_restorebutton.xpm
diff --git a/lib/compatibility/kmdi/qextmdi/res/kde2_undockbutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde2_undockbutton.xpm
index 711bf01c..711bf01c 100644
--- a/lib/compatibility/kmdi/qextmdi/res/kde2_undockbutton.xpm
+++ b/lib/compatibility/tdemdi/qextmdi/res/kde2_undockbutton.xpm
diff --git a/lib/compatibility/kmdi/qextmdi/res/kde2laptop_closebutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde2laptop_closebutton.xpm
index 6801e4e3..6801e4e3 100644
--- a/lib/compatibility/kmdi/qextmdi/res/kde2laptop_closebutton.xpm
+++ b/lib/compatibility/tdemdi/qextmdi/res/kde2laptop_closebutton.xpm
diff --git a/lib/compatibility/kmdi/qextmdi/res/kde2laptop_closebutton_menu.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde2laptop_closebutton_menu.xpm
index 9d071231..9d071231 100644
--- a/lib/compatibility/kmdi/qextmdi/res/kde2laptop_closebutton_menu.xpm
+++ b/lib/compatibility/tdemdi/qextmdi/res/kde2laptop_closebutton_menu.xpm
diff --git a/lib/compatibility/kmdi/qextmdi/res/kde2laptop_maxbutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde2laptop_maxbutton.xpm
index b8ce6de2..b8ce6de2 100644
--- a/lib/compatibility/kmdi/qextmdi/res/kde2laptop_maxbutton.xpm
+++ b/lib/compatibility/tdemdi/qextmdi/res/kde2laptop_maxbutton.xpm
diff --git a/lib/compatibility/kmdi/qextmdi/res/kde2laptop_minbutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde2laptop_minbutton.xpm
index 6bcf76c5..6bcf76c5 100644
--- a/lib/compatibility/kmdi/qextmdi/res/kde2laptop_minbutton.xpm
+++ b/lib/compatibility/tdemdi/qextmdi/res/kde2laptop_minbutton.xpm
diff --git a/lib/compatibility/kmdi/qextmdi/res/kde2laptop_restorebutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde2laptop_restorebutton.xpm
index 803ce6db..803ce6db 100644
--- a/lib/compatibility/kmdi/qextmdi/res/kde2laptop_restorebutton.xpm
+++ b/lib/compatibility/tdemdi/qextmdi/res/kde2laptop_restorebutton.xpm
diff --git a/lib/compatibility/kmdi/qextmdi/res/kde2laptop_undockbutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde2laptop_undockbutton.xpm
index 1f23ecaf..1f23ecaf 100644
--- a/lib/compatibility/kmdi/qextmdi/res/kde2laptop_undockbutton.xpm
+++ b/lib/compatibility/tdemdi/qextmdi/res/kde2laptop_undockbutton.xpm
diff --git a/lib/compatibility/kmdi/qextmdi/res/kde_closebutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde_closebutton.xpm
index e714359a..e714359a 100644
--- a/lib/compatibility/kmdi/qextmdi/res/kde_closebutton.xpm
+++ b/lib/compatibility/tdemdi/qextmdi/res/kde_closebutton.xpm
diff --git a/lib/compatibility/kmdi/qextmdi/res/kde_maxbutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde_maxbutton.xpm
index 2af3bf88..2af3bf88 100644
--- a/lib/compatibility/kmdi/qextmdi/res/kde_maxbutton.xpm
+++ b/lib/compatibility/tdemdi/qextmdi/res/kde_maxbutton.xpm
diff --git a/lib/compatibility/kmdi/qextmdi/res/kde_minbutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde_minbutton.xpm
index c4e609ae..c4e609ae 100644
--- a/lib/compatibility/kmdi/qextmdi/res/kde_minbutton.xpm
+++ b/lib/compatibility/tdemdi/qextmdi/res/kde_minbutton.xpm
diff --git a/lib/compatibility/kmdi/qextmdi/res/kde_restorebutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde_restorebutton.xpm
index 4ec18513..4ec18513 100644
--- a/lib/compatibility/kmdi/qextmdi/res/kde_restorebutton.xpm
+++ b/lib/compatibility/tdemdi/qextmdi/res/kde_restorebutton.xpm
diff --git a/lib/compatibility/kmdi/qextmdi/res/kde_undockbutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/kde_undockbutton.xpm
index de97e9e7..de97e9e7 100644
--- a/lib/compatibility/kmdi/qextmdi/res/kde_undockbutton.xpm
+++ b/lib/compatibility/tdemdi/qextmdi/res/kde_undockbutton.xpm
diff --git a/lib/compatibility/kmdi/qextmdi/res/win_closebutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/win_closebutton.xpm
index d8be0243..d8be0243 100644
--- a/lib/compatibility/kmdi/qextmdi/res/win_closebutton.xpm
+++ b/lib/compatibility/tdemdi/qextmdi/res/win_closebutton.xpm
diff --git a/lib/compatibility/kmdi/qextmdi/res/win_maxbutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/win_maxbutton.xpm
index 95e501a8..95e501a8 100644
--- a/lib/compatibility/kmdi/qextmdi/res/win_maxbutton.xpm
+++ b/lib/compatibility/tdemdi/qextmdi/res/win_maxbutton.xpm
diff --git a/lib/compatibility/kmdi/qextmdi/res/win_minbutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/win_minbutton.xpm
index 1e8787e7..1e8787e7 100644
--- a/lib/compatibility/kmdi/qextmdi/res/win_minbutton.xpm
+++ b/lib/compatibility/tdemdi/qextmdi/res/win_minbutton.xpm
diff --git a/lib/compatibility/kmdi/qextmdi/res/win_restorebutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/win_restorebutton.xpm
index 87bb5b30..87bb5b30 100644
--- a/lib/compatibility/kmdi/qextmdi/res/win_restorebutton.xpm
+++ b/lib/compatibility/tdemdi/qextmdi/res/win_restorebutton.xpm
diff --git a/lib/compatibility/kmdi/qextmdi/res/win_undockbutton.xpm b/lib/compatibility/tdemdi/qextmdi/res/win_undockbutton.xpm
index 386ebd8a..386ebd8a 100644
--- a/lib/compatibility/kmdi/qextmdi/res/win_undockbutton.xpm
+++ b/lib/compatibility/tdemdi/qextmdi/res/win_undockbutton.xpm
diff --git a/lib/compatibility/kmdi/qextmdi/tdelibs_export.h b/lib/compatibility/tdemdi/qextmdi/tdelibs_export.h
index 57c2f0aa..57c2f0aa 100644
--- a/lib/compatibility/kmdi/qextmdi/tdelibs_export.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdelibs_export.h
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp
index 1ba89270..91dcb4cd 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdichildarea.cpp
+//    filename             : tdemdichildarea.cpp
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -25,10 +25,10 @@
 //
 //----------------------------------------------------------------------------
 
-#include "kmdichildarea.h"
-#include "kmdichildarea.moc"
+#include "tdemdichildarea.h"
+#include "tdemdichildarea.moc"
 
-#include "kmdidefines.h"
+#include "tdemdidefines.h"
 
 #include <kconfig.h>
 #include <kdebug.h>
@@ -46,7 +46,7 @@
 //============ KMdiChildArea ============//
 
 KMdiChildArea::KMdiChildArea( TQWidget *parent )
-		: TQFrame( parent, "kmdi_childarea" )
+		: TQFrame( parent, "tdemdi_childarea" )
 {
 	setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
 	m_captionFont = TQFont();
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildarea.h b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.h
index 09624887..137ef275 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildarea.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdichildarea.h
+//    filename             : tdemdichildarea.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -31,8 +31,8 @@
 #include <tqframe.h>
 #include <tqptrlist.h>
 
-#include "kmdichildfrm.h"
-#include "kmdichildview.h"
+#include "tdemdichildfrm.h"
+#include "tdemdichildview.h"
 
 class KMdiChildAreaPrivate;
 
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp
index 7a5620c5..4e6586f7 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdichildfrm.cpp
+//    filename             : tdemdichildfrm.cpp
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -27,13 +27,13 @@
 //
 //----------------------------------------------------------------------------
 
-#include "kmdichildfrm.h"
-#include "kmdichildfrm.moc"
+#include "tdemdichildfrm.h"
+#include "tdemdichildfrm.moc"
 
-#include "kmdidefines.h"
-#include "kmdichildfrmcaption.h"
-#include "kmdichildarea.h"
-#include "kmdimainfrm.h"
+#include "tdemdidefines.h"
+#include "tdemdichildfrmcaption.h"
+#include "tdemdichildarea.h"
+#include "tdemdimainfrm.h"
 
 #include <tqpainter.h>
 #include <tqapplication.h>
@@ -99,7 +99,7 @@ void KMdiWin32IconButton::mousePressEvent( TQMouseEvent* )
 //============ KMdiChildFrm ============//
 
 KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent )
-	: TQFrame( parent, "kmdi_childfrm" )
+	: TQFrame( parent, "tdemdi_childfrm" )
 	, m_pClient( 0L )
 	, m_pManager( 0L )
 	, m_pCaption( 0L )
@@ -131,12 +131,12 @@ KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent )
 
 	m_pManager = parent;
 
-	m_pWinIcon = new KMdiWin32IconButton( m_pCaption, "kmdi_iconbutton_icon" );
-	m_pUnixIcon = new TQToolButton( m_pCaption, "kmdi_toolbutton_icon" );
-	m_pMinimize = new TQToolButton( m_pCaption, "kmdi_toolbutton_min" );
-	m_pMaximize = new TQToolButton( m_pCaption, "kmdi_toolbutton_max" );
-	m_pClose = new TQToolButton( m_pCaption, "kmdi_toolbutton_close" );
-	m_pUndock = new TQToolButton( m_pCaption, "kmdi_toolbutton_undock" );
+	m_pWinIcon = new KMdiWin32IconButton( m_pCaption, "tdemdi_iconbutton_icon" );
+	m_pUnixIcon = new TQToolButton( m_pCaption, "tdemdi_toolbutton_icon" );
+	m_pMinimize = new TQToolButton( m_pCaption, "tdemdi_toolbutton_min" );
+	m_pMaximize = new TQToolButton( m_pCaption, "tdemdi_toolbutton_max" );
+	m_pClose = new TQToolButton( m_pCaption, "tdemdi_toolbutton_close" );
+	m_pUndock = new TQToolButton( m_pCaption, "tdemdi_toolbutton_undock" );
 
 	TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) );
 	TQObject::connect( m_pMaximize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( maximizePressed() ) );
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.h
index c244cd94..54bdbe84 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdichildfrm.h
+//    filename             : tdemdichildfrm.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -37,7 +37,7 @@
 
 #include <tqdict.h>
 
-#include "kmdichildfrmcaption.h"
+#include "tdemdichildfrmcaption.h"
 
 class KMdiChildArea;
 class KMdiChildView;
@@ -62,7 +62,7 @@ signals:
 };
 
 //==============================================================================
-/* some special events, see kmdidefines.h
+/* some special events, see tdemdidefines.h
 */ 
 //------------------------------------------------------------------------------
 /**
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp
index ed4ba2d6..ca8c3e28 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdichildfrmcaption.cpp
+//    filename             : tdemdichildfrmcaption.cpp
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -25,8 +25,8 @@
 //
 //----------------------------------------------------------------------------
 
-#include "kmdichildfrmcaption.h"
-#include "kmdichildfrmcaption.moc"
+#include "tdemdichildfrmcaption.h"
+#include "tdemdichildfrmcaption.moc"
 
 #include <tqpainter.h>
 #include <tqapplication.h>
@@ -34,10 +34,10 @@
 #include <tqtoolbutton.h>
 #include <tqpopupmenu.h>
 
-#include "kmdidefines.h"
-#include "kmdichildfrm.h"
-#include "kmdichildarea.h"
-#include "kmdimainfrm.h"
+#include "tdemdidefines.h"
+#include "tdemdichildfrm.h"
+#include "tdemdichildarea.h"
+#include "tdemdimainfrm.h"
 #include <klocale.h>
 #include <iostream>
 
@@ -66,7 +66,7 @@
 //============== KMdiChildFrmCaption =============//
 
 KMdiChildFrmCaption::KMdiChildFrmCaption( KMdiChildFrm *parent )
-		: TQWidget( parent, "kmdi_childfrmcaption" )
+		: TQWidget( parent, "tdemdi_childfrmcaption" )
 {
 	m_szCaption = i18n( "Unnamed" );
 	m_bActive = false;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.h b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.h
index 0b84339a..f25fe4b4 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdichildfrmcaption.h
+//    filename             : tdemdichildfrmcaption.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -29,7 +29,7 @@
 
 #include <tqwidget.h>
 
-#include "kmdidefines.h"
+#include "tdemdidefines.h"
 
 class KMdiChildFrm;
 
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp
index 7ccf2927..69b4effd 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdichildview.cpp
+//    filename             : tdemdichildview.cpp
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -29,15 +29,15 @@
 //
 //----------------------------------------------------------------------------
 
-#include "kmdichildview.h"
-#include "kmdichildview.moc"
+#include "tdemdichildview.h"
+#include "tdemdichildview.moc"
 
 #include <tqdatetime.h>
 #include <tqobjectlist.h>
 
-#include "kmdimainfrm.h"
-#include "kmdichildfrm.h"
-#include "kmdidefines.h"
+#include "tdemdimainfrm.h"
+#include "tdemdichildfrm.h"
+#include "tdemdidefines.h"
 #include <kdebug.h>
 #include <klocale.h>
 #include <tqiconset.h>
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildview.h b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.h
index 2d5c9681..d459f663 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildview.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdichildview.h
+//    filename             : tdemdichildview.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -37,7 +37,7 @@
 #include <tqapplication.h>
 #include <tqdatetime.h>
 
-#include "kmdichildfrm.h"
+#include "tdemdichildfrm.h"
 
 class KMdiChildViewPrivate;
 
diff --git a/lib/compatibility/kmdi/qextmdi/kmdidefines.h b/lib/compatibility/tdemdi/qextmdi/tdemdidefines.h
index ce41244a..389304f6 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdidefines.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdidefines.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdidefines.h
+//    filename             : tdemdidefines.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
diff --git a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp
index 173cb723..80307785 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp
@@ -17,9 +17,9 @@
  Boston, MA 02110-1301, USA.
 */
 
-#include "kmdimainfrm.h"
-#include "kmdidockcontainer.h"
-#include "kmdidockcontainer.moc"
+#include "tdemdimainfrm.h"
+#include "tdemdidockcontainer.h"
+#include "tdemdidockcontainer.moc"
 
 #include "kdockwidget_private.h"
 
@@ -27,7 +27,7 @@
 #include <tqlayout.h>
 #include <tqtimer.h>
 #include <tqtooltip.h>
-#include <kmultitabbar.h>
+#include <tdemultitabbar.h>
 #include <kglobalsettings.h>
 
 #include <kdebug.h>
@@ -37,7 +37,7 @@
 #include <klocale.h>
 
 //TODO: Well, this is already defined in tdeui/kdockwidget.cpp
-static const char* const kmdi_not_close_xpm[] =
+static const char* const tdemdi_not_close_xpm[] =
     {
         "5 5 2 1",
         "# c black",
@@ -215,7 +215,7 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const
 			TQToolTip::add( btn, i18n( "Switch between overlap and side by side mode", "Overlap" ) );
 
 			btn->setToggleButton( true );
-			btn->setPixmap( const_cast< const char** >( kmdi_not_close_xpm ) );
+			btn->setPixmap( const_cast< const char** >( tdemdi_not_close_xpm ) );
 			hdr->addButton( btn );
 			m_overlapButtons.insert( w, btn );
 			btn->setOn( !isOverlapMode() );
diff --git a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.h
index 5f1f5dcc..5f1f5dcc 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.h
diff --git a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp
index f62b6056..575fa2b2 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp
@@ -9,7 +9,7 @@
 
 #include <ktabbar.h>
 #include <kpopupmenu.h>
-#include "kmdidocumentviewtabwidget.h"
+#include "tdemdidocumentviewtabwidget.h"
 
 KMdiDocumentViewTabWidget::KMdiDocumentViewTabWidget( TQWidget* parent, const char* name ) : KTabWidget( parent, name )
 {
@@ -145,7 +145,7 @@ KMdi::TabWidgetVisibility KMdiDocumentViewTabWidget::tabWidgetVisibility( )
 
 
 #ifndef NO_INCLUDE_MOCFILES
-#include "kmdidocumentviewtabwidget.moc"
+#include "tdemdidocumentviewtabwidget.moc"
 #endif
 
 // kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.h b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h
index 3dbf9b52..4678f0f8 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h
@@ -11,7 +11,7 @@
 #define _KMDI_DOCUMENT_VIEW_TAB_WIDGET_H_
 
 #include <ktabwidget.h>
-#include <kmdidefines.h>
+#include <tdemdidefines.h>
 
 class KPopupMenu;
 
diff --git a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.cpp
index e8f71ff2..a4592e38 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.cpp
@@ -16,8 +16,8 @@
   Boston, MA 02110-1301, USA.
 */
 
-#include "kmdifocuslist.h"
-#include "kmdifocuslist.moc"
+#include "tdemdifocuslist.h"
+#include "tdemdifocuslist.moc"
 #include <tqobjectlist.h>
 #include <kdebug.h>
 
diff --git a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.h b/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.h
index f3c70ad1..f3c70ad1 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.h
diff --git a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
index 34c25f0d..e326cc26 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
@@ -17,8 +17,8 @@
   Boston, MA 02110-1301, USA.
 */
 
-#include "kmdiguiclient.h"
-#include "kmdiguiclient.moc"
+#include "tdemdiguiclient.h"
+#include "tdemdiguiclient.moc"
 
 #include <tqpopupmenu.h>
 #include <kapplication.h>
@@ -32,12 +32,12 @@
 #include <kdebug.h>
 #include <kdockwidget.h>
 #include <tdeversion.h>
-#include "kmdimainfrm.h"
-#include "kmditoolviewaccessor.h"
-#include "kmditoolviewaccessor_p.h"
+#include "tdemdimainfrm.h"
+#include "tdemditoolviewaccessor.h"
+#include "tdemditoolviewaccessor_p.h"
 namespace
 {
-const char *actionListName = "show_kmdi_document_tool_view_actions";
+const char *actionListName = "show_tdemdi_document_tool_view_actions";
 
 const char *guiDescription = ""
                              "<!DOCTYPE kpartgui><kpartgui name=\"KMDIViewActions\">"
@@ -48,7 +48,7 @@ const char *guiDescription = ""
                              "</MenuBar>"
                              "</kpartgui>";
 
-const char *resourceFileName = "kmdiviewactions.rc";
+const char *resourceFileName = "tdemdiviewactions.rc";
 
 }
 
@@ -136,7 +136,7 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
 
 	if ( actionCollection() ->kaccel() == 0 )
 		actionCollection() ->setWidget( mdiMainFrm );
-	m_toolMenu = new KActionMenu( i18n( "Tool &Views" ), actionCollection(), "kmdi_toolview_menu" );
+	m_toolMenu = new KActionMenu( i18n( "Tool &Views" ), actionCollection(), "tdemdi_toolview_menu" );
 	if ( showMDIModeAction )
 	{
 		m_mdiModeAction = new KSelectAction( i18n( "MDI Mode" ), 0, actionCollection() );
@@ -151,20 +151,20 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
 	connect( m_mdiMainFrm, TQT_SIGNAL( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ),
 	         this, TQT_SLOT( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ) );
 
-	m_gotoToolDockMenu = new KActionMenu( i18n( "Tool &Docks" ), actionCollection(), "kmdi_tooldock_menu" );
+	m_gotoToolDockMenu = new KActionMenu( i18n( "Tool &Docks" ), actionCollection(), "tdemdi_tooldock_menu" );
 	m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Top Dock" ), ALT + CTRL + SHIFT + Key_T, TQT_TQOBJECT(this), TQT_SIGNAL( toggleTop() ),
-	                            actionCollection(), "kmdi_activate_top" ) );
+	                            actionCollection(), "tdemdi_activate_top" ) );
 	m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Left Dock" ), ALT + CTRL + SHIFT + Key_L, TQT_TQOBJECT(this), TQT_SIGNAL( toggleLeft() ),
-	                            actionCollection(), "kmdi_activate_left" ) );
+	                            actionCollection(), "tdemdi_activate_left" ) );
 	m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Right Dock" ), ALT + CTRL + SHIFT + Key_R, TQT_TQOBJECT(this), TQT_SIGNAL( toggleRight() ),
-	                            actionCollection(), "kmdi_activate_right" ) );
+	                            actionCollection(), "tdemdi_activate_right" ) );
 	m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, TQT_TQOBJECT(this), TQT_SIGNAL( toggleBottom() ),
-	                            actionCollection(), "kmdi_activate_bottom" ) );
-	m_gotoToolDockMenu->insert( new KActionSeparator( actionCollection(), "kmdi_goto_menu_separator" ) );
+	                            actionCollection(), "tdemdi_activate_bottom" ) );
+	m_gotoToolDockMenu->insert( new KActionSeparator( actionCollection(), "tdemdi_goto_menu_separator" ) );
 	m_gotoToolDockMenu->insert( new KAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( prevToolViewInDock() ),
-	                            actionCollection(), "kmdi_prev_toolview" ) );
+	                            actionCollection(), "tdemdi_prev_toolview" ) );
 	m_gotoToolDockMenu->insert( new KAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( nextToolViewInDock() ),
-	                            actionCollection(), "kmdi_next_toolview" ) );
+	                            actionCollection(), "tdemdi_next_toolview" ) );
 
 	actionCollection() ->readShortcutSettings( "Shortcuts", kapp->config() );
 }
@@ -247,7 +247,7 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva )
 {
 	kdDebug( 760 ) << "*****void KMDIGUIClient::addToolView(KMdiToolViewAccessor* mtva)*****" << endl;
 	//	kdDebug()<<"name: "<<mtva->wrappedWidget()->name()<<endl;
-	TQString aname = TQString( "kmdi_toolview_" ) + mtva->wrappedWidget() ->name();
+	TQString aname = TQString( "tdemdi_toolview_" ) + mtva->wrappedWidget() ->name();
 
 	// try to read the action shortcut
 	KShortcut sc;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.h b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h
index 6fa40b49..46cc8ad2 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h
@@ -23,7 +23,7 @@
 #include <tqguardedptr.h>
 #include <kxmlguiclient.h>
 #include <kaction.h>
-#include "kmdidefines.h"
+#include "tdemdidefines.h"
 
 class KMainWindow;
 class KToolBar;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdiiterator.h b/lib/compatibility/tdemdi/qextmdi/tdemdiiterator.h
index 6faf5224..96a24ea4 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdiiterator.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdiiterator.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdiiterator.h
+//    filename             : tdemdiiterator.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
diff --git a/lib/compatibility/kmdi/qextmdi/kmdilistiterator.h b/lib/compatibility/tdemdi/qextmdi/tdemdilistiterator.h
index e8e5d79d..de7c8f9c 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdilistiterator.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdilistiterator.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdilistiterator.h
+//    filename             : tdemdilistiterator.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -27,7 +27,7 @@
 #ifndef _KMDILISTITERATOR_H_
 #define _KMDILISTITERATOR_H_
 
-#include <kmdiiterator.h>
+#include <tdemdiiterator.h>
 
 template <class I>
 class TQPtrList;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
index bfddac38..de17b7f1 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdimainfrm.cpp
+//    filename             : tdemdimainfrm.cpp
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -51,7 +51,7 @@
 #include <klocale.h>
 
 #include <kiconloader.h>
-#include <kmdidockcontainer.h>
+#include <tdemdidockcontainer.h>
 
 
 #include <tqtoolbutton.h>
@@ -63,16 +63,16 @@
 #include <tqmap.h>
 #include <tqvaluelist.h>
 
-#include "kmdimainfrm.h"
-#include "kmditaskbar.h"
-#include "kmdichildfrm.h"
-#include "kmdichildarea.h"
-#include "kmdichildview.h"
-#include "kmdidockcontainer.h"
-#include "kmditoolviewaccessor_p.h"
-#include "kmdifocuslist.h"
-#include "kmdidocumentviewtabwidget.h"
-#include "kmdiguiclient.h"
+#include "tdemdimainfrm.h"
+#include "tdemditaskbar.h"
+#include "tdemdichildfrm.h"
+#include "tdemdichildarea.h"
+#include "tdemdichildview.h"
+#include "tdemdidockcontainer.h"
+#include "tdemditoolviewaccessor_p.h"
+#include "tdemdifocuslist.h"
+#include "tdemdidocumentviewtabwidget.h"
+#include "tdemdiguiclient.h"
 
 #include "win_undockbutton.xpm"
 #include "win_minbutton.xpm"
@@ -1422,22 +1422,22 @@ void KMdiMainFrm::switchToToplevelMode()
    
 	//FIXME although i don't know what to fix
 	// 5. show the child views again
-	TQPtrListIterator<KMdiChildView> kmdicvit( *m_pDocumentViews );
-	for ( kmdicvit.toFirst(); ( *kmdicvit ); ++kmdicvit )
+	TQPtrListIterator<KMdiChildView> tdemdicvit( *m_pDocumentViews );
+	for ( tdemdicvit.toFirst(); ( *tdemdicvit ); ++tdemdicvit )
 	{
 #ifdef TQ_WS_X11
-		XSetTransientForHint( tqt_xdisplay(), ( *kmdicvit )->winId(), winId() );
+		XSetTransientForHint( tqt_xdisplay(), ( *tdemdicvit )->winId(), winId() );
 #endif
-		( *kmdicvit )->show();
+		( *tdemdicvit )->show();
 	}
 
 	// 6.) reset all memorized positions of the undocked ones and show them again
 	TQValueList<TQRect>::Iterator qvlqrit;
 	TQValueList<TQRect>::Iterator qvlEnd = positionList.end();
-	for ( kmdicvit.toFirst(), qvlqrit = positionList.begin() ; ( *kmdicvit ) && qvlqrit != qvlEnd; ++kmdicvit, ++qvlqrit )
+	for ( tdemdicvit.toFirst(), qvlqrit = positionList.begin() ; ( *tdemdicvit ) && qvlqrit != qvlEnd; ++tdemdicvit, ++qvlqrit )
 	{
-		( *kmdicvit )->setGeometry( ( *qvlqrit ) );
-		( *kmdicvit )->show();
+		( *tdemdicvit )->setGeometry( ( *qvlqrit ) );
+		( *tdemdicvit )->show();
 	}
 
 	m_pDockbaseAreaOfDocumentViews->setDockSite( KDockWidget::DockNone );
@@ -2935,7 +2935,7 @@ KTabWidget * KMdiMainFrm::tabWidget() const
 	return m_documentTabWidget;
 }
 
-#include "kmdimainfrm.moc"
+#include "tdemdimainfrm.moc"
 
 // vim: ts=2 sw=2 et
 // kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h
index c0786d20..220875fc 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdimainfrm.h
+//    filename             : tdemdimainfrm.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -31,7 +31,7 @@
 #ifndef _KMDIMAINFRM_H_
 #define _KMDIMAINFRM_H_
 
-#include <kparts/dockmainwindow.h>
+#include <tdeparts/dockmainwindow.h>
 #include <kmenubar.h>
 #include <kpopupmenu.h>
 
@@ -41,13 +41,13 @@
 #include <tqdom.h>
 #include <tqguardedptr.h>
 
-#include "kmditaskbar.h"
-#include "kmdichildarea.h"
-#include "kmdichildview.h"
-#include "kmdiiterator.h"
-#include "kmdilistiterator.h"
-#include "kmdinulliterator.h"
-#include "kmditoolviewaccessor.h"
+#include "tdemditaskbar.h"
+#include "tdemdichildarea.h"
+#include "tdemdichildview.h"
+#include "tdemdiiterator.h"
+#include "tdemdilistiterator.h"
+#include "tdemdinulliterator.h"
+#include "tdemditoolviewaccessor.h"
 
 class TQTimer;
 class TQPopupMenu;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdinulliterator.h b/lib/compatibility/tdemdi/qextmdi/tdemdinulliterator.h
index 187c931b..ff9a17c3 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdinulliterator.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdinulliterator.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdinulliterator.h
+//    filename             : tdemdinulliterator.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -27,7 +27,7 @@
 #ifndef _KMDINULLITERATOR_H_
 #define _KMDINULLITERATOR_H_
 
-#include "kmdiiterator.h"
+#include "tdemdiiterator.h"
 
 template <class Item>
 class KMdiNullIterator : public KMdiIterator<Item> {
diff --git a/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp
index 81384f98..3c61dab2 100644
--- a/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmditaskbar.cpp
+//    filename             : tdemditaskbar.cpp
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -26,12 +26,12 @@
 //
 //----------------------------------------------------------------------------
 
-#include "kmditaskbar.h"
-#include "kmditaskbar.moc"
+#include "tdemditaskbar.h"
+#include "tdemditaskbar.moc"
 
-#include "kmdimainfrm.h"
-#include "kmdichildview.h"
-#include "kmdidefines.h"
+#include "tdemdimainfrm.h"
+#include "tdemdichildview.h"
+#include "tdemdidefines.h"
 
 #include <tqtooltip.h>
 #include <tqlabel.h>
diff --git a/lib/compatibility/kmdi/qextmdi/kmditaskbar.h b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h
index 003aec00..50b77d9b 100644
--- a/lib/compatibility/kmdi/qextmdi/kmditaskbar.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmditaskbar.h
+//    filename             : tdemditaskbar.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -34,7 +34,7 @@
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 
-#include "kmdidefines.h"
+#include "tdemdidefines.h"
 
 class KMdiMainFrm;
 class KMdiChildView;
diff --git a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.cpp
index 1e42f12d..ce6fcca0 100644
--- a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.cpp
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmditoolviewaccessor.h
+//    filename             : tdemditoolviewaccessor.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -22,12 +22,12 @@
 #ifndef NO_KDE
 # include <kdebug.h>
 #endif
-#include "kmditoolviewaccessor_p.h"
-#include "kmdiguiclient.h"
-#include "kmdimainfrm.h"
+#include "tdemditoolviewaccessor_p.h"
+#include "tdemdiguiclient.h"
+#include "tdemdimainfrm.h"
 
-#include "kmditoolviewaccessor.h"
-#include "kmditoolviewaccessor_p.h"
+#include "tdemditoolviewaccessor.h"
+#include "tdemditoolviewaccessor_p.h"
 
 KMdiToolViewAccessor::KMdiToolViewAccessor( KMdiMainFrm *parent, TQWidget *widgetToWrap, const TQString& tabToolTip, const TQString& tabCaption )
 		: TQObject( parent )
@@ -263,7 +263,7 @@ void KMdiToolViewAccessor::show()
 
 
 #ifndef NO_INCLUDE_MOCFILES
-#include "kmditoolviewaccessor.moc"
+#include "tdemditoolviewaccessor.moc"
 #endif 
 // kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
 
diff --git a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.h b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.h
index b5cfdaad..d03bdfce 100644
--- a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmditoolviewaccessor.h
+//    filename             : tdemditoolviewaccessor.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
diff --git a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor_p.h b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor_p.h
index ecbaa76a..81e770e8 100644
--- a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor_p.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor_p.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmditoolviewaccessor_p.h
+//    filename             : tdemditoolviewaccessor_p.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
diff --git a/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp
index 031c8c16..511e50a0 100644
--- a/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          kmultitabbar.cpp -  description
+                          tdemultitabbar.cpp -  description
                              -------------------
     begin                :  2001
     copyright            : (C) 2001,2002,2003 by Joseph Wenninger <jowenn@kde.org>
@@ -22,10 +22,10 @@
     Boston, MA 02110-1301, USA.
  ***************************************************************************/
 
-#include "kmultitabbar.h"
-#include "kmultitabbar.moc"
-#include "kmultitabbar_p.h"
-#include "kmultitabbar_p.moc"
+#include "tdemultitabbar.h"
+#include "tdemultitabbar.moc"
+#include "tdemultitabbar_p.h"
+#include "tdemultitabbar_p.moc"
 #include <tqbutton.h>
 #include <tqpopupmenu.h>
 #include <tqlayout.h>
diff --git a/lib/compatibility/kmdi/qextmdi/kmultitabbar.h b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.h
index d8ce755a..a299e8f5 100644
--- a/lib/compatibility/kmdi/qextmdi/kmultitabbar.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          kmultitabbar.h -  description
+                          tdemultitabbar.h -  description
                              -------------------
     begin                :  2001
     copyright            : (C) 2001,2002,2003 by Joseph Wenninger <jowenn@kde.org>
diff --git a/lib/compatibility/kmdi/qextmdi/kmultitabbar_p.h b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar_p.h
index dc8a7d8b..7a1c6714 100644
--- a/lib/compatibility/kmdi/qextmdi/kmultitabbar_p.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar_p.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          kmultitabbar_p.h -  description
+                          tdemultitabbar_p.h -  description
                              -------------------
     begin                :  2003
     copyright            : (C) 2003 by Joseph Wenninger <jowenn@kde.org>
@@ -25,7 +25,7 @@
 #ifndef K_MULTI_TAB_BAR_P_H
 #define K_MULTI_TAB_BAR_P_H
 #include <tqscrollview.h>
-#include <kmultitabbar.h>
+#include <tdemultitabbar.h>
 
 class KMultiTabBarInternal: public TQScrollView
 {