From 87e49a06e2f4ee153caeabfa4240e9ab94fbd135 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:14:05 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- src/config.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/config.cpp') diff --git a/src/config.cpp b/src/config.cpp index 12a1430..4ec463b 100755 --- a/src/config.cpp +++ b/src/config.cpp @@ -58,7 +58,7 @@ void Config::read() loadPlugins(); readProfiles(); - KConfig *conf = kapp->config(); + TDEConfig *conf = kapp->config(); TQStringList listDefaults; int intDefault; bool boolDefault; @@ -266,7 +266,7 @@ void Config::write( bool sync ) writeServiceMenu(); writeAmarokScript(); - KConfig *conf = kapp->config(); + TDEConfig *conf = kapp->config(); conf->setGroup( "Ripper" ); conf->writeEntry( "ripper", (currentRipper)?currentRipper->rip.bin:"kio_audiocd" ); @@ -640,10 +640,10 @@ void Config::writeAmarokScript() KStandardDirs* stdDirs = new KStandardDirs(); if( !TQFile::exists(locateLocal("data","amarok/scripts/soundKonverter/soundKonverter.rb")) ) { - KIO::NetAccess::file_copy( stdDirs->findResource("data","soundkonverter/amarokscript/soundKonverter.rb"), locateLocal("data","amarok/scripts/soundKonverter/soundKonverter.rb"), 0755, true ); + TDEIO::NetAccess::file_copy( stdDirs->findResource("data","soundkonverter/amarokscript/soundKonverter.rb"), locateLocal("data","amarok/scripts/soundKonverter/soundKonverter.rb"), 0755, true ); } if( !TQFile::exists(locateLocal("data","amarok/scripts/soundKonverter/README")) ) { - KIO::NetAccess::file_copy( stdDirs->findResource("data","soundkonverter/amarokscript/README"), locateLocal("data","amarok/scripts/soundKonverter/README"), -1, true ); + TDEIO::NetAccess::file_copy( stdDirs->findResource("data","soundkonverter/amarokscript/README"), locateLocal("data","amarok/scripts/soundKonverter/README"), -1, true ); } delete stdDirs; } -- cgit v1.2.1