diff options
Diffstat (limited to 'kresources/groupwise/soap')
-rw-r--r-- | kresources/groupwise/soap/contactconverter.cpp | 2 | ||||
-rw-r--r-- | kresources/groupwise/soap/groupwiseserver.cpp | 4 | ||||
-rw-r--r-- | kresources/groupwise/soap/gwjobs.cpp | 4 | ||||
-rw-r--r-- | kresources/groupwise/soap/incidenceconverter.cpp | 4 | ||||
-rw-r--r-- | kresources/groupwise/soap/ksslsocket.cpp | 4 | ||||
-rw-r--r-- | kresources/groupwise/soap/soapC.cpp | 2 | ||||
-rw-r--r-- | kresources/groupwise/soap/soapStub.h | 2 | ||||
-rw-r--r-- | kresources/groupwise/soap/stdsoap2.h | 4 |
8 files changed, 13 insertions, 13 deletions
diff --git a/kresources/groupwise/soap/contactconverter.cpp b/kresources/groupwise/soap/contactconverter.cpp index 34c934fe5..69c4b90f2 100644 --- a/kresources/groupwise/soap/contactconverter.cpp +++ b/kresources/groupwise/soap/contactconverter.cpp @@ -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::fromLatin1("messaging/%1").tqarg( protocol ), + addr.insertCustom( TQString::fromLatin1("messaging/%1").arg( protocol ), TQString::fromLatin1( "All" ), addresses.join( TQChar( 0xE000 ) ) ); } diff --git a/kresources/groupwise/soap/groupwiseserver.cpp b/kresources/groupwise/soap/groupwiseserver.cpp index 2b4f9827e..130895cdc 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::fromLatin1( strerror( errno ) ); perror( 0 ); soap->error = SOAP_TCP_ERROR; - mErrorText = i18n("Connect failed: %1.").tqarg( errorMessage ); + mErrorText = i18n("Connect failed: %1.").arg( errorMessage ); return SOAP_INVALID_SOCKET; } @@ -149,7 +149,7 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *, if ( rc == -3 ) errorMessage = TQString::fromLatin1( "Connection timed out. Check host and port number" ); } - mErrorText = i18n("Connect failed: %1.").tqarg( errorMessage ); + mErrorText = i18n("Connect failed: %1.").arg( errorMessage ); soap->error =SOAP_TCP_ERROR; return SOAP_INVALID_SOCKET; } diff --git a/kresources/groupwise/soap/gwjobs.cpp b/kresources/groupwise/soap/gwjobs.cpp index 24c0c0dc8..47aa67745 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" ).tqarg( id.c_str() ), false ); + mServer->emitErrorMessage( i18n("Unable to read GroupWise address book: %1" ).arg( id.c_str() ), false ); return; } @@ -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." ).tqarg( id.c_str() ), false ); + mServer->emitErrorMessage( i18n("Unable to read GroupWise address book: reading %1 returned no items." ).arg( id.c_str() ), false ); break; } } diff --git a/kresources/groupwise/soap/incidenceconverter.cpp b/kresources/groupwise/soap/incidenceconverter.cpp index 7610e8116..8d21e4da7 100644 --- a/kresources/groupwise/soap/incidenceconverter.cpp +++ b/kresources/groupwise/soap/incidenceconverter.cpp @@ -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::fromLatin1( "; %1" ).tqarg( (*it)->name() ); + to += TQString::fromLatin1( "; %1" ).arg( (*it)->name() ); kdDebug() << "IncidenceConverter::setAttendees(), adding " << (*it)->fullName() << endl; TQString uuid; @@ -635,7 +635,7 @@ void IncidenceConverter::getAttendees( ngwt__CalendarItem *item, KCal::Incidence // set our status if ( emailsMatch( stringToTQString(recipient->email), mFromEmail ) ) if ( item->status->accepted ) - attendee->seStatus( ( *item->status->accepted ) ? KCal::Attendee::Accepted : KCal::Attendee::NeedsAction ); + attendee->setStatus( ( *item->status->accepted ) ? KCal::Attendee::Accepted : KCal::Attendee::NeedsAction ); else kdDebug() << "---- found ourselves, but not accepted" << endl; else diff --git a/kresources/groupwise/soap/ksslsocket.cpp b/kresources/groupwise/soap/ksslsocket.cpp index 8119e3e7c..e38f00d04 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.tqarg(ourHost), + msg.arg(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.tqarg(ourHost), + msg.arg(ourHost), i18n("Server Authentication"), i18n("&Details"), KStdGuiItem::cont().text() ); diff --git a/kresources/groupwise/soap/soapC.cpp b/kresources/groupwise/soap/soapC.cpp index 658040e41..13f91309b 100644 --- a/kresources/groupwise/soap/soapC.cpp +++ b/kresources/groupwise/soap/soapC.cpp @@ -11148,7 +11148,7 @@ static const struct soap_code_map soap_codes_ngwt__VersionEventType[] = { (long)created, "created" }, { (long)deleteVersion, "deleteVersion" }, { (long)endAccess, "endAccess" }, - { (long)reseStatus, "reseStatus" }, + { (long)resetStatus, "resetStatus" }, { (long)restore, "restore" }, { (long)retrieve, "retrieve" }, { (long)securityModified, "securityModified" }, diff --git a/kresources/groupwise/soap/soapStub.h b/kresources/groupwise/soap/soapStub.h index 7fdb0f68c..f41b9f7a7 100644 --- a/kresources/groupwise/soap/soapStub.h +++ b/kresources/groupwise/soap/soapStub.h @@ -241,7 +241,7 @@ enum ngwt__StatusTrackingOptions {None = 0, Delivered = 1, DeliveredAndOpened = #ifndef SOAP_TYPE_ngwt__VersionEventType #define SOAP_TYPE_ngwt__VersionEventType (384) /* ngwt:VersionEventType */ -enum ngwt__VersionEventType {archive_ = 0, checkIn = 1, checkOut = 2, copyIn = 3, copyOut = 4, copyVersion = 5, created = 6, deleteVersion = 7, endAccess = 8, reseStatus = 9, restore = 10, retrieve = 11, securityModified = 12, versionDownloaded = 13, viewed = 14, unknown = 15}; +enum ngwt__VersionEventType {archive_ = 0, checkIn = 1, checkOut = 2, copyIn = 3, copyOut = 4, copyVersion = 5, created = 6, deleteVersion = 7, endAccess = 8, resetStatus = 9, restore = 10, retrieve = 11, securityModified = 12, versionDownloaded = 13, viewed = 14, unknown = 15}; #endif #ifndef SOAP_TYPE_ngwt__VersionStatus diff --git a/kresources/groupwise/soap/stdsoap2.h b/kresources/groupwise/soap/stdsoap2.h index 7dee722a1..4ff4725a7 100644 --- a/kresources/groupwise/soap/stdsoap2.h +++ b/kresources/groupwise/soap/stdsoap2.h @@ -1350,8 +1350,8 @@ struct soap std::ostream *os; std::istream *is; #else - void *os; /* preserve tqalignment */ - void *is; /* preserve tqalignment */ + void *os; /* preserve alignment */ + void *is; /* preserve alignment */ #endif #ifndef UNDER_CE int sendfd; |