summaryrefslogtreecommitdiffstats
path: root/tdecore/kshortcutlist.cpp
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.cpp
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.cpp')
-rw-r--r--tdecore/kshortcutlist.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tdecore/kshortcutlist.cpp b/tdecore/kshortcutlist.cpp
index 9666f7aab..fcfc48b48 100644
--- a/tdecore/kshortcutlist.cpp
+++ b/tdecore/kshortcutlist.cpp
@@ -68,7 +68,7 @@ bool KShortcutList::setOther( Other, uint, TQVariant )
return false;
}
-bool KShortcutList::readSettings( const TQString& sConfigGroup, KConfigBase* pConfig )
+bool KShortcutList::readSettings( const TQString& sConfigGroup, TDEConfigBase* pConfig )
{
kdDebug(125) << "KShortcutList::readSettings( \"" << sConfigGroup << "\", " << pConfig << " ) start" << endl;
if( !pConfig )
@@ -84,7 +84,7 @@ bool KShortcutList::readSettings( const TQString& sConfigGroup, KConfigBase* pCo
kdDebug(125) << "\treadSettings( \"" << sGroup << "\", " << pConfig << " )" << endl;
if( !pConfig->hasGroup( sGroup ) )
return true;
- KConfigGroupSaver cgs( pConfig, sGroup );
+ TDEConfigGroupSaver cgs( pConfig, sGroup );
uint nSize = count();
for( uint i = 0; i < nSize; i++ ) {
@@ -106,7 +106,7 @@ bool KShortcutList::readSettings( const TQString& sConfigGroup, KConfigBase* pCo
return true;
}
-bool KShortcutList::writeSettings( const TQString &sConfigGroup, KConfigBase* pConfig, bool bWriteAll, bool bGlobal ) const
+bool KShortcutList::writeSettings( const TQString &sConfigGroup, TDEConfigBase* pConfig, bool bWriteAll, bool bGlobal ) const
{
kdDebug(125) << "KShortcutList::writeSettings( " << sConfigGroup << ", " << pConfig << ", " << bWriteAll << ", " << bGlobal << " )" << endl;
if( !pConfig )
@@ -118,7 +118,7 @@ bool KShortcutList::writeSettings( const TQString &sConfigGroup, KConfigBase* pC
if( pConfig->hasGroup( "Keys" ) )
pConfig->deleteGroup( "Keys", true );
- KConfigGroupSaver cs( pConfig, sGroup );
+ TDEConfigGroupSaver cs( pConfig, sGroup );
uint nSize = count();
for( uint i = 0; i < nSize; i++ ) {