From 86d8364ac704bdc8ad2dfcf52307d9626cfac567 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:37:21 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kontact/src/profilemanager.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kontact/src/profilemanager.cpp') diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp index c64cbf978..295f4615d 100644 --- a/kontact/src/profilemanager.cpp +++ b/kontact/src/profilemanager.cpp @@ -151,7 +151,7 @@ void Kontact::ProfileManager::writeConfig() const Kontact::Profile Kontact::ProfileManager::readFromConfiguration( const TQString& configFile, bool isLocal ) { - KConfig profileCfg( configFile, true /*read-only*/, false /*no KDE global*/ ); + TDEConfig profileCfg( configFile, true /*read-only*/, false /*no KDE global*/ ); const TQString configDir = configFile.left( configFile.findRev( TQDir::separator(), -1 ) ); profileCfg.setGroup( "Kontact Profile" ); const TQString id = profileCfg.readEntry( "Identifier" ); @@ -168,7 +168,7 @@ void Kontact::ProfileManager::writeProfileConfig( const Kontact::Profile& profil { const TQString profileDir = profile.saveLocation(); const TQString cfgPath = profileDir + "/profile.cfg"; - KConfig profileCfg( cfgPath, false /*read-only*/, false /*no KDE global*/ ); + TDEConfig profileCfg( cfgPath, false /*read-only*/, false /*no KDE global*/ ); profileCfg.setGroup( "Kontact Profile" ); profileCfg.writeEntry( "Identifier", profile.id() ); profileCfg.writeEntry( "Name", profile.name() ); @@ -235,7 +235,7 @@ void Kontact::Profile::copyConfigFiles( const TQString& source_, const TQString& { const KURL source = KURL::fromPathOrURL( source_+"/*rc" ); const KURL dest = KURL::fromPathOrURL( dest_ ); - KIO::CopyJob* job = KIO::copy( source, dest, /*showProgressInfo=*/false ); + TDEIO::CopyJob* job = TDEIO::copy( source, dest, /*showProgressInfo=*/false ); // TODO better check for the copy result } @@ -283,7 +283,7 @@ void Kontact::ProfileManager::removeProfile( const TQString& id ) Kontact::Profile profile = profileById( id ); if ( profile.isLocal() ) { KURL location = KURL::fromPathOrURL( profile.saveLocation() ); - KIO::DeleteJob* job = KIO::del( location, /*shred*/ false, /*showProgressInfo=*/false ); + TDEIO::DeleteJob* job = TDEIO::del( location, /*shred*/ false, /*showProgressInfo=*/false ); // TODO check result } m_profiles.remove( id ); @@ -302,7 +302,7 @@ Kontact::ProfileManager::ExportError Kontact::ProfileManager::exportProfileToDir const KURL source = KURL::fromPathOrURL( profile.saveLocation() ); const KURL target = KURL::fromPathOrURL( path + TQDir::separator() + profile.name() ); - KIO::CopyJob* job = KIO::copy( source, target, /*showProgressInfo=*/false ); + TDEIO::CopyJob* job = TDEIO::copy( source, target, /*showProgressInfo=*/false ); // TODO check result return SuccessfulExport; @@ -319,7 +319,7 @@ Kontact::ProfileManager::ImportError Kontact::ProfileManager::importProfileFromD const KURL source = KURL::fromPathOrURL( path ); const KURL target = KURL::fromPathOrURL( profile.saveLocation() ); - KIO::CopyJob* job = KIO::copy( source, target, /*showProgressInfo=*/false ); + TDEIO::CopyJob* job = TDEIO::copy( source, target, /*showProgressInfo=*/false ); // TODO better check for the copy result addProfile( profile ); -- cgit v1.2.1