Rename many classes and header files to avoid conflicts with KDE4

8 files changed, 14 insertions, 14 deletions

diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
index 64f5848f..f6bed90c 100644
--- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
@@ -36,8 +36,8 @@
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <ktoolbar.h>
-#include <kpopupmenu.h>
+#include <tdetoolbar.h>
+#include <tdepopupmenu.h>
 #include <twin.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.h b/lib/compatibility/tdemdi/qextmdi/kdockwidget.h
index 69e5f7dc..bf54a5c0 100644
--- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.h
+++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.h
@@ -55,13 +55,13 @@
 #include <tqtabwidget.h>
 
 #ifndef NO_KDE2
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <netwm_def.h>
 #else
 
 #include <tqmainwindow.h>
 #include "exportdockclass.h"
-#include "dummykmainwindow.h"
+#include "dummytdemainwindow.h"
 #endif
 
 #include <tdelibs_export.h>
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp
index 575fa2b2..fe60b25f 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp
@@ -8,7 +8,7 @@
 //----------------------------------------------------------------------------
 
 #include <ktabbar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include "tdemdidocumentviewtabwidget.h"
 
 KMdiDocumentViewTabWidget::KMdiDocumentViewTabWidget( TQWidget* parent, const char* name ) : KTabWidget( parent, name )
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
index 4c9930be..142213ad 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
@@ -1,6 +1,6 @@
 /* This file is part of the KDE libraries
   Copyright (C) 2003 Joseph Wenninger <jowenn@kde.org>
-  based on ktoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
+  based on tdetoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Library General Public
@@ -23,10 +23,10 @@
 #include <tqpopupmenu.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
-#include <ktoolbar.h>
-#include <kmainwindow.h>
+#include <tdetoolbar.h>
+#include <tdemainwindow.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqstring.h>
 #include <assert.h>
 #include <kdebug.h>
@@ -134,7 +134,7 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
 		setXML( completeDescription, false /*merge*/ );
 	}
 
-	if ( actionCollection() ->kaccel() == 0 )
+	if ( actionCollection() ->tdeaccel() == 0 )
 		actionCollection() ->setWidget( mdiMainFrm );
 	m_toolMenu = new TDEActionMenu( i18n( "Tool &Views" ), actionCollection(), "tdemdi_toolview_menu" );
 	if ( showMDIModeAction )
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h
index 98c606ce..f55207b2 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h
@@ -22,7 +22,7 @@
 #include <tqobject.h>
 #include <tqguardedptr.h>
 #include <kxmlguiclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include "tdemdidefines.h"
 
 class TDEMainWindow;
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h
index 220875fc..db464c9c 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h
@@ -33,7 +33,7 @@
 
 #include <tdeparts/dockmainwindow.h>
 #include <kmenubar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <tqptrlist.h>
 #include <tqrect.h>
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h
index 9d0267bb..8ff55a74 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h
@@ -28,7 +28,7 @@
 #ifndef _KMDITASKBAR_H_
 #define _KMDITASKBAR_H_
 
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <tqptrlist.h>
 #include <tqpixmap.h>
 #include <tqlabel.h>
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor_p.h b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor_p.h
index c3812792..ec19b862 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor_p.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor_p.h
@@ -27,7 +27,7 @@
 #include <tqwidget.h>
 #include <kdockwidget.h>
 #include <tqguardedptr.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 class KMDI_EXPORT KMdiToolViewAccessorPrivate {
 public: