summaryrefslogtreecommitdiffstats
path: root/kresources/kolab/shared/kmailconnection.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
commitf4fae92b6768541e2952173c3d4b09040f95bf7e (patch)
treed8c5d93232235cd635f3310b4d95490df181ba2d /kresources/kolab/shared/kmailconnection.cpp
parent125c0a08265b75a133644d3b55f47e37c919f45d (diff)
downloadtdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.tar.gz
tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.zip
Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kresources/kolab/shared/kmailconnection.cpp')
-rw-r--r--kresources/kolab/shared/kmailconnection.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/kresources/kolab/shared/kmailconnection.cpp b/kresources/kolab/shared/kmailconnection.cpp
index 66674abfa..5b2921b94 100644
--- a/kresources/kolab/shared/kmailconnection.cpp
+++ b/kresources/kolab/shared/kmailconnection.cpp
@@ -85,7 +85,7 @@ bool KMailConnection::connectToKMail()
if ( services[i].find( "anonymous" ) == 0 ) // querying anonymous-XXXXX deadlocks as well, what are those anyway?
continue;
const QCStringList objs = kapp->dcopClient()->remoteObjects( services[i] );
- if ( objs.contains( dcopObjectId ) ) {
+ if ( objs.tqcontains( dcopObjectId ) ) {
dcopService = services[i];
break;
}
@@ -111,8 +111,8 @@ bool KMailConnection::connectToKMail()
dcopService, dcopObjectId );
// Attach to the KMail signals
- if ( !connectKMailSignal( "incidenceAdded(TQString,TQString,Q_UINT32,int,TQString)",
- "fromKMailAddIncidence(TQString,TQString,Q_UINT32,int,TQString)" ) )
+ if ( !connectKMailSignal( "incidenceAdded(TQString,TQString,TQ_UINT32,int,TQString)",
+ "fromKMailAddIncidence(TQString,TQString,TQ_UINT32,int,TQString)" ) )
kdError(5650) << "DCOP connection to incidenceAdded failed" << endl;
if ( !connectKMailSignal( "incidenceDeleted(TQString,TQString,TQString)",
"fromKMailDelIncidence(TQString,TQString,TQString)" ) )
@@ -126,8 +126,8 @@ bool KMailConnection::connectToKMail()
if ( !connectKMailSignal( "subresourceDeleted(TQString,TQString)",
"fromKMailDelSubresource(TQString,TQString)" ) )
kdError(5650) << "DCOP connection to subresourceDeleted failed" << endl;
- if ( !connectKMailSignal( "asyncLoadResult(TQMap<Q_UINT32, TQString>, TQString, TQString)",
- "fromKMailAsyncLoadResult(TQMap<Q_UINT32, TQString>, TQString, TQString)" ) )
+ if ( !connectKMailSignal( "asyncLoadResult(TQMap<TQ_UINT32, TQString>, TQString, TQString)",
+ "fromKMailAsyncLoadResult(TQMap<TQ_UINT32, TQString>, TQString, TQString)" ) )
kdError(5650) << "DCOP connection to asyncLoadResult failed" << endl;
}
@@ -136,7 +136,7 @@ bool KMailConnection::connectToKMail()
bool KMailConnection::fromKMailAddIncidence( const TQString& type,
const TQString& folder,
- Q_UINT32 sernum,
+ TQ_UINT32 sernum,
int format,
const TQString& data )
{
@@ -184,7 +184,7 @@ void KMailConnection::fromKMailDelSubresource( const TQString& type,
mResource->fromKMailDelSubresource( type, resource );
}
-void KMailConnection::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+void KMailConnection::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
const TQString& type,
const TQString& folder )
{
@@ -219,7 +219,7 @@ bool KMailConnection::kmailIncidencesCount( int& count,
return mKMailIcalIfaceStub->ok();
}
-bool KMailConnection::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
+bool KMailConnection::kmailIncidences( TQMap<TQ_UINT32, TQString>& lst,
const TQString& mimetype,
const TQString& resource,
int startIndex,
@@ -235,7 +235,7 @@ bool KMailConnection::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
bool KMailConnection::kmailGetAttachment( KURL& url,
const TQString& resource,
- Q_UINT32 sernum,
+ TQ_UINT32 sernum,
const TQString& filename )
{
if ( !connectToKMail() )
@@ -247,7 +247,7 @@ bool KMailConnection::kmailGetAttachment( KURL& url,
bool KMailConnection::kmailAttachmentMimetype( TQString & mimeType,
const TQString & resource,
- Q_UINT32 sernum,
+ TQ_UINT32 sernum,
const TQString & filename )
{
if ( !connectToKMail() )
@@ -257,7 +257,7 @@ bool KMailConnection::kmailAttachmentMimetype( TQString & mimeType,
}
bool KMailConnection::kmailListAttachments(TQStringList &list,
- const TQString & resource, Q_UINT32 sernum)
+ const TQString & resource, TQ_UINT32 sernum)
{
if ( !connectToKMail() )
return false;
@@ -267,7 +267,7 @@ bool KMailConnection::kmailListAttachments(TQStringList &list,
}
bool KMailConnection::kmailDeleteIncidence( const TQString& resource,
- Q_UINT32 sernum )
+ TQ_UINT32 sernum )
{
return connectToKMail()
&& mKMailIcalIfaceStub->deleteIncidenceKolab( resource, sernum )
@@ -275,7 +275,7 @@ bool KMailConnection::kmailDeleteIncidence( const TQString& resource,
}
bool KMailConnection::kmailUpdate( const TQString& resource,
- Q_UINT32& sernum,
+ TQ_UINT32& sernum,
const TQString& subject,
const TQString& plainTextBody,
const TQMap<TQCString, TQString>& customHeaders,