summaryrefslogtreecommitdiffstats
path: root/tdecore/kaccelaction.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
commit703fb0c89c2eee56a1e613e67a446db9d4287929 (patch)
treedd8c5ca66075cd89c2638a2b48cf78386a9870a7 /tdecore/kaccelaction.h
parent818e7abec3d5d3809b6b77293558678371c16b71 (diff)
downloadtdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz
tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kaccelaction.h')
-rw-r--r--tdecore/kaccelaction.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/tdecore/kaccelaction.h b/tdecore/kaccelaction.h
index 4c7ac1840..9cca25d4a 100644
--- a/tdecore/kaccelaction.h
+++ b/tdecore/kaccelaction.h
@@ -30,8 +30,8 @@
class KAccelBase;
class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
/**
* @internal
@@ -400,7 +400,7 @@ class TDECORE_EXPORT KAccelActions
* @param sGroup the group in the configuration file
* @return true if successful, false otherwise
*/
- bool init( KConfigBase& config, const TQString& sGroup );
+ bool init( TDEConfigBase& config, const TQString& sGroup );
/**
* Updates the shortcuts of all actions in this object
@@ -521,7 +521,7 @@ class TDECORE_EXPORT KAccelActions
* @param pConfig the configuration file to load from
* @return true if successful, false otherwise
*/
- bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
+ bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
/**
* Writes the actions to the given configuration file.
@@ -532,7 +532,7 @@ class TDECORE_EXPORT KAccelActions
* @param bGlobal true to write to the global configuration file
* @return true if successful, false otherwise
*/
- bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+ bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
bool bWriteAll = false, bool bGlobal = false ) const;
/**