From f2225fc1f936c1d9e6a5570a63ffe12c366176bf Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 31 Jan 2013 13:29:09 -0600 Subject: Rename KStandard for enhanced compatibility with KDE4 --- libkcal/resourcecached.cpp | 8 ++++---- libkcal/resourcelocal.cpp | 2 +- libkcal/resourcelocalconfig.cpp | 2 +- libkcal/resourcelocaldir.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'libkcal') diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp index 5be335e9..13d11be0 100644 --- a/libkcal/resourcecached.cpp +++ b/libkcal/resourcecached.cpp @@ -304,7 +304,7 @@ void ResourceCached::loadCache() setIdMapperIdentifier(); mIdMapper.load(); - if ( KStandardDirs::exists( cacheFile() ) ) { + if ( TDEStandardDirs::exists( cacheFile() ) ) { mCalendar.load( cacheFile() ); if ( readOnly() ) { Incidence::List incidences( rawIncidences() ); @@ -355,7 +355,7 @@ void ResourceCached::cleanUpEventCache( const Event::List &eventList ) { CalendarLocal calendar ( TQString::fromLatin1( "UTC" ) ); - if ( KStandardDirs::exists( cacheFile() ) ) + if ( TDEStandardDirs::exists( cacheFile() ) ) calendar.load( cacheFile() ); else return; @@ -384,7 +384,7 @@ void ResourceCached::cleanUpTodoCache( const Todo::List &todoList ) { CalendarLocal calendar ( TQString::fromLatin1( "UTC" ) ); - if ( KStandardDirs::exists( cacheFile() ) ) + if ( TDEStandardDirs::exists( cacheFile() ) ) calendar.load( cacheFile() ); else return; @@ -457,7 +457,7 @@ void ResourceCached::loadChangesCache( TQMap &map, const TQStr { CalendarLocal calendar ( TQString::fromLatin1( "UTC" ) ); - if ( KStandardDirs::exists( changesCacheFile( type ) ) ) + if ( TDEStandardDirs::exists( changesCacheFile( type ) ) ) calendar.load( changesCacheFile( type ) ); else return; diff --git a/libkcal/resourcelocal.cpp b/libkcal/resourcelocal.cpp index 8cfb3a9c..dca20b9a 100644 --- a/libkcal/resourcelocal.cpp +++ b/libkcal/resourcelocal.cpp @@ -146,7 +146,7 @@ bool ResourceLocal::doLoad() { bool success; - if ( !KStandardDirs::exists( mURL.path() ) ) { + if ( !TDEStandardDirs::exists( mURL.path() ) ) { kdDebug(5800) << "ResourceLocal::load(): File doesn't exist yet." << endl; // Save the empty calendar, so the calendar file will be created. success = doSave(); diff --git a/libkcal/resourcelocalconfig.cpp b/libkcal/resourcelocalconfig.cpp index 50c909bf..92c34e29 100644 --- a/libkcal/resourcelocalconfig.cpp +++ b/libkcal/resourcelocalconfig.cpp @@ -80,7 +80,7 @@ void ResourceLocalConfig::saveSettings( KRES::Resource *resource ) TQString url = mURL->url(); if( url.isEmpty() ) { - KStandardDirs dirs; + TDEStandardDirs dirs; TQString saveFolder = dirs.saveLocation( "data", "korganizer" ); TQFile file( saveFolder + "/std.ics" ); diff --git a/libkcal/resourcelocaldir.cpp b/libkcal/resourcelocaldir.cpp index 5ca0518e..730f3abd 100644 --- a/libkcal/resourcelocaldir.cpp +++ b/libkcal/resourcelocaldir.cpp @@ -127,13 +127,13 @@ bool ResourceLocalDir::doLoad() mCalendar.close(); TQString dirName = mURL.path(); - if ( !( KStandardDirs::exists( dirName ) || KStandardDirs::exists( dirName + "/") ) ) { + if ( !( TDEStandardDirs::exists( dirName ) || TDEStandardDirs::exists( dirName + "/") ) ) { kdDebug(5800) << "ResourceLocalDir::load(): Directory '" << dirName << "' doesn't exist yet. Creating it..." << endl; // Create the directory. Use 0775 to allow group-writable if the umask // allows it (permissions will be 0775 & ~umask). This is desired e.g. for // group-shared directories! - return KStandardDirs::makeDir( dirName, 0775 ); + return TDEStandardDirs::makeDir( dirName, 0775 ); } // The directory exists. Now try to open (the files in) it. -- cgit v1.2.3