Rename many classes and header files to avoid conflicts with KDE4

132 files changed, 191 insertions, 191 deletions

diff --git a/extra/kde300/kkeyserver_x11.h b/extra/kde300/kkeyserver_x11.h
index f0b4dbe..0929285 100644
--- a/extra/kde300/kkeyserver_x11.h
+++ b/extra/kde300/kkeyserver_x11.h
@@ -1,7 +1,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 namespace KKeyServer
diff --git a/extra/kde300/tdeaccelaction.h b/extra/kde300/tdeaccelaction.h
index bd85a25..1ee45c2 100644
--- a/extra/kde300/tdeaccelaction.h
+++ b/extra/kde300/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/extra/kde300/tdeaccelbase.h b/extra/kde300/tdeaccelbase.h
index 0fbbe79..8e6deb1 100644
--- a/extra/kde300/tdeaccelbase.h
+++ b/extra/kde300/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver_x11.h"
 
 class TQPopupMenu;
@@ -116,7 +116,7 @@ class TDEAccelBasePrivate;
  * menu structure.
  *
  * @short Configurable key binding support.
- * @version $Id: kaccelbase.h,v 1.20 2002/03/03 21:20:25 lunakl Exp $
+ * @version $Id: tdeaccelbase.h,v 1.20 2002/03/03 21:20:25 lunakl Exp $
  */
 
 class TDEAccelBase
diff --git a/extra/kde300/tdetoolbarbutton.h b/extra/kde300/tdetoolbarbutton.h
index a708ee3..94d87cc 100644
--- a/extra/kde300/tdetoolbarbutton.h
+++ b/extra/kde300/tdetoolbarbutton.h
@@ -20,7 +20,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-// $Id: ktoolbarbutton.h,v 1.21 2002/03/04 00:51:52 lunakl Exp $
+// $Id: tdetoolbarbutton.h,v 1.21 2002/03/04 00:51:52 lunakl Exp $
 #ifndef _KTOOLBARBUTTON_H
 #define _KTOOLBARBUTTON_H
 
@@ -294,7 +294,7 @@ private:
 /**
 * List of @ref TDEToolBarButton objects.
 * @internal
-* @version $Id: ktoolbarbutton.h,v 1.21 2002/03/04 00:51:52 lunakl Exp $
+* @version $Id: tdetoolbarbutton.h,v 1.21 2002/03/04 00:51:52 lunakl Exp $
 */
 class TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
 {
diff --git a/extra/kde301/kkeyserver_x11.h b/extra/kde301/kkeyserver_x11.h
index f0b4dbe..0929285 100644
--- a/extra/kde301/kkeyserver_x11.h
+++ b/extra/kde301/kkeyserver_x11.h
@@ -1,7 +1,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 namespace KKeyServer
diff --git a/extra/kde301/tdeaccelaction.h b/extra/kde301/tdeaccelaction.h
index bd85a25..1ee45c2 100644
--- a/extra/kde301/tdeaccelaction.h
+++ b/extra/kde301/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/extra/kde301/tdeaccelbase.h b/extra/kde301/tdeaccelbase.h
index 0fbbe79..8e6deb1 100644
--- a/extra/kde301/tdeaccelbase.h
+++ b/extra/kde301/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver_x11.h"
 
 class TQPopupMenu;
@@ -116,7 +116,7 @@ class TDEAccelBasePrivate;
  * menu structure.
  *
  * @short Configurable key binding support.
- * @version $Id: kaccelbase.h,v 1.20 2002/03/03 21:20:25 lunakl Exp $
+ * @version $Id: tdeaccelbase.h,v 1.20 2002/03/03 21:20:25 lunakl Exp $
  */
 
 class TDEAccelBase
diff --git a/extra/kde301/tdetoolbarbutton.h b/extra/kde301/tdetoolbarbutton.h
index e34c4fe..bdf8bb0 100644
--- a/extra/kde301/tdetoolbarbutton.h
+++ b/extra/kde301/tdetoolbarbutton.h
@@ -20,7 +20,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-// $Id: ktoolbarbutton.h,v 1.21.2.1 2002/04/28 20:59:16 wtrobin Exp $
+// $Id: tdetoolbarbutton.h,v 1.21.2.1 2002/04/28 20:59:16 wtrobin Exp $
 #ifndef _KTOOLBARBUTTON_H
 #define _KTOOLBARBUTTON_H
 
@@ -301,7 +301,7 @@ private:
 /**
 * List of @ref TDEToolBarButton objects.
 * @internal
-* @version $Id: ktoolbarbutton.h,v 1.21.2.1 2002/04/28 20:59:16 wtrobin Exp $
+* @version $Id: tdetoolbarbutton.h,v 1.21.2.1 2002/04/28 20:59:16 wtrobin Exp $
 */
 class TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
 {
diff --git a/extra/kde303/kkeyserver_x11.h b/extra/kde303/kkeyserver_x11.h
index f0b4dbe..0929285 100644
--- a/extra/kde303/kkeyserver_x11.h
+++ b/extra/kde303/kkeyserver_x11.h
@@ -1,7 +1,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 namespace KKeyServer
diff --git a/extra/kde303/tdeaccelaction.h b/extra/kde303/tdeaccelaction.h
index bd85a25..1ee45c2 100644
--- a/extra/kde303/tdeaccelaction.h
+++ b/extra/kde303/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/extra/kde303/tdeaccelbase.h b/extra/kde303/tdeaccelbase.h
index 0fbbe79..8e6deb1 100644
--- a/extra/kde303/tdeaccelbase.h
+++ b/extra/kde303/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver_x11.h"
 
 class TQPopupMenu;
@@ -116,7 +116,7 @@ class TDEAccelBasePrivate;
  * menu structure.
  *
  * @short Configurable key binding support.
- * @version $Id: kaccelbase.h,v 1.20 2002/03/03 21:20:25 lunakl Exp $
+ * @version $Id: tdeaccelbase.h,v 1.20 2002/03/03 21:20:25 lunakl Exp $
  */
 
 class TDEAccelBase
diff --git a/extra/kde303/tdetoolbarbutton.h b/extra/kde303/tdetoolbarbutton.h
index 990504c..4ac8947 100644
--- a/extra/kde303/tdetoolbarbutton.h
+++ b/extra/kde303/tdetoolbarbutton.h
@@ -20,7 +20,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-// $Id: ktoolbarbutton.h,v 1.21.2.2 2002/05/26 13:09:06 carewolf Exp $
+// $Id: tdetoolbarbutton.h,v 1.21.2.2 2002/05/26 13:09:06 carewolf Exp $
 #ifndef _KTOOLBARBUTTON_H
 #define _KTOOLBARBUTTON_H
 
@@ -301,7 +301,7 @@ private:
 /**
 * List of @ref TDEToolBarButton objects.
 * @internal
-* @version $Id: ktoolbarbutton.h,v 1.21.2.2 2002/05/26 13:09:06 carewolf Exp $
+* @version $Id: tdetoolbarbutton.h,v 1.21.2.2 2002/05/26 13:09:06 carewolf Exp $
 */
 class TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
 {
diff --git a/extra/kde310/kkeyserver_x11.h b/extra/kde310/kkeyserver_x11.h
index 4169273..517dcae 100644
--- a/extra/kde310/kkeyserver_x11.h
+++ b/extra/kde310/kkeyserver_x11.h
@@ -1,7 +1,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 /**
diff --git a/extra/kde310/kpanelmenu.h b/extra/kde310/kpanelmenu.h
index b58decb..b96b15e 100644
--- a/extra/kde310/kpanelmenu.h
+++ b/extra/kde310/kpanelmenu.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __KPANELMENU_H__
 
 #include <tqstring.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 
 class KPanelMenuPrivate;
diff --git a/extra/kde310/tdeaccelaction.h b/extra/kde310/tdeaccelaction.h
index 28c52d2..4ad018f 100644
--- a/extra/kde310/tdeaccelaction.h
+++ b/extra/kde310/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/extra/kde310/tdeaccelbase.h b/extra/kde310/tdeaccelbase.h
index 807c426..21ee3a3 100644
--- a/extra/kde310/tdeaccelbase.h
+++ b/extra/kde310/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver_x11.h"
 
 class TQPopupMenu;
@@ -116,7 +116,7 @@ class TQWidget;
  * menu structure.
  *
  * @short Configurable key binding support.
- * @version $Id: kaccelbase.h,v 1.22 2002/10/06 18:19:39 ellis Exp $
+ * @version $Id: tdeaccelbase.h,v 1.22 2002/10/06 18:19:39 ellis Exp $
  */
 
 class TDEAccelBase
diff --git a/extra/kde310/tdetoolbarbutton.h b/extra/kde310/tdetoolbarbutton.h
index 7dd41f8..bea5bbe 100644
--- a/extra/kde310/tdetoolbarbutton.h
+++ b/extra/kde310/tdetoolbarbutton.h
@@ -20,7 +20,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-// $Id: ktoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $
+// $Id: tdetoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $
 #ifndef _KTOOLBARBUTTON_H
 #define _KTOOLBARBUTTON_H
 
@@ -305,7 +305,7 @@ private:
 /**
 * List of @ref TDEToolBarButton objects.
 * @internal
-* @version $Id: ktoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $
+* @version $Id: tdetoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $
 */
 class TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
 {
diff --git a/extra/kde311/kkeyserver_x11.h b/extra/kde311/kkeyserver_x11.h
index 4169273..517dcae 100644
--- a/extra/kde311/kkeyserver_x11.h
+++ b/extra/kde311/kkeyserver_x11.h
@@ -1,7 +1,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 /**
diff --git a/extra/kde311/kpanelmenu.h b/extra/kde311/kpanelmenu.h
index 639d029..6749754 100644
--- a/extra/kde311/kpanelmenu.h
+++ b/extra/kde311/kpanelmenu.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __KPANELMENU_H__
 
 #include <tqstring.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 
 class KPanelMenuPrivate;
diff --git a/extra/kde311/tdeaccelaction.h b/extra/kde311/tdeaccelaction.h
index 28c52d2..4ad018f 100644
--- a/extra/kde311/tdeaccelaction.h
+++ b/extra/kde311/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/extra/kde311/tdeaccelbase.h b/extra/kde311/tdeaccelbase.h
index 807c426..21ee3a3 100644
--- a/extra/kde311/tdeaccelbase.h
+++ b/extra/kde311/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver_x11.h"
 
 class TQPopupMenu;
@@ -116,7 +116,7 @@ class TQWidget;
  * menu structure.
  *
  * @short Configurable key binding support.
- * @version $Id: kaccelbase.h,v 1.22 2002/10/06 18:19:39 ellis Exp $
+ * @version $Id: tdeaccelbase.h,v 1.22 2002/10/06 18:19:39 ellis Exp $
  */
 
 class TDEAccelBase
diff --git a/extra/kde311/tdetoolbarbutton.h b/extra/kde311/tdetoolbarbutton.h
index 7dd41f8..bea5bbe 100644
--- a/extra/kde311/tdetoolbarbutton.h
+++ b/extra/kde311/tdetoolbarbutton.h
@@ -20,7 +20,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-// $Id: ktoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $
+// $Id: tdetoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $
 #ifndef _KTOOLBARBUTTON_H
 #define _KTOOLBARBUTTON_H
 
@@ -305,7 +305,7 @@ private:
 /**
 * List of @ref TDEToolBarButton objects.
 * @internal
-* @version $Id: ktoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $
+* @version $Id: tdetoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $
 */
 class TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
 {
diff --git a/extra/kde312/kkeyserver_x11.h b/extra/kde312/kkeyserver_x11.h
index 4169273..517dcae 100644
--- a/extra/kde312/kkeyserver_x11.h
+++ b/extra/kde312/kkeyserver_x11.h
@@ -1,7 +1,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 /**
diff --git a/extra/kde312/kpanelmenu.h b/extra/kde312/kpanelmenu.h
index b58decb..b96b15e 100644
--- a/extra/kde312/kpanelmenu.h
+++ b/extra/kde312/kpanelmenu.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __KPANELMENU_H__
 
 #include <tqstring.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 
 class KPanelMenuPrivate;
diff --git a/extra/kde312/tdeaccelaction.h b/extra/kde312/tdeaccelaction.h
index 28c52d2..4ad018f 100644
--- a/extra/kde312/tdeaccelaction.h
+++ b/extra/kde312/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/extra/kde312/tdeaccelbase.h b/extra/kde312/tdeaccelbase.h
index 807c426..21ee3a3 100644
--- a/extra/kde312/tdeaccelbase.h
+++ b/extra/kde312/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver_x11.h"
 
 class TQPopupMenu;
@@ -116,7 +116,7 @@ class TQWidget;
  * menu structure.
  *
  * @short Configurable key binding support.
- * @version $Id: kaccelbase.h,v 1.22 2002/10/06 18:19:39 ellis Exp $
+ * @version $Id: tdeaccelbase.h,v 1.22 2002/10/06 18:19:39 ellis Exp $
  */
 
 class TDEAccelBase
diff --git a/extra/kde312/tdetoolbarbutton.h b/extra/kde312/tdetoolbarbutton.h
index 7dd41f8..bea5bbe 100644
--- a/extra/kde312/tdetoolbarbutton.h
+++ b/extra/kde312/tdetoolbarbutton.h
@@ -20,7 +20,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-// $Id: ktoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $
+// $Id: tdetoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $
 #ifndef _KTOOLBARBUTTON_H
 #define _KTOOLBARBUTTON_H
 
@@ -305,7 +305,7 @@ private:
 /**
 * List of @ref TDEToolBarButton objects.
 * @internal
-* @version $Id: ktoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $
+* @version $Id: tdetoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $
 */
 class TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
 {
diff --git a/extra/kde313/kkeyserver_x11.h b/extra/kde313/kkeyserver_x11.h
index 4169273..517dcae 100644
--- a/extra/kde313/kkeyserver_x11.h
+++ b/extra/kde313/kkeyserver_x11.h
@@ -1,7 +1,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 /**
diff --git a/extra/kde313/kpanelmenu.h b/extra/kde313/kpanelmenu.h
index b58decb..b96b15e 100644
--- a/extra/kde313/kpanelmenu.h
+++ b/extra/kde313/kpanelmenu.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __KPANELMENU_H__
 
 #include <tqstring.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 
 class KPanelMenuPrivate;
diff --git a/extra/kde313/tdeaccelaction.h b/extra/kde313/tdeaccelaction.h
index 28c52d2..4ad018f 100644
--- a/extra/kde313/tdeaccelaction.h
+++ b/extra/kde313/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/extra/kde313/tdeaccelbase.h b/extra/kde313/tdeaccelbase.h
index 807c426..21ee3a3 100644
--- a/extra/kde313/tdeaccelbase.h
+++ b/extra/kde313/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver_x11.h"
 
 class TQPopupMenu;
@@ -116,7 +116,7 @@ class TQWidget;
  * menu structure.
  *
  * @short Configurable key binding support.
- * @version $Id: kaccelbase.h,v 1.22 2002/10/06 18:19:39 ellis Exp $
+ * @version $Id: tdeaccelbase.h,v 1.22 2002/10/06 18:19:39 ellis Exp $
  */
 
 class TDEAccelBase
diff --git a/extra/kde313/tdetoolbarbutton.h b/extra/kde313/tdetoolbarbutton.h
index 7dd41f8..bea5bbe 100644
--- a/extra/kde313/tdetoolbarbutton.h
+++ b/extra/kde313/tdetoolbarbutton.h
@@ -20,7 +20,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-// $Id: ktoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $
+// $Id: tdetoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $
 #ifndef _KTOOLBARBUTTON_H
 #define _KTOOLBARBUTTON_H
 
@@ -305,7 +305,7 @@ private:
 /**
 * List of @ref TDEToolBarButton objects.
 * @internal
-* @version $Id: ktoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $
+* @version $Id: tdetoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $
 */
 class TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
 {
diff --git a/extra/kde314/kkeyserver_x11.h b/extra/kde314/kkeyserver_x11.h
index a7fa366..26d9bec 100644
--- a/extra/kde314/kkeyserver_x11.h
+++ b/extra/kde314/kkeyserver_x11.h
@@ -1,7 +1,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 /**
diff --git a/extra/kde314/kpanelmenu.h b/extra/kde314/kpanelmenu.h
index e66aee4..649791c 100644
--- a/extra/kde314/kpanelmenu.h
+++ b/extra/kde314/kpanelmenu.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __KPANELMENU_H__
 
 #include <tqstring.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 
 class KPanelMenuPrivate;
diff --git a/extra/kde314/tdeaccelaction.h b/extra/kde314/tdeaccelaction.h
index 28c52d2..4ad018f 100644
--- a/extra/kde314/tdeaccelaction.h
+++ b/extra/kde314/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/extra/kde314/tdeaccelbase.h b/extra/kde314/tdeaccelbase.h
index 807c426..21ee3a3 100644
--- a/extra/kde314/tdeaccelbase.h
+++ b/extra/kde314/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver_x11.h"
 
 class TQPopupMenu;
@@ -116,7 +116,7 @@ class TQWidget;
  * menu structure.
  *
  * @short Configurable key binding support.
- * @version $Id: kaccelbase.h,v 1.22 2002/10/06 18:19:39 ellis Exp $
+ * @version $Id: tdeaccelbase.h,v 1.22 2002/10/06 18:19:39 ellis Exp $
  */
 
 class TDEAccelBase
diff --git a/extra/kde314/tdetoolbarbutton.h b/extra/kde314/tdetoolbarbutton.h
index 7dd41f8..bea5bbe 100644
--- a/extra/kde314/tdetoolbarbutton.h
+++ b/extra/kde314/tdetoolbarbutton.h
@@ -20,7 +20,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-// $Id: ktoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $
+// $Id: tdetoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $
 #ifndef _KTOOLBARBUTTON_H
 #define _KTOOLBARBUTTON_H
 
@@ -305,7 +305,7 @@ private:
 /**
 * List of @ref TDEToolBarButton objects.
 * @internal
-* @version $Id: ktoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $
+* @version $Id: tdetoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $
 */
 class TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
 {
diff --git a/extra/kde315/kkeyserver_x11.h b/extra/kde315/kkeyserver_x11.h
index a7fa366..26d9bec 100644
--- a/extra/kde315/kkeyserver_x11.h
+++ b/extra/kde315/kkeyserver_x11.h
@@ -1,7 +1,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 /**
diff --git a/extra/kde315/kpanelmenu.h b/extra/kde315/kpanelmenu.h
index e66aee4..649791c 100644
--- a/extra/kde315/kpanelmenu.h
+++ b/extra/kde315/kpanelmenu.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __KPANELMENU_H__
 
 #include <tqstring.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 
 class KPanelMenuPrivate;
diff --git a/extra/kde315/tdeaccelaction.h b/extra/kde315/tdeaccelaction.h
index 28c52d2..4ad018f 100644
--- a/extra/kde315/tdeaccelaction.h
+++ b/extra/kde315/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/extra/kde315/tdeaccelbase.h b/extra/kde315/tdeaccelbase.h
index 807c426..21ee3a3 100644
--- a/extra/kde315/tdeaccelbase.h
+++ b/extra/kde315/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver_x11.h"
 
 class TQPopupMenu;
@@ -116,7 +116,7 @@ class TQWidget;
  * menu structure.
  *
  * @short Configurable key binding support.
- * @version $Id: kaccelbase.h,v 1.22 2002/10/06 18:19:39 ellis Exp $
+ * @version $Id: tdeaccelbase.h,v 1.22 2002/10/06 18:19:39 ellis Exp $
  */
 
 class TDEAccelBase
diff --git a/extra/kde315/tdetoolbarbutton.h b/extra/kde315/tdetoolbarbutton.h
index 7dd41f8..bea5bbe 100644
--- a/extra/kde315/tdetoolbarbutton.h
+++ b/extra/kde315/tdetoolbarbutton.h
@@ -20,7 +20,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-// $Id: ktoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $
+// $Id: tdetoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $
 #ifndef _KTOOLBARBUTTON_H
 #define _KTOOLBARBUTTON_H
 
@@ -305,7 +305,7 @@ private:
 /**
 * List of @ref TDEToolBarButton objects.
 * @internal
-* @version $Id: ktoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $
+* @version $Id: tdetoolbarbutton.h,v 1.26 2002/09/28 15:16:22 tjansen Exp $
 */
 class TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
 {
diff --git a/extra/kde320/kkeyserver_x11.h b/extra/kde320/kkeyserver_x11.h
index c2e11b7..ad6894c 100644
--- a/extra/kde320/kkeyserver_x11.h
+++ b/extra/kde320/kkeyserver_x11.h
@@ -1,7 +1,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 /**
diff --git a/extra/kde320/kpanelmenu.h b/extra/kde320/kpanelmenu.h
index b2e7265..3ef1764 100644
--- a/extra/kde320/kpanelmenu.h
+++ b/extra/kde320/kpanelmenu.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __KPANELMENU_H__
 
 #include <tqstring.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 
 class KPanelMenuPrivate;
diff --git a/extra/kde320/kurifilter.h b/extra/kde320/kurifilter.h
index 325da8f..f0550d1 100644
--- a/extra/kde320/kurifilter.h
+++ b/extra/kde320/kurifilter.h
@@ -500,17 +500,17 @@ private:
  * of the filters you want to use to a TQStringList and invoke
  * the appropriate filtering function. The examples below show
  * the use of specific filters. The first one uses a single
- * filter called kshorturifilter while the second example uses
+ * filter called tdeshorturifilter while the second example uses
  * multiple filters:
  *
  * \code
  * TQString text = "kde.org";
- * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" );
+ * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" );
  * \endcode
  *
  * \code
  * TQStringList list;
- * list << "kshorturifilter" << "localdomainfilter";
+ * list << "tdeshorturifilter" << "localdomainfilter";
  * bool filtered = KURIFilter::self()->filterURI( text, list );
  * \endcode
  *
diff --git a/extra/kde320/tdeaccelaction.h b/extra/kde320/tdeaccelaction.h
index 269136c..f84a24d 100644
--- a/extra/kde320/tdeaccelaction.h
+++ b/extra/kde320/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/extra/kde320/tdeaccelbase.h b/extra/kde320/tdeaccelbase.h
index ea654cc..296790f 100644
--- a/extra/kde320/tdeaccelbase.h
+++ b/extra/kde320/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver_x11.h"
 
 class TQPopupMenu;
@@ -116,7 +116,7 @@ class TQWidget;
  * menu structure.
  *
  * @short Configurable key binding support.
- * @version $Id: kaccelbase.h,v 1.26 2003/08/16 19:44:57 coolo Exp $
+ * @version $Id: tdeaccelbase.h,v 1.26 2003/08/16 19:44:57 coolo Exp $
  */
 
 class TDEAccelBase
diff --git a/extra/kde320/tdetoolbarbutton.h b/extra/kde320/tdetoolbarbutton.h
index 2c80447..6201d1d 100644
--- a/extra/kde320/tdetoolbarbutton.h
+++ b/extra/kde320/tdetoolbarbutton.h
@@ -20,7 +20,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-// $Id: ktoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $
+// $Id: tdetoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $
 #ifndef _KTOOLBARBUTTON_H
 #define _KTOOLBARBUTTON_H
 
@@ -303,7 +303,7 @@ private:
 /**
 * List of TDEToolBarButton objects.
 * @internal
-* @version $Id: ktoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $
+* @version $Id: tdetoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $
 */
 class TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
 {
diff --git a/extra/kde321/kkeyserver_x11.h b/extra/kde321/kkeyserver_x11.h
index c2e11b7..ad6894c 100644
--- a/extra/kde321/kkeyserver_x11.h
+++ b/extra/kde321/kkeyserver_x11.h
@@ -1,7 +1,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 /**
diff --git a/extra/kde321/kpanelmenu.h b/extra/kde321/kpanelmenu.h
index b2e7265..3ef1764 100644
--- a/extra/kde321/kpanelmenu.h
+++ b/extra/kde321/kpanelmenu.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __KPANELMENU_H__
 
 #include <tqstring.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 
 class KPanelMenuPrivate;
diff --git a/extra/kde321/kurifilter.h b/extra/kde321/kurifilter.h
index 325da8f..f0550d1 100644
--- a/extra/kde321/kurifilter.h
+++ b/extra/kde321/kurifilter.h
@@ -500,17 +500,17 @@ private:
  * of the filters you want to use to a TQStringList and invoke
  * the appropriate filtering function. The examples below show
  * the use of specific filters. The first one uses a single
- * filter called kshorturifilter while the second example uses
+ * filter called tdeshorturifilter while the second example uses
  * multiple filters:
  *
  * \code
  * TQString text = "kde.org";
- * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" );
+ * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" );
  * \endcode
  *
  * \code
  * TQStringList list;
- * list << "kshorturifilter" << "localdomainfilter";
+ * list << "tdeshorturifilter" << "localdomainfilter";
  * bool filtered = KURIFilter::self()->filterURI( text, list );
  * \endcode
  *
diff --git a/extra/kde321/tdeaccelaction.h b/extra/kde321/tdeaccelaction.h
index 269136c..f84a24d 100644
--- a/extra/kde321/tdeaccelaction.h
+++ b/extra/kde321/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/extra/kde321/tdeaccelbase.h b/extra/kde321/tdeaccelbase.h
index ea654cc..296790f 100644
--- a/extra/kde321/tdeaccelbase.h
+++ b/extra/kde321/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver_x11.h"
 
 class TQPopupMenu;
@@ -116,7 +116,7 @@ class TQWidget;
  * menu structure.
  *
  * @short Configurable key binding support.
- * @version $Id: kaccelbase.h,v 1.26 2003/08/16 19:44:57 coolo Exp $
+ * @version $Id: tdeaccelbase.h,v 1.26 2003/08/16 19:44:57 coolo Exp $
  */
 
 class TDEAccelBase
diff --git a/extra/kde321/tdetoolbarbutton.h b/extra/kde321/tdetoolbarbutton.h
index 2c80447..6201d1d 100644
--- a/extra/kde321/tdetoolbarbutton.h
+++ b/extra/kde321/tdetoolbarbutton.h
@@ -20,7 +20,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-// $Id: ktoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $
+// $Id: tdetoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $
 #ifndef _KTOOLBARBUTTON_H
 #define _KTOOLBARBUTTON_H
 
@@ -303,7 +303,7 @@ private:
 /**
 * List of TDEToolBarButton objects.
 * @internal
-* @version $Id: ktoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $
+* @version $Id: tdetoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $
 */
 class TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
 {
diff --git a/extra/kde322/kkeyserver_x11.h b/extra/kde322/kkeyserver_x11.h
index c2e11b7..ad6894c 100644
--- a/extra/kde322/kkeyserver_x11.h
+++ b/extra/kde322/kkeyserver_x11.h
@@ -1,7 +1,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 /**
diff --git a/extra/kde322/kpanelmenu.h b/extra/kde322/kpanelmenu.h
index b2e7265..3ef1764 100644
--- a/extra/kde322/kpanelmenu.h
+++ b/extra/kde322/kpanelmenu.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __KPANELMENU_H__
 
 #include <tqstring.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 
 class KPanelMenuPrivate;
diff --git a/extra/kde322/kurifilter.h b/extra/kde322/kurifilter.h
index 325da8f..f0550d1 100644
--- a/extra/kde322/kurifilter.h
+++ b/extra/kde322/kurifilter.h
@@ -500,17 +500,17 @@ private:
  * of the filters you want to use to a TQStringList and invoke
  * the appropriate filtering function. The examples below show
  * the use of specific filters. The first one uses a single
- * filter called kshorturifilter while the second example uses
+ * filter called tdeshorturifilter while the second example uses
  * multiple filters:
  *
  * \code
  * TQString text = "kde.org";
- * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" );
+ * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" );
  * \endcode
  *
  * \code
  * TQStringList list;
- * list << "kshorturifilter" << "localdomainfilter";
+ * list << "tdeshorturifilter" << "localdomainfilter";
  * bool filtered = KURIFilter::self()->filterURI( text, list );
  * \endcode
  *
diff --git a/extra/kde322/tdeaccelaction.h b/extra/kde322/tdeaccelaction.h
index 269136c..f84a24d 100644
--- a/extra/kde322/tdeaccelaction.h
+++ b/extra/kde322/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/extra/kde322/tdeaccelbase.h b/extra/kde322/tdeaccelbase.h
index ea654cc..296790f 100644
--- a/extra/kde322/tdeaccelbase.h
+++ b/extra/kde322/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver_x11.h"
 
 class TQPopupMenu;
@@ -116,7 +116,7 @@ class TQWidget;
  * menu structure.
  *
  * @short Configurable key binding support.
- * @version $Id: kaccelbase.h,v 1.26 2003/08/16 19:44:57 coolo Exp $
+ * @version $Id: tdeaccelbase.h,v 1.26 2003/08/16 19:44:57 coolo Exp $
  */
 
 class TDEAccelBase
diff --git a/extra/kde322/tdetoolbarbutton.h b/extra/kde322/tdetoolbarbutton.h
index 2c80447..6201d1d 100644
--- a/extra/kde322/tdetoolbarbutton.h
+++ b/extra/kde322/tdetoolbarbutton.h
@@ -20,7 +20,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-// $Id: ktoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $
+// $Id: tdetoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $
 #ifndef _KTOOLBARBUTTON_H
 #define _KTOOLBARBUTTON_H
 
@@ -303,7 +303,7 @@ private:
 /**
 * List of TDEToolBarButton objects.
 * @internal
-* @version $Id: ktoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $
+* @version $Id: tdetoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $
 */
 class TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
 {
diff --git a/extra/kde323/kkeyserver_x11.h b/extra/kde323/kkeyserver_x11.h
index c2e11b7..ad6894c 100644
--- a/extra/kde323/kkeyserver_x11.h
+++ b/extra/kde323/kkeyserver_x11.h
@@ -1,7 +1,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 /**
diff --git a/extra/kde323/kpanelmenu.h b/extra/kde323/kpanelmenu.h
index b2e7265..3ef1764 100644
--- a/extra/kde323/kpanelmenu.h
+++ b/extra/kde323/kpanelmenu.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __KPANELMENU_H__
 
 #include <tqstring.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 
 class KPanelMenuPrivate;
diff --git a/extra/kde323/kurifilter.h b/extra/kde323/kurifilter.h
index 325da8f..f0550d1 100644
--- a/extra/kde323/kurifilter.h
+++ b/extra/kde323/kurifilter.h
@@ -500,17 +500,17 @@ private:
  * of the filters you want to use to a TQStringList and invoke
  * the appropriate filtering function. The examples below show
  * the use of specific filters. The first one uses a single
- * filter called kshorturifilter while the second example uses
+ * filter called tdeshorturifilter while the second example uses
  * multiple filters:
  *
  * \code
  * TQString text = "kde.org";
- * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" );
+ * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" );
  * \endcode
  *
  * \code
  * TQStringList list;
- * list << "kshorturifilter" << "localdomainfilter";
+ * list << "tdeshorturifilter" << "localdomainfilter";
  * bool filtered = KURIFilter::self()->filterURI( text, list );
  * \endcode
  *
diff --git a/extra/kde323/tdeaccelaction.h b/extra/kde323/tdeaccelaction.h
index 269136c..f84a24d 100644
--- a/extra/kde323/tdeaccelaction.h
+++ b/extra/kde323/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/extra/kde323/tdeaccelbase.h b/extra/kde323/tdeaccelbase.h
index ea654cc..296790f 100644
--- a/extra/kde323/tdeaccelbase.h
+++ b/extra/kde323/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver_x11.h"
 
 class TQPopupMenu;
@@ -116,7 +116,7 @@ class TQWidget;
  * menu structure.
  *
  * @short Configurable key binding support.
- * @version $Id: kaccelbase.h,v 1.26 2003/08/16 19:44:57 coolo Exp $
+ * @version $Id: tdeaccelbase.h,v 1.26 2003/08/16 19:44:57 coolo Exp $
  */
 
 class TDEAccelBase
diff --git a/extra/kde323/tdetoolbarbutton.h b/extra/kde323/tdetoolbarbutton.h
index 2c80447..6201d1d 100644
--- a/extra/kde323/tdetoolbarbutton.h
+++ b/extra/kde323/tdetoolbarbutton.h
@@ -20,7 +20,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-// $Id: ktoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $
+// $Id: tdetoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $
 #ifndef _KTOOLBARBUTTON_H
 #define _KTOOLBARBUTTON_H
 
@@ -303,7 +303,7 @@ private:
 /**
 * List of TDEToolBarButton objects.
 * @internal
-* @version $Id: ktoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $
+* @version $Id: tdetoolbarbutton.h,v 1.34 2003/09/09 12:40:58 bhards Exp $
 */
 class TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
 {
diff --git a/extra/kde330/kkeyserver_x11.h b/extra/kde330/kkeyserver_x11.h
index c2e11b7..ad6894c 100644
--- a/extra/kde330/kkeyserver_x11.h
+++ b/extra/kde330/kkeyserver_x11.h
@@ -1,7 +1,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 /**
diff --git a/extra/kde330/kpanelmenu.h b/extra/kde330/kpanelmenu.h
index fd9c00c..c0ea523 100644
--- a/extra/kde330/kpanelmenu.h
+++ b/extra/kde330/kpanelmenu.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __KPANELMENU_H__
 
 #include <tqstring.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 
 class KPanelMenuPrivate;
diff --git a/extra/kde330/kurifilter.h b/extra/kde330/kurifilter.h
index 325da8f..f0550d1 100644
--- a/extra/kde330/kurifilter.h
+++ b/extra/kde330/kurifilter.h
@@ -500,17 +500,17 @@ private:
  * of the filters you want to use to a TQStringList and invoke
  * the appropriate filtering function. The examples below show
  * the use of specific filters. The first one uses a single
- * filter called kshorturifilter while the second example uses
+ * filter called tdeshorturifilter while the second example uses
  * multiple filters:
  *
  * \code
  * TQString text = "kde.org";
- * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" );
+ * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" );
  * \endcode
  *
  * \code
  * TQStringList list;
- * list << "kshorturifilter" << "localdomainfilter";
+ * list << "tdeshorturifilter" << "localdomainfilter";
  * bool filtered = KURIFilter::self()->filterURI( text, list );
  * \endcode
  *
diff --git a/extra/kde330/tdeaccelaction.h b/extra/kde330/tdeaccelaction.h
index 269136c..f84a24d 100644
--- a/extra/kde330/tdeaccelaction.h
+++ b/extra/kde330/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/extra/kde330/tdeaccelbase.h b/extra/kde330/tdeaccelbase.h
index ea654cc..296790f 100644
--- a/extra/kde330/tdeaccelbase.h
+++ b/extra/kde330/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver_x11.h"
 
 class TQPopupMenu;
@@ -116,7 +116,7 @@ class TQWidget;
  * menu structure.
  *
  * @short Configurable key binding support.
- * @version $Id: kaccelbase.h,v 1.26 2003/08/16 19:44:57 coolo Exp $
+ * @version $Id: tdeaccelbase.h,v 1.26 2003/08/16 19:44:57 coolo Exp $
  */
 
 class TDEAccelBase
diff --git a/extra/kde330/tdetoolbarbutton.h b/extra/kde330/tdetoolbarbutton.h
index 724e26b..27936a8 100644
--- a/extra/kde330/tdetoolbarbutton.h
+++ b/extra/kde330/tdetoolbarbutton.h
@@ -303,7 +303,7 @@ private:
 /**
 * List of TDEToolBarButton objects.
 * @internal
-* @version $Id: ktoolbarbutton.h,v 1.36 2004/03/18 02:50:16 bmeyer Exp $
+* @version $Id: tdetoolbarbutton.h,v 1.36 2004/03/18 02:50:16 bmeyer Exp $
 */
 class TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
 {
diff --git a/extra/kde331/kkeyserver_x11.h b/extra/kde331/kkeyserver_x11.h
index c2e11b7..ad6894c 100644
--- a/extra/kde331/kkeyserver_x11.h
+++ b/extra/kde331/kkeyserver_x11.h
@@ -1,7 +1,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 /**
diff --git a/extra/kde331/kpanelmenu.h b/extra/kde331/kpanelmenu.h
index fd9c00c..c0ea523 100644
--- a/extra/kde331/kpanelmenu.h
+++ b/extra/kde331/kpanelmenu.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __KPANELMENU_H__
 
 #include <tqstring.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 
 class KPanelMenuPrivate;
diff --git a/extra/kde331/kurifilter.h b/extra/kde331/kurifilter.h
index 325da8f..f0550d1 100644
--- a/extra/kde331/kurifilter.h
+++ b/extra/kde331/kurifilter.h
@@ -500,17 +500,17 @@ private:
  * of the filters you want to use to a TQStringList and invoke
  * the appropriate filtering function. The examples below show
  * the use of specific filters. The first one uses a single
- * filter called kshorturifilter while the second example uses
+ * filter called tdeshorturifilter while the second example uses
  * multiple filters:
  *
  * \code
  * TQString text = "kde.org";
- * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" );
+ * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" );
  * \endcode
  *
  * \code
  * TQStringList list;
- * list << "kshorturifilter" << "localdomainfilter";
+ * list << "tdeshorturifilter" << "localdomainfilter";
  * bool filtered = KURIFilter::self()->filterURI( text, list );
  * \endcode
  *
diff --git a/extra/kde331/tdeaccelaction.h b/extra/kde331/tdeaccelaction.h
index 269136c..f84a24d 100644
--- a/extra/kde331/tdeaccelaction.h
+++ b/extra/kde331/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/extra/kde331/tdeaccelbase.h b/extra/kde331/tdeaccelbase.h
index ea654cc..296790f 100644
--- a/extra/kde331/tdeaccelbase.h
+++ b/extra/kde331/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver_x11.h"
 
 class TQPopupMenu;
@@ -116,7 +116,7 @@ class TQWidget;
  * menu structure.
  *
  * @short Configurable key binding support.
- * @version $Id: kaccelbase.h,v 1.26 2003/08/16 19:44:57 coolo Exp $
+ * @version $Id: tdeaccelbase.h,v 1.26 2003/08/16 19:44:57 coolo Exp $
  */
 
 class TDEAccelBase
diff --git a/extra/kde331/tdetoolbarbutton.h b/extra/kde331/tdetoolbarbutton.h
index 724e26b..27936a8 100644
--- a/extra/kde331/tdetoolbarbutton.h
+++ b/extra/kde331/tdetoolbarbutton.h
@@ -303,7 +303,7 @@ private:
 /**
 * List of TDEToolBarButton objects.
 * @internal
-* @version $Id: ktoolbarbutton.h,v 1.36 2004/03/18 02:50:16 bmeyer Exp $
+* @version $Id: tdetoolbarbutton.h,v 1.36 2004/03/18 02:50:16 bmeyer Exp $
 */
 class TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
 {
diff --git a/extra/kde332/kkeyserver_x11.h b/extra/kde332/kkeyserver_x11.h
index c2e11b7..ad6894c 100644
--- a/extra/kde332/kkeyserver_x11.h
+++ b/extra/kde332/kkeyserver_x11.h
@@ -1,7 +1,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 /**
diff --git a/extra/kde332/kpanelmenu.h b/extra/kde332/kpanelmenu.h
index fd9c00c..c0ea523 100644
--- a/extra/kde332/kpanelmenu.h
+++ b/extra/kde332/kpanelmenu.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __KPANELMENU_H__
 
 #include <tqstring.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 
 class KPanelMenuPrivate;
diff --git a/extra/kde332/kurifilter.h b/extra/kde332/kurifilter.h
index 325da8f..f0550d1 100644
--- a/extra/kde332/kurifilter.h
+++ b/extra/kde332/kurifilter.h
@@ -500,17 +500,17 @@ private:
  * of the filters you want to use to a TQStringList and invoke
  * the appropriate filtering function. The examples below show
  * the use of specific filters. The first one uses a single
- * filter called kshorturifilter while the second example uses
+ * filter called tdeshorturifilter while the second example uses
  * multiple filters:
  *
  * \code
  * TQString text = "kde.org";
- * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" );
+ * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" );
  * \endcode
  *
  * \code
  * TQStringList list;
- * list << "kshorturifilter" << "localdomainfilter";
+ * list << "tdeshorturifilter" << "localdomainfilter";
  * bool filtered = KURIFilter::self()->filterURI( text, list );
  * \endcode
  *
diff --git a/extra/kde332/tdeaccelaction.h b/extra/kde332/tdeaccelaction.h
index 269136c..f84a24d 100644
--- a/extra/kde332/tdeaccelaction.h
+++ b/extra/kde332/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/extra/kde332/tdeaccelbase.h b/extra/kde332/tdeaccelbase.h
index ea654cc..296790f 100644
--- a/extra/kde332/tdeaccelbase.h
+++ b/extra/kde332/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver_x11.h"
 
 class TQPopupMenu;
@@ -116,7 +116,7 @@ class TQWidget;
  * menu structure.
  *
  * @short Configurable key binding support.
- * @version $Id: kaccelbase.h,v 1.26 2003/08/16 19:44:57 coolo Exp $
+ * @version $Id: tdeaccelbase.h,v 1.26 2003/08/16 19:44:57 coolo Exp $
  */
 
 class TDEAccelBase
diff --git a/extra/kde332/tdetoolbarbutton.h b/extra/kde332/tdetoolbarbutton.h
index 724e26b..27936a8 100644
--- a/extra/kde332/tdetoolbarbutton.h
+++ b/extra/kde332/tdetoolbarbutton.h
@@ -303,7 +303,7 @@ private:
 /**
 * List of TDEToolBarButton objects.
 * @internal
-* @version $Id: ktoolbarbutton.h,v 1.36 2004/03/18 02:50:16 bmeyer Exp $
+* @version $Id: tdetoolbarbutton.h,v 1.36 2004/03/18 02:50:16 bmeyer Exp $
 */
 class TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
 {
diff --git a/extra/kde340/kkeyserver_x11.h b/extra/kde340/kkeyserver_x11.h
index 0251007..d6c8cb4 100644
--- a/extra/kde340/kkeyserver_x11.h
+++ b/extra/kde340/kkeyserver_x11.h
@@ -23,7 +23,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 /**
diff --git a/extra/kde340/kpanelmenu.h b/extra/kde340/kpanelmenu.h
index 0c03d6f..03b700b 100644
--- a/extra/kde340/kpanelmenu.h
+++ b/extra/kde340/kpanelmenu.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __KPANELMENU_H__
 
 #include <tqstring.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 
 class KPanelMenuPrivate;
diff --git a/extra/kde340/kurifilter.h b/extra/kde340/kurifilter.h
index 53dbaa6..1ec8b77 100644
--- a/extra/kde340/kurifilter.h
+++ b/extra/kde340/kurifilter.h
@@ -503,17 +503,17 @@ private:
  * of the filters you want to use to a TQStringList and invoke
  * the appropriate filtering function. The examples below show
  * the use of specific filters. The first one uses a single
- * filter called kshorturifilter while the second example uses
+ * filter called tdeshorturifilter while the second example uses
  * multiple filters:
  *
  * \code
  * TQString text = "kde.org";
- * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" );
+ * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" );
  * \endcode
  *
  * \code
  * TQStringList list;
- * list << "kshorturifilter" << "localdomainfilter";
+ * list << "tdeshorturifilter" << "localdomainfilter";
  * bool filtered = KURIFilter::self()->filterURI( text, list );
  * \endcode
  *
diff --git a/extra/kde340/tdeaccelaction.h b/extra/kde340/tdeaccelaction.h
index 963ce24..54a9070 100644
--- a/extra/kde340/tdeaccelaction.h
+++ b/extra/kde340/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/extra/kde340/tdeaccelbase.h b/extra/kde340/tdeaccelbase.h
index 00ab632..372735c 100644
--- a/extra/kde340/tdeaccelbase.h
+++ b/extra/kde340/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver.h"
 
 class TQPopupMenu;
diff --git a/extra/kde340/tdetoolbarbutton.h b/extra/kde340/tdetoolbarbutton.h
index f035feb..1b35a81 100644
--- a/extra/kde340/tdetoolbarbutton.h
+++ b/extra/kde340/tdetoolbarbutton.h
@@ -317,7 +317,7 @@ private:
 /**
 * List of TDEToolBarButton objects.
 * @internal
-* @version $Id: ktoolbarbutton.h,v 1.39 2004/12/22 14:08:36 faure Exp $
+* @version $Id: tdetoolbarbutton.h,v 1.39 2004/12/22 14:08:36 faure Exp $
 */
 class TDEUI_EXPORT TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
 {
diff --git a/extra/kde341/kkeyserver_x11.h b/extra/kde341/kkeyserver_x11.h
index 0251007..d6c8cb4 100644
--- a/extra/kde341/kkeyserver_x11.h
+++ b/extra/kde341/kkeyserver_x11.h
@@ -23,7 +23,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 /**
diff --git a/extra/kde341/kpanelmenu.h b/extra/kde341/kpanelmenu.h
index 0c03d6f..03b700b 100644
--- a/extra/kde341/kpanelmenu.h
+++ b/extra/kde341/kpanelmenu.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __KPANELMENU_H__
 
 #include <tqstring.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 
 class KPanelMenuPrivate;
diff --git a/extra/kde341/kurifilter.h b/extra/kde341/kurifilter.h
index 53dbaa6..1ec8b77 100644
--- a/extra/kde341/kurifilter.h
+++ b/extra/kde341/kurifilter.h
@@ -503,17 +503,17 @@ private:
  * of the filters you want to use to a TQStringList and invoke
  * the appropriate filtering function. The examples below show
  * the use of specific filters. The first one uses a single
- * filter called kshorturifilter while the second example uses
+ * filter called tdeshorturifilter while the second example uses
  * multiple filters:
  *
  * \code
  * TQString text = "kde.org";
- * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" );
+ * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" );
  * \endcode
  *
  * \code
  * TQStringList list;
- * list << "kshorturifilter" << "localdomainfilter";
+ * list << "tdeshorturifilter" << "localdomainfilter";
  * bool filtered = KURIFilter::self()->filterURI( text, list );
  * \endcode
  *
diff --git a/extra/kde341/tdeaccelaction.h b/extra/kde341/tdeaccelaction.h
index 963ce24..54a9070 100644
--- a/extra/kde341/tdeaccelaction.h
+++ b/extra/kde341/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/extra/kde341/tdeaccelbase.h b/extra/kde341/tdeaccelbase.h
index 00ab632..372735c 100644
--- a/extra/kde341/tdeaccelbase.h
+++ b/extra/kde341/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver.h"
 
 class TQPopupMenu;
diff --git a/extra/kde341/tdetoolbarbutton.h b/extra/kde341/tdetoolbarbutton.h
index f035feb..1b35a81 100644
--- a/extra/kde341/tdetoolbarbutton.h
+++ b/extra/kde341/tdetoolbarbutton.h
@@ -317,7 +317,7 @@ private:
 /**
 * List of TDEToolBarButton objects.
 * @internal
-* @version $Id: ktoolbarbutton.h,v 1.39 2004/12/22 14:08:36 faure Exp $
+* @version $Id: tdetoolbarbutton.h,v 1.39 2004/12/22 14:08:36 faure Exp $
 */
 class TDEUI_EXPORT TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
 {
diff --git a/extra/kde342/kkeyserver_x11.h b/extra/kde342/kkeyserver_x11.h
index 0dae410..5ae8830 100644
--- a/extra/kde342/kkeyserver_x11.h
+++ b/extra/kde342/kkeyserver_x11.h
@@ -23,7 +23,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 /**
diff --git a/extra/kde342/kpanelmenu.h b/extra/kde342/kpanelmenu.h
index 0c03d6f..03b700b 100644
--- a/extra/kde342/kpanelmenu.h
+++ b/extra/kde342/kpanelmenu.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __KPANELMENU_H__
 
 #include <tqstring.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 
 class KPanelMenuPrivate;
diff --git a/extra/kde342/kurifilter.h b/extra/kde342/kurifilter.h
index 53dbaa6..1ec8b77 100644
--- a/extra/kde342/kurifilter.h
+++ b/extra/kde342/kurifilter.h
@@ -503,17 +503,17 @@ private:
  * of the filters you want to use to a TQStringList and invoke
  * the appropriate filtering function. The examples below show
  * the use of specific filters. The first one uses a single
- * filter called kshorturifilter while the second example uses
+ * filter called tdeshorturifilter while the second example uses
  * multiple filters:
  *
  * \code
  * TQString text = "kde.org";
- * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" );
+ * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" );
  * \endcode
  *
  * \code
  * TQStringList list;
- * list << "kshorturifilter" << "localdomainfilter";
+ * list << "tdeshorturifilter" << "localdomainfilter";
  * bool filtered = KURIFilter::self()->filterURI( text, list );
  * \endcode
  *
diff --git a/extra/kde342/tdeaccelaction.h b/extra/kde342/tdeaccelaction.h
index 963ce24..54a9070 100644
--- a/extra/kde342/tdeaccelaction.h
+++ b/extra/kde342/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/extra/kde342/tdeaccelbase.h b/extra/kde342/tdeaccelbase.h
index 00ab632..372735c 100644
--- a/extra/kde342/tdeaccelbase.h
+++ b/extra/kde342/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver.h"
 
 class TQPopupMenu;
diff --git a/extra/kde342/tdetoolbarbutton.h b/extra/kde342/tdetoolbarbutton.h
index 91d1291..8da921f 100644
--- a/extra/kde342/tdetoolbarbutton.h
+++ b/extra/kde342/tdetoolbarbutton.h
@@ -317,7 +317,7 @@ private:
 /**
 * List of TDEToolBarButton objects.
 * @internal
-* @version $Id: ktoolbarbutton.h 372745 2004-12-22 14:08:36Z dfaure $
+* @version $Id: tdetoolbarbutton.h 372745 2004-12-22 14:08:36Z dfaure $
 */
 class TDEUI_EXPORT TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
 {
diff --git a/extra/kde343/kkeyserver_x11.h b/extra/kde343/kkeyserver_x11.h
index 0dae410..5ae8830 100644
--- a/extra/kde343/kkeyserver_x11.h
+++ b/extra/kde343/kkeyserver_x11.h
@@ -23,7 +23,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 /**
diff --git a/extra/kde343/kpanelmenu.h b/extra/kde343/kpanelmenu.h
index 0c03d6f..03b700b 100644
--- a/extra/kde343/kpanelmenu.h
+++ b/extra/kde343/kpanelmenu.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __KPANELMENU_H__
 
 #include <tqstring.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 
 class KPanelMenuPrivate;
diff --git a/extra/kde343/kurifilter.h b/extra/kde343/kurifilter.h
index 53dbaa6..1ec8b77 100644
--- a/extra/kde343/kurifilter.h
+++ b/extra/kde343/kurifilter.h
@@ -503,17 +503,17 @@ private:
  * of the filters you want to use to a TQStringList and invoke
  * the appropriate filtering function. The examples below show
  * the use of specific filters. The first one uses a single
- * filter called kshorturifilter while the second example uses
+ * filter called tdeshorturifilter while the second example uses
  * multiple filters:
  *
  * \code
  * TQString text = "kde.org";
- * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" );
+ * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" );
  * \endcode
  *
  * \code
  * TQStringList list;
- * list << "kshorturifilter" << "localdomainfilter";
+ * list << "tdeshorturifilter" << "localdomainfilter";
  * bool filtered = KURIFilter::self()->filterURI( text, list );
  * \endcode
  *
diff --git a/extra/kde343/tdeaccelaction.h b/extra/kde343/tdeaccelaction.h
index 963ce24..54a9070 100644
--- a/extra/kde343/tdeaccelaction.h
+++ b/extra/kde343/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/extra/kde343/tdeaccelbase.h b/extra/kde343/tdeaccelbase.h
index 00ab632..372735c 100644
--- a/extra/kde343/tdeaccelbase.h
+++ b/extra/kde343/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver.h"
 
 class TQPopupMenu;
diff --git a/extra/kde343/tdetoolbarbutton.h b/extra/kde343/tdetoolbarbutton.h
index 91d1291..8da921f 100644
--- a/extra/kde343/tdetoolbarbutton.h
+++ b/extra/kde343/tdetoolbarbutton.h
@@ -317,7 +317,7 @@ private:
 /**
 * List of TDEToolBarButton objects.
 * @internal
-* @version $Id: ktoolbarbutton.h 372745 2004-12-22 14:08:36Z dfaure $
+* @version $Id: tdetoolbarbutton.h 372745 2004-12-22 14:08:36Z dfaure $
 */
 class TDEUI_EXPORT TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
 {
diff --git a/extra/kde350/kkeyserver_x11.h b/extra/kde350/kkeyserver_x11.h
index 2b48047..46268dc 100644
--- a/extra/kde350/kkeyserver_x11.h
+++ b/extra/kde350/kkeyserver_x11.h
@@ -23,7 +23,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 /**
diff --git a/extra/kde350/kpanelmenu.h b/extra/kde350/kpanelmenu.h
index 0c03d6f..03b700b 100644
--- a/extra/kde350/kpanelmenu.h
+++ b/extra/kde350/kpanelmenu.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __KPANELMENU_H__
 
 #include <tqstring.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 
 class KPanelMenuPrivate;
diff --git a/extra/kde350/kurifilter.h b/extra/kde350/kurifilter.h
index 639366f..5bfcc92 100644
--- a/extra/kde350/kurifilter.h
+++ b/extra/kde350/kurifilter.h
@@ -503,17 +503,17 @@ private:
  * of the filters you want to use to a TQStringList and invoke
  * the appropriate filtering function. The examples below show
  * the use of specific filters. The first one uses a single
- * filter called kshorturifilter while the second example uses
+ * filter called tdeshorturifilter while the second example uses
  * multiple filters:
  *
  * \code
  * TQString text = "kde.org";
- * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" );
+ * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" );
  * \endcode
  *
  * \code
  * TQStringList list;
- * list << "kshorturifilter" << "localdomainfilter";
+ * list << "tdeshorturifilter" << "localdomainfilter";
  * bool filtered = KURIFilter::self()->filterURI( text, list );
  * \endcode
  *
diff --git a/extra/kde350/tdeaccelaction.h b/extra/kde350/tdeaccelaction.h
index 809533f..e8232cc 100644
--- a/extra/kde350/tdeaccelaction.h
+++ b/extra/kde350/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/extra/kde350/tdeaccelbase.h b/extra/kde350/tdeaccelbase.h
index e5d832a..920c1c7 100644
--- a/extra/kde350/tdeaccelbase.h
+++ b/extra/kde350/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver.h"
 
 class TQPopupMenu;
diff --git a/extra/kde350/tdetoolbarbutton.h b/extra/kde350/tdetoolbarbutton.h
index 1c08569..6d5cd72 100644
--- a/extra/kde350/tdetoolbarbutton.h
+++ b/extra/kde350/tdetoolbarbutton.h
@@ -318,7 +318,7 @@ private:
 /**
 * List of TDEToolBarButton objects.
 * @internal
-* @version $Id: ktoolbarbutton.h 465272 2005-09-29 09:47:40Z mueller $
+* @version $Id: tdetoolbarbutton.h 465272 2005-09-29 09:47:40Z mueller $
 */
 class TDEUI_EXPORT TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
 {
diff --git a/extra/kde351/kkeyserver_x11.h b/extra/kde351/kkeyserver_x11.h
index 2b48047..46268dc 100644
--- a/extra/kde351/kkeyserver_x11.h
+++ b/extra/kde351/kkeyserver_x11.h
@@ -23,7 +23,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 /**
diff --git a/extra/kde351/kpanelmenu.h b/extra/kde351/kpanelmenu.h
index 0c03d6f..03b700b 100644
--- a/extra/kde351/kpanelmenu.h
+++ b/extra/kde351/kpanelmenu.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __KPANELMENU_H__
 
 #include <tqstring.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 
 class KPanelMenuPrivate;
diff --git a/extra/kde351/kurifilter.h b/extra/kde351/kurifilter.h
index 639366f..5bfcc92 100644
--- a/extra/kde351/kurifilter.h
+++ b/extra/kde351/kurifilter.h
@@ -503,17 +503,17 @@ private:
  * of the filters you want to use to a TQStringList and invoke
  * the appropriate filtering function. The examples below show
  * the use of specific filters. The first one uses a single
- * filter called kshorturifilter while the second example uses
+ * filter called tdeshorturifilter while the second example uses
  * multiple filters:
  *
  * \code
  * TQString text = "kde.org";
- * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" );
+ * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" );
  * \endcode
  *
  * \code
  * TQStringList list;
- * list << "kshorturifilter" << "localdomainfilter";
+ * list << "tdeshorturifilter" << "localdomainfilter";
  * bool filtered = KURIFilter::self()->filterURI( text, list );
  * \endcode
  *
diff --git a/extra/kde351/tdeaccelaction.h b/extra/kde351/tdeaccelaction.h
index 809533f..e8232cc 100644
--- a/extra/kde351/tdeaccelaction.h
+++ b/extra/kde351/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/extra/kde351/tdeaccelbase.h b/extra/kde351/tdeaccelbase.h
index e5d832a..920c1c7 100644
--- a/extra/kde351/tdeaccelbase.h
+++ b/extra/kde351/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver.h"
 
 class TQPopupMenu;
diff --git a/extra/kde351/tdetoolbarbutton.h b/extra/kde351/tdetoolbarbutton.h
index 1c08569..6d5cd72 100644
--- a/extra/kde351/tdetoolbarbutton.h
+++ b/extra/kde351/tdetoolbarbutton.h
@@ -318,7 +318,7 @@ private:
 /**
 * List of TDEToolBarButton objects.
 * @internal
-* @version $Id: ktoolbarbutton.h 465272 2005-09-29 09:47:40Z mueller $
+* @version $Id: tdetoolbarbutton.h 465272 2005-09-29 09:47:40Z mueller $
 */
 class TDEUI_EXPORT TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
 {
diff --git a/extra/kde352/kkeyserver_x11.h b/extra/kde352/kkeyserver_x11.h
index 2b48047..46268dc 100644
--- a/extra/kde352/kkeyserver_x11.h
+++ b/extra/kde352/kkeyserver_x11.h
@@ -23,7 +23,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 /**
diff --git a/extra/kde352/kpanelmenu.h b/extra/kde352/kpanelmenu.h
index 0c03d6f..03b700b 100644
--- a/extra/kde352/kpanelmenu.h
+++ b/extra/kde352/kpanelmenu.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __KPANELMENU_H__
 
 #include <tqstring.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 
 class KPanelMenuPrivate;
diff --git a/extra/kde352/kurifilter.h b/extra/kde352/kurifilter.h
index 639366f..5bfcc92 100644
--- a/extra/kde352/kurifilter.h
+++ b/extra/kde352/kurifilter.h
@@ -503,17 +503,17 @@ private:
  * of the filters you want to use to a TQStringList and invoke
  * the appropriate filtering function. The examples below show
  * the use of specific filters. The first one uses a single
- * filter called kshorturifilter while the second example uses
+ * filter called tdeshorturifilter while the second example uses
  * multiple filters:
  *
  * \code
  * TQString text = "kde.org";
- * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" );
+ * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" );
  * \endcode
  *
  * \code
  * TQStringList list;
- * list << "kshorturifilter" << "localdomainfilter";
+ * list << "tdeshorturifilter" << "localdomainfilter";
  * bool filtered = KURIFilter::self()->filterURI( text, list );
  * \endcode
  *
diff --git a/extra/kde352/tdeaccelaction.h b/extra/kde352/tdeaccelaction.h
index 809533f..e8232cc 100644
--- a/extra/kde352/tdeaccelaction.h
+++ b/extra/kde352/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/extra/kde352/tdeaccelbase.h b/extra/kde352/tdeaccelbase.h
index e5d832a..920c1c7 100644
--- a/extra/kde352/tdeaccelbase.h
+++ b/extra/kde352/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver.h"
 
 class TQPopupMenu;
diff --git a/extra/kde352/tdetoolbarbutton.h b/extra/kde352/tdetoolbarbutton.h
index 1c08569..6d5cd72 100644
--- a/extra/kde352/tdetoolbarbutton.h
+++ b/extra/kde352/tdetoolbarbutton.h
@@ -318,7 +318,7 @@ private:
 /**
 * List of TDEToolBarButton objects.
 * @internal
-* @version $Id: ktoolbarbutton.h 465272 2005-09-29 09:47:40Z mueller $
+* @version $Id: tdetoolbarbutton.h 465272 2005-09-29 09:47:40Z mueller $
 */
 class TDEUI_EXPORT TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
 {
diff --git a/extra/kde353/kkeyserver_x11.h b/extra/kde353/kkeyserver_x11.h
index ce3fa2f..9033091 100644
--- a/extra/kde353/kkeyserver_x11.h
+++ b/extra/kde353/kkeyserver_x11.h
@@ -23,7 +23,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 /**
diff --git a/extra/kde353/kpanelmenu.h b/extra/kde353/kpanelmenu.h
index 0c03d6f..03b700b 100644
--- a/extra/kde353/kpanelmenu.h
+++ b/extra/kde353/kpanelmenu.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __KPANELMENU_H__
 
 #include <tqstring.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 
 class KPanelMenuPrivate;
diff --git a/extra/kde353/kurifilter.h b/extra/kde353/kurifilter.h
index 639366f..5bfcc92 100644
--- a/extra/kde353/kurifilter.h
+++ b/extra/kde353/kurifilter.h
@@ -503,17 +503,17 @@ private:
  * of the filters you want to use to a TQStringList and invoke
  * the appropriate filtering function. The examples below show
  * the use of specific filters. The first one uses a single
- * filter called kshorturifilter while the second example uses
+ * filter called tdeshorturifilter while the second example uses
  * multiple filters:
  *
  * \code
  * TQString text = "kde.org";
- * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" );
+ * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" );
  * \endcode
  *
  * \code
  * TQStringList list;
- * list << "kshorturifilter" << "localdomainfilter";
+ * list << "tdeshorturifilter" << "localdomainfilter";
  * bool filtered = KURIFilter::self()->filterURI( text, list );
  * \endcode
  *
diff --git a/extra/kde353/tdeaccelaction.h b/extra/kde353/tdeaccelaction.h
index 809533f..e8232cc 100644
--- a/extra/kde353/tdeaccelaction.h
+++ b/extra/kde353/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/extra/kde353/tdeaccelbase.h b/extra/kde353/tdeaccelbase.h
index e5d832a..920c1c7 100644
--- a/extra/kde353/tdeaccelbase.h
+++ b/extra/kde353/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver.h"
 
 class TQPopupMenu;
diff --git a/extra/kde353/tdetoolbarbutton.h b/extra/kde353/tdetoolbarbutton.h
index 1c08569..6d5cd72 100644
--- a/extra/kde353/tdetoolbarbutton.h
+++ b/extra/kde353/tdetoolbarbutton.h
@@ -318,7 +318,7 @@ private:
 /**
 * List of TDEToolBarButton objects.
 * @internal
-* @version $Id: ktoolbarbutton.h 465272 2005-09-29 09:47:40Z mueller $
+* @version $Id: tdetoolbarbutton.h 465272 2005-09-29 09:47:40Z mueller $
 */
 class TDEUI_EXPORT TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
 {