summaryrefslogtreecommitdiffstats
path: root/kmail/kmacctcachedimap.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
commit86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch)
tree97d3ac2c2f60780d9a1de4f82caac7cb27534501 /kmail/kmacctcachedimap.cpp
parenta9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff)
downloadtdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz
tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kmail/kmacctcachedimap.cpp')
-rw-r--r--kmail/kmacctcachedimap.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp
index 2a797acbb..473b0b99c 100644
--- a/kmail/kmacctcachedimap.cpp
+++ b/kmail/kmacctcachedimap.cpp
@@ -132,7 +132,7 @@ TQValueList<KMFolderCachedImap*> KMAcctCachedImap::killAllJobsInternal( bool dis
// Make list of folders to reset. This must be done last, since folderComplete
// can trigger the next queued mail check already.
TQValueList<KMFolderCachedImap*> folderList;
- TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
+ TQMap<TDEIO::Job*, jobData>::Iterator it = mapJobData.begin();
for (; it != mapJobData.end(); ++it) {
if ((*it).parent)
folderList << static_cast<KMFolderCachedImap*>((*it).parent->storage());
@@ -150,7 +150,7 @@ TQValueList<KMFolderCachedImap*> KMAcctCachedImap::killAllJobsInternal( bool dis
KMAccount::deleteFolderJobs();
if ( disconnectSlave && mSlave ) {
- KIO::Scheduler::disconnectSlave( mSlave );
+ TDEIO::Scheduler::disconnectSlave( mSlave );
mSlave = 0;
}
return folderList;
@@ -161,7 +161,7 @@ void KMAcctCachedImap::cancelMailCheck()
{
// Make list of folders to reset, like in killAllJobs
TQValueList<KMFolderCachedImap*> folderList;
- TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
+ TQMap<TDEIO::Job*, jobData>::Iterator it = mapJobData.begin();
for (; it != mapJobData.end(); ++it) {
if ( (*it).cancellable && (*it).parent )
folderList << static_cast<KMFolderCachedImap*>((*it).parent->storage());
@@ -308,7 +308,7 @@ void KMAcctCachedImap::addLastUnreadMsgCount( const KMFolderCachedImap *folder,
//
//
-void KMAcctCachedImap::readConfig( /*const*/ KConfig/*Base*/ & config ) {
+void KMAcctCachedImap::readConfig( /*const*/ TDEConfig/*Base*/ & config ) {
ImapAccountBase::readConfig( config );
// Apparently this method is only ever called once (from KMKernel::init) so this is ok
mPreviouslyDeletedFolders = config.readListEntry( "deleted-folders" );
@@ -323,7 +323,7 @@ void KMAcctCachedImap::readConfig( /*const*/ KConfig/*Base*/ & config ) {
mGroupwareType = (GroupwareType)config.readNumEntry( "groupwareType", GroupwareKolab );
}
-void KMAcctCachedImap::writeConfig( KConfig/*Base*/ & config ) /*const*/ {
+void KMAcctCachedImap::writeConfig( TDEConfig/*Base*/ & config ) /*const*/ {
ImapAccountBase::writeConfig( config );
config.writeEntry( "deleted-folders", mDeletedFolders + mPreviouslyDeletedFolders );
config.writeEntry( "renamed-folders-paths", mRenamedFolders.keys() );
@@ -447,7 +447,7 @@ void KMAcctCachedImap::slotProgressItemCanceled( ProgressItem* )
killAllJobs( abortConnection );
if ( abortConnection ) {
// If we were trying to connect, tell kmfoldercachedimap so that it moves on
- emit connectionResult( KIO::ERR_USER_CANCELED, TQString() );
+ emit connectionResult( TDEIO::ERR_USER_CANCELED, TQString() );
}
}