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 --- kmail/kmfoldermaildir.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kmail/kmfoldermaildir.cpp') diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp index c12a58915..c6fa7be24 100644 --- a/kmail/kmfoldermaildir.cpp +++ b/kmail/kmfoldermaildir.cpp @@ -1012,7 +1012,7 @@ static bool removeDirAndContentsRecursively( const TQString & path ) //----------------------------------------------------------------------------- int KMFolderMaildir::removeContents() { - // NOTE: Don' use KIO::netaccess, it has reentrancy problems and multiple + // NOTE: Don' use TDEIO::netaccess, it has reentrancy problems and multiple // mailchecks going on trigger them, when removing dirs if ( !removeDirAndContentsRecursively( location() + "/new/" ) ) return 1; if ( !removeDirAndContentsRecursively( location() + "/cur/" ) ) return 1; @@ -1132,14 +1132,14 @@ TQ_INT64 KMFolderMaildir::doFolderSize() const //kdDebug(5006) << k_funcinfo << "Starting dirSizeJob for folder " // << location() << endl; KDirSize* job = KDirSize::dirSizeJob( list ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), - this, TQT_SLOT( slotDirSizeJobResult( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), + this, TQT_SLOT( slotDirSizeJobResult( TDEIO::Job* ) ) ); } return -1; } -void KMFolderMaildir::slotDirSizeJobResult( KIO::Job* job ) +void KMFolderMaildir::slotDirSizeJobResult( TDEIO::Job* job ) { mCurrentlyCheckingFolderSize = false; KDirSize * dirsize = dynamic_cast( job ); @@ -1164,8 +1164,8 @@ void KMFolderMaildir::slotDirSizeJobResult( KIO::Job* job ) //kdDebug(5006) << k_funcinfo << "Starting dirSizeJob for folder " // << entry.first->location() << endl; KDirSize* job = KDirSize::dirSizeJob( entry.second ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), - entry.first, TQT_SLOT( slotDirSizeJobResult( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), + entry.first, TQT_SLOT( slotDirSizeJobResult( TDEIO::Job* ) ) ); break; } else -- cgit v1.2.1