summaryrefslogtreecommitdiffstats
path: root/kresources/kolab/shared
diff options
context:
space:
mode:
Diffstat (limited to 'kresources/kolab/shared')
-rw-r--r--kresources/kolab/shared/kmailconnection.cpp26
-rw-r--r--kresources/kolab/shared/kmailconnection.h16
-rw-r--r--kresources/kolab/shared/kolabbase.cpp10
-rw-r--r--kresources/kolab/shared/resourcekolabbase.cpp14
-rw-r--r--kresources/kolab/shared/resourcekolabbase.h16
-rw-r--r--kresources/kolab/shared/subresource.cpp6
-rw-r--r--kresources/kolab/shared/subresource.h8
7 files changed, 48 insertions, 48 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,
diff --git a/kresources/kolab/shared/kmailconnection.h b/kresources/kolab/shared/kmailconnection.h
index 16b80bfb0..3cf5b826f 100644
--- a/kresources/kolab/shared/kmailconnection.h
+++ b/kresources/kolab/shared/kmailconnection.h
@@ -55,7 +55,7 @@ class KMailConnection : public TQObject, public DCOPObject {
// These are the methods called by KMail when the resource changes
k_dcop:
bool fromKMailAddIncidence( const TQString& type, const TQString& resource,
- Q_UINT32 sernum, int format, const TQString& xml );
+ TQ_UINT32 sernum, int format, const TQString& xml );
void fromKMailDelIncidence( const TQString& type, const TQString& resource,
const TQString& xml );
void fromKMailRefresh( const TQString& type, const TQString& resource );
@@ -63,7 +63,7 @@ k_dcop:
const TQString& label, bool writable,
bool alarmRelevant );
void fromKMailDelSubresource( const TQString& type, const TQString& resource );
- void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map, const TQString& type,
+ void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map, const TQString& type,
const TQString& folder );
public:
@@ -81,20 +81,20 @@ public:
bool kmailIncidencesCount( int& count,
const TQString& mimetype,
const TQString& resource );
- bool kmailIncidences( TQMap<Q_UINT32, TQString>& lst, const TQString& mimetype,
+ bool kmailIncidences( TQMap<TQ_UINT32, TQString>& lst, const TQString& mimetype,
const TQString& resource,
int startIndex,
int nbMessages );
- bool kmailGetAttachment( KURL& url, const TQString& resource, Q_UINT32 sernum,
+ bool kmailGetAttachment( KURL& url, const TQString& resource, TQ_UINT32 sernum,
const TQString& filename );
bool kmailAttachmentMimetype( TQString &mimeType, const TQString &resource,
- Q_UINT32 sernum, const TQString &filename );
+ TQ_UINT32 sernum, const TQString &filename );
bool kmailListAttachments( TQStringList &list, const TQString &resource,
- Q_UINT32 sernum );
- bool kmailDeleteIncidence( const TQString& resource, Q_UINT32 sernum );
+ TQ_UINT32 sernum );
+ bool kmailDeleteIncidence( const TQString& resource, TQ_UINT32 sernum );
bool kmailUpdate( const TQString& resource,
- Q_UINT32& sernum,
+ TQ_UINT32& sernum,
const TQString& subject,
const TQString& plainTextBody,
const TQMap<TQCString, TQString>& customHeaders,
diff --git a/kresources/kolab/shared/kolabbase.cpp b/kresources/kolab/shared/kolabbase.cpp
index b7f502576..978481072 100644
--- a/kresources/kolab/shared/kolabbase.cpp
+++ b/kresources/kolab/shared/kolabbase.cpp
@@ -44,8 +44,8 @@ using namespace Kolab;
KolabBase::KolabBase( const TQString& tz )
- : mCreationDate( TQDateTime::currentDateTime() ),
- mLastModified( TQDateTime::currentDateTime() ),
+ : mCreationDate( TQDateTime::tqcurrentDateTime() ),
+ mLastModified( TQDateTime::tqcurrentDateTime() ),
mSensitivity( Public ), mTimeZoneId( tz ),
mHasPilotSyncId( false ), mHasPilotSyncStatus( false )
{
@@ -94,7 +94,7 @@ void KolabBase::setFields( const KABC::Addressee* addressee )
kdDebug(5006) << "Creation time string: " << creationString << endl;
TQDateTime creationDate;
if ( creationString.isEmpty() ) {
- creationDate = TQDateTime::currentDateTime();
+ creationDate = TQDateTime::tqcurrentDateTime();
kdDebug(5006) << "Creation date set to current time\n";
}
else {
@@ -103,7 +103,7 @@ void KolabBase::setFields( const KABC::Addressee* addressee )
}
TQDateTime modified = addressee->revision();
if ( !modified.isValid() )
- modified = TQDateTime::currentDateTime();
+ modified = TQDateTime::tqcurrentDateTime();
setLastModified( modified );
if ( modified < creationDate ) {
// It's not possible that the modification date is earlier than creation
@@ -259,7 +259,7 @@ bool KolabBase::loadEmailAttribute( TQDomElement& element, Email& email )
const TQString tagName = e.tagName();
if ( tagName == "display-name" ) {
- // Quote the text in case it contains commas or other quotable chars.
+ // Quote the text in case it tqcontains commas or other quotable chars.
TQString tusername = KPIM::quoteNameIfNecessary( e.text() );
TQString tname, temail;
diff --git a/kresources/kolab/shared/resourcekolabbase.cpp b/kresources/kolab/shared/resourcekolabbase.cpp
index 2db2117db..26ef00db6 100644
--- a/kresources/kolab/shared/resourcekolabbase.cpp
+++ b/kresources/kolab/shared/resourcekolabbase.cpp
@@ -83,7 +83,7 @@ bool ResourceKolabBase::kmailIncidencesCount( int &count,
return mConnection->kmailIncidencesCount( count, mimetype, resource );
}
-bool ResourceKolabBase::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
+bool ResourceKolabBase::kmailIncidences( TQMap<TQ_UINT32, TQString>& lst,
const TQString& mimetype,
const TQString& resource,
int startIndex,
@@ -93,27 +93,27 @@ bool ResourceKolabBase::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
}
bool ResourceKolabBase::kmailGetAttachment( KURL& url, const TQString& resource,
- Q_UINT32 sernum,
+ TQ_UINT32 sernum,
const TQString& filename ) const
{
return mConnection->kmailGetAttachment( url, resource, sernum, filename );
}
bool ResourceKolabBase::kmailAttachmentMimetype( TQString & mimeType, TQString & resource,
- Q_UINT32 sernum, const TQString & filename ) const
+ TQ_UINT32 sernum, const TQString & filename ) const
{
return mConnection->kmailAttachmentMimetype( mimeType, resource, sernum, filename );
}
bool ResourceKolabBase::kmailListAttachments( TQStringList &list,
const TQString & resource,
- Q_UINT32 sernum ) const
+ TQ_UINT32 sernum ) const
{
return mConnection->kmailListAttachments( list, resource, sernum );
}
bool ResourceKolabBase::kmailDeleteIncidence( const TQString& resource,
- Q_UINT32 sernum )
+ TQ_UINT32 sernum )
{
return mSilent || mConnection->kmailDeleteIncidence( resource, sernum );
}
@@ -126,7 +126,7 @@ static TQString plainTextBody()
" Groupware format.\nFor a list of such email clients please"
" visit\n%1" );
const char * url = "http://www.kolab.org/kolab2-clients.html";
- TQString firstPartTextUntranslated = TQString::fromLatin1( firstPartTextToTranslate ).arg( url );
+ TQString firstPartTextUntranslated = TQString::tqfromLatin1( firstPartTextToTranslate ).arg( url );
TQString firstPartText = i18n( firstPartTextToTranslate ).arg( url );
if ( firstPartText != firstPartTextUntranslated ) {
firstPartText.append("\n\n-----------------------------------------------------\n\n");
@@ -136,7 +136,7 @@ static TQString plainTextBody()
}
bool ResourceKolabBase::kmailUpdate( const TQString& resource,
- Q_UINT32& sernum,
+ TQ_UINT32& sernum,
const TQString& xml,
const TQString& mimetype,
const TQString& subject,
diff --git a/kresources/kolab/shared/resourcekolabbase.h b/kresources/kolab/shared/resourcekolabbase.h
index 1bd8b9515..565be2675 100644
--- a/kresources/kolab/shared/resourcekolabbase.h
+++ b/kresources/kolab/shared/resourcekolabbase.h
@@ -81,7 +81,7 @@ public:
// These are the methods called by KMail when the resource changes
virtual bool fromKMailAddIncidence( const TQString& type,
const TQString& resource,
- Q_UINT32 sernum,
+ TQ_UINT32 sernum,
int format,
const TQString& data ) = 0;
virtual void fromKMailDelIncidence( const TQString& type,
@@ -97,7 +97,7 @@ public:
virtual void fromKMailDelSubresource( const TQString& type,
const TQString& resource ) = 0;
- virtual void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+ virtual void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
const TQString& type,
const TQString& folder ) = 0;
protected:
@@ -119,7 +119,7 @@ protected:
/// Get the mimetype attachments from a chunk of messages from this folder.
/// Returns a TQMap with serialNumber/attachment pairs.
- bool kmailIncidences( TQMap<Q_UINT32, TQString>& lst, const TQString& mimetype,
+ bool kmailIncidences( TQMap<TQ_UINT32, TQString>& lst, const TQString& mimetype,
const TQString& resource,
int startIndex,
int nbMessages ) const;
@@ -131,20 +131,20 @@ public: // for Contact
/// be called by the resource after obtaining the incidence.
/// The resource must delete the temp file.
bool kmailGetAttachment( KURL& url, const TQString& resource,
- Q_UINT32 sernum,
+ TQ_UINT32 sernum,
const TQString& filename ) const;
/** Get the mimetype of the specified attachment. */
bool kmailAttachmentMimetype( TQString &mimeType, TQString &resource,
- Q_UINT32 sernum, const TQString &filename ) const;
+ TQ_UINT32 sernum, const TQString &filename ) const;
/// List all attachments of a mail.
bool kmailListAttachments( TQStringList &list, const TQString &resource,
- Q_UINT32 sernum ) const;
+ TQ_UINT32 sernum ) const;
protected:
/// Delete an incidence.
- bool kmailDeleteIncidence( const TQString& resource, Q_UINT32 sernum );
+ bool kmailDeleteIncidence( const TQString& resource, TQ_UINT32 sernum );
KMailICalIface::StorageFormat kmailStorageFormat( const TQString& folder ) const;
@@ -152,7 +152,7 @@ protected:
/// Update an incidence. The list of attachments are URLs.
/// The parameter sernum is updated with the right KMail serial number
- bool kmailUpdate( const TQString& resource, Q_UINT32& sernum,
+ bool kmailUpdate( const TQString& resource, TQ_UINT32& sernum,
const TQString& xml,
const TQString& mimetype,
const TQString& subject,
diff --git a/kresources/kolab/shared/subresource.cpp b/kresources/kolab/shared/subresource.cpp
index de4048fc7..a7ffb8f90 100644
--- a/kresources/kolab/shared/subresource.cpp
+++ b/kresources/kolab/shared/subresource.cpp
@@ -103,7 +103,7 @@ int SubResource::completionWeight() const
return mCompletionWeight;
}
-StorageReference::StorageReference( const TQString& resource, Q_UINT32 sernum )
+StorageReference::StorageReference( const TQString& resource, TQ_UINT32 sernum )
: mResource( resource ), mSerialNumber( sernum )
{
}
@@ -122,12 +122,12 @@ TQString StorageReference::resource() const
return mResource;
}
-void StorageReference::setSerialNumber( Q_UINT32 serialNumber )
+void StorageReference::setSerialNumber( TQ_UINT32 serialNumber )
{
mSerialNumber = serialNumber;
}
-Q_UINT32 StorageReference::serialNumber() const
+TQ_UINT32 StorageReference::serialNumber() const
{
return mSerialNumber;
}
diff --git a/kresources/kolab/shared/subresource.h b/kresources/kolab/shared/subresource.h
index 87f98e6dd..de7a92e93 100644
--- a/kresources/kolab/shared/subresource.h
+++ b/kresources/kolab/shared/subresource.h
@@ -96,18 +96,18 @@ public:
// Just for QMap
StorageReference() {}
- StorageReference( const TQString& resource, Q_UINT32 sernum );
+ StorageReference( const TQString& resource, TQ_UINT32 sernum );
virtual ~StorageReference();
virtual void setResource( const TQString& resource );
virtual TQString resource() const;
- virtual void setSerialNumber( Q_UINT32 serialNumber );
- virtual Q_UINT32 serialNumber() const;
+ virtual void setSerialNumber( TQ_UINT32 serialNumber );
+ virtual TQ_UINT32 serialNumber() const;
private:
TQString mResource;
- Q_UINT32 mSerialNumber;
+ TQ_UINT32 mSerialNumber;
};
typedef TQMap<TQString, StorageReference> UidMap;
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-17 13:42:56 +0000