Rename kglobalaccel* files to tdeglobalaccel*.HEADmaster

A dummy 'kglobalaccel.h' has been added to allow TDE to built till renaming is carried out across the whole code base. It will then be removed.

Signed-off-by: Michele Calgaro <[email protected]>

14 files changed, 274 insertions, 273 deletions

diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt
index 2b6d4c67e..adaf2493b 100644
--- a/tdecore/CMakeLists.txt
+++ b/tdecore/CMakeLists.txt
@@ -56,7 +56,7 @@ install( FILES
     kcharsets.h tdeversion.h kpty.h tdeprocess.h tdeprocctrl.h
     tdelocale.h kicontheme.h kiconloader.h kdebug.h twinmodule.h
     twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h
-    kglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h
+    kglobalaccel.h tdeglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h
     kregexp.h kcompletion.h kstringhandler.h kstddirs.h
     kstandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h
     kallocator.h kvmallocator.h tdecrash.h krfcdate.h kinstance.h
@@ -113,7 +113,7 @@ set( ${target}_SRCS
   twin.cpp twinmodule.cpp krootprop.cpp kcharsets.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
+  tdeglobalaccel_x11.cpp tdeglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp
   tdecrash.cpp kurl.cpp kregexp.cpp tdeglobal.cpp tdeglobalsettings.cpp
   kallocator.cpp kvmallocator.cpp kmimesourcefactory.cpp
   kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp tdetempfile.cpp
diff --git a/tdecore/MAINTAINERS b/tdecore/MAINTAINERS
index 39b3a1424..efc01568a 100644
--- a/tdecore/MAINTAINERS
+++ b/tdecore/MAINTAINERS
@@ -28,8 +28,8 @@ kdcoppropertyproxy.cpp
 kdebug.cpp		Stephan Kulow <[email protected]>
 kdesktopfile.cpp
 tdeglobal.cpp		Stephan Kulow <[email protected]>
-kglobalaccel.cpp	Ellis Whitehead <[email protected]>
-kglobalaccel_x11.cpp	Ellis Whitehead <[email protected]>
+tdeglobalaccel.cpp	Ellis Whitehead <[email protected]>
+tdeglobalaccel_x11.cpp	Ellis Whitehead <[email protected]>
 tdeglobalsettings.cpp	David Faure <[email protected]>
 kiconeffect.cpp
 kiconloader.cpp
@@ -98,7 +98,7 @@ tdeconfigdialogmanager.cpp
 tdeconfigskeleton.cpp
 kdebugdcopiface.cpp	Andreas Beckermann ([email protected]) (copyright)
 tdeversion.cpp
-kglobalaccel_win.cpp	Ellis Whitehead <[email protected]> (copyright)
+tdeglobalaccel_win.cpp	Ellis Whitehead <[email protected]> (copyright)
 kkeyserver_x11.cpp
 klockfile.cpp		Waldo Bastian <[email protected]> (copyright)
 kmacroexpander.cpp
diff --git a/tdecore/Makefile.am b/tdecore/Makefile.am
index 924362b3f..bcd5f63d2 100644
--- a/tdecore/Makefile.am
+++ b/tdecore/Makefile.am
@@ -43,7 +43,7 @@ include_HEADERS = tdeconfig.h tdeconfigskeleton.h \
 	tdeuniqueapplication.h kcharsets.h tdeversion.h kpty.h tdeprocess.h \
 	tdeprocctrl.h tdelocale.h kicontheme.h kiconloader.h kdebug.h \
 	twinmodule.h twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h \
-	kglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h \
+	kglobalaccel.h tdeglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h \
 	kregexp.h kcompletion.h kstringhandler.h \
 	kstddirs.h kstandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h \
 	kallocator.h kvmallocator.h tdecrash.h krfcdate.h \
@@ -83,7 +83,7 @@ libtdefakes_pic.a: libtdefakes.la
 
 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 \
+	tdeglobalaccel_x11.h tdeglobalaccel_win.h kkeyserver_x11.h kkeyserver.h \
 	kregpriv.h tdeshortcutmenu.h tdesycocadict.h tdesycocafactory.h netsupp.h \
 	kcheckaccelerators.h kcalendarsystemgregorian.h \
 	kcalendarsystemhijri.h kcalendarsystemhebrew.h kcalendarsystemjalali.h \
@@ -97,7 +97,7 @@ libtdecore_la_SOURCES = libintl.cpp tdeapplication.cpp \
 	kiconloader.cpp twin.cpp twinmodule.cpp krootprop.cpp kcharsets.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 \
+	tdeglobalaccel_x11.cpp tdeglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp \
 	tdecrash.cpp kurl.cpp kregexp.cpp tdeglobal.cpp tdeglobalsettings.cpp \
 	kallocator.cpp kvmallocator.cpp kmimesourcefactory.cpp \
 	kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp tdetempfile.cpp \
diff --git a/tdecore/kglobalaccel.h b/tdecore/kglobalaccel.h
index 22dedd513..730adf02c 100644
--- a/tdecore/kglobalaccel.h
+++ b/tdecore/kglobalaccel.h
@@ -1,239 +1 @@
-/* This file is part of the KDE libraries
-    Copyright (C) 2001,2002 Ellis Whitehead <[email protected]>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#ifndef _KGLOBALACCEL_H_
-#define _KGLOBALACCEL_H_
-
-#include <tqobject.h>
-#include <tdeshortcut.h>
-
-class TQPopupMenu;
-class TQWidget;
-class TDEAccelAction;
-class TDEAccelActions;
-class TDEConfigBase;
-
-class TDEGlobalAccelPrivate;
-
-/**
-* TDEGlobalAccel allows you to have global accelerators that are independent of
-* the focused window. Unlike TDEAccel it does not matter which window is 
-* currently active.
-*
-* @see TDEAccel
-* @see TDEAccelShortcutList
-* @see KKeyChooser
-* @see KKeyDialog
-* @short Configurable global shortcut support
-*/
-class TDECORE_EXPORT TDEGlobalAccel : public TQObject
-{
-	TQ_OBJECT
- public:
-	/**
-	 * Creates a new TDEGlobalAccel object with the given pParent and
-	 * psName.
-	 * @param pParent the parent of the TQObject
-	 * @param psName the name of the TQObject
-	 */
-	TDEGlobalAccel( TQObject* pParent, const char* psName = 0 );
-	virtual ~TDEGlobalAccel();
-
-	/**
-	 * Checks whether the accelerators are enabled.
-	 * @return true if the TDEGlobalAccel is enabled
-	 */
-	bool isEnabled();
-	
-	/**
-	 * Enables or disables the TDEGlobalAccel
-	 * @param bEnabled true if the TDEGlobalAccel should be enabled, false if it
-	 *  should be disabled.
-	 */
-	void setEnabled( bool bEnabled );
-
-	/**
-	 * Create an accelerator action.
-	 *
-	 * Usage:
-	 *\code
-	 * insert( "Do Something", i18n("Do Something"),
-	 *   i18n("This action allows you to do something really great with this program to "
-	 *        "the currently open document."),
-	 *   ALT+CTRL+Key_Q, KKey::QtWIN+CTRL+Key_Q, this, TQ_SLOT(slotDoSomething()) );
-	 *\endcode
-	 *
-	 * @param sAction The internal name of the action.
-	 * @param sLabel An i18n'ized short description of the action displayed when
-	 *  using KKeyChooser to reconfigure the shortcuts.
-	 * @param sWhatsThis An extended description of the action.
-	 * @param cutDef3 The default 3 modifier scheme shortcut.
-	 * @param cutDef4 The default 4 modifier scheme shortcut.
-	 * @param pObjSlot Pointer to the slot object.
-	 * @param psMethodSlot Pointer to the slot method.
-	 * @param bConfigurable Allow the user to change this shortcut if set to 'true'.
-	 * @param bEnabled The action will be activated by the shortcut if set to 'true'.
-	 */
-	TDEAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
-	                 const TDEShortcut& cutDef3, const TDEShortcut& cutDef4,
-	                 const TQObject* pObjSlot, const char* psMethodSlot,
-	                 bool bConfigurable = true, bool bEnabled = true );
-
-	/**
-	 * Removes the accelerator action identified by the name.
-	 * Remember to also call updateConnections().
-	 * @param sAction the name of the action to remove
-	 * @since 3.1
-	 */
-	bool remove( const TQString& sAction );
-
-	/**
-	 * Use this to insert a label into the action list.  This will be
-	 * displayed when the user configures shortcuts.
-	 * @param sName of the of the action to insert
-	 * @param sLabel a user-readable (i18n!) name for the action
-	 * @return the TDEAccelAction of the action
-	 */
-	TDEAccelAction* insert( const TQString& sName, const TQString& sLabel );
-
-	/**
-	 * Updates the connections of the accelerations after changing them. 
-	 * @return true if successful, false otherwise
-	 */
-	bool updateConnections();
-
-	/**
-	 * Return the shortcut associated with the action named by @p sAction.
-	 * @param sAction the name of the action
-	 * @return the shortcut. If the action does not exist a null shortcut will be returned.
-	 */
-	const TDEShortcut& shortcut( const TQString& sAction ) const;
-	/**
-	 * Set the shortcut to be associated with the action named by @p sAction.
-	 * @param sAction the name of the action
-	 * @param shortcut the shortcut for the action
-	 * @return true if successful, false otherwise
-	 */
-	bool setShortcut( const TQString& sAction, const TDEShortcut &shortcut );
-	/**
-	 * Set the slot to be called when the shortcut of the action named
-	 * by @p sAction is pressed.
-	 * @param sAction the name of the action
-	 * @param pObjSlot the receiver of the signal
-	 * @param psMethodSlot the slot to receive the signal
-	 * @return true if successful, false otherwise
-	 */
-	bool setSlot( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot );
-
-        /**
-         * Enables or disables action @p sAction.
-         * @since 3.4
-         */ 
-	bool setActionEnabled( const TQString& sAction, bool bEnable );
-	/**
-	 * Return the label (i18n'ized short description) associated with the action named by @p sAction.
-	 * @param sAction the name of the action
-	 * @return the label
-	 * @since 3.3
-	 */
-	TQString label( const TQString& sAction ) const;
-
-	/**
-	 * Returns the configuration group that is used to save the accelerators.
-	 * @return the configuration group
-	 * @see TDEConfig
-	 */
-	const TQString& configGroup() const;
-
-	/**
-	 * Sets the configuration group that is used to save the accelerators.
-	 * @param cg the configuration group
-	 * @see TDEConfig
-	 */
-	void setConfigGroup( const TQString &cg );
-
-	/**
-	 * Read all shortcuts from @p pConfig, or (if @p pConfig
-	 * is zero) from the application's configuration file
-	 * TDEGlobal::config().
-	 * @param pConfig the configuration file to read from, or 0 for the application
-	 *                 configuration file
-	 * @return true if successful, false otherwise
-	 */
-	bool readSettings( TDEConfigBase* pConfig = 0 );
-
-	/**
-	 * Write the current shortcuts to @p pConfig,
-	 * or (if @p pConfig is zero) to the application's
-	 * configuration file.
-	 * @param pConfig the configuration file to read from, or 0 for the application
-	 *                 configuration file
-	 * @return true if successful, false otherwise
-	 * @since 3.1
-	 */
-	bool writeSettings( TDEConfigBase* pConfig = 0 ) const;
-	// BCI: merge these two writeSettings methods in KDE 4.0
-	/**
-	 * Write the current shortcuts to @p pConfig,
-	 * or (if @p pConfig is zero) to the application's
-	 * configuration file.  Alternatively, if bGlobal is true, then write
-	 * to kdeglobals.
-	 * @param pConfig the configuration file to read from, or 0 for the application
-	 *                 configuration file
-	 * @param bGlobal if true write the configuration to the kde global settings
-	 * @return true if successful, false otherwise
-	 */
-	bool writeSettings( TDEConfigBase* pConfig, bool bGlobal ) const;
-
-	/**
-	 * @internal -- this a wrapper function to
-	 * TDEAccelActions::useFourModifierKeys().
-	 */
-	static bool useFourModifierKeys();
-        
-        /**
-         * @internal
-         */
-        static void blockShortcuts( bool block );
-        /**
-         * @internal
-         */
-        void disableBlocking( bool disable );
-        
-        /**
-         * @internal
-         */
-        // like setEnabled(), but doesn't ungrab (see in TDEGlobalAccelPrivate)
-        void suspend( bool s );
-
-private:
-
-	TDEAccelActions& actions();
-	const TDEAccelActions& actions() const;
-
-	friend class TDEGlobalAccelPrivate;
-	friend class TDEAccelShortcutList;
-protected:
-	/** \internal */
-	virtual void virtual_hook( int id, void* data );
-private:
-	class TDEGlobalAccelPrivate* d;
-};
-
-#endif // _KGLOBALACCEL_H_
+#include <tdeglobalaccel.h>
diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp
index 2cdc4b3a4..985817732 100644
--- a/tdecore/tdeapplication.cpp
+++ b/tdecore/tdeapplication.cpp
@@ -93,7 +93,7 @@
 #include <kprotocolinfo.h>
 #include <kkeynative.h>
 #include <kmdcodec.h>
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
 
 #if defined TQ_WS_X11
 #include <tdestartupinfo.h>
diff --git a/tdecore/kglobalaccel.cpp b/tdecore/tdeglobalaccel.cpp
index 5da0093a2..dd2a93b6f 100644
--- a/tdecore/kglobalaccel.cpp
+++ b/tdecore/tdeglobalaccel.cpp
@@ -17,15 +17,15 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kglobalaccel.h"
+#include "tdeglobalaccel.h"
 #ifdef TQ_WS_X11
-#include "kglobalaccel_x11.h"
+#include "tdeglobalaccel_x11.h"
 #elif defined(TQ_WS_WIN)
-#include "kglobalaccel_win.h"
+#include "tdeglobalaccel_win.h"
 #elif defined(TQ_WS_MACX)
-#include "kglobalaccel_mac.h"
+#include "tdeglobalaccel_mac.h"
 #else
-#include "kglobalaccel_emb.h"
+#include "tdeglobalaccel_emb.h"
 #endif
 
 #include <tqstring.h>
@@ -136,4 +136,4 @@ bool TDEGlobalAccel::useFourModifierKeys()
 void TDEGlobalAccel::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "kglobalaccel.moc"
+#include "tdeglobalaccel.moc"
diff --git a/tdecore/tdeglobalaccel.h b/tdecore/tdeglobalaccel.h
new file mode 100644
index 000000000..be34a3cdd
--- /dev/null
+++ b/tdecore/tdeglobalaccel.h
@@ -0,0 +1,239 @@
+/* This file is part of the KDE libraries
+    Copyright (C) 2001,2002 Ellis Whitehead <[email protected]>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifndef _TDEGLOBALACCEL_H_
+#define _TDEGLOBALACCEL_H_
+
+#include <tqobject.h>
+#include <tdeshortcut.h>
+
+class TQPopupMenu;
+class TQWidget;
+class TDEAccelAction;
+class TDEAccelActions;
+class TDEConfigBase;
+
+class TDEGlobalAccelPrivate;
+
+/**
+* TDEGlobalAccel allows you to have global accelerators that are independent of
+* the focused window. Unlike TDEAccel it does not matter which window is 
+* currently active.
+*
+* @see TDEAccel
+* @see TDEAccelShortcutList
+* @see KKeyChooser
+* @see KKeyDialog
+* @short Configurable global shortcut support
+*/
+class TDECORE_EXPORT TDEGlobalAccel : public TQObject
+{
+	TQ_OBJECT
+ public:
+	/**
+	 * Creates a new TDEGlobalAccel object with the given pParent and
+	 * psName.
+	 * @param pParent the parent of the TQObject
+	 * @param psName the name of the TQObject
+	 */
+	TDEGlobalAccel( TQObject* pParent, const char* psName = 0 );
+	virtual ~TDEGlobalAccel();
+
+	/**
+	 * Checks whether the accelerators are enabled.
+	 * @return true if the TDEGlobalAccel is enabled
+	 */
+	bool isEnabled();
+	
+	/**
+	 * Enables or disables the TDEGlobalAccel
+	 * @param bEnabled true if the TDEGlobalAccel should be enabled, false if it
+	 *  should be disabled.
+	 */
+	void setEnabled( bool bEnabled );
+
+	/**
+	 * Create an accelerator action.
+	 *
+	 * Usage:
+	 *\code
+	 * insert( "Do Something", i18n("Do Something"),
+	 *   i18n("This action allows you to do something really great with this program to "
+	 *        "the currently open document."),
+	 *   ALT+CTRL+Key_Q, KKey::QtWIN+CTRL+Key_Q, this, TQ_SLOT(slotDoSomething()) );
+	 *\endcode
+	 *
+	 * @param sAction The internal name of the action.
+	 * @param sLabel An i18n'ized short description of the action displayed when
+	 *  using KKeyChooser to reconfigure the shortcuts.
+	 * @param sWhatsThis An extended description of the action.
+	 * @param cutDef3 The default 3 modifier scheme shortcut.
+	 * @param cutDef4 The default 4 modifier scheme shortcut.
+	 * @param pObjSlot Pointer to the slot object.
+	 * @param psMethodSlot Pointer to the slot method.
+	 * @param bConfigurable Allow the user to change this shortcut if set to 'true'.
+	 * @param bEnabled The action will be activated by the shortcut if set to 'true'.
+	 */
+	TDEAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
+	                 const TDEShortcut& cutDef3, const TDEShortcut& cutDef4,
+	                 const TQObject* pObjSlot, const char* psMethodSlot,
+	                 bool bConfigurable = true, bool bEnabled = true );
+
+	/**
+	 * Removes the accelerator action identified by the name.
+	 * Remember to also call updateConnections().
+	 * @param sAction the name of the action to remove
+	 * @since 3.1
+	 */
+	bool remove( const TQString& sAction );
+
+	/**
+	 * Use this to insert a label into the action list.  This will be
+	 * displayed when the user configures shortcuts.
+	 * @param sName of the of the action to insert
+	 * @param sLabel a user-readable (i18n!) name for the action
+	 * @return the TDEAccelAction of the action
+	 */
+	TDEAccelAction* insert( const TQString& sName, const TQString& sLabel );
+
+	/**
+	 * Updates the connections of the accelerations after changing them. 
+	 * @return true if successful, false otherwise
+	 */
+	bool updateConnections();
+
+	/**
+	 * Return the shortcut associated with the action named by @p sAction.
+	 * @param sAction the name of the action
+	 * @return the shortcut. If the action does not exist a null shortcut will be returned.
+	 */
+	const TDEShortcut& shortcut( const TQString& sAction ) const;
+	/**
+	 * Set the shortcut to be associated with the action named by @p sAction.
+	 * @param sAction the name of the action
+	 * @param shortcut the shortcut for the action
+	 * @return true if successful, false otherwise
+	 */
+	bool setShortcut( const TQString& sAction, const TDEShortcut &shortcut );
+	/**
+	 * Set the slot to be called when the shortcut of the action named
+	 * by @p sAction is pressed.
+	 * @param sAction the name of the action
+	 * @param pObjSlot the receiver of the signal
+	 * @param psMethodSlot the slot to receive the signal
+	 * @return true if successful, false otherwise
+	 */
+	bool setSlot( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot );
+
+        /**
+         * Enables or disables action @p sAction.
+         * @since 3.4
+         */ 
+	bool setActionEnabled( const TQString& sAction, bool bEnable );
+	/**
+	 * Return the label (i18n'ized short description) associated with the action named by @p sAction.
+	 * @param sAction the name of the action
+	 * @return the label
+	 * @since 3.3
+	 */
+	TQString label( const TQString& sAction ) const;
+
+	/**
+	 * Returns the configuration group that is used to save the accelerators.
+	 * @return the configuration group
+	 * @see TDEConfig
+	 */
+	const TQString& configGroup() const;
+
+	/**
+	 * Sets the configuration group that is used to save the accelerators.
+	 * @param cg the configuration group
+	 * @see TDEConfig
+	 */
+	void setConfigGroup( const TQString &cg );
+
+	/**
+	 * Read all shortcuts from @p pConfig, or (if @p pConfig
+	 * is zero) from the application's configuration file
+	 * TDEGlobal::config().
+	 * @param pConfig the configuration file to read from, or 0 for the application
+	 *                 configuration file
+	 * @return true if successful, false otherwise
+	 */
+	bool readSettings( TDEConfigBase* pConfig = 0 );
+
+	/**
+	 * Write the current shortcuts to @p pConfig,
+	 * or (if @p pConfig is zero) to the application's
+	 * configuration file.
+	 * @param pConfig the configuration file to read from, or 0 for the application
+	 *                 configuration file
+	 * @return true if successful, false otherwise
+	 * @since 3.1
+	 */
+	bool writeSettings( TDEConfigBase* pConfig = 0 ) const;
+	// BCI: merge these two writeSettings methods in KDE 4.0
+	/**
+	 * Write the current shortcuts to @p pConfig,
+	 * or (if @p pConfig is zero) to the application's
+	 * configuration file.  Alternatively, if bGlobal is true, then write
+	 * to kdeglobals.
+	 * @param pConfig the configuration file to read from, or 0 for the application
+	 *                 configuration file
+	 * @param bGlobal if true write the configuration to the kde global settings
+	 * @return true if successful, false otherwise
+	 */
+	bool writeSettings( TDEConfigBase* pConfig, bool bGlobal ) const;
+
+	/**
+	 * @internal -- this a wrapper function to
+	 * TDEAccelActions::useFourModifierKeys().
+	 */
+	static bool useFourModifierKeys();
+        
+        /**
+         * @internal
+         */
+        static void blockShortcuts( bool block );
+        /**
+         * @internal
+         */
+        void disableBlocking( bool disable );
+        
+        /**
+         * @internal
+         */
+        // like setEnabled(), but doesn't ungrab (see in TDEGlobalAccelPrivate)
+        void suspend( bool s );
+
+private:
+
+	TDEAccelActions& actions();
+	const TDEAccelActions& actions() const;
+
+	friend class TDEGlobalAccelPrivate;
+	friend class TDEAccelShortcutList;
+protected:
+	/** \internal */
+	virtual void virtual_hook( int id, void* data );
+private:
+	class TDEGlobalAccelPrivate* d;
+};
+
+#endif // _TDEGLOBALACCEL_H_
diff --git a/tdecore/kglobalaccel_emb.h b/tdecore/tdeglobalaccel_emb.h
index 5e5145d66..2fd16bd44 100644
--- a/tdecore/kglobalaccel_emb.h
+++ b/tdecore/tdeglobalaccel_emb.h
@@ -1,5 +1,5 @@
-#ifndef _KGLOBALACCEL_EMB_H
-#define _KGLOBALACCEL_EMB_H
+#ifndef _TDEGLOBALACCEL_EMB_H
+#define _TDEGLOBALACCEL_EMB_H
 
 #include "tdeaccelbase.h"
 #include "tdeshortcut.h"
@@ -15,4 +15,4 @@ public:
 	virtual bool disconnectKey( TDEAccelAction&, KKeySequence );
 };
 
-#endif // _KGLOBALACCEL_EMB_H
+#endif // _TDEGLOBALACCEL_EMB_H
diff --git a/tdecore/kglobalaccel_mac.h b/tdecore/tdeglobalaccel_mac.h
index b2803b0c0..c21533916 100644
--- a/tdecore/kglobalaccel_mac.h
+++ b/tdecore/tdeglobalaccel_mac.h
@@ -1,5 +1,5 @@
-#ifndef _KGLOBALACCEL_MAC_H
-#define _KGLOBALACCEL_MAC_H
+#ifndef _TDEGLOBALACCEL_MAC_H
+#define _TDEGLOBALACCEL_MAC_H
 
 #include <tqwidget.h>
 
@@ -28,4 +28,4 @@ public:
     { return false; }
 };
 
-#endif // _KGLOBALACCEL_EMB_H
+#endif // _TDEGLOBALACCEL_MAC_H
diff --git a/tdecore/kglobalaccel_win.cpp b/tdecore/tdeglobalaccel_win.cpp
index a222d0242..faf3708f4 100644
--- a/tdecore/kglobalaccel_win.cpp
+++ b/tdecore/tdeglobalaccel_win.cpp
@@ -22,8 +22,8 @@
 #include <tqwindowdefs.h>
 #ifdef TQ_WS_WIN
 
-#include "kglobalaccel_win.h"
-#include "kglobalaccel.h"
+#include "tdeglobalaccel_win.h"
+#include "tdeglobalaccel.h"
 #include "kkeyserver_x11.h"
 
 #include <tqpopupmenu.h>
@@ -340,6 +340,6 @@ void TDEGlobalAccelPrivate::slotActivated( int iAction )
 		activate( pAction, KKeySequence() );
 }
 
-#include "kglobalaccel_win.moc"
+#include "tdeglobalaccel_win.moc"
 
 #endif // !TQ_WS_WIN
diff --git a/tdecore/kglobalaccel_win.h b/tdecore/tdeglobalaccel_win.h
index 45943b071..ec224a0f7 100644
--- a/tdecore/kglobalaccel_win.h
+++ b/tdecore/tdeglobalaccel_win.h
@@ -17,8 +17,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef _KGLOBALACCEL_WIN_H
-#define _KGLOBALACCEL_WIN_H
+#ifndef _TDEGLOBALACCEL_WIN_H
+#define _TDEGLOBALACCEL_WIN_H
 
 #include <tqmap.h>
 #include <tqwidget.h>
@@ -74,4 +74,4 @@ class TDEGlobalAccelPrivate : public TQWidget, public TDEAccelBase
 	bool m_blockingDisabled;
 };
 
-#endif // _KGLOBALACCEL_WIN_H
+#endif // _TDEGLOBALACCEL_WIN_H
diff --git a/tdecore/kglobalaccel_x11.cpp b/tdecore/tdeglobalaccel_x11.cpp
index a518c58c8..2bf6e0d3e 100644
--- a/tdecore/kglobalaccel_x11.cpp
+++ b/tdecore/tdeglobalaccel_x11.cpp
@@ -22,8 +22,8 @@
 #include <tqwindowdefs.h>
 #ifdef TQ_WS_X11
 
-#include "kglobalaccel_x11.h"
-#include "kglobalaccel.h"
+#include "tdeglobalaccel_x11.h"
+#include "tdeglobalaccel.h"
 #include "kkeyserver_x11.h"
 
 #include <tqpopupmenu.h>
@@ -446,6 +446,6 @@ void TDEGlobalAccelPrivate::slotActivated( int iAction )
 		activate( pAction, KKeySequence() );
 }
 
-#include "kglobalaccel_x11.moc"
+#include "tdeglobalaccel_x11.moc"
 
 #endif // !TQ_WS_X11
diff --git a/tdecore/kglobalaccel_x11.h b/tdecore/tdeglobalaccel_x11.h
index 1502d89cb..2162299ee 100644
--- a/tdecore/kglobalaccel_x11.h
+++ b/tdecore/tdeglobalaccel_x11.h
@@ -17,8 +17,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef _KGLOBALACCEL_X11_H
-#define _KGLOBALACCEL_X11_H
+#ifndef _TDEGLOBALACCEL_X11_H
+#define _TDEGLOBALACCEL_X11_H
 
 #include <tqmap.h>
 #include <tqwidget.h>
@@ -107,4 +107,4 @@ class TDEGlobalAccelPrivate : public TQWidget, public TDEAccelBase
         bool m_suspended;
 };
 
-#endif // _KGLOBALACCEL_X11_H
+#endif // _TDEGLOBALACCEL_X11_H
diff --git a/tdecore/tdeshortcutlist.cpp b/tdecore/tdeshortcutlist.cpp
index ffacd001c..cc9961199 100644
--- a/tdecore/tdeshortcutlist.cpp
+++ b/tdecore/tdeshortcutlist.cpp
@@ -6,7 +6,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeglobal.h>
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
 #include <kinstance.h>
 #include <tdeshortcut.h>
 #include "tdeshortcutlist.h"