Rename many classes and header files to avoid conflicts with KDE4

33 files changed, 87 insertions, 87 deletions

diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt
index dbc2a7065..871190eac 100644
--- a/tdecore/CMakeLists.txt
+++ b/tdecore/CMakeLists.txt
@@ -75,14 +75,14 @@ install( FILES
     kapp.h kapplication.h kuniqueapp.h kuniqueapplication.h
     kcharsets.h tdeversion.h kpty.h kprocess.h kprocctrl.h
     klocale.h kicontheme.h kiconloader.h kdebug.h twinmodule.h
-    twin.h krootprop.h kshortcut.h kkeynative.h kaccel.h
-    kglobalaccel.h kstdaccel.h kshortcutlist.h kcatalogue.h
+    twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h
+    kglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h
     kregexp.h kcompletion.h kstringhandler.h kstddirs.h
     kstandarddirs.h kglobal.h kglobalsettings.h ksharedptr.h
     kallocator.h kvmallocator.h kcrash.h krfcdate.h kinstance.h
     kpalette.h kipc.h klibloader.h ktempfile.h ksavefile.h
     krandomsequence.h knotifyclient.h kiconeffect.h kaudioplayer.h
-    kdcoppropertyproxy.h netwm.h kaccelmanager.h netwm_def.h
+    kdcoppropertyproxy.h netwm.h tdeaccelmanager.h netwm_def.h
     kpixmapprovider.h kunload.h kstaticdeleter.h kextsock.h
     kextendedsocket.h ksockaddr.h kprocio.h kasyncio.h kbufferedio.h
     kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h tdesycoca.h
@@ -126,13 +126,13 @@ set( ${target}_SRCS
   ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp klocale.cpp
   krfcdate.cpp kiconeffect.cpp kicontheme.cpp kiconloader.cpp
   twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp
-  kckey.cpp kshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp
-  kaccelaction.cpp kshortcutmenu.cpp kaccelbase.cpp kaccel.cpp
-  kglobalaccel_x11.cpp kglobalaccel.cpp kstdaccel.cpp kshortcutlist.cpp
+  kckey.cpp tdeshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp
+  tdeaccelaction.cpp tdeshortcutmenu.cpp tdeaccelbase.cpp tdeaccel.cpp
+  kglobalaccel_x11.cpp kglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp
   kcrash.cpp kurl.cpp kregexp.cpp kglobal.cpp kglobalsettings.cpp
   kallocator.cpp kvmallocator.cpp kmimesourcefactory.cpp
   kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp ktempfile.cpp
-  kuniqueapplication.cpp kaccelmanager.cpp ksavefile.cpp
+  kuniqueapplication.cpp tdeaccelmanager.cpp ksavefile.cpp
   krandomsequence.cpp kstringhandler.cpp kcompletion.cpp
   kcmdlineargs.cpp kaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp
   kaudioplayer.cpp kdcoppropertyproxy.cpp ksockaddr.cpp
diff --git a/tdecore/MAINTAINERS b/tdecore/MAINTAINERS
index 6295c102d..2b171743c 100644
--- a/tdecore/MAINTAINERS
+++ b/tdecore/MAINTAINERS
@@ -7,9 +7,9 @@ more logical grouping.
 
 dmalloc.cpp
 kaboutdata.cpp		David Faure <faure@kde.org>
-kaccel.cpp		Ellis Whitehead <ellis@kde.org>
-kaccelaction.cpp	Ellis Whitehead <ellis@kde.org>
-kaccelbase.cpp		Ellis Whitehead <ellis@kde.org>
+tdeaccel.cpp		Ellis Whitehead <ellis@kde.org>
+tdeaccelaction.cpp	Ellis Whitehead <ellis@kde.org>
+tdeaccelbase.cpp		Ellis Whitehead <ellis@kde.org>
 kallocator.cpp		Waldo Bastian <bastian@kde.org>
 kappdcopiface.cpp
 kapplication.cpp	Waldo Bastian <bastian@kde.org>
@@ -56,13 +56,13 @@ kregexp.cpp
 krfcdate.cpp		Waldo Bastian <bastian@kde.org>
 krootprop.cpp   	Lubos Lunak <l.lunak@kde.org>
 ksavefile.cpp		Waldo Bastian <bastian@kde.org>
-kshortcut.cpp		Ellis Whitehead <ellis@kde.org>
+tdeshortcut.cpp		Ellis Whitehead <ellis@kde.org>
 ksimpleconfig.cpp	Waldo Bastian <bastian@kde.org>
 ksocks.cpp
 kstandarddirs.cpp	Waldo Bastian <bastian@kde.org>
 kstartupinfo.cpp	Lubos Lunak <l.lunak@kde.org>
 kstaticdeleter.cpp	Stephan Kulow <coolo@kde.org>
-kstdaccel.cpp		Ellis Whitehead <ellis@kde.org>
+tdestdaccel.cpp		Ellis Whitehead <ellis@kde.org>
 kstringhandler.cpp
 tdesycoca.cpp		Waldo Bastian <bastian@kde.org>
 tdesycocadict.cpp		Waldo Bastian <bastian@kde.org>
@@ -109,7 +109,7 @@ kprotocolinfofactory.cpp	Torben Weis <weis@kde.org> (copyright)
 kprotocolinfofactory.cpp	Waldo Bastian <bastian@kde.org> (copyright)
 kpty.cpp
 kshell.cpp		Oswald Buddenhagen <ossi@kde.org> (copyright)
-kshortcutmenu.cpp	Ellis Whitehead <ellis@kde.org> (copyright)
+tdeshortcutmenu.cpp	Ellis Whitehead <ellis@kde.org> (copyright)
 ktempdir.cpp		Joseph Wenninger <jowenn@kde.org> (copyright)
 kuser.cpp		Tim Jansen <tim@tjansen.de> (copyright)
 kvmallocator.cpp	Waldo Bastian (bastian@kde.org) (copyright)
diff --git a/tdecore/Makefile.am b/tdecore/Makefile.am
index 2204ab749..332e178ea 100644
--- a/tdecore/Makefile.am
+++ b/tdecore/Makefile.am
@@ -42,14 +42,14 @@ include_HEADERS = tdeconfig.h tdeconfigskeleton.h \
 	kcmdlineargs.h tdeconfigbackend.h kapp.h kapplication.h kuniqueapp.h \
 	kuniqueapplication.h kcharsets.h tdeversion.h kpty.h kprocess.h \
 	kprocctrl.h klocale.h kicontheme.h kiconloader.h kdebug.h \
-	twinmodule.h twin.h krootprop.h kshortcut.h kkeynative.h kaccel.h \
-	kglobalaccel.h kstdaccel.h kshortcutlist.h kcatalogue.h \
+	twinmodule.h twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h \
+	kglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h \
 	kregexp.h kcompletion.h kstringhandler.h \
 	kstddirs.h kstandarddirs.h kglobal.h kglobalsettings.h ksharedptr.h \
 	kallocator.h kvmallocator.h kcrash.h krfcdate.h \
 	kinstance.h kpalette.h kipc.h klibloader.h ktempfile.h ksavefile.h \
 	krandomsequence.h knotifyclient.h kiconeffect.h \
-	kaudioplayer.h kdcoppropertyproxy.h netwm.h kaccelmanager.h \
+	kaudioplayer.h kdcoppropertyproxy.h netwm.h tdeaccelmanager.h \
 	netwm_def.h kpixmapprovider.h kunload.h kstaticdeleter.h \
 	kextsock.h kextendedsocket.h ksockaddr.h kprocio.h kasyncio.h \
 	kbufferedio.h kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h \
@@ -81,10 +81,10 @@ libtdefakes_pic.a: libtdefakes.la
 	ar cru libtdefakes_pic.a fakes_pic.o vsnprintf_pic.o
 	ranlib libtdefakes_pic.a
 
-noinst_HEADERS = kaccelaction.h kaccelbase.h kaccelprivate.h kckey.h \
+noinst_HEADERS = tdeaccelaction.h tdeaccelbase.h tdeaccelprivate.h kckey.h \
 	kcompletion_private.h netwm_p.h \
 	kglobalaccel_x11.h kglobalaccel_win.h kkeyserver_x11.h kkeyserver.h \
-	kregpriv.h kshortcutmenu.h tdesycocadict.h tdesycocafactory.h netsupp.h \
+	kregpriv.h tdeshortcutmenu.h tdesycocadict.h tdesycocafactory.h netsupp.h \
 	kcheckaccelerators.h kcalendarsystemgregorian.h \
 	kcalendarsystemhijri.h kcalendarsystemhebrew.h kcalendarsystemjalali.h \
 	kprotocolinfofactory.h kqiodevicegzip_p.h kiconloader_p.h
@@ -95,13 +95,13 @@ libtdecore_la_SOURCES = libintl.cpp kapplication.cpp \
 	kstandarddirs.cpp ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp \
 	klocale.cpp krfcdate.cpp kiconeffect.cpp kicontheme.cpp \
 	kiconloader.cpp twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp \
-	kckey.cpp kshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp \
-	kaccelaction.cpp kshortcutmenu.cpp kaccelbase.cpp kaccel.cpp \
-	kglobalaccel_x11.cpp kglobalaccel.cpp kstdaccel.cpp kshortcutlist.cpp \
+	kckey.cpp tdeshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp \
+	tdeaccelaction.cpp tdeshortcutmenu.cpp tdeaccelbase.cpp tdeaccel.cpp \
+	kglobalaccel_x11.cpp kglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp \
 	kcrash.cpp kurl.cpp kregexp.cpp kglobal.cpp kglobalsettings.cpp \
 	kallocator.cpp kvmallocator.cpp kmimesourcefactory.cpp \
 	kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp ktempfile.cpp \
-	kuniqueapplication.cpp kaccelmanager.cpp \
+	kuniqueapplication.cpp tdeaccelmanager.cpp \
 	ksavefile.cpp krandomsequence.cpp kstringhandler.cpp kcompletion.cpp \
 	kcmdlineargs.cpp kaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp \
 	kaudioplayer.cpp kdcoppropertyproxy.cpp \
diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp
index 705713a7e..35ece3c25 100644
--- a/tdecore/kapplication.cpp
+++ b/tdecore/kapplication.cpp
@@ -77,8 +77,8 @@
 #include <kdatastream.h>
 #include <klibloader.h>
 #include <kmimesourcefactory.h>
-#include <kstdaccel.h>
-#include <kaccel.h>
+#include <tdestdaccel.h>
+#include <tdeaccel.h>
 #include "kcheckaccelerators.h"
 #include <tqptrdict.h>
 #include <kmacroexpander.h>
diff --git a/tdecore/kcheckaccelerators.cpp b/tdecore/kcheckaccelerators.cpp
index ec11f50a8..b7e113f4b 100644
--- a/tdecore/kcheckaccelerators.cpp
+++ b/tdecore/kcheckaccelerators.cpp
@@ -26,7 +26,7 @@
 #include "config.h"
 
 #include "kcheckaccelerators.h"
-#include "kaccelmanager.h"
+#include "tdeaccelmanager.h"
 #include <tqpopupmenu.h>
 #include <tqapplication.h>
 #include <tqdialog.h>
@@ -42,7 +42,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <klocale.h>
 
 /*
diff --git a/tdecore/kcompletion.h b/tdecore/kcompletion.h
index 020512b43..d88a3d6fc 100644
--- a/tdecore/kcompletion.h
+++ b/tdecore/kcompletion.h
@@ -30,7 +30,7 @@
 #include "tdelibs_export.h"
 #include <kglobalsettings.h>
 #include <ksortablevaluelist.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class KCompTreeNode;
 class KCompletionPrivate;
diff --git a/tdecore/kglobalaccel.cpp b/tdecore/kglobalaccel.cpp
index eb1b56323..6af97065d 100644
--- a/tdecore/kglobalaccel.cpp
+++ b/tdecore/kglobalaccel.cpp
@@ -29,9 +29,9 @@
 #endif
 
 #include <tqstring.h>
-#include "kaccelbase.h"
+#include "tdeaccelbase.h"
 #include <kdebug.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <klocale.h>
 
 //----------------------------------------------------
diff --git a/tdecore/kglobalaccel.h b/tdecore/kglobalaccel.h
index 9606b8af1..a8ed8a955 100644
--- a/tdecore/kglobalaccel.h
+++ b/tdecore/kglobalaccel.h
@@ -21,7 +21,7 @@
 #define _KGLOBALACCEL_H_
 
 #include <tqobject.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TQPopupMenu;
 class TQWidget;
diff --git a/tdecore/kglobalaccel_emb.h b/tdecore/kglobalaccel_emb.h
index e4feb601e..5e5145d66 100644
--- a/tdecore/kglobalaccel_emb.h
+++ b/tdecore/kglobalaccel_emb.h
@@ -1,8 +1,8 @@
 #ifndef _KGLOBALACCEL_EMB_H
 #define _KGLOBALACCEL_EMB_H
 
-#include "kaccelbase.h"
-#include "kshortcut.h"
+#include "tdeaccelbase.h"
+#include "tdeshortcut.h"
 
 class TDEGlobalAccelPrivate
 {
diff --git a/tdecore/kglobalaccel_mac.h b/tdecore/kglobalaccel_mac.h
index 82fe332b4..b2803b0c0 100644
--- a/tdecore/kglobalaccel_mac.h
+++ b/tdecore/kglobalaccel_mac.h
@@ -3,8 +3,8 @@
 
 #include <tqwidget.h>
 
-#include "kshortcut.h"
-#include "kaccelbase.h"
+#include "tdeshortcut.h"
+#include "tdeaccelbase.h"
 
 class TDEGlobalAccelPrivate: public TDEAccelBase
 {
diff --git a/tdecore/kglobalaccel_win.h b/tdecore/kglobalaccel_win.h
index 0a938cbfc..e60fed8ee 100644
--- a/tdecore/kglobalaccel_win.h
+++ b/tdecore/kglobalaccel_win.h
@@ -23,9 +23,9 @@
 #include <tqmap.h>
 #include <tqwidget.h>
 
-#include "kaccelbase.h"
+#include "tdeaccelbase.h"
 #include "kkeyserver.h"
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 
 /**
  * @internal
diff --git a/tdecore/kglobalaccel_x11.h b/tdecore/kglobalaccel_x11.h
index df1f54425..b22363926 100644
--- a/tdecore/kglobalaccel_x11.h
+++ b/tdecore/kglobalaccel_x11.h
@@ -23,9 +23,9 @@
 #include <tqmap.h>
 #include <tqwidget.h>
 
-#include "kaccelbase.h"
+#include "tdeaccelbase.h"
 #include "kkeyserver_x11.h"
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 
 /**
  * @internal
diff --git a/tdecore/kglobalsettings.cpp b/tdecore/kglobalsettings.cpp
index f9774a886..27ba7743e 100644
--- a/tdecore/kglobalsettings.cpp
+++ b/tdecore/kglobalsettings.cpp
@@ -41,10 +41,10 @@ static QRgb qt_colorref2qrgb(COLORREF col)
 
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kstandarddirs.h>
 #include <kcharsets.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <klocale.h>
 #include <tqfontinfo.h>
 #include <stdlib.h>
diff --git a/tdecore/kkeynative.h b/tdecore/kkeynative.h
index cf29fcabc..e2774417d 100644
--- a/tdecore/kkeynative.h
+++ b/tdecore/kkeynative.h
@@ -23,7 +23,7 @@
 #ifndef __KKEYNATIVE_H
 #define __KKEYNATIVE_H
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 #ifdef Q_WS_X11
 typedef union _XEvent XEvent;
diff --git a/tdecore/kkeyserver_x11.cpp b/tdecore/kkeyserver_x11.cpp
index 69acd0d5e..cd4abb6fb 100644
--- a/tdecore/kkeyserver_x11.cpp
+++ b/tdecore/kkeyserver_x11.cpp
@@ -29,7 +29,7 @@
 
 #include "kkeyserver_x11.h"
 #include "kkeynative.h"
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 
 #include <tdeconfig.h>
 #include <kdebug.h>
@@ -1020,7 +1020,7 @@ void Variations::init( const KKey& key, bool bQt )
 
 } // end of namespace KKeyServer block
 
-// FIXME: This needs to be moved to kshortcut.cpp, and create a 
+// FIXME: This needs to be moved to tdeshortcut.cpp, and create a 
 //  KKeyServer::method which it will call.
 // Alt+SysReq => Alt+Print
 // Ctrl+Shift+Plus => Ctrl+Plus (en)
diff --git a/tdecore/kkeyserver_x11.h b/tdecore/kkeyserver_x11.h
index ce3fa2fed..90330911b 100644
--- a/tdecore/kkeyserver_x11.h
+++ b/tdecore/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/tdecore/network/ipv6blactdelist b/tdecore/network/ipv6blacklist
index f4d4d1252..f4d4d1252 100644
--- a/tdecore/network/ipv6blactdelist
+++ b/tdecore/network/ipv6blacklist
diff --git a/tdecore/tdeaccel.cpp b/tdecore/tdeaccel.cpp
index 9dde93e7a..be8fba51b 100644
--- a/tdecore/tdeaccel.cpp
+++ b/tdecore/tdeaccel.cpp
@@ -17,7 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kaccel.h"
+#include "tdeaccel.h"
 
 #include <tqaccel.h>
 #include <tqguardedptr.h>
@@ -26,13 +26,13 @@
 #include <tqstring.h>
 #include <tqtimer.h>
 
-#include "kaccelbase.h"
+#include "tdeaccelbase.h"
 #include <kapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
-#include "kaccelprivate.h"
+#include "tdeaccelprivate.h"
 
 #ifdef Q_WS_X11
 #	include <X11/Xlib.h>
@@ -43,7 +43,7 @@
 #	endif
 #endif
 
-// TODO: Put in kaccelbase.cpp
+// TODO: Put in tdeaccelbase.cpp
 //---------------------------------------------------------------------
 // TDEAccelEventHandler
 //---------------------------------------------------------------------
@@ -659,5 +659,5 @@ TQString TDEAccel::findKey( int key ) const
 void TDEAccel::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "kaccel.moc"
-#include "kaccelprivate.moc"
+#include "tdeaccel.moc"
+#include "tdeaccelprivate.moc"
diff --git a/tdecore/tdeaccel.h b/tdecore/tdeaccel.h
index 8a3f2d499..8b61102f4 100644
--- a/tdecore/tdeaccel.h
+++ b/tdecore/tdeaccel.h
@@ -21,8 +21,8 @@
 #define _KACCEL_H
 
 #include <tqaccel.h>
-#include <kshortcut.h>
-#include <kstdaccel.h>
+#include <tdeshortcut.h>
+#include <tdestdaccel.h>
 #include "tdelibs_export.h"
 
 class TQPopupMenu; // for obsolete insertItem() methods below
diff --git a/tdecore/tdeaccelaction.cpp b/tdecore/tdeaccelaction.cpp
index d3ec59be3..93f17ae25 100644
--- a/tdecore/tdeaccelaction.cpp
+++ b/tdecore/tdeaccelaction.cpp
@@ -20,8 +20,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kaccelaction.h"
-#include "kaccelbase.h"   // for TDEAccelBase::slotRemoveAction() & emitSignal()
+#include "tdeaccelaction.h"
+#include "tdeaccelbase.h"   // for TDEAccelBase::slotRemoveAction() & emitSignal()
 
 #include <tqkeycode.h>
 
@@ -31,7 +31,7 @@
 #include <kglobal.h>
 #include <kkeynative.h>
 #include <klocale.h>
-#include <kshortcutlist.h>
+#include <tdeshortcutlist.h>
 
 //---------------------------------------------------------------------
 // TDEAccelAction
diff --git a/tdecore/tdeaccelaction.h b/tdecore/tdeaccelaction.h
index 809533ff8..e8232cc44 100644
--- a/tdecore/tdeaccelaction.h
+++ b/tdecore/tdeaccelaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TDEAccelBase;
 
diff --git a/tdecore/tdeaccelbase.cpp b/tdecore/tdeaccelbase.cpp
index 235803134..434801f61 100644
--- a/tdecore/tdeaccelbase.cpp
+++ b/tdecore/tdeaccelbase.cpp
@@ -20,7 +20,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kaccelbase.h"
+#include "tdeaccelbase.h"
 
 #include <tqkeycode.h>
 #include <tqlabel.h>
@@ -33,7 +33,7 @@
 #include <kkeynative.h>
 #include "kkeyserver.h"
 #include <klocale.h>
-#include "kshortcutmenu.h"
+#include "tdeshortcutmenu.h"
 
 //---------------------------------------------------------------------
 // class TDEAccelBase::ActionInfo
diff --git a/tdecore/tdeaccelbase.h b/tdecore/tdeaccelbase.h
index 3d7180c4f..377589718 100644
--- a/tdecore/tdeaccelbase.h
+++ b/tdecore/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/tdecore/tdeaccelmanager.cpp b/tdecore/tdeaccelmanager.cpp
index 9ac4dbdae..5fcfcc450 100644
--- a/tdecore/tdeaccelmanager.cpp
+++ b/tdecore/tdeaccelmanager.cpp
@@ -17,7 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kaccelmanager.h"
+#include "tdeaccelmanager.h"
 
 #include <tqapplication.h>
 #include <tqcheckbox.h>
@@ -45,7 +45,7 @@
 #include <kdebug.h>
 
 
-#include "kaccelmanager_private.h"
+#include "tdeaccelmanager_private.h"
 #include "../tdeui/kstdaction_p.h"
 #include "../tdeutils/tdemultitabbar.h"
 
@@ -869,4 +869,4 @@ void TDEAcceleratorManager::setNoAccel( TQWidget *widget )
     TDEAcceleratorManagerPrivate::ignored_widgets[widget] = 1;
 }
 
-#include "kaccelmanager_private.moc"
+#include "tdeaccelmanager_private.moc"
diff --git a/tdecore/tdeconfig_compiler/checkkcfg.pl b/tdecore/tdeconfig_compiler/checkkcfg.pl
index 26b12bad2..8d066b810 100755
--- a/tdecore/tdeconfig_compiler/checkkcfg.pl
+++ b/tdecore/tdeconfig_compiler/checkkcfg.pl
@@ -24,12 +24,12 @@ if ( system( $cmd ) != 0 ) {
   exit 1;
 }
 
-chectdefile( $file_h );
-chectdefile( $file_cpp );
+checkfile( $file_h );
+checkfile( $file_cpp );
 
 exit 0;
 
-sub chectdefile()
+sub checkfile()
 {
   my $file = shift;
 
diff --git a/tdecore/tdeshortcut.cpp b/tdecore/tdeshortcut.cpp
index ae568d5b7..33797b0bc 100644
--- a/tdecore/tdeshortcut.cpp
+++ b/tdecore/tdeshortcut.cpp
@@ -17,7 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 #include "kkeyserver.h"
 
diff --git a/tdecore/tdeshortcutlist.cpp b/tdecore/tdeshortcutlist.cpp
index d32df889d..645e69565 100644
--- a/tdecore/tdeshortcutlist.cpp
+++ b/tdecore/tdeshortcutlist.cpp
@@ -1,15 +1,15 @@
 #include <tqstring.h>
 #include <tqvariant.h>
 
-#include <kaccel.h>
-#include "kaccelaction.h"
+#include <tdeaccel.h>
+#include "tdeaccelaction.h"
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalaccel.h>
 #include <kinstance.h>
-#include <kshortcut.h>
-#include "kshortcutlist.h"
+#include <tdeshortcut.h>
+#include "tdeshortcutlist.h"
 
 //---------------------------------------------------------------------
 // TDEShortcutList
diff --git a/tdecore/tdeshortcutmenu.cpp b/tdecore/tdeshortcutmenu.cpp
index be485fb7e..91061a734 100644
--- a/tdecore/tdeshortcutmenu.cpp
+++ b/tdecore/tdeshortcutmenu.cpp
@@ -21,10 +21,10 @@
 #include <tqlabel.h>
 #include <tqpopupmenu.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include <kdebug.h>
 #include <kglobalsettings.h>
-#include "kshortcutmenu.h"
+#include "tdeshortcutmenu.h"
 //#include <kkeynative.h>
 
 TDEShortcutMenu::TDEShortcutMenu( TQWidget* pParent, TDEAccelActions* pActions, KKeySequence seq )
@@ -158,4 +158,4 @@ void TDEShortcutMenu::keepItemsMatching( KKey key )
 	updateShortcuts();
 }
 
-#include "kshortcutmenu.moc"
+#include "tdeshortcutmenu.moc"
diff --git a/tdecore/tdeshortcutmenu.h b/tdecore/tdeshortcutmenu.h
index 6e01cdd95..a62757316 100644
--- a/tdecore/tdeshortcutmenu.h
+++ b/tdecore/tdeshortcutmenu.h
@@ -23,7 +23,7 @@
 #include <tqmap.h>
 #include <tqpopupmenu.h>
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 
 class TQLabel;
 
diff --git a/tdecore/tdestdaccel.cpp b/tdecore/tdestdaccel.cpp
index ac1381c88..f91d2ee66 100644
--- a/tdecore/tdestdaccel.cpp
+++ b/tdecore/tdestdaccel.cpp
@@ -19,16 +19,16 @@
 */
 #define __KSTDACCEL_CPP_ 1
 
-#include "kstdaccel.h"
+#include "tdestdaccel.h"
 
-#include "kaccelaction.h"
-#include "kaccelbase.h"
+#include "tdeaccelaction.h"
+#include "tdeaccelbase.h"
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kshortcut.h>
-#include <kshortcutlist.h>
+#include <tdeshortcut.h>
+#include <tdeshortcutlist.h>
 
 namespace TDEStdAccel
 {
diff --git a/tdecore/tdestdaccel.h b/tdecore/tdestdaccel.h
index 580204673..3914794f6 100644
--- a/tdecore/tdestdaccel.h
+++ b/tdecore/tdestdaccel.h
@@ -21,7 +21,7 @@
 #define KSTDACCEL_H
 
 #include <tqstring.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include "tdelibs_export.h"
 
 class TQKeyEvent;
@@ -35,7 +35,7 @@ class TDEAccelActions;
  * so do not hardcode the default behavior.
  *
  * If you want real configurable keybindings in your applications,
- * please checkout the class TDEAccel in kaccel.h
+ * please checkout the class TDEAccel in tdeaccel.h
  * @see TDEAccelShortcutList
  */
 namespace TDEStdAccel
diff --git a/tdecore/tests/Makefile.am b/tdecore/tests/Makefile.am
index 90ba46051..2911d3ab8 100644
--- a/tdecore/tests/Makefile.am
+++ b/tdecore/tests/Makefile.am
@@ -28,9 +28,9 @@ check_PROGRAMS = tdeconfigtestgui klocaletest kprocesstest ksimpleconfigtest \
 	cplusplustest kiconloadertest kresolvertest kmdcodectest knotifytest \
 	ksortablevaluelisttest krfcdatetest testqtargs kprociotest \
 	kcharsetstest kcalendartest kmacroexpandertest kshelltest \
-	kxerrorhandlertest startserviceby kstdacceltest kglobaltest ktimezonestest
+	kxerrorhandlertest startserviceby tdestdacceltest kglobaltest ktimezonestest
 
-TESTS = kurltest kstdacceltest
+TESTS = kurltest tdestdacceltest
 
 noinst_HEADERS = klocaletest.h kprocesstest.h KIDLTest.h \
 		kipctest.h kprociotest.h
@@ -75,7 +75,7 @@ kmacroexpandertest_SOURCES = kmacroexpandertest.cpp
 kshelltest_SOURCES = kshelltest.cpp
 kxerrorhandlertest_SOURCES = kxerrorhandlertest.cpp
 startserviceby_SOURCES = startserviceby.cpp
-kstdacceltest_SOURCES = kstdacceltest.cpp
+tdestdacceltest_SOURCES = tdestdacceltest.cpp
 kglobaltest_SOURCES = kglobaltest.cpp
 ktimezonestest_SOURCES = ktimezonestest.cpp
 
diff --git a/tdecore/tests/tdestdacceltest.cpp b/tdecore/tests/tdestdacceltest.cpp
index a3e2d2473..fbc5077a5 100644
--- a/tdecore/tests/tdestdacceltest.cpp
+++ b/tdecore/tests/tdestdacceltest.cpp
@@ -2,7 +2,7 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <stdlib.h> // for exit
 
 static bool check(TQString txt, TQString a, TQString b)
@@ -24,7 +24,7 @@ static bool check(TQString txt, TQString a, TQString b)
 int main(int argc, char *argv[])
 {
   TDEApplication::disableAutoDcopRegistration();
-  TDEApplication app(argc,argv,"kstdacceltest",false,false);
+  TDEApplication app(argc,argv,"tdestdacceltest",false,false);
 
   check( "shortcutDefault FullScreen", TDEStdAccel::shortcutDefault( TDEStdAccel::FullScreen ).toString(), "Ctrl+Shift+F" );
   check( "shortcutDefault BeginningOfLine", TDEStdAccel::shortcutDefault( TDEStdAccel::BeginningOfLine ).toString(), "Home" );