diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:35:07 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:35:07 -0600 |
commit | 703fb0c89c2eee56a1e613e67a446db9d4287929 (patch) | |
tree | dd8c5ca66075cd89c2638a2b48cf78386a9870a7 /tdecore/kglobalaccel.h | |
parent | 818e7abec3d5d3809b6b77293558678371c16b71 (diff) | |
download | tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kglobalaccel.h')
-rw-r--r-- | tdecore/kglobalaccel.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tdecore/kglobalaccel.h b/tdecore/kglobalaccel.h index 1389386c4..fdda08f5a 100644 --- a/tdecore/kglobalaccel.h +++ b/tdecore/kglobalaccel.h @@ -27,7 +27,7 @@ class TQPopupMenu; class TQWidget; class KAccelAction; class KAccelActions; -class KConfigBase; +class TDEConfigBase; class TDEGlobalAccelPrivate; @@ -157,14 +157,14 @@ class TDECORE_EXPORT TDEGlobalAccel : public TQObject /** * Returns the configuration group that is used to save the accelerators. * @return the configuration group - * @see KConfig + * @see TDEConfig */ const TQString& configGroup() const; /** * Sets the configuration group that is used to save the accelerators. * @param cg the configuration group - * @see KConfig + * @see TDEConfig */ void setConfigGroup( const TQString &cg ); @@ -176,7 +176,7 @@ class TDECORE_EXPORT TDEGlobalAccel : public TQObject * configuration file * @return true if successful, false otherwise */ - bool readSettings( KConfigBase* pConfig = 0 ); + bool readSettings( TDEConfigBase* pConfig = 0 ); /** * Write the current shortcuts to @p pConfig, @@ -187,7 +187,7 @@ class TDECORE_EXPORT TDEGlobalAccel : public TQObject * @return true if successful, false otherwise * @since 3.1 */ - bool writeSettings( KConfigBase* pConfig = 0 ) const; + bool writeSettings( TDEConfigBase* pConfig = 0 ) const; // BCI: merge these two writeSettings methods in KDE 4.0 /** * Write the current shortcuts to @p pConfig, @@ -199,7 +199,7 @@ class TDECORE_EXPORT TDEGlobalAccel : public TQObject * @param bGlobal if true write the configuration to the kde global settings * @return true if successful, false otherwise */ - bool writeSettings( KConfigBase* pConfig, bool bGlobal ) const; + bool writeSettings( TDEConfigBase* pConfig, bool bGlobal ) const; /** * @internal -- this a wrapper function to |