summaryrefslogtreecommitdiffstats
path: root/tdecore/kshortcutlist.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/kshortcutlist.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/kshortcutlist.h')
-rw-r--r--tdecore/kshortcutlist.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/tdecore/kshortcutlist.h b/tdecore/kshortcutlist.h
index 497bfaf15..7f4caa079 100644
--- a/tdecore/kshortcutlist.h
+++ b/tdecore/kshortcutlist.h
@@ -25,7 +25,7 @@
#include "tdelibs_export.h"
class TQVariant;
-class KConfigBase;
+class TDEConfigBase;
class TDEInstance;
class KKeySequence;
class KShortcut;
@@ -162,7 +162,7 @@ class TDECORE_EXPORT KShortcutList
* @param pConfig the configuration file to load from
* @return true if successful, false otherwise
*/
- virtual bool readSettings( const TQString& sConfigGroup = TQString::null, KConfigBase* pConfig = 0 );
+ virtual bool readSettings( const TQString& sConfigGroup = TQString::null, TDEConfigBase* pConfig = 0 );
/**
* Writes the shortcuts to the given configuration file.
@@ -173,7 +173,7 @@ class TDECORE_EXPORT KShortcutList
* @param bGlobal true to write to the global configuration file
* @return true if successful, false otherwise
*/
- virtual bool writeSettings( const TQString& sConfigGroup = TQString::null, KConfigBase* pConfig = 0,
+ virtual bool writeSettings( const TQString& sConfigGroup = TQString::null, TDEConfigBase* pConfig = 0,
bool bWriteAll = false, bool bGlobal = false ) const;
protected: