summaryrefslogtreecommitdiffstats
path: root/kcontrol/keys/kaccelaction.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/keys/kaccelaction.h
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/keys/kaccelaction.h')
-rw-r--r--kcontrol/keys/kaccelaction.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/kcontrol/keys/kaccelaction.h b/kcontrol/keys/kaccelaction.h
index ef8ff9f33..a50d7a41d 100644
--- a/kcontrol/keys/kaccelaction.h
+++ b/kcontrol/keys/kaccelaction.h
@@ -33,8 +33,8 @@
class KAccelBase;
class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
/*
KAccelAction holds information an a given action, such as "Run Command"
@@ -156,7 +156,7 @@ class KAccelActions
void clear();
bool init( const KAccelActions& );
- bool init( KConfigBase& config, const TQString& sGroup );
+ bool init( TDEConfigBase& config, const TQString& sGroup );
void updateShortcuts( KAccelActions& );
@@ -176,8 +176,8 @@ class KAccelActions
KAccelAction* insert( const TQString& sName, const TQString& sLabel );
bool remove( const TQString& sAction );
- bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
- bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+ bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
+ bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
bool bWriteAll = false, bool bGlobal = false ) const;
void emitKeycodeChanged();