summaryrefslogtreecommitdiffstats
path: root/kresources/newexchange
diff options
context:
space:
mode:
Diffstat (limited to 'kresources/newexchange')
-rw-r--r--kresources/newexchange/Incidence.mapping4
-rw-r--r--kresources/newexchange/exchangeaddressbookadaptor.cpp2
-rw-r--r--kresources/newexchange/exchangecalendaradaptor.cpp2
-rw-r--r--kresources/newexchange/exchangeconvertercalendar.cpp28
-rw-r--r--kresources/newexchange/exchangeconvertercontact.cpp6
-rw-r--r--kresources/newexchange/exchangeglobals.cpp10
-rw-r--r--kresources/newexchange/kabc_resourceexchange.h1
-rw-r--r--kresources/newexchange/kcal_resourceexchange.h1
8 files changed, 28 insertions, 26 deletions
diff --git a/kresources/newexchange/Incidence.mapping b/kresources/newexchange/Incidence.mapping
index ef0914b56..145ca4802 100644
--- a/kresources/newexchange/Incidence.mapping
+++ b/kresources/newexchange/Incidence.mapping
@@ -104,7 +104,7 @@ DAV:id
Incidence::pilotId()
-Incidence::syncStatus()
+Incidence::synctqStatus()
Incidence::relatedToUid()
@@ -156,7 +156,7 @@ h1:0x00008101 b:dt='int' | status: 0_Open, 1_InProgress, 2
No correspondence:
==================
Incidence::pilotId()
-Incidence::syncStatus()
+Incidence::synctqStatus()
Incidence::relatedToUid()
Incidence::custom()
diff --git a/kresources/newexchange/exchangeaddressbookadaptor.cpp b/kresources/newexchange/exchangeaddressbookadaptor.cpp
index 423ac75a7..13ad362df 100644
--- a/kresources/newexchange/exchangeaddressbookadaptor.cpp
+++ b/kresources/newexchange/exchangeaddressbookadaptor.cpp
@@ -84,7 +84,7 @@ void ExchangeAddressBookAdaptor::customAdaptUploadUrl( KURL &url )
TQString ExchangeAddressBookAdaptor::defaultNewItemName( KPIM::GroupwareUploadItem *item ) {
if ( item ) return item->uid()+".EML";
- else return TQString::null;
+ else return TQString();
}
diff --git a/kresources/newexchange/exchangecalendaradaptor.cpp b/kresources/newexchange/exchangecalendaradaptor.cpp
index ceec4412b..43e1dfdb3 100644
--- a/kresources/newexchange/exchangecalendaradaptor.cpp
+++ b/kresources/newexchange/exchangecalendaradaptor.cpp
@@ -117,7 +117,7 @@ void ExchangeDelete::findUidSingleMaster( TQString const& uid )
TQString ExchangeCalendarAdaptor::defaultNewItemName( KPIM::GroupwareUploadItem *item ) {
if ( item ) return item->uid()+".EML";
- else return TQString::null;
+ else return TQString();
}
KPIM::GroupwareUploadItem *ExchangeCalendarAdaptor::newUploadItem( KCal::Incidence*it,
diff --git a/kresources/newexchange/exchangeconvertercalendar.cpp b/kresources/newexchange/exchangeconvertercalendar.cpp
index d2a8d55cd..d28e8b1cf 100644
--- a/kresources/newexchange/exchangeconvertercalendar.cpp
+++ b/kresources/newexchange/exchangeconvertercalendar.cpp
@@ -34,7 +34,7 @@
using namespace KCal;
#define TaskNamespace1 "http://schemas.microsoft.com/mapi/id/{00062003-0000-0000-C000-000000000046}/"
-#define TaskProp_Status "0x00008101"
+#define TaskProp_tqStatus "0x00008101"
#define TaskProp_PercentCompleted "0x00008102"
#define TaskProp_DtStart "0x00008104"
#define TaskProp_DtDue "0x00008105"
@@ -164,7 +164,7 @@ void ExchangeConverterCalendar::createRequestTask( TQDomDocument &doc, TQDomElem
propertyTask2( TaskProp_ReminderTime );
propertyTask2( TaskProp_ReminderPlaySound );
propertyTask2( TaskProp_ReminderSoundFile );
- propertyTask1( TaskProp_Status );
+ propertyTask1( TaskProp_tqStatus );
}
#undef propertyTask1
#undef propertyTask2
@@ -410,7 +410,7 @@ kdDebug()<<"ExchangeConverterCalendar::readIncidence: ERROR: No UID given"<<endl
TQStringList::Iterator it = tmplst.begin();
KCal::DateList exdates;
for ( ; it != tmplst.end(); ++it ) {
- exdates.append( /*utcAsZone(*/ TQDateTime::fromString( *it, Qt::ISODate )/*,
+ exdates.append( /*utcAsZone(*/ TQDateTime::fromString( *it, TQt::ISODate )/*,
localTimeZoneId )*/.date() );
}
event->recurrence()->setExDates( exdates );
@@ -497,7 +497,7 @@ kdDebug()<<"ExchangeConverterCalendar::readIncidence: ERROR: No UID given"<<endl
// What to do about recurrence rules?
// FIXME: Reminders, use TaskProp_ReminderSet, TaskProp_ReminderTime,
- // TaskProp_ReminderPlaySound, TaskProp_ReminderSoundFile, TaskProp_Status
+ // TaskProp_ReminderPlaySound, TaskProp_ReminderSoundFile, TaskProp_tqStatus
// But how do I get the offset?
return true;
@@ -593,7 +593,7 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
void addDateProp( TQDomElement &el ) { el.setAttribute( "b:dt", "dateTime.tz" ); }
void addFloatProp( TQDomElement &el ) { el.setAttribute( "b:dt", "float" ); }
void addIntProp( TQDomElement &el ) { el.setAttribute( "b:dt", "int" ); }
- TQString timePropString( const TQDateTime &dt ) { return dt.toString( Qt::ISODate )+"Z"; }
+ TQString timePropString( const TQDateTime &dt ) { return dt.toString( TQt::ISODate )+"Z"; }
bool visitIncidence( Incidence *incidence )
{
@@ -605,9 +605,9 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
domHTTPMailProperty( "textdescription", incidence->description() );
// FIXME: timestampt, comments and categories
// domHTTPMailProperty( "date", ??? ); // timestamp not available in libkcal
-// domDavProperty( "comment", incidence->comments() ); // libkcal has a QStringlist, not one string
+// domDavProperty( "comment", incidence->comments() ); // libkcal has a TQStringlist, not one string
// domProperty( "urn:schemas-microsoft-com:office:office", "Keywords", ??? ); // It's a <v>entyr1</v><v>entry2</v> String list!
- tmpstr = TQString::null;
+ tmpstr = TQString();
switch ( incidence->secrecy() ) {
case KCal::Incidence::SecrecyPublic: tmpstr = "0"; break;
case KCal::Incidence::SecrecyPrivate: tmpstr = "2"; break;
@@ -622,7 +622,7 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
domMailHeaderProperty( "from", incidence->organizer().fullName() );
// Attendees:
- tmpstr = TQString::null;
+ tmpstr = TQString();
TQStringList reqattnames;
TQStringList optattnames;
Attendee::List atts = incidence->attendees();
@@ -668,7 +668,7 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
// FIXME: domCalendarProperty( "sequence", event->sequence() );
domCalendarProperty( "location", event->location() );
- TQString tmpstr( TQString::null );
+ TQString tmpstr;
switch ( event->transparency() ) {
case KCal::Event::Transparent: tmpstr = "FREE"; break;
case KCal::Event::Opaque: tmpstr = "BUSY"; break;
@@ -730,8 +730,8 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
/* FIXME:
domCalendarProperty( "uid", todo->uid() );
- domCalendarProperty( "created", todo->created().toString( Qt::ISODate ) );
- domCalendarProperty( "lastmodified", todo->lastModified().toString( Qt::ISODate ) );*/
+ domCalendarProperty( "created", todo->created().toString( TQt::ISODate ) );
+ domCalendarProperty( "lastmodified", todo->lastModified().toString( TQt::ISODate ) );*/
// TODO
/*propertyTask1( TaskProp_Owner );
propertyTask2( TaskProp_ContactNames );
@@ -747,7 +747,7 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
propertyTask2( TaskProp_ReminderTime );
propertyTask2( TaskProp_ReminderPlaySound );
propertyTask2( TaskProp_ReminderSoundFile );
- propertyTask1( TaskProp_Status );*/
+ propertyTask1( TaskProp_tqStatus );*/
return true;
}
bool visit( Journal *journal )
@@ -758,8 +758,8 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
"outlookmessageclass", "IPM.Journal" );
/* FIXME:
domCalendarProperty( "uid", todo->uid() );
- domCalendarProperty( "created", todo->created().toString( Qt::ISODate ) );
- domCalendarProperty( "lastmodified", todo->lastModified().toString( Qt::ISODate ) );*/
+ domCalendarProperty( "created", todo->created().toString( TQt::ISODate ) );
+ domCalendarProperty( "lastmodified", todo->lastModified().toString( TQt::ISODate ) );*/
// TODO
return true;
}
diff --git a/kresources/newexchange/exchangeconvertercontact.cpp b/kresources/newexchange/exchangeconvertercontact.cpp
index 88ad3a158..40e0498a6 100644
--- a/kresources/newexchange/exchangeconvertercontact.cpp
+++ b/kresources/newexchange/exchangeconvertercontact.cpp
@@ -585,13 +585,13 @@ TQDomDocument ExchangeConverterContact::createWebDAV( Addressee addr )
// FIXME: Exchange uses the date in the form 8/13, i.e. possibly without a
// year! How shall I deal with this?
/* TQDate dt = addr.birthday().date();
- TQString str = (dt.isValid())?(dt.toString( Qt::ISODate )):(TQString::null);
+ TQString str = (dt.isValid())?(dt.toString( TQt::ISODate )):(TQString());
if ( !str.isEmpty() ) {
TQDomElement el = domContactProperty( "bday", str );
el.setAttribute( "b:dt", "date" );
}
- dt = TQDate::fromString( addr.custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate );
- str = (dt.isValid())?(dt.toString( Qt::ISODate )):(TQString::null);
+ dt = TQDate::fromString( addr.custom( "KADDRESSBOOK", "X-Anniversary" ), TQt::ISODate );
+ str = (dt.isValid())?(dt.toString( TQt::ISODate )):(TQString());
if ( !str.isEmpty() ) {
TQDomElement el = domContactProperty( "weddinganniversary", str );
el.setAttribute( "b:dt", "date" );
diff --git a/kresources/newexchange/exchangeglobals.cpp b/kresources/newexchange/exchangeglobals.cpp
index 544051667..b17302386 100644
--- a/kresources/newexchange/exchangeglobals.cpp
+++ b/kresources/newexchange/exchangeglobals.cpp
@@ -90,7 +90,7 @@ bool ExchangeGlobals::getFolderHasSubs( const TQDomNode &folderNode )
KIO::Job *ExchangeGlobals::createListFoldersJob( const KURL &url )
{
TQDomDocument doc;
- TQDomElement root = WebdavHandler::addDavElement( doc, doc, "d:propfind" );
+ TQDomElement root = WebdavHandler::addDavElement( doc, doc, "d:proptqfind" );
TQDomElement prop = WebdavHandler::addElement( doc, root, "d:prop" );
WebdavHandler::addElement( doc, prop, "d:displayname" );
WebdavHandler::addElement( doc, prop, "d:contentclass" );
@@ -104,7 +104,7 @@ KIO::Job *ExchangeGlobals::createListFoldersJob( const KURL &url )
KIO::TransferJob *ExchangeGlobals::createListItemsJob( const KURL &url )
{
TQDomDocument doc;
- TQDomElement root = WebdavHandler::addDavElement( doc, doc, "d:propfind" );
+ TQDomElement root = WebdavHandler::addDavElement( doc, doc, "d:proptqfind" );
TQDomElement prop = WebdavHandler::addElement( doc, root, "d:prop" );
WebdavHandler::addElement( doc, prop, "d:getetag" );
WebdavHandler::addElement( doc, prop, "d:contentclass" );
@@ -126,7 +126,7 @@ kdDebug() << "Person=" << KPIM::FolderLister::Contact << ", "
// Don't use an <allprop/> request!
TQDomDocument doc;
- TQDomElement root = WebdavHandler::addDavElement( doc, doc, "d:propfind" );
+ TQDomElement root = WebdavHandler::addDavElement( doc, doc, "d:proptqfind" );
TQDomElement prop = WebdavHandler::addElement( doc, root, "d:prop" );
TQDomAttr att_h = doc.createAttribute( "xmlns:h" );
att_h.setValue( "urn:schemas:mailheader:" );
@@ -242,7 +242,7 @@ bool ExchangeGlobals::interpretCalendarDownloadItemsJob( KCal::CalendarAdaptor *
KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>(job);
if ( !davjob || !adaptor ) return false;
-kdDebug() << "ExchangeGlobals::interpretCalendarDownloadItemsJob(): QDomDocument="
+kdDebug() << "ExchangeGlobals::interpretCalendarDownloadItemsJob(): TQDomDocument="
<< endl << davjob->response().toString() << endl;
KCal::ExchangeConverterCalendar conv;
conv.setTimeZone( adaptor->resource()->timeZoneId() );
@@ -266,7 +266,7 @@ bool ExchangeGlobals::interpretAddressBookDownloadItemsJob(
KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>(job);
if ( !davjob || !adaptor ) return false;
-kdDebug() << "ExchangeGlobals::interpretAddressBookDownloadItemsJob(): QDomDocument="
+kdDebug() << "ExchangeGlobals::interpretAddressBookDownloadItemsJob(): TQDomDocument="
<< endl << davjob->response().toString() << endl;
KABC::ExchangeConverterContact conv;
KABC::Addressee::List addressees = conv.parseWebDAV( davjob->response() );
diff --git a/kresources/newexchange/kabc_resourceexchange.h b/kresources/newexchange/kabc_resourceexchange.h
index 36f3ca2eb..0ef4677af 100644
--- a/kresources/newexchange/kabc_resourceexchange.h
+++ b/kresources/newexchange/kabc_resourceexchange.h
@@ -28,6 +28,7 @@ namespace KABC {
class KDE_EXPORT ResourceExchange : public ResourceGroupwareBase
{
Q_OBJECT
+ TQ_OBJECT
public:
ResourceExchange( const KConfig * );
diff --git a/kresources/newexchange/kcal_resourceexchange.h b/kresources/newexchange/kcal_resourceexchange.h
index 2a6d01675..94ef8901e 100644
--- a/kresources/newexchange/kcal_resourceexchange.h
+++ b/kresources/newexchange/kcal_resourceexchange.h
@@ -32,6 +32,7 @@ namespace KCal {
class KDE_EXPORT ResourceExchange : public ResourceGroupwareBase
{
Q_OBJECT
+ TQ_OBJECT
public:
ResourceExchange();
ResourceExchange( const KConfig * );
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-07 21:57:47 +0000