summaryrefslogtreecommitdiffstats
path: root/kresources/groupwise/soap
diff options
context:
space:
mode:
Diffstat (limited to 'kresources/groupwise/soap')
-rw-r--r--kresources/groupwise/soap/contactconverter.cpp48
-rw-r--r--kresources/groupwise/soap/contactconverter.h4
-rw-r--r--kresources/groupwise/soap/groupwiseserver.cpp86
-rw-r--r--kresources/groupwise/soap/groupwiseserver.h70
-rw-r--r--kresources/groupwise/soap/gwconverter.cpp72
-rw-r--r--kresources/groupwise/soap/gwconverter.h36
-rw-r--r--kresources/groupwise/soap/gwjobs.cpp26
-rw-r--r--kresources/groupwise/soap/gwjobs.h20
-rw-r--r--kresources/groupwise/soap/incidenceconverter.cpp44
-rw-r--r--kresources/groupwise/soap/incidenceconverter.h18
-rw-r--r--kresources/groupwise/soap/ksslsocket.cpp62
-rw-r--r--kresources/groupwise/soap/ksslsocket.h12
-rw-r--r--kresources/groupwise/soap/soapdebug.cpp16
-rw-r--r--kresources/groupwise/soap/stdsoap2.h2
14 files changed, 258 insertions, 258 deletions
diff --git a/kresources/groupwise/soap/contactconverter.cpp b/kresources/groupwise/soap/contactconverter.cpp
index a971e56a1..2abb8f452 100644
--- a/kresources/groupwise/soap/contactconverter.cpp
+++ b/kresources/groupwise/soap/contactconverter.cpp
@@ -110,10 +110,10 @@ ngwt__Contact* ContactConverter::convertToContact( const KABC::Addressee &addr )
ngwt__EmailAddressList* emailList = soap_new_ngwt__EmailAddressList( soap(), -1 );
std::vector<std::string>* list = soap_new_std__vectorTemplateOfstd__string( soap(), -1 );
- QStringList emails = addr.emails();
+ TQStringList emails = addr.emails();
emailList->primary = qStringToString( emails.first() );
- QStringList::Iterator it;
+ TQStringList::Iterator it;
for ( it = emails.begin(); it != emails.end(); ++it )
list->push_back( std::string( (*it).utf8() ) );
@@ -284,7 +284,7 @@ KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact )
if ( fullName->displayName )
addr.setFormattedName( stringToQString( fullName->displayName ) );
else
- addr.setFormattedName( QString::null );
+ addr.setFormattedName( TQString::null );
if ( fullName->namePrefix )
addr.setPrefix( stringToQString( fullName->namePrefix ) );
@@ -304,7 +304,7 @@ KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact )
// Emails
if ( contact->emailList ) {
- QStringList emails;
+ TQStringList emails;
if ( contact->emailList->primary )
emails.append( stringToQString( contact->emailList->primary ) );
@@ -324,7 +324,7 @@ KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact )
// Phone numbers
if ( contact->phoneList && !contact->phoneList->phone.empty() ) {
- QString defaultNumber = stringToQString( contact->phoneList->default_ );
+ TQString defaultNumber = stringToQString( contact->phoneList->default_ );
std::vector<class ngwt__PhoneNumber*> list = contact->phoneList->phone;
std::vector<class ngwt__PhoneNumber*>::const_iterator it;
@@ -371,7 +371,7 @@ KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact )
ngwt__PersonalInfo* info = contact->personalInfo;
if ( info->birthday ) {
- QDate date = stringToQDate( info->birthday );
+ TQDate date = stringToQDate( info->birthday );
if ( date.isValid() )
addr.setBirthday( date );
}
@@ -383,28 +383,28 @@ KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact )
// IM addresses
if ( contact->imList ) {
// put all the im addresses on the same service into the same qstringlist
- QMap<QString, QStringList> addressMap;
+ TQMap<TQString, TQStringList> addressMap;
std::vector<ngwt__ImAddress*> list = contact->imList->im;
std::vector<ngwt__ImAddress*>::const_iterator it;
for ( it = list.begin(); it != list.end(); ++it ) {
- QStringList addressesForService = addressMap[ stringToQString( (*it)->service ) ];
+ TQStringList addressesForService = addressMap[ stringToQString( (*it)->service ) ];
addressesForService.append( stringToQString( (*it)->address ) );
addressMap.insert( stringToQString( (*it)->service ), addressesForService );
}
// then construct a custom field from each qstringlist
- QMap<QString, QStringList>::Iterator addrIt;
+ TQMap<TQString, TQStringList>::Iterator addrIt;
for ( addrIt = addressMap.begin(); addrIt != addressMap.end(); ++addrIt )
{
- QString protocol = addrIt.key();
- QStringList addresses = addrIt.data();
+ TQString protocol = addrIt.key();
+ TQStringList addresses = addrIt.data();
//kdDebug() << "got IM addresses for '" << protocol << "' : " << addresses << endl;
// 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( QString::fromLatin1("messaging/%1").arg( protocol ),
- QString::fromLatin1( "All" ),
- addresses.join( QChar( 0xE000 ) ) );
+ addr.insertCustom( TQString::fromLatin1("messaging/%1").arg( protocol ),
+ TQString::fromLatin1( "All" ),
+ addresses.join( TQChar( 0xE000 ) ) );
}
}
@@ -576,23 +576,23 @@ ngwt__ImAddressList* ContactConverter::convertImAddresses( const KABC::Addressee
// if it contains IM addresses
// extract each one and add it to imList
- const QStringList customs = addr.customs();
- QStringList::ConstIterator it;
+ const TQStringList customs = addr.customs();
+ TQStringList::ConstIterator it;
bool isSet = false;
for ( it = customs.begin(); it != customs.end(); ++it ) {
- QString app, name, value;
+ TQString app, name, value;
splitField( *it, app, name, value );
- if ( app.startsWith( QString::fromLatin1( "messaging/" ) ) && name == QString::fromLatin1( "All" ) ) {
+ if ( app.startsWith( TQString::fromLatin1( "messaging/" ) ) && name == TQString::fromLatin1( "All" ) ) {
// get the protocol for this field
- QString protocol = app.section( '/', 1, 1 );
+ TQString protocol = app.section( '/', 1, 1 );
if ( !protocol.isEmpty() ) {
if ( protocol == "groupwise" )
protocol = "novell";
- QStringList addresses = QStringList::split( QChar( 0xE000 ), value );
- QStringList::iterator end = addresses.end();
+ TQStringList addresses = TQStringList::split( TQChar( 0xE000 ), value );
+ TQStringList::iterator end = addresses.end();
// extract each address for this protocol, and create an ngwt__ImAddress for it, and append it to list.
- for ( QStringList::ConstIterator it = addresses.begin(); it != end; ++it ) {
+ for ( TQStringList::ConstIterator it = addresses.begin(); it != end; ++it ) {
ngwt__ImAddress* address = soap_new_ngwt__ImAddress( soap(), -1 );
address->service = soap_new_std__string( soap(), -1 );
address->address = soap_new_std__string( soap(), -1 );
@@ -616,11 +616,11 @@ ngwt__ImAddressList* ContactConverter::convertImAddresses( const KABC::Addressee
}
}
-void ContactConverter::splitField( const QString &str, QString &app, QString &name, QString &value )
+void ContactConverter::splitField( const TQString &str, TQString &app, TQString &name, TQString &value )
{
int colon = str.find( ':' );
if ( colon != -1 ) {
- QString tmp = str.left( colon );
+ TQString tmp = str.left( colon );
value = str.mid( colon + 1 );
int dash = tmp.find( '-' );
diff --git a/kresources/groupwise/soap/contactconverter.h b/kresources/groupwise/soap/contactconverter.h
index b4376713f..6594c6d0e 100644
--- a/kresources/groupwise/soap/contactconverter.h
+++ b/kresources/groupwise/soap/contactconverter.h
@@ -47,8 +47,8 @@ class ContactConverter : public GWConverter
which is a different structure to that used for phone numbers, email addresses etc */
ngwt__ImAddressList* convertImAddresses( const KABC::Addressee& );
// splits up an arbitrary custom field
- void splitField( const QString &str, QString &app, QString &name, QString &value );
- static QMap<QString, QString > mIMProtocolMap;
+ void splitField( const TQString &str, TQString &app, TQString &name, TQString &value );
+ static TQMap<TQString, TQString > mIMProtocolMap;
};
#endif
diff --git a/kresources/groupwise/soap/groupwiseserver.cpp b/kresources/groupwise/soap/groupwiseserver.cpp
index 8445be9ff..28c73b68d 100644
--- a/kresources/groupwise/soap/groupwiseserver.cpp
+++ b/kresources/groupwise/soap/groupwiseserver.cpp
@@ -38,8 +38,8 @@
#include <kdebug.h>
#include <klocale.h>
-#include <qnamespace.h>
-#include <qfile.h>
+#include <tqnamespace.h>
+#include <tqfile.h>
#include "ksslsocket.h"
#include "contactconverter.h"
@@ -55,11 +55,11 @@
#include "groupwiseserver.h"
-static QMap<struct soap *,GroupwiseServer *> mServerMap;
+static TQMap<struct soap *,GroupwiseServer *> mServerMap;
int myOpen( struct soap *soap, const char *endpoint, const char *host, int port )
{
- QMap<struct soap *,GroupwiseServer *>::ConstIterator it;
+ TQMap<struct soap *,GroupwiseServer *>::ConstIterator it;
it = mServerMap.find( soap );
if ( it == mServerMap.end() ) {
soap->error = SOAP_FAULT;
@@ -71,7 +71,7 @@ int myOpen( struct soap *soap, const char *endpoint, const char *host, int port
int myClose( struct soap *soap )
{
- QMap<struct soap *,GroupwiseServer *>::ConstIterator it;
+ TQMap<struct soap *,GroupwiseServer *>::ConstIterator it;
it = mServerMap.find( soap );
if ( it == mServerMap.end() ) return SOAP_FAULT;
@@ -80,7 +80,7 @@ int myClose( struct soap *soap )
int mySendCallback( struct soap *soap, const char *s, size_t n )
{
- QMap<struct soap *,GroupwiseServer *>::ConstIterator it;
+ TQMap<struct soap *,GroupwiseServer *>::ConstIterator it;
it = mServerMap.find( soap );
if ( it == mServerMap.end() ) return SOAP_FAULT;
@@ -89,7 +89,7 @@ int mySendCallback( struct soap *soap, const char *s, size_t n )
size_t myReceiveCallback( struct soap *soap, char *s, size_t n )
{
- QMap<struct soap *,GroupwiseServer *>::ConstIterator it;
+ TQMap<struct soap *,GroupwiseServer *>::ConstIterator it;
it = mServerMap.find( soap );
if ( it == mServerMap.end() ) {
kdDebug() << "No soap object found" << endl;
@@ -114,11 +114,11 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *,
// kdDebug() << "Creating KSSLSocket()" << endl;
m_sock = new KSSLSocket();
m_sock->setTimeout( KProtocolManager::connectTimeout() );
- connect( m_sock, SIGNAL( sslFailure() ), SLOT( slotSslError() ) );
+ connect( m_sock, TQT_SIGNAL( sslFailure() ), TQT_SLOT( slotSslError() ) );
} else {
m_sock = new KExtendedSocket();
}
- mErrorText = QString::null;
+ mErrorText = TQString::null;
m_sock->reset();
m_sock->setBlockingMode( false );
@@ -128,8 +128,8 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *,
int rc = m_sock->lookup();
if (rc != 0 ) {
kdError() << "gSoapOpen: lookup of " << host << " failed " << rc << endl;
- QString errorMessage;
- errorMessage = QString::fromLatin1( strerror( errno ) );
+ TQString errorMessage;
+ errorMessage = TQString::fromLatin1( strerror( errno ) );
perror( 0 );
soap->error = SOAP_TCP_ERROR;
mErrorText = i18n("Connect failed: %1.").arg( errorMessage );
@@ -139,15 +139,15 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *,
rc = m_sock->connect();
if ( rc != 0 ) {
kdError() << "gSoapOpen: connect failed " << rc << endl;
- QString errorMessage;
+ TQString errorMessage;
if ( rc == -1 ) {
- errorMessage = QString::fromLatin1( strerror( errno ) );
+ errorMessage = TQString::fromLatin1( strerror( errno ) );
perror( 0 );
}
//set the soap struct's error here!
else {
if ( rc == -3 )
- errorMessage = QString::fromLatin1( "Connection timed out. Check host and port number" );
+ errorMessage = TQString::fromLatin1( "Connection timed out. Check host and port number" );
}
mErrorText = i18n("Connect failed: %1.").arg( errorMessage );
soap->error =SOAP_TCP_ERROR;
@@ -263,9 +263,9 @@ size_t GroupwiseServer::gSoapReceiveCallback( struct soap *soap, char *s,
return ret;
}
-GroupwiseServer::GroupwiseServer( const QString &url, const QString &user,
- const QString &password, QObject *parent )
- : QObject( parent, "GroupwiseServer" ),
+GroupwiseServer::GroupwiseServer( const TQString &url, const TQString &user,
+ const TQString &password, TQObject *parent )
+ : TQObject( parent, "GroupwiseServer" ),
mUrl( url ), mUser( user ), mPassword( password ),
mSSL( url.left(6)=="https:" ), m_sock( 0 ),
mError( 0 )
@@ -644,7 +644,7 @@ bool GroupwiseServer::logout()
return true;
}
-GroupWise::DeltaInfo GroupwiseServer::getDeltaInfo( const QStringList & addressBookIds )
+GroupWise::DeltaInfo GroupwiseServer::getDeltaInfo( const TQStringList & addressBookIds )
{
GroupWise::DeltaInfo info;
info.count = 0;
@@ -719,7 +719,7 @@ GroupWise::AddressBook::List GroupwiseServer::addressBookList()
return books;
}
-bool GroupwiseServer::readAddressBooksSynchronous( const QStringList &addrBookIds )
+bool GroupwiseServer::readAddressBooksSynchronous( const TQStringList &addrBookIds )
{
if ( mSession.empty() ) {
kdError() << "GroupwiseServer::readAddressBooksSynchronous(): no session." << endl;
@@ -735,7 +735,7 @@ bool GroupwiseServer::readAddressBooksSynchronous( const QStringList &addrBookId
return true;
}
-bool GroupwiseServer::updateAddressBooks( const QStringList &addrBookIds, const unsigned long startSequenceNumber, const unsigned long lastPORebuildTime )
+bool GroupwiseServer::updateAddressBooks( const TQStringList &addrBookIds, const unsigned long startSequenceNumber, const unsigned long lastPORebuildTime )
{
if ( mSession.empty() ) {
kdError() << "GroupwiseServer::updateAddressBooks(): no session." << endl;
@@ -757,7 +757,7 @@ bool GroupwiseServer::updateAddressBooks( const QStringList &addrBookIds, const
return true;
}
-std::string GroupwiseServer::getFullIDFor( const QString & gwRecordIDFromIcal )
+std::string GroupwiseServer::getFullIDFor( const TQString & gwRecordIDFromIcal )
{
// first get the ID of the calendar folder - because we don't store this in the resource we have to fetch it manually
std::string calendarFolderID;
@@ -847,12 +847,12 @@ bool GroupwiseServer::acceptIncidence( KCal::Incidence *incidence )
GWConverter conv( mSoap );
- QString qGwUid = incidence->customProperty( "GWRESOURCE", "UID" );
+ TQString qGwUid = incidence->customProperty( "GWRESOURCE", "UID" );
std::string gwUID;
if ( qGwUid.isEmpty() )
{
- QString gwRecordIDFromIcal = incidence->nonKDECustomProperty( "X-GWRECORDID" );
+ TQString gwRecordIDFromIcal = incidence->nonKDECustomProperty( "X-GWRECORDID" );
// we need to do a getItem to get the item's complete ID, including the container portion
// this is only necessary because the Ical GWRECORDID property is incomplete
gwUID = getFullIDFor( gwRecordIDFromIcal );
@@ -899,7 +899,7 @@ bool GroupwiseServer::declineIncidence( KCal::Incidence *incidence )
if ( gwUID.empty() )
{
- QString gwRecordIDFromIcal = incidence->nonKDECustomProperty( "X-GWRECORDID" );
+ TQString gwRecordIDFromIcal = incidence->nonKDECustomProperty( "X-GWRECORDID" );
// we need to do a getItem to get the item's complete ID, including the container portion
// this is only necessary because the Ical GWRECORDID property is incomplete
gwUID = getFullIDFor( gwRecordIDFromIcal );
@@ -941,7 +941,7 @@ bool GroupwiseServer::addIncidence( KCal::Incidence *incidence,
kdDebug() << "GroupwiseServer::addIncidence() " << incidence->summary()
<< endl;
- QString gwRecordIDFromIcal = incidence->nonKDECustomProperty( "X-GWRECORDID" );
+ TQString gwRecordIDFromIcal = incidence->nonKDECustomProperty( "X-GWRECORDID" );
if( !gwRecordIDFromIcal.isEmpty() || !incidence->customProperty( "GWRESOURCE", "UID" ).isEmpty() ) {
kdDebug() << "Incidence has GroupWise ID already: (" << gwRecordIDFromIcal << "ical|" << incidence->customProperty( "GWRESOURCE", "UID" ) << "soap) and organizer : " << incidence->organizer().email() << endl;
return acceptIncidence( incidence );
@@ -985,7 +985,7 @@ bool GroupwiseServer::addIncidence( KCal::Incidence *incidence,
{
std::string firstId = *(response.id.begin() );
incidence->setCustomProperty( "GWRESOURCE", "UID",
- QString::fromUtf8( firstId.c_str() ) );
+ TQString::fromUtf8( firstId.c_str() ) );
}
return true;
}
@@ -1106,7 +1106,7 @@ bool GroupwiseServer::checkResponse( int result, ngwt__Status *status )
kdDebug() << "SOAP call succeeded" << endl;
}
if ( status && status->code != 0 ) {
- QString msg = "SOAP Response Status: " + QString::number( status->code );
+ TQString msg = "SOAP Response Status: " + TQString::number( status->code );
if ( status->description ) {
msg += " ";
msg += status->description->c_str();
@@ -1130,11 +1130,11 @@ bool GroupwiseServer::deleteIncidence( KCal::Incidence *incidence )
<< endl;
// decline if necessary on the server
- QString gwRecordIDFromIcal = incidence->nonKDECustomProperty( "X-GWRECORDID" );
+ TQString gwRecordIDFromIcal = incidence->nonKDECustomProperty( "X-GWRECORDID" );
// debug contents of message custom properties
kdDebug() << "incidence custom properties BEGIN" << endl;
- typedef QMap<QCString, QString> PropMap;
+ typedef TQMap<TQCString, TQString> PropMap;
PropMap customs = incidence->customProperties();
PropMap::Iterator it;
for ( it = customs.begin(); it != customs.end(); ++it )
@@ -1219,7 +1219,7 @@ bool GroupwiseServer::retractRequest( KCal::Incidence *incidence, RetractCause c
return checkResponse( result, response.status );
}
-bool GroupwiseServer::insertAddressee( const QString &addrBookId, KABC::Addressee &addr )
+bool GroupwiseServer::insertAddressee( const TQString &addrBookId, KABC::Addressee &addr )
{
if ( mSession.empty() ) {
kdError() << "GroupwiseServer::insertAddressee(): no session." << endl;
@@ -1244,7 +1244,7 @@ bool GroupwiseServer::insertAddressee( const QString &addrBookId, KABC::Addresse
&request, &response );
if ( !checkResponse( result, response.status ) ) return false;
- addr.insertCustom( "GWRESOURCE", "UID", QString::fromUtf8( response.id.front().c_str() ) );
+ addr.insertCustom( "GWRESOURCE", "UID", TQString::fromUtf8( response.id.front().c_str() ) );
addr.setChanged( false );
return true;
@@ -1325,8 +1325,8 @@ bool GroupwiseServer::readCalendarSynchronous( KCal::Calendar *cal )
return true;
}
-bool GroupwiseServer::readFreeBusy( const QString &email,
- const QDate &start, const QDate &end, KCal::FreeBusy *freeBusy )
+bool GroupwiseServer::readFreeBusy( const TQString &email,
+ const TQDate &start, const TQDate &end, KCal::FreeBusy *freeBusy )
{
if ( mSession.empty() ) {
kdError() << "GroupwiseServer::readFreeBusy(): no session." << endl;
@@ -1370,7 +1370,7 @@ bool GroupwiseServer::readFreeBusy( const QString &email,
// Get free/busy data
_ngwm__getFreeBusyRequest getFreeBusyRequest;
- getFreeBusyRequest.freeBusySessionId = QString::number( fbSessionId ).utf8();
+ getFreeBusyRequest.freeBusySessionId = TQString::number( fbSessionId ).utf8();
_ngwm__getFreeBusyResponse getFreeBusyResponse;
@@ -1408,8 +1408,8 @@ bool GroupwiseServer::readFreeBusy( const QString &email,
if ( blocks ) {
std::vector<class ngwt__FreeBusyBlock *>::const_iterator it2;
for( it2 = blocks->begin(); it2 != blocks->end(); ++it2 ) {
- QDateTime blockStart = conv.charToQDateTime( (*it2)->startDate );
- QDateTime blockEnd = conv.charToQDateTime( (*it2)->endDate );
+ TQDateTime blockStart = conv.charToQDateTime( (*it2)->startDate );
+ TQDateTime blockEnd = conv.charToQDateTime( (*it2)->endDate );
ngwt__AcceptLevel acceptLevel = *(*it2)->acceptLevel;
/* TODO: show Free/Busy subject in diagram - we need to support these as people use it for checking others' calendars */
@@ -1458,7 +1458,7 @@ void GroupwiseServer::emitReadAddressBookProcessedSize( int s )
emit readAddressBookProcessedSize( s );
}
-void GroupwiseServer::emitErrorMessage( const QString & msg, bool fatal )
+void GroupwiseServer::emitErrorMessage( const TQString & msg, bool fatal )
{
emit errorMessage( msg, fatal );
}
@@ -1468,16 +1468,16 @@ void GroupwiseServer::emitGotAddressees( const KABC::Addressee::List addressees
emit gotAddressees( addressees );
}
-void GroupwiseServer::log( const QString &prefix, const char *s, size_t n )
+void GroupwiseServer::log( const TQString &prefix, const char *s, size_t n )
{
if ( mLogFile.isEmpty() ) return;
kdDebug() << "GroupwiseServer::log() " << prefix << " " << n << " bytes"
<< endl;
- QString log = mLogFile + "_" + QString::number( getpid() ) +
+ TQString log = mLogFile + "_" + TQString::number( getpid() ) +
"_" + prefix + ".log";
- QFile f( log );
+ TQFile f( log );
if ( !f.open( IO_WriteOnly | IO_Append ) ) {
kdError() << "Unable to open log file '" << log << "'" << endl;
} else {
@@ -1564,7 +1564,7 @@ bool GroupwiseServer::readUserSettings( ngwt__Settings *&returnedSettings )
return true; /** FIXME return false if no settings fetched */
}
-bool GroupwiseServer::modifyUserSettings( QMap<QString, QString> & settings )
+bool GroupwiseServer::modifyUserSettings( TQMap<TQString, TQString> & settings )
{
kdDebug() << "GroupwiseServer::userSettings()" << endl;
@@ -1575,7 +1575,7 @@ bool GroupwiseServer::modifyUserSettings( QMap<QString, QString> & settings )
_ngwm__modifySettingsRequest request;
_ngwm__modifySettingsResponse response;
request.settings = soap_new_ngwt__SettingsList( mSoap, -1 );
- QMap<QString, QString>::Iterator it;
+ TQMap<TQString, TQString>::Iterator it;
for ( it = settings.begin(); it != settings.end(); ++it )
{
kdDebug() << " creating Custom for " << it.key() << ", " << it.data() << endl;
@@ -1610,7 +1610,7 @@ bool GroupwiseServer::setCompleted( KCal::Todo * todo )
if ( todo )
{
GWConverter conv( mSoap );
- QString id = todo->customProperty( "GWRESOURCE", "UID" );
+ TQString id = todo->customProperty( "GWRESOURCE", "UID" );
ngwt__ItemRefList * items = soap_new_ngwt__ItemRefList( mSoap, 1 );
items->item.push_back( *( conv.qStringToString( id ) ) );
if ( todo->isCompleted() )
diff --git a/kresources/groupwise/soap/groupwiseserver.h b/kresources/groupwise/soap/groupwiseserver.h
index 8197ba5cd..8117ebb2b 100644
--- a/kresources/groupwise/soap/groupwiseserver.h
+++ b/kresources/groupwise/soap/groupwiseserver.h
@@ -23,12 +23,12 @@
#include <kio/job.h>
#include <kio/jobclasses.h>
-#include <qapplication.h>
-#include <qmap.h>
-#include <qobject.h>
-#include <qstring.h>
-#include <qthread.h>
-#include <qvaluelist.h>
+#include <tqapplication.h>
+#include <tqmap.h>
+#include <tqobject.h>
+#include <tqstring.h>
+#include <tqthread.h>
+#include <tqvaluelist.h>
#include <string>
@@ -69,13 +69,13 @@ enum ErrorCode { NoError, RefreshNeeded };
class AddressBook
{
public:
- typedef QValueList<AddressBook> List;
+ typedef TQValueList<AddressBook> List;
AddressBook() : isPersonal( false ), isFrequentContacts( false ), isSystemAddressBook( false ) {}
- QString id;
- QString name;
- QString description;
+ TQString id;
+ TQString name;
+ TQString description;
bool isPersonal;
bool isFrequentContacts;
bool isSystemAddressBook;
@@ -98,12 +98,12 @@ class GroupwiseServer : public QObject
public:
bool checkResponse( int result, ngwt__Status *status );
enum RetractCause { DueToResend, Other };
- GroupwiseServer( const QString &url, const QString &user,
- const QString &password, QObject *parent );
+ GroupwiseServer( const TQString &url, const TQString &user,
+ const TQString &password, TQObject *parent );
~GroupwiseServer();
int error() const { return mError; }
- QString errorText() const { return mErrorText; }
+ TQString errorText() const { return mErrorText; }
bool login();
bool logout();
@@ -149,22 +149,22 @@ class GroupwiseServer : public QObject
GroupWise::AddressBook::List addressBookList();
- bool readAddressBooksSynchronous( const QStringList &addrBookIds );
- bool updateAddressBooks( const QStringList &addrBookIds,
+ bool readAddressBooksSynchronous( const TQStringList &addrBookIds );
+ bool updateAddressBooks( const TQStringList &addrBookIds,
const unsigned long startSequenceNumber, const unsigned long lastPORebuildTime );
- bool insertAddressee( const QString &addrBookId, KABC::Addressee& );
+ bool insertAddressee( const TQString &addrBookId, KABC::Addressee& );
bool changeAddressee( const KABC::Addressee& );
bool removeAddressee( const KABC::Addressee& );
- bool readFreeBusy( const QString &email, const QDate &start,
- const QDate &end, KCal::FreeBusy * );
+ bool readFreeBusy( const TQString &email, const TQDate &start,
+ const TQDate &end, KCal::FreeBusy * );
bool dumpData();
void dumpFolderList();
// bool getDelta();
- GroupWise::DeltaInfo getDeltaInfo( const QStringList & addressBookIds );
+ GroupWise::DeltaInfo getDeltaInfo( const TQStringList & addressBookIds );
bool getCategoryList();
@@ -176,20 +176,20 @@ class GroupwiseServer : public QObject
void emitReadAddressBookTotalSize( int );
void emitReadAddressBookProcessedSize( int );
- void emitErrorMessage( const QString &, bool );
+ void emitErrorMessage( const TQString &, bool );
void emitGotAddressees( const KABC::Addressee::List );
bool readUserSettings( ngwt__Settings *&settings );
- bool modifyUserSettings( QMap<QString, QString> & );
+ bool modifyUserSettings( TQMap<TQString, TQString> & );
- QString userEmail() const { return mUserEmail; }
- QString userName() const { return mUserName; }
- QString userUuid() const { return mUserUuid; }
+ TQString userEmail() const { return mUserEmail; }
+ TQString userName() const { return mUserName; }
+ TQString userUuid() const { return mUserUuid; }
signals:
void readAddressBookTotalSize( int );
void readAddressBookProcessedSize( int );
- void errorMessage( const QString &, bool );
+ void errorMessage( const TQString &, bool );
void gotAddressees( const KABC::Addressee::List );
protected:
@@ -205,29 +205,29 @@ class GroupwiseServer : public QObject
/**
* Given a partial record ID, query the server for the full version from the calendar folder
*/
- std::string getFullIDFor( const QString & );
+ std::string getFullIDFor( const TQString & );
/**
* Check if an incidence involves other people
*/
bool iAmTheOrganizer( KCal::Incidence * );
- void log( const QString &prefix, const char *s, size_t n );
+ void log( const TQString &prefix, const char *s, size_t n );
protected slots:
void slotSslError();
private:
- QString mUrl;
- QString mUser;
- QString mPassword;
+ TQString mUrl;
+ TQString mUser;
+ TQString mPassword;
bool mSSL;
std::string mSession;
- QString mUserName;
- QString mUserEmail;
- QString mUserUuid;
+ TQString mUserName;
+ TQString mUserEmail;
+ TQString mUserUuid;
std::string mCalendarFolder;
std::string mCheckListFolder;
@@ -238,9 +238,9 @@ class GroupwiseServer : public QObject
KExtendedSocket *m_sock;
int mError;
- QString mErrorText;
+ TQString mErrorText;
- QString mLogFile;
+ TQString mLogFile;
};
#endif
diff --git a/kresources/groupwise/soap/gwconverter.cpp b/kresources/groupwise/soap/gwconverter.cpp
index e005974e6..ba64cff9a 100644
--- a/kresources/groupwise/soap/gwconverter.cpp
+++ b/kresources/groupwise/soap/gwconverter.cpp
@@ -35,7 +35,7 @@ struct soap* GWConverter::soap() const
return mSoap;
}
-std::string* GWConverter::qStringToString( const QString &string )
+std::string* GWConverter::qStringToString( const TQString &string )
{
std::string *str = soap_new_std__string( mSoap, -1 );
str->append( string.utf8() );
@@ -43,20 +43,20 @@ std::string* GWConverter::qStringToString( const QString &string )
return str;
}
-QString GWConverter::stringToQString( const std::string &str )
+TQString GWConverter::stringToQString( const std::string &str )
{
- return QString::fromUtf8( str.c_str() );
+ return TQString::fromUtf8( str.c_str() );
}
-QString GWConverter::stringToQString( std::string *str )
+TQString GWConverter::stringToQString( std::string *str )
{
- if ( !str ) return QString::null;
- return QString::fromUtf8( str->c_str() );
+ if ( !str ) return TQString::null;
+ return TQString::fromUtf8( str->c_str() );
}
-char* GWConverter::qStringToChar( const QString &string )
+char* GWConverter::qStringToChar( const TQString &string )
{
- QCString str = string.utf8();
+ TQCString str = string.utf8();
char* charStr = (char*)soap_malloc( mSoap, str.length() + 1 );
memcpy( charStr, str, str.length() );
@@ -65,80 +65,80 @@ char* GWConverter::qStringToChar( const QString &string )
return charStr;
}
-QDate GWConverter::charToQDate( const char *str )
+TQDate GWConverter::charToQDate( const char *str )
{
- if ( !str ) return QDate(); // FIXME: Qt::ISODate is probably no good here because it expects yyyy-MM-dd not yyyyMMdd
- return QDate::fromString( QString::fromUtf8( str ), Qt::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 QDateTime &dt,
- const QString &timezone )
+char *GWConverter::qDateTimeToChar( const TQDateTime &dt,
+ const TQString &timezone )
{
return qDateTimeToChar( KPimPrefs::localTimeToUtc( dt, timezone ) );
}
-char *GWConverter::qDateTimeToChar( const QDateTime &dt )
+char *GWConverter::qDateTimeToChar( const TQDateTime &dt )
{
return qStringToChar( dt.toString( "yyyyMMddThhmmZ" ) );
}
-std::string* GWConverter::qDateTimeToString( const QDateTime &dt, const QString &timezone )
+std::string* GWConverter::qDateTimeToString( const TQDateTime &dt, const TQString &timezone )
{
return qDateTimeToString( KPimPrefs::localTimeToUtc( dt, timezone ) );
}
-std::string* GWConverter::qDateTimeToString( const QDateTime &dt )
+std::string* GWConverter::qDateTimeToString( const TQDateTime &dt )
{
return qStringToString( dt.toString( "yyyyMMddThhmmZ" ) );
}
-QDateTime GWConverter::stringToQDateTime( const std::string* str )
+TQDateTime GWConverter::stringToQDateTime( const std::string* str )
{
- QDateTime dt = QDateTime::fromString( QString::fromUtf8( str->c_str() ), Qt::ISODate );
+ TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str->c_str() ), Qt::ISODate );
return dt;
}
-char* GWConverter::qDateToChar( const QDate &date )
+char* GWConverter::qDateToChar( const TQDate &date )
{
return qStringToChar( date.toString( "yyyyMMdd" ) );
}
-std::string* GWConverter::qDateToString( const QDate &date )
+std::string* GWConverter::qDateToString( const TQDate &date )
{
return qStringToString( date.toString( "yyyyMMdd" ) );
}
-QDate GWConverter::stringToQDate( std::string* str )
+TQDate GWConverter::stringToQDate( std::string* str )
{
//NB this ISODate may become unnecessary, if GW stops sending in yyyy-mm-dd format again
- return QDate::fromString( QString::fromLatin1( str->c_str() ), Qt::ISODate );
+ return TQDate::fromString( TQString::fromLatin1( str->c_str() ), Qt::ISODate );
}
-QDateTime GWConverter::charToQDateTime( const char *str )
+TQDateTime GWConverter::charToQDateTime( const char *str )
{
- if ( !str ) return QDateTime();
+ if ( !str ) return TQDateTime();
// kdDebug() << "charToQDateTime(): " << str << endl;
// as above re Qt::ISODate
- QDateTime dt = QDateTime::fromString( QString::fromUtf8( str ), Qt::ISODate );
+ TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str ), Qt::ISODate );
// kdDebug() << " " << dt.toString() << endl;
return dt;
}
-QDateTime GWConverter::charToQDateTime( const char *str,
- const QString &timezone )
+TQDateTime GWConverter::charToQDateTime( const char *str,
+ const TQString &timezone )
{
- if ( !str ) return QDateTime();
- QDateTime utc = charToQDateTime( str );
+ if ( !str ) return TQDateTime();
+ TQDateTime utc = charToQDateTime( str );
return KPimPrefs::utcToLocalTime( utc, timezone );
}
-bool GWConverter::emailsMatch( const QString & email1, const QString & email2 )
+bool GWConverter::emailsMatch( const TQString & email1, const TQString & email2 )
{
// eg demo3.po1.dom1@dmz1.provo.novell.com == demo3@dmz1.provo.novell.com
if ( email1 == email2 )
return true;
- QString shorter, longer;
+ TQString shorter, longer;
if ( email1.length() < email2.length() )
{
shorter = email1;
@@ -150,12 +150,12 @@ bool GWConverter::emailsMatch( const QString & email1, const QString & email2 )
longer = email1;
}
- QString shortStem = shorter.section( '@', 0, 0 );
- QString longStem = longer.section( '@', 0, 0 );
- QString shortHost = shorter.section( '@', 1, 1 );
- QString longHost = longer.section( '@', 1, 1 );
+ TQString shortStem = shorter.section( '@', 0, 0 );
+ TQString longStem = longer.section( '@', 0, 0 );
+ TQString shortHost = shorter.section( '@', 1, 1 );
+ TQString longHost = longer.section( '@', 1, 1 );
- QString extension = longStem.right( longStem.length() - shortStem.length() );
+ TQString extension = longStem.right( longStem.length() - shortStem.length() );
kdDebug() << "gwconverter::emailsMatch(): " << shorter << " = " << longer << endl;
kdDebug() << "shortStem: " << shortStem << ", longStem: " << longStem << ", extension: " << extension << endl;
diff --git a/kresources/groupwise/soap/gwconverter.h b/kresources/groupwise/soap/gwconverter.h
index be8a8dd61..08d5220fc 100644
--- a/kresources/groupwise/soap/gwconverter.h
+++ b/kresources/groupwise/soap/gwconverter.h
@@ -21,8 +21,8 @@
#ifndef KABC_GW_CONVERTER_H
#define KABC_GW_CONVERTER_H
-#include <qdatetime.h>
-#include <qstring.h>
+#include <tqdatetime.h>
+#include <tqstring.h>
#include "soapH.h"
@@ -33,30 +33,30 @@ class GWConverter
struct soap* soap() const;
- static QString stringToQString( const std::string& );
- static QString stringToQString( std::string* );
+ static TQString stringToQString( const std::string& );
+ static TQString stringToQString( std::string* );
- std::string* qStringToString( const QString& );
- char* qStringToChar( const QString& );
+ std::string* qStringToString( const TQString& );
+ char* qStringToChar( const TQString& );
- char* qDateToChar( const QDate& );
- QDate charToQDate( const char * );
+ char* qDateToChar( const TQDate& );
+ TQDate charToQDate( const char * );
- std::string* qDateToString( const QDate &string );
- QDate stringToQDate( std::string* );
+ std::string* qDateToString( const TQDate &string );
+ TQDate stringToQDate( std::string* );
- char *qDateTimeToChar( const QDateTime &dt, const QString &timezone );
- char *qDateTimeToChar( const QDateTime &dt );
+ char *qDateTimeToChar( const TQDateTime &dt, const TQString &timezone );
+ char *qDateTimeToChar( const TQDateTime &dt );
- QDateTime charToQDateTime( const char *str );
- QDateTime charToQDateTime( const char *str, const QString &timezone );
+ TQDateTime charToQDateTime( const char *str );
+ TQDateTime charToQDateTime( const char *str, const TQString &timezone );
- std::string* qDateTimeToString( const QDateTime &string, const QString &timezone );
- std::string* qDateTimeToString( const QDateTime &string );
+ std::string* qDateTimeToString( const TQDateTime &string, const TQString &timezone );
+ std::string* qDateTimeToString( const TQDateTime &string );
- QDateTime stringToQDateTime( const std::string* );
+ TQDateTime stringToQDateTime( const std::string* );
- bool emailsMatch( const QString & email1, const QString & email2 );
+ bool emailsMatch( const TQString & email1, const TQString & email2 );
private:
struct soap* mSoap;
};
diff --git a/kresources/groupwise/soap/gwjobs.cpp b/kresources/groupwise/soap/gwjobs.cpp
index f1cdd049a..43d5d58df 100644
--- a/kresources/groupwise/soap/gwjobs.cpp
+++ b/kresources/groupwise/soap/gwjobs.cpp
@@ -26,7 +26,7 @@
#include <libkcal/incidence.h>
#include <libkcal/resourcecached.h>
-#include <qtimer.h>
+#include <tqtimer.h>
#include "contactconverter.h"
#include "incidenceconverter.h"
@@ -38,19 +38,19 @@
#define READ_ADDRESS_FOLDER_CHUNK_SIZE 50
#define READ_CALENDAR_FOLDER_CHUNK_SIZE 50
-GWJob::GWJob( GroupwiseServer *server, struct soap *soap, const QString &url,
+GWJob::GWJob( GroupwiseServer *server, struct soap *soap, const TQString &url,
const std::string &session )
: mServer( server ), mSoap( soap ), mUrl( url ), mSession( session ), mError( GroupWise::NoError )
{
}
ReadAddressBooksJob::ReadAddressBooksJob( GroupwiseServer *server,
- struct soap *soap, const QString &url, const std::string &session )
+ struct soap *soap, const TQString &url, const std::string &session )
: GWJob( server, soap, url, session )
{
}
-void ReadAddressBooksJob::setAddressBookIds( const QStringList &ids )
+void ReadAddressBooksJob::setAddressBookIds( const TQStringList &ids )
{
mAddressBookIds = ids;
@@ -82,7 +82,7 @@ void ReadAddressBooksJob::run()
if ( !(*it)->id ) {
kdError() << "No addressbook id" << endl;
} else {
- QString id = GWConverter::stringToQString( (*it)->id );
+ TQString id = GWConverter::stringToQString( (*it)->id );
kdDebug() << "Reading ID: " << id << endl;
if ( mAddressBookIds.find( id ) != mAddressBookIds.end() ) {
readAddressBook( *(*it)->id );
@@ -93,8 +93,8 @@ void ReadAddressBooksJob::run()
}
#else
GWConverter conv( mSoap );
- QStringList::Iterator it = mAddressBookIds.begin();
- const QStringList::Iterator end = mAddressBookIds.end();
+ TQStringList::Iterator it = mAddressBookIds.begin();
+ const TQStringList::Iterator end = mAddressBookIds.end();
for ( ; it != end; ++it )
{
std::string* id = conv.qStringToString( *it );
@@ -158,7 +158,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id )
addr.insertCustom( "GWRESOURCE", "CONTAINER", converter.stringToQString( id ) );
- QString remoteUid = converter.stringToQString( (*it)->id );
+ TQString remoteUid = converter.stringToQString( (*it)->id );
KABC::Addressee oldAddressee = mResource->findByUid( mResource->idMapper().localId( remoteUid ) );
if ( oldAddressee.isEmpty() ) // new addressee
@@ -323,7 +323,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id )
#endif
}
-ReadCalendarJob::ReadCalendarJob( GroupwiseServer *server, struct soap *soap, const QString &url,
+ReadCalendarJob::ReadCalendarJob( GroupwiseServer *server, struct soap *soap, const TQString &url,
const std::string &session )
: GWJob( server, soap, url, session ), mCalendar( 0 )
{
@@ -475,8 +475,8 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts
ngwt__Filter *filter = soap_new_ngwm__Filter( mSoap, -1 );
ngwt__FilterEntry *filterEntry = soap_new_ngwm__FilterEntry( mSoap, -1 );
filterEntry->op = gte;
- filterEntry->field = QString::fromLatin1( "startDate" ).utf8();
- filterEntry->value = QDateTime::currentDateTime().toString( "yyyyMMddThhmmZ" ).utf8();
+ filterEntry->field = TQString::fromLatin1( "startDate" ).utf8();
+ filterEntry->value = TQDateTime::currentDateTime().toString( "yyyyMMddThhmmZ" ).utf8();
filter->element = filterEntry;
@@ -636,12 +636,12 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts
}
UpdateAddressBooksJob::UpdateAddressBooksJob( GroupwiseServer *server,
- struct soap *soap, const QString &url, const std::string &session )
+ struct soap *soap, const TQString &url, const std::string &session )
: GWJob( server, soap, url, session )
{
}
-void UpdateAddressBooksJob::setAddressBookIds( const QStringList &ids )
+void UpdateAddressBooksJob::setAddressBookIds( const TQStringList &ids )
{
mAddressBookIds = ids;
diff --git a/kresources/groupwise/soap/gwjobs.h b/kresources/groupwise/soap/gwjobs.h
index 3cf47c095..815e6261e 100644
--- a/kresources/groupwise/soap/gwjobs.h
+++ b/kresources/groupwise/soap/gwjobs.h
@@ -20,7 +20,7 @@
#ifndef GROUPWISE_JOBS_H
#define GROUPWISE_JOBS_H
-#include <qobject.h>
+#include <tqobject.h>
#include <string>
@@ -45,12 +45,12 @@ class GroupwiseServer;
class GWJob
{
public:
- GWJob( GroupwiseServer *server, struct soap *soap, const QString &url, const std::string &session );
+ GWJob( GroupwiseServer *server, struct soap *soap, const TQString &url, const std::string &session );
int error() const { return mError; }
protected:
GroupwiseServer *mServer;
struct soap *mSoap;
- QString mUrl;
+ TQString mUrl;
const std::string mSession;
int mError;
};
@@ -59,10 +59,10 @@ class ReadAddressBooksJob : public GWJob
{
public:
ReadAddressBooksJob( GroupwiseServer *server, struct soap *soap,
- const QString &url,
+ const TQString &url,
const std::string &session );
- void setAddressBookIds( const QStringList& );
+ void setAddressBookIds( const TQStringList& );
void run();
@@ -70,7 +70,7 @@ class ReadAddressBooksJob : public GWJob
void readAddressBook( std::string& );
private:
- QStringList mAddressBookIds;
+ TQStringList mAddressBookIds;
KABC::Resource *mResource;
int mProgress;
};
@@ -78,7 +78,7 @@ class ReadAddressBooksJob : public GWJob
class ReadCalendarJob : public GWJob
{
public:
- ReadCalendarJob( GroupwiseServer *server, struct soap *soap, const QString &url,
+ ReadCalendarJob( GroupwiseServer *server, struct soap *soap, const TQString &url,
const std::string &session );
void setCalendarFolder( std::string* );
@@ -101,11 +101,11 @@ class UpdateAddressBooksJob : public GWJob
{
public:
UpdateAddressBooksJob( GroupwiseServer *server, struct soap *soap,
- const QString &url,
+ const TQString &url,
const std::string &session );
/** set the address book IDs to update - at the moment this is only the System Address Book (SAB) */
- void setAddressBookIds( const QStringList& );
+ void setAddressBookIds( const TQStringList& );
/**
* set the sequence number to start reading deltas from (usually the last sequenec number
@@ -122,7 +122,7 @@ class UpdateAddressBooksJob : public GWJob
void updateAddressBook( std::string& );
private:
- QStringList mAddressBookIds;
+ TQStringList mAddressBookIds;
KABC::Resource *mResource;
int mProgress;
unsigned long mLastPORebuildTime;
diff --git a/kresources/groupwise/soap/incidenceconverter.cpp b/kresources/groupwise/soap/incidenceconverter.cpp
index 051f00655..5e5e4c404 100644
--- a/kresources/groupwise/soap/incidenceconverter.cpp
+++ b/kresources/groupwise/soap/incidenceconverter.cpp
@@ -39,8 +39,8 @@ IncidenceConverter::IncidenceConverter( struct soap* soap )
mTimezone = KPimPrefs::timezone();
}
-void IncidenceConverter::setFrom( const QString &name,
- const QString &email, const QString &uuid )
+void IncidenceConverter::setFrom( const TQString &name,
+ const TQString &email, const TQString &uuid )
{
mFromName = name;
mFromEmail = email;
@@ -135,8 +135,8 @@ ngwt__Appointment* IncidenceConverter::convertToAppointment( KCal::Event* event
if ( event->dtStart().isValid() ) {
/* kdDebug() << " convertToAppointment() raw start date: " << event->dtStart().toString() << endl;*/
- QDateTime start = event->dtStart();
- start.setTime( QTime( 0, 0, 0 ) );
+ TQDateTime start = event->dtStart();
+ start.setTime( TQTime( 0, 0, 0 ) );
appointment->startDate = qDateTimeToChar( start, mTimezone );
//appointment->startDay = qDateToString( event->dtStart().date()/*.addDays( -1 )*/ );
/* kdDebug() << " converted start date: " << appointment->startDate << endl;*/
@@ -145,9 +145,9 @@ ngwt__Appointment* IncidenceConverter::convertToAppointment( KCal::Event* event
kdDebug() << " event start date not valid " << endl;
if ( event->hasEndDate() ) {
// kdDebug() << " convertToAppointment() raw end date: " << event->dtEnd().toString() << endl;
- QDateTime end = event->dtEnd();
+ TQDateTime end = event->dtEnd();
end = end.addDays( 1 );
- end.setTime( QTime( 0, 0, 0 ) );
+ end.setTime( TQTime( 0, 0, 0 ) );
appointment->endDate = qDateTimeToChar( end, mTimezone );
//appointment->endDay = qDateToString( event->dtEnd().date() );
// kdDebug() << " converted end date:" << appointment->endDate << endl;
@@ -215,7 +215,7 @@ KCal::Todo* IncidenceConverter::convertFromTask( ngwt__Task* task )
}
if ( task->taskPriority ) {
- QString priority = stringToQString( task->taskPriority );
+ TQString priority = stringToQString( task->taskPriority );
// FIXME: Store priority string somewhere
@@ -256,7 +256,7 @@ ngwt__Task* IncidenceConverter::convertToTask( KCal::Todo* todo )
}
// FIXME: Restore custom priorities
- QString priority = QString::number( todo->priority() );
+ TQString priority = TQString::number( todo->priority() );
task->taskPriority = qStringToString( priority );
task->completed = (bool*)soap_malloc( soap(), 1 );
@@ -311,7 +311,7 @@ ngwt__Note* IncidenceConverter::convertToNote( KCal::Journal* journal )
}
if ( !note->subject )
- note->subject = qStringToString( QString("NO SUBJECT") );
+ note->subject = qStringToString( TQString("NO SUBJECT") );
return note;
}
@@ -362,7 +362,7 @@ bool IncidenceConverter::convertToCalendarItem( KCal::Incidence* incidence, ngwt
item->modified = 0;
item->changes = 0;
- QString id = incidence->customProperty( "GWRESOURCE", "UID" );
+ TQString id = incidence->customProperty( "GWRESOURCE", "UID" );
if ( !id.isEmpty() ) item->id = qStringToString( id );
// Container
@@ -449,7 +449,7 @@ void IncidenceConverter::setAttendees( KCal::Incidence *incidence,
if ( !mFromEmail.isEmpty() ) item->distribution->from->email = qStringToString( mFromEmail );
if ( !mFromUuid.isEmpty() ) item->distribution->from->uuid = qStringToString( mFromUuid );
- QString to; // To list consists of display names of organizer and attendees separated by "; "
+ TQString to; // To list consists of display names of organizer and attendees separated by "; "
to += incidence->organizer().name();
item->distribution->sendoptions = soap_new_ngwt__SendOptions( soap(), -1 );
@@ -470,11 +470,11 @@ void IncidenceConverter::setAttendees( KCal::Incidence *incidence,
KCal::Attendee::List::ConstIterator it;
for( it = attendees.begin(); it != attendees.end(); ++it ) {
if ( !to.isEmpty() )
- to += QString::fromLatin1( "; %1" ).arg( (*it)->name() );
+ to += TQString::fromLatin1( "; %1" ).arg( (*it)->name() );
kdDebug() << "IncidenceConverter::setAttendees(), adding " << (*it)->fullName()
<< endl;
- QString uuid;
- QValueList<KABC::Addressee> addList = KABC::StdAddressBook::self()->findByEmail( (*it)->email() );
+ TQString uuid;
+ TQValueList<KABC::Addressee> addList = KABC::StdAddressBook::self()->findByEmail( (*it)->email() );
if ( !addList.first().isEmpty() )
uuid = addList.first().custom( "GWRESOURCE", "UUID" ); //uuid may be mandatory for the recipients list to be stored on the server...
item->distribution->recipients->recipient.push_back( createRecipient( (*it)->name(), (*it)->email(), uuid ) );
@@ -484,8 +484,8 @@ void IncidenceConverter::setAttendees( KCal::Incidence *incidence,
item->distribution->bc = 0;
}
-ngwt__Recipient *IncidenceConverter::createRecipient( const QString &name,
- const QString &email, const QString &uuid )
+ngwt__Recipient *IncidenceConverter::createRecipient( const TQString &name,
+ const TQString &email, const TQString &uuid )
{
ngwt__Recipient *recipient = soap_new_ngwt__Recipient( soap(), -1 );
@@ -534,7 +534,7 @@ bool IncidenceConverter::convertFromCalendarItem( ngwt__CalendarItem* item,
getAttendees( item, incidence );
if ( item->recurrenceKey )
- incidence->setCustomProperty( "GWRESOURCE", "RECURRENCEKEY", QString::number( *item->recurrenceKey ) );
+ incidence->setCustomProperty( "GWRESOURCE", "RECURRENCEKEY", TQString::number( *item->recurrenceKey ) );
/*
// This must just be a very early cut at recurrence
@@ -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 ) {
- QDate date = QDate::fromString( s2q( *it ), Qt::ISODate );
+ TQDate date = TQDate::fromString( s2q( *it ), Qt::ISODate );
if ( date.isValid() )
}
}
@@ -568,7 +568,7 @@ void IncidenceConverter::getItemDescription( ngwt__CalendarItem *item, KCal::Inc
// text/plain should be the description
if ( stringToQString( (*it)->contentType ) == "text/plain" ) {
- QString description = QString::fromUtf8( (char*)data.__ptr, data.__size );
+ TQString description = TQString::fromUtf8( (char*)data.__ptr, data.__size );
incidence->setDescription( description );
kdDebug() << "Incidence description decodes to: " << description << endl;
return;
@@ -731,7 +731,7 @@ void IncidenceConverter::setRecurrence( KCal::Incidence * incidence, ngwt__Calen
*freq = Weekly;
item->rrule->frequency = freq;
// now change the bitArray of the days of the week that it recurs on to a ngwt__DayOfWeekList *
- QBitArray ba = recur->days();
+ TQBitArray ba = recur->days();
ngwt__DayOfYearWeekList * weeklyDays = soap_new_ngwt__DayOfYearWeekList( soap(), -1 );
for ( int i = 0; i < 7; ++i )
{
@@ -795,11 +795,11 @@ void IncidenceConverter::setRecurrence( KCal::Incidence * incidence, ngwt__Calen
// TODO: translate '1st sunday in may'
ngwt__DayOfYearList * daysOfYear = soap_new_ngwt__DayOfYearList( soap(), -1 );
#if LIBKCAL_IS_VERSION( 1, 3, 0 )
- QValueList<int> rmd;
+ TQValueList<int> rmd;
rmd = recur->yearMonths();
daysOfYear->day.push_back( rmd.first() );
#else
- QPtrList<int> rmd;
+ TQPtrList<int> rmd;
rmd = recur->yearNums();
daysOfYear->day.push_back( *rmd.first() );
#endif
diff --git a/kresources/groupwise/soap/incidenceconverter.h b/kresources/groupwise/soap/incidenceconverter.h
index 8d7b6844e..6f2ced84a 100644
--- a/kresources/groupwise/soap/incidenceconverter.h
+++ b/kresources/groupwise/soap/incidenceconverter.h
@@ -35,8 +35,8 @@ class IncidenceConverter : public GWConverter
public:
IncidenceConverter( struct soap* );
- void setFrom( const QString &name, const QString &email,
- const QString &uuid );
+ void setFrom( const TQString &name, const TQString &email,
+ const TQString &uuid );
KCal::Event* convertFromAppointment( ngwt__Appointment* );
ngwt__Appointment* convertToAppointment( KCal::Event* );
@@ -61,16 +61,16 @@ class IncidenceConverter : public GWConverter
void setRecurrence( KCal::Incidence *, ngwt__CalendarItem * );
// used for converting weekly recurrences from GW
-// QBitArray getDayBitArray( ngwt__DayOfWeekList * );
+// TQBitArray getDayBitArray( ngwt__DayOfWeekList * );
- ngwt__Recipient *createRecipient( const QString &name,
- const QString &email, const QString &uuid = QString::null );
+ ngwt__Recipient *createRecipient( const TQString &name,
+ const TQString &email, const TQString &uuid = TQString::null );
- QString mTimezone;
+ TQString mTimezone;
- QString mFromName;
- QString mFromEmail;
- QString mFromUuid;
+ TQString mFromName;
+ TQString mFromEmail;
+ TQString mFromUuid;
};
#endif
diff --git a/kresources/groupwise/soap/ksslsocket.cpp b/kresources/groupwise/soap/ksslsocket.cpp
index 4fdc3f5f6..653a55317 100644
--- a/kresources/groupwise/soap/ksslsocket.cpp
+++ b/kresources/groupwise/soap/ksslsocket.cpp
@@ -17,7 +17,7 @@
*************************************************************************
*/
-#include <qsocketnotifier.h>
+#include <tqsocketnotifier.h>
#include <dcopclient.h>
#include <klocale.h>
@@ -39,8 +39,8 @@ struct KSSLSocketPrivate
mutable KSSL *kssl;
KSSLCertificateCache *cc;
DCOPClient *dcc;
- QMap<QString,QString> metaData;
- QSocketNotifier *socketNotifier;
+ TQMap<TQString,TQString> metaData;
+ TQSocketNotifier *socketNotifier;
};
KSSLSocket::KSSLSocket() : KExtendedSocket()
@@ -57,9 +57,9 @@ KSSLSocket::KSSLSocket() : KExtendedSocket()
setBlockingMode(false);
//Connect internal slots
- QObject::connect( this, SIGNAL(connectionSuccess()), this, SLOT(slotConnected()) );
- QObject::connect( this, SIGNAL(closed(int)), this, SLOT(slotDisconnected()) );
- QObject::connect( this, SIGNAL(connectionFailed(int)), this, SLOT(slotDisconnected()));
+ TQObject::connect( this, TQT_SIGNAL(connectionSuccess()), this, TQT_SLOT(slotConnected()) );
+ TQObject::connect( this, TQT_SIGNAL(closed(int)), this, TQT_SLOT(slotDisconnected()) );
+ TQObject::connect( this, TQT_SIGNAL(connectionFailed(int)), this, TQT_SLOT(slotDisconnected()));
}
KSSLSocket::~KSSLSocket()
@@ -142,22 +142,22 @@ void KSSLSocket::slotDisconnected()
readNotifier()->setEnabled(false);
}
-void KSSLSocket::setMetaData( const QString &key, const QVariant &data )
+void KSSLSocket::setMetaData( const TQString &key, const TQVariant &data )
{
- QVariant v = data;
+ TQVariant v = data;
d->metaData[key] = v.asString();
}
-bool KSSLSocket::hasMetaData( const QString &key )
+bool KSSLSocket::hasMetaData( const TQString &key )
{
return d->metaData.contains(key);
}
-QString KSSLSocket::metaData( const QString &key )
+TQString KSSLSocket::metaData( const TQString &key )
{
if( d->metaData.contains(key) )
return d->metaData[key];
- return QString::null;
+ return TQString::null;
}
/*
@@ -168,13 +168,13 @@ I basically copied the below from tcpKIO::SlaveBase.hpp, with some modificaions
* Copyright (C) 2001 Dawit Alemayehu <adawit@kde.org>
*/
-int KSSLSocket::messageBox( KIO::SlaveBase::MessageBoxType type, const QString &text, const QString &caption,
- const QString &buttonYes, const QString &buttonNo )
+int KSSLSocket::messageBox( KIO::SlaveBase::MessageBoxType type, const TQString &text, const TQString &caption,
+ const TQString &buttonYes, const TQString &buttonNo )
{
kdDebug(0) << "messageBox " << type << " " << text << " - " << caption << buttonYes << buttonNo << endl;
- QByteArray data, result;
- QCString returnType;
- QDataStream arg(data, IO_WriteOnly);
+ TQByteArray data, result;
+ TQCString returnType;
+ TQDataStream arg(data, IO_WriteOnly);
arg << (int)1 << (int)type << text << caption << buttonYes << buttonNo;
if ( ! d->dcc ){
@@ -183,16 +183,16 @@ int KSSLSocket::messageBox( KIO::SlaveBase::MessageBoxType type, const QString &
}
if (!d->dcc->isApplicationRegistered("kio_uiserver"))
{
- KApplication::startServiceByDesktopPath("kio_uiserver.desktop",QStringList());
+ KApplication::startServiceByDesktopPath("kio_uiserver.desktop",TQStringList());
}
d->dcc->call("kio_uiserver", "UIServer",
- "messageBox(int,int,QString,QString,QString,QString)", data, returnType, result);
+ "messageBox(int,int,TQString,TQString,TQString,TQString)", data, returnType, result);
if( returnType == "int" )
{
int res;
- QDataStream r(result, IO_ReadOnly);
+ TQDataStream r(result, IO_ReadOnly);
r >> res;
return res;
}
@@ -209,10 +209,10 @@ int KSSLSocket::verifyCertificate()
bool _IPmatchesCN = false;
int result;
bool doAddHost = false;
- QString ourHost = host();
- QString ourIp = peerAddress()->pretty();
+ TQString ourHost = host();
+ TQString ourIp = peerAddress()->pretty();
- QString theurl = "https://" + ourHost + ":" + port();
+ TQString theurl = "https://" + ourHost + ":" + port();
if (!d->cc)
d->cc = new KSSLCertificateCache;
@@ -241,15 +241,15 @@ int KSSLSocket::verifyCertificate()
setMetaData("ssl_cipher", d->kssl->connectionInfo().getCipher());
setMetaData("ssl_cipher_desc", d->kssl->connectionInfo().getCipherDescription());
setMetaData("ssl_cipher_version", d->kssl->connectionInfo().getCipherVersion());
- setMetaData("ssl_cipher_used_bits", QString::number(d->kssl->connectionInfo().getCipherUsedBits()));
- setMetaData("ssl_cipher_bits", QString::number(d->kssl->connectionInfo().getCipherBits()));
+ setMetaData("ssl_cipher_used_bits", TQString::number(d->kssl->connectionInfo().getCipherUsedBits()));
+ setMetaData("ssl_cipher_bits", TQString::number(d->kssl->connectionInfo().getCipherBits()));
setMetaData("ssl_peer_ip", ourIp );
- QString errorStr;
+ TQString errorStr;
for(KSSLCertificate::KSSLValidationList::ConstIterator it = ksvl.begin();
it != ksvl.end(); ++it)
{
- errorStr += QString::number(*it)+":";
+ errorStr += TQString::number(*it)+":";
}
setMetaData("ssl_cert_errors", errorStr);
@@ -257,8 +257,8 @@ int KSSLSocket::verifyCertificate()
if (pc.chain().isValid() && pc.chain().depth() > 1)
{
- QString theChain;
- QPtrList<KSSLCertificate> chain = pc.chain().getChain();
+ TQString theChain;
+ TQPtrList<KSSLCertificate> chain = pc.chain().getChain();
for (KSSLCertificate *c = chain.first(); c; c = chain.next())
{
theChain += c->toString();
@@ -271,7 +271,7 @@ int KSSLSocket::verifyCertificate()
setMetaData("ssl_peer_chain", "");
}
- setMetaData("ssl_cert_state", QString::number(ksv));
+ setMetaData("ssl_cert_state", TQString::number(ksv));
if (ksv == KSSLCertificate::Ok)
{
@@ -321,7 +321,7 @@ int KSSLSocket::verifyCertificate()
{
if (ksv == KSSLCertificate::InvalidHost)
{
- QString msg = i18n("The IP address of the host %1 "
+ TQString msg = i18n("The IP address of the host %1 "
"does not match the one the "
"certificate was issued to.");
result = messageBox( KIO::SlaveBase::WarningYesNoCancel,
@@ -332,7 +332,7 @@ int KSSLSocket::verifyCertificate()
}
else
{
- QString msg = i18n("The server certificate failed the "
+ TQString msg = i18n("The server certificate failed the "
"authenticity test (%1).");
result = messageBox( KIO::SlaveBase::WarningYesNoCancel,
msg.arg(ourHost),
diff --git a/kresources/groupwise/soap/ksslsocket.h b/kresources/groupwise/soap/ksslsocket.h
index 47874e0d5..d58b41918 100644
--- a/kresources/groupwise/soap/ksslsocket.h
+++ b/kresources/groupwise/soap/ksslsocket.h
@@ -19,7 +19,7 @@
*************************************************************************
*/
-#include <qvariant.h>
+#include <tqvariant.h>
#include <kextsock.h>
#include <kio/slavebase.h>
@@ -45,14 +45,14 @@ class KSSLSocket : public KExtendedSocket
private:
int verifyCertificate();
- int messageBox( KIO::SlaveBase::MessageBoxType type, const QString &text,
- const QString &caption, const QString &buttonYes, const QString &buttonNo );
+ int messageBox( KIO::SlaveBase::MessageBoxType type, const TQString &text,
+ const TQString &caption, const TQString &buttonYes, const TQString &buttonNo );
//Copied frm tcpslavebase to simply integrating their dialog function
- void setMetaData( const QString &, const QVariant & );
- bool hasMetaData( const QString & );
- QString metaData( const QString & );
+ void setMetaData( const TQString &, const TQVariant & );
+ bool hasMetaData( const TQString & );
+ TQString metaData( const TQString & );
KSSLSocketPrivate *d;
};
diff --git a/kresources/groupwise/soap/soapdebug.cpp b/kresources/groupwise/soap/soapdebug.cpp
index 3d0e3f223..caa56e5b5 100644
--- a/kresources/groupwise/soap/soapdebug.cpp
+++ b/kresources/groupwise/soap/soapdebug.cpp
@@ -56,9 +56,9 @@ int main( int argc, char **argv )
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
- QString user = args->getOption( "user" );
- QString pass = args->getOption( "password" );
- QString url = args->getOption( "server" );
+ TQString user = args->getOption( "user" );
+ TQString pass = args->getOption( "password" );
+ TQString url = args->getOption( "server" );
#if 1
if ( user.isEmpty() ) {
@@ -97,7 +97,7 @@ int main( int argc, char **argv )
#endif
#if 0
- QString fbUser = args->getOption( "freebusy-user" );
+ TQString fbUser = args->getOption( "freebusy-user" );
if ( fbUser.isEmpty() ) {
kdError() << "Need user for which the freebusy data should be retrieved."
<< endl;
@@ -105,7 +105,7 @@ int main( int argc, char **argv )
KCal::FreeBusy *fb = new KCal::FreeBusy;
server.readFreeBusy( "user1",
- QDate( 2004, 9, 1 ), QDate( 2004, 10, 31 ), fb );
+ TQDate( 2004, 9, 1 ), TQDate( 2004, 10, 31 ), fb );
}
#endif
@@ -129,17 +129,17 @@ int main( int argc, char **argv )
}
KCal::ICalFormat format;
- QString ical = format.toString( &calendar );
+ TQString ical = format.toString( &calendar );
kdDebug() << "ICALENDAR: " << ical << endl;
#endif
#if 0
- QString id = args->getOption( "addressbook-id" );
+ TQString id = args->getOption( "addressbook-id" );
kdDebug() << "ADDRESSBOOK ID: " << id << endl;
- QStringList ids;
+ TQStringList ids;
ids.append( id );
KABC::ResourceMemory resource;
diff --git a/kresources/groupwise/soap/stdsoap2.h b/kresources/groupwise/soap/stdsoap2.h
index a7f6e3299..af603d801 100644
--- a/kresources/groupwise/soap/stdsoap2.h
+++ b/kresources/groupwise/soap/stdsoap2.h
@@ -1294,7 +1294,7 @@ struct soap
int send_timeout; /* when > 0, gives socket send timeout in seconds, < 0 in usec */
int connect_timeout; /* when > 0, gives socket connect() timeout in seconds, < 0 in usec */
int accept_timeout; /* when > 0, gives socket accept() timeout in seconds, < 0 in usec */
- int socket_flags; /* socket recv() and send() flags, e.g. set to MSG_NOSIGNAL to disable sigpipe */
+ int socket_flags; /* socket recv() and send() flags, e.g. set to MSG_NOQT_SIGNAL to disable sigpipe */
int connect_flags; /* connect() SOL_SOCKET sockopt flags, e.g. set to SO_DEBUG to debug socket */
int bind_flags; /* bind() SOL_SOCKET sockopt flags, e.g. set to SO_REUSEADDR to enable reuse */
int accept_flags; /* accept() SOL_SOCKET sockopt flags */
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-23 00:06:58 +0000