summaryrefslogtreecommitdiffstats
path: root/kresources/kolab/kabc
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-13 00:46:47 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-13 00:46:47 +0000
commit67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (patch)
tree5f52a9eada2e9f3654fc327d7c14dfef570a6ecb /kresources/kolab/kabc
parent2ee4bf4fd5eff93b2fbef0ff8e8063edffc5da5c (diff)
downloadtdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.tar.gz
tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.zip
Initial conversion of kdepim to TQt
This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kresources/kolab/kabc')
-rw-r--r--kresources/kolab/kabc/contact.cpp22
-rw-r--r--kresources/kolab/kabc/contact.h10
-rw-r--r--kresources/kolab/kabc/kolab.desktop2
-rw-r--r--kresources/kolab/kabc/resourcekolab.cpp26
-rw-r--r--kresources/kolab/kabc/resourcekolab.h7
-rw-r--r--kresources/kolab/kabc/resourcekolab_plugin.cpp6
6 files changed, 37 insertions, 36 deletions
diff --git a/kresources/kolab/kabc/contact.cpp b/kresources/kolab/kabc/contact.cpp
index e3032d118..474eafa3d 100644
--- a/kresources/kolab/kabc/contact.cpp
+++ b/kresources/kolab/kabc/contact.cpp
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -293,12 +293,12 @@ TQDate Contact::anniversary() const
return mAnniversary;
}
-void Contact::setChildren( const TQString& children )
+void Contact::setChildren( const TQString& tqchildren )
{
- mChildren = children;
+ mChildren = tqchildren;
}
-TQString Contact::children() const
+TQString Contact::tqchildren() const
{
return mChildren;
}
@@ -619,7 +619,7 @@ bool Contact::loadAttribute( TQDomElement& element )
}
break;
case 'c':
- if ( tagName == "children" ) {
+ if ( tagName == "tqchildren" ) {
setChildren( element.text() );
return true;
}
@@ -798,7 +798,7 @@ bool Contact::saveAttributes( TQDomElement& element ) const
writeString( element, "x-logo", mLogoAttachmentName );
if ( !sound().isNull() )
writeString( element, "x-sound", mSoundAttachmentName );
- writeString( element, "children", children() );
+ writeString( element, "tqchildren", tqchildren() );
writeString( element, "gender", gender() );
writeString( element, "language", language() );
savePhoneAttributes( element );
@@ -1115,12 +1115,12 @@ void Contact::setFields( const KABC::Addressee* addressee )
for( TQStringList::Iterator it = customs.begin(); it != customs.end(); ++it ) {
// KABC::Addressee doesn't offer a real way to iterate over customs, other than splitting strings ourselves
// The format is "app-name:value".
- int pos = (*it).find( '-' );
+ int pos = (*it).tqfind( '-' );
if ( pos == -1 ) continue;
TQString app = (*it).left( pos );
if ( app == "KOLAB" ) continue;
TQString name = (*it).mid( pos + 1 );
- pos = name.find( ':' );
+ pos = name.tqfind( ':' );
if ( pos == -1 ) continue;
TQString value = name.mid( pos + 1 );
name = name.left( pos );
@@ -1146,7 +1146,7 @@ void Contact::setFields( const KABC::Addressee* addressee )
// mailer, timezone, productId, sortString, agent, rfc2426 name()
// Things KAddressBook can't handle, so they are saved as unhandled tags:
- // initials, children, gender, language
+ // initials, tqchildren, gender, language
}
// The loading is: xml -> Contact -> addressee, this is the second part
diff --git a/kresources/kolab/kabc/contact.h b/kresources/kolab/kabc/contact.h
index 66a7c418a..60c399335 100644
--- a/kresources/kolab/kabc/contact.h
+++ b/kresources/kolab/kabc/contact.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -154,8 +154,8 @@ public:
TQString soundAttachmentName() const { return mSoundAttachmentName; }
TQByteArray sound() const { return mSound; }
- void setChildren( const TQString& children );
- TQString children() const;
+ void setChildren( const TQString& tqchildren );
+ TQString tqchildren() const;
void setGender( const TQString& gender );
TQString gender() const;
diff --git a/kresources/kolab/kabc/kolab.desktop b/kresources/kolab/kabc/kolab.desktop
index 8339f9c22..c0c9c80d7 100644
--- a/kresources/kolab/kabc/kolab.desktop
+++ b/kresources/kolab/kabc/kolab.desktop
@@ -35,7 +35,7 @@ Name[pl]=Książka adresowa na serwerze IMAP za pośrednictwem KMail
Name[pt]=Livro de Endereços em Servidor IMAP via KMail
Name[pt_BR]=Livro de Endereços em servidor IMAP via KMail
Name[ru]=Адресная книга на сервере IMAP через KMail
-Name[sk]=Adresár na IMAP-serveri pomocou KMail
+Name[sk]=Adresár na IMAP-serveri potqmocou KMail
Name[sl]=Adresar na strežniku IMAP preko KMaila
Name[sr]=Адресар на IMAP серверу преко KMail-а
Name[sr@Latn]=Adresar na IMAP serveru preko KMail-a
diff --git a/kresources/kolab/kabc/resourcekolab.cpp b/kresources/kolab/kabc/resourcekolab.cpp
index e9c481bfb..0acabb09b 100644
--- a/kresources/kolab/kabc/resourcekolab.cpp
+++ b/kresources/kolab/kabc/resourcekolab.cpp
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -79,7 +79,7 @@ static const char* s_inlineMimeType = "text/x-vcard";
KABC::ResourceKolab::ResourceKolab( const KConfig *config )
: KPIM::ResourceABC( config ),
Kolab::ResourceKolabBase( "ResourceKolab-KABC" ),
- mCachedSubresource( TQString::null ), mCachedSubresourceNotFound( false ), mLocked( false )
+ mCachedSubresource( TQString() ), mCachedSubresourceNotFound( false ), mLocked( false )
{
setType( "imap" );
if ( !config ) {
@@ -144,7 +144,7 @@ KABC::Ticket * KABC::ResourceKolab::requestSaveTicket()
void KABC::ResourceKolab::releaseSaveTicket( Ticket* ticket )
{
mLocked = false;
- mCachedSubresource = TQString::null;
+ mCachedSubresource = TQString();
mCachedSubresourceNotFound = false;
delete ticket;
}
@@ -185,7 +185,7 @@ static const struct { const char* mimetype; KMailICalIface::StorageFormat format
bool KABC::ResourceKolab::loadSubResource( const TQString& subResource )
{
int count = 0;
- if ( !kmailIncidencesCount( count, TQString::null, subResource ) ) {
+ if ( !kmailIncidencesCount( count, TQString(), subResource ) ) {
kdError() << "Communication problem in KABC::ResourceKolab::loadSubResource()\n";
return false;
}
@@ -335,7 +335,7 @@ bool KABC::ResourceKolab::kmailUpdateAddressee( const Addressee& addr )
const TQString uid = addr.uid();
TQString subResource;
TQ_UINT32 sernum;
- if ( mUidMap.find( uid ) != mUidMap.end() ) {
+ if ( mUidMap.tqfind( uid ) != mUidMap.end() ) {
subResource = mUidMap[ uid ].resource();
if ( !subresourceWritable( subResource ) ) {
kdWarning() << "Wow! Something tried to update a non-writable addressee! Fix this caller: " << kdBacktrace() << endl;
@@ -398,7 +398,7 @@ bool KABC::ResourceKolab::kmailUpdateAddressee( const Addressee& addr )
kdDebug(5650) << "kmailUpdate returned, now sernum=" << sernum << " for uid=" << uid << endl;
mUidMap[ uid ] = StorageReference( subResource, sernum );
// This is ugly, but it's faster than doing
- // mAddrMap.find(addr.uid()), which would give the same :-(
+ // mAddrMap.tqfind(addr.uid()), which would give the same :-(
// Reason for this: The Changed attribute of Addressee should
// be mutable
const_cast<Addressee&>(addr).setChanged( false );
@@ -431,7 +431,7 @@ void KABC::ResourceKolab::insertAddressee( const Addressee& addr )
void KABC::ResourceKolab::removeAddressee( const Addressee& addr )
{
const TQString uid = addr.uid();
- if ( mUidMap.find( uid ) == mUidMap.end() ) return;
+ if ( mUidMap.tqfind( uid ) == mUidMap.end() ) return;
//kdDebug(5650) << k_funcinfo << uid << endl;
const TQString resource = mUidMap[ uid ].resource();
if ( !subresourceWritable( resource ) ) {
@@ -494,7 +494,7 @@ void KABC::ResourceKolab::fromKMailDelIncidence( const TQString& type,
mUidsPendingDeletion.remove( uid );
} else if ( mUidsPendingUpdate.tqcontains( uid ) ) {
// It's good to know if was deleted, but we are waiting on a new one to
- // tqreplace it, so let's just sit tight.
+ // replace it, so let's just sit tight.
} else {
// We didn't trigger this, so KMail did, remove the reference to the uid
mAddrMap.remove( uid );
@@ -633,7 +633,7 @@ TQString KABC::ResourceKolab::subresourceLabel( const TQString& subresource ) co
}
kdDebug(5650) << "subresourceLabel( " << subresource << " ): not found!\n";
- return TQString::null;
+ return TQString();
}
void KABC::ResourceKolab::setSubresourceCompletionWeight( const TQString& subresource, int completionWeight )
@@ -668,9 +668,9 @@ void KABC::ResourceKolab::setSubresourceActive( const TQString &subresource, boo
/*virtual*/
-bool KABC::ResourceKolab::addSubresource( const TQString& label, const TQString& parent )
+bool KABC::ResourceKolab::addSubresource( const TQString& label, const TQString& tqparent )
{
- return kmailAddSubresource( label, parent, s_kmailContentsType );
+ return kmailAddSubresource( label, tqparent, s_kmailContentsType );
}
/*virtual*/
diff --git a/kresources/kolab/kabc/resourcekolab.h b/kresources/kolab/kabc/resourcekolab.h
index 2288bf258..a3c8a9c36 100644
--- a/kresources/kolab/kabc/resourcekolab.h
+++ b/kresources/kolab/kabc/resourcekolab.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -53,6 +53,7 @@ class KDE_EXPORT ResourceKolab : public KPIM::ResourceABC,
public Kolab::ResourceKolabBase
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/kresources/kolab/kabc/resourcekolab_plugin.cpp b/kresources/kolab/kabc/resourcekolab_plugin.cpp
index c4f1b3333..db69b8969 100644
--- a/kresources/kolab/kabc/resourcekolab_plugin.cpp
+++ b/kresources/kolab/kabc/resourcekolab_plugin.cpp
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.