summaryrefslogtreecommitdiffstats
path: root/kresources/groupwise/soap
diff options
context:
space:
mode:
Diffstat (limited to 'kresources/groupwise/soap')
-rw-r--r--kresources/groupwise/soap/contactconverter.cpp6
-rw-r--r--kresources/groupwise/soap/groupwiseserver.cpp8
-rw-r--r--kresources/groupwise/soap/gwconverter.cpp12
-rw-r--r--kresources/groupwise/soap/gwjobs.cpp6
-rw-r--r--kresources/groupwise/soap/incidenceconverter.cpp10
-rw-r--r--kresources/groupwise/soap/ksslsocket.cpp4
6 files changed, 23 insertions, 23 deletions
diff --git a/kresources/groupwise/soap/contactconverter.cpp b/kresources/groupwise/soap/contactconverter.cpp
index 97aff84f2..605d14d69 100644
--- a/kresources/groupwise/soap/contactconverter.cpp
+++ b/kresources/groupwise/soap/contactconverter.cpp
@@ -70,7 +70,7 @@ ngwt__Contact* ContactConverter::convertToContact( const KABC::Addressee &addr )
std::vector<ngwt__ContainerRef*>* container = soap_new_std__vectorTemplateOfPointerTongwt__ContainerRef( soap(), -1 );
ngwt__ContainerRef* containerRef = soap_new_ngwt__ContainerRef( soap(), -1 );
containerRef->deleted = 0;
- containerRef->__item = addr.custom( "GWRESOURCE", "CONTAINER" ).utf8();
+ containerRef->__item = addr.custom( "GWRESOURCE", "CONTAINER" ).utf8().data();
container->push_back( containerRef );
contact->container = *container;
@@ -402,7 +402,7 @@ KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact )
// TODO: map protocol to KDE's set of known protocol names (need to know the set of services in use elsewhere)
if ( protocol == "nov" )
protocol = "groupwise";
- addr.insertCustom( TQString::tqfromLatin1("messaging/%1").arg( protocol ),
+ addr.insertCustom( TQString::tqfromLatin1("messaging/%1").tqarg( protocol ),
TQString::tqfromLatin1( "All" ),
addresses.join( TQChar( 0xE000 ) ) );
}
@@ -456,7 +456,7 @@ ngwt__PhoneNumber* ContactConverter::convertPhoneNumber( const KABC::PhoneNumber
return 0;
ngwt__PhoneNumber* phoneNumber = soap_new_ngwt__PhoneNumber( soap(), -1 );
- phoneNumber->__item = number.number().utf8();
+ phoneNumber->__item = number.number().utf8().data();
if ( number.type() & KABC::PhoneNumber::Fax ) {
phoneNumber->type = Fax;
diff --git a/kresources/groupwise/soap/groupwiseserver.cpp b/kresources/groupwise/soap/groupwiseserver.cpp
index bd908c442..3aee84877 100644
--- a/kresources/groupwise/soap/groupwiseserver.cpp
+++ b/kresources/groupwise/soap/groupwiseserver.cpp
@@ -132,7 +132,7 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *,
errorMessage = TQString::tqfromLatin1( strerror( errno ) );
perror( 0 );
soap->error = SOAP_TCP_ERROR;
- mErrorText = i18n("Connect failed: %1.").arg( errorMessage );
+ mErrorText = i18n("Connect failed: %1.").tqarg( errorMessage );
return SOAP_INVALID_SOCKET;
}
@@ -149,7 +149,7 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *,
if ( rc == -3 )
errorMessage = TQString::tqfromLatin1( "Connection timed out. Check host and port number" );
}
- mErrorText = i18n("Connect failed: %1.").arg( errorMessage );
+ mErrorText = i18n("Connect failed: %1.").tqarg( errorMessage );
soap->error =SOAP_TCP_ERROR;
return SOAP_INVALID_SOCKET;
}
@@ -315,7 +315,7 @@ bool GroupwiseServer::login()
ngwt__PlainText pt;
- pt.username = mUser.utf8();
+ pt.username = mUser.utf8().data();
pt.password = conv.qStringToString( mPassword );
loginReq.auth = &pt;
mSoap->userid = strdup( mUser.utf8() );
@@ -1370,7 +1370,7 @@ bool GroupwiseServer::readFreeBusy( const TQString &email,
// Get free/busy data
_ngwm__getFreeBusyRequest getFreeBusyRequest;
- getFreeBusyRequest.freeBusySessionId = TQString::number( fbSessionId ).utf8();
+ getFreeBusyRequest.freeBusySessionId = TQString::number( fbSessionId ).utf8().data();
_ngwm__getFreeBusyResponse getFreeBusyResponse;
diff --git a/kresources/groupwise/soap/gwconverter.cpp b/kresources/groupwise/soap/gwconverter.cpp
index 5ca7c332f..3cd61f60b 100644
--- a/kresources/groupwise/soap/gwconverter.cpp
+++ b/kresources/groupwise/soap/gwconverter.cpp
@@ -67,8 +67,8 @@ char* GWConverter::qStringToChar( const TQString &string )
TQDate GWConverter::charToTQDate( const char *str )
{
- if ( !str ) return TQDate(); // FIXME: TQt::ISODate is probably no good here because it expects yyyy-MM-dd not yyyyMMdd
- return TQDate::fromString( TQString::fromUtf8( str ), TQt::ISODate );
+ if ( !str ) return TQDate(); // FIXME: Qt::ISODate is probably no good here because it expects yyyy-MM-dd not yyyyMMdd
+ return TQDate::fromString( TQString::fromUtf8( str ), Qt::ISODate );
}
char *GWConverter::qDateTimeToChar( const TQDateTime &dt,
@@ -94,7 +94,7 @@ std::string* GWConverter::qDateTimeToString( const TQDateTime &dt )
TQDateTime GWConverter::stringToTQDateTime( const std::string* str )
{
- TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str->c_str() ), TQt::ISODate );
+ TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str->c_str() ), Qt::ISODate );
return dt;
}
@@ -111,15 +111,15 @@ std::string* GWConverter::qDateToString( const TQDate &date )
TQDate GWConverter::stringToTQDate( std::string* str )
{
//NB this ISODate may become unnecessary, if GW stops sending in yyyy-mm-dd format again
- return TQDate::fromString( TQString::tqfromLatin1( str->c_str() ), TQt::ISODate );
+ return TQDate::fromString( TQString::tqfromLatin1( str->c_str() ), Qt::ISODate );
}
TQDateTime GWConverter::charToTQDateTime( const char *str )
{
if ( !str ) return TQDateTime();
// kdDebug() << "charToTQDateTime(): " << str << endl;
- // as above re TQt::ISODate
- TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str ), TQt::ISODate );
+ // as above re Qt::ISODate
+ TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str ), Qt::ISODate );
// kdDebug() << " " << dt.toString() << endl;
return dt;
}
diff --git a/kresources/groupwise/soap/gwjobs.cpp b/kresources/groupwise/soap/gwjobs.cpp
index bd2f908e4..7a95cf6e8 100644
--- a/kresources/groupwise/soap/gwjobs.cpp
+++ b/kresources/groupwise/soap/gwjobs.cpp
@@ -121,7 +121,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id )
&itemsRequest, &itemsResponse );
if ( result != 0 ) {
soap_print_fault( mSoap, stderr );
- mServer->emitErrorMessage( i18n("Unable to read GroupWise address book: %1" ).arg( id.c_str() ), false );
+ mServer->emitErrorMessage( i18n("Unable to read GroupWise address book: %1" ).tqarg( id.c_str() ), false );
return;
}
@@ -192,7 +192,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id )
cursorRequest.container = id;
cursorRequest.view = 0;
- if ( id.tqfind( "GroupWiseSystemAddressBook" ) == 0 )
+ if ( id.find( "GroupWiseSystemAddressBook" ) == 0 )
{
kdDebug() << " Book: " << id.c_str() << " is a SAB " << endl;
// filter for Contacts until we support Groups
@@ -613,7 +613,7 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts
else
{
kdDebug() << " readCursor got no Items in Response!" << endl;
- mServer->emitErrorMessage( i18n("Unable to read GroupWise address book: reading %1 returned no items." ).arg( id.c_str() ), false );
+ mServer->emitErrorMessage( i18n("Unable to read GroupWise address book: reading %1 returned no items." ).tqarg( id.c_str() ), false );
break;
}
}
diff --git a/kresources/groupwise/soap/incidenceconverter.cpp b/kresources/groupwise/soap/incidenceconverter.cpp
index b7a360ee3..7888ff50a 100644
--- a/kresources/groupwise/soap/incidenceconverter.cpp
+++ b/kresources/groupwise/soap/incidenceconverter.cpp
@@ -370,7 +370,7 @@ bool IncidenceConverter::convertToCalendarItem( KCal::Incidence* incidence, ngwt
std::vector<ngwt__ContainerRef*>* container = soap_new_std__vectorTemplateOfPointerTongwt__ContainerRef( soap(), -1 );
ngwt__ContainerRef* containerRef = soap_new_ngwt__ContainerRef( soap(), -1 );
containerRef->deleted = 0;
- containerRef->__item = incidence->customProperty( "GWRESOURCE", "CONTAINER" ).utf8();
+ containerRef->__item = incidence->customProperty( "GWRESOURCE", "CONTAINER" ).utf8().data();
container->push_back( containerRef );
item->container = *container;
@@ -470,7 +470,7 @@ void IncidenceConverter::setAttendees( KCal::Incidence *incidence,
KCal::Attendee::List::ConstIterator it;
for( it = attendees.begin(); it != attendees.end(); ++it ) {
if ( !to.isEmpty() )
- to += TQString::tqfromLatin1( "; %1" ).arg( (*it)->name() );
+ to += TQString::tqfromLatin1( "; %1" ).tqarg( (*it)->name() );
kdDebug() << "IncidenceConverter::setAttendees(), adding " << (*it)->fullName()
<< endl;
TQString uuid;
@@ -543,7 +543,7 @@ bool IncidenceConverter::convertFromCalendarItem( ngwt__CalendarItem* item,
std::vector<xsd__date>::const_iterator it;
for ( it = dateList->begin(); it != dateList->end(); ++it ) {
- TQDate date = TQDate::fromString( s2q( *it ), TQt::ISODate );
+ TQDate date = TQDate::fromString( s2q( *it ), Qt::ISODate );
if ( date.isValid() )
}
}
@@ -689,7 +689,7 @@ void IncidenceConverter::setRecurrence( KCal::Incidence * incidence, ngwt__Calen
// recurrence date - try setting it using the recurrence start date - didn't help
/* std::string startDate;
- startDate.append( recur->recurStart().date().toString( TQt::ISODate ).utf8() );
+ startDate.append( recur->recurStart().date().toString( Qt::ISODate ).utf8() );
item->rdate = soap_new_ngwt__RecurrenceDateType( soap(), -1 );
item->rdate->date.push_back( startDate );*/
// exceptions list - try sending empty list even if no exceptions
@@ -704,7 +704,7 @@ void IncidenceConverter::setRecurrence( KCal::Incidence * incidence, ngwt__Calen
for ( KCal::DateList::ConstIterator it = exceptions.begin(); it != exceptions.end(); ++it )
{
std::string startDate;
- startDate.append( (*it).toString( TQt::ISODate ).utf8() );
+ startDate.append( TQString((*it).toString( Qt::ISODate )).utf8() );
item->exdate->date.push_back( startDate );
}
}
diff --git a/kresources/groupwise/soap/ksslsocket.cpp b/kresources/groupwise/soap/ksslsocket.cpp
index eef6a5bf1..e9e05c26e 100644
--- a/kresources/groupwise/soap/ksslsocket.cpp
+++ b/kresources/groupwise/soap/ksslsocket.cpp
@@ -325,7 +325,7 @@ int KSSLSocket::verifyCertificate()
"does not match the one the "
"certificate was issued to.");
result = messageBox( KIO::SlaveBase::WarningYesNoCancel,
- msg.arg(ourHost),
+ msg.tqarg(ourHost),
i18n("Server Authentication"),
i18n("&Details"),
KStdGuiItem::cont().text() );
@@ -335,7 +335,7 @@ int KSSLSocket::verifyCertificate()
TQString msg = i18n("The server certificate failed the "
"authenticity test (%1).");
result = messageBox( KIO::SlaveBase::WarningYesNoCancel,
- msg.arg(ourHost),
+ msg.tqarg(ourHost),
i18n("Server Authentication"),
i18n("&Details"),
KStdGuiItem::cont().text() );
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-09 06:33:34 +0000