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 /tdeui/kactioncollection.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 'tdeui/kactioncollection.h')
| -rw-r--r-- | tdeui/kactioncollection.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tdeui/kactioncollection.h b/tdeui/kactioncollection.h index 28c9e530e..35dd5dc2d 100644 --- a/tdeui/kactioncollection.h +++ b/tdeui/kactioncollection.h @@ -46,8 +46,8 @@ class KToolBar; class KAccel; class KAccelActions; -class KConfig; -class KConfigBase; +class TDEConfig; +class TDEConfigBase; class KURL; class TDEInstance; class KToolBar; @@ -191,11 +191,11 @@ public: /** * Used for reading shortcut configuration from a non-XML rc file. */ - bool readShortcutSettings( const TQString& sConfigGroup = TQString::null, KConfigBase* pConfig = 0 ); + bool readShortcutSettings( const TQString& sConfigGroup = TQString::null, TDEConfigBase* pConfig = 0 ); /** * Used for writing shortcut configuration to a non-XML rc file. */ - bool writeShortcutSettings( const TQString& sConfigGroup = TQString::null, KConfigBase* pConfig = 0 ) const; + bool writeShortcutSettings( const TQString& sConfigGroup = TQString::null, TDEConfigBase* pConfig = 0 ) const; void setInstance( TDEInstance *instance ); /** The instance with which this class is associated. */ |