diff options
Diffstat (limited to 'tderesources/groupwise')
21 files changed, 83 insertions, 146 deletions
diff --git a/tderesources/groupwise/groupwisesettingswidget.cpp b/tderesources/groupwise/groupwisesettingswidget.cpp index 48de8143..cbff52ac 100644 --- a/tderesources/groupwise/groupwisesettingswidget.cpp +++ b/tderesources/groupwise/groupwisesettingswidget.cpp @@ -27,8 +27,8 @@ GroupWiseSettingsWidget::GroupWiseSettingsWidget( TQWidget * parent ) : GroupWiseSettingsWidgetBase( parent ) { - connect( m_settingsList, TQT_SIGNAL( itemRenamed( TQListViewItem *, int ) ), - this, TQT_SLOT( slotItemRenamed( TQListViewItem *, int ) ) ); + connect( m_settingsList, TQ_SIGNAL( itemRenamed( TQListViewItem *, int ) ), + this, TQ_SLOT( slotItemRenamed( TQListViewItem *, int ) ) ); } void GroupWiseSettingsWidget::slotItemRenamed( TQListViewItem * item, int ) diff --git a/tderesources/groupwise/groupwisesettingswidget.h b/tderesources/groupwise/groupwisesettingswidget.h index 9fff6aa7..9e81533d 100644 --- a/tderesources/groupwise/groupwisesettingswidget.h +++ b/tderesources/groupwise/groupwisesettingswidget.h @@ -30,7 +30,7 @@ class TQListViewItem; class GroupWiseSettingsWidget : public GroupWiseSettingsWidgetBase { -Q_OBJECT +TQ_OBJECT public: GroupWiseSettingsWidget( TQWidget * parent ); diff --git a/tderesources/groupwise/kcal_resourcegroupwise.cpp b/tderesources/groupwise/kcal_resourcegroupwise.cpp index a8a0727e..b75492e1 100644 --- a/tderesources/groupwise/kcal_resourcegroupwise.cpp +++ b/tderesources/groupwise/kcal_resourcegroupwise.cpp @@ -40,7 +40,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tderesources/configwidget.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstringhandler.h> #include <kurl.h> #include <libtdepim/kpimprefs.h> @@ -158,16 +158,16 @@ bool ResourceGroupwise::doLoad() mJobData = TQString(); mDownloadJob = TDEIO::get( url, false, false ); - connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); - connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); mProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading calendar") ); connect( mProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelLoad() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelLoad() ) ); return true; } diff --git a/tderesources/groupwise/kcal_resourcegroupwise.h b/tderesources/groupwise/kcal_resourcegroupwise.h index 5743a282..ea9c846e 100644 --- a/tderesources/groupwise/kcal_resourcegroupwise.h +++ b/tderesources/groupwise/kcal_resourcegroupwise.h @@ -30,7 +30,7 @@ #include <tdeabc/locknull.h> #include <tdeio/job.h> #include <tdeconfig.h> -#include <kdemacros.h> +#include <tdemacros.h> class ngwt__Settings; @@ -41,9 +41,9 @@ class GroupwisePrefsBase; /** This class provides a resource for accessing a Groupwise calendar. */ -class KDE_EXPORT ResourceGroupwise : public ResourceCached +class TDE_EXPORT ResourceGroupwise : public ResourceCached { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp index cb9f4493..0ef36231 100644 --- a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp +++ b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp @@ -28,7 +28,7 @@ #include <tdelistview.h> #include <kdebug.h> #include <kdialogbase.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <klineedit.h> #include <libkcal/resourcecachedconfig.h> @@ -73,7 +73,7 @@ ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* parent, const char* mainLayout->addMultiCellWidget( mSaveConfig, 6, 6, 0, 1 ); settingsButton->hide(); - // connect( settingsButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotViewUserSettings() ) ); + // connect( settingsButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotViewUserSettings() ) ); } @@ -123,7 +123,7 @@ void ResourceGroupwiseConfig::slotViewUserSettings() if ( s ) { - KDialogBase * dialog = new KDialogBase( ::tqqt_cast<TQWidget*>(parent() ), "gwsettingswidget", true, i18n( "GroupWise Settings" ) ); + KDialogBase * dialog = new KDialogBase( ::tqt_cast<TQWidget*>(parent() ), "gwsettingswidget", true, i18n( "GroupWise Settings" ) ); // TQVBoxLayout * layout = new TQVBoxLayout( dialog ); GroupWiseSettingsWidget * settingsWidget = new GroupWiseSettingsWidget( dialog ); dialog->setMainWidget( settingsWidget ); diff --git a/tderesources/groupwise/kcal_resourcegroupwiseconfig.h b/tderesources/groupwise/kcal_resourcegroupwiseconfig.h index 87447e0a..a955b0f3 100644 --- a/tderesources/groupwise/kcal_resourcegroupwiseconfig.h +++ b/tderesources/groupwise/kcal_resourcegroupwiseconfig.h @@ -21,7 +21,7 @@ #define KCALRESOURCEGROUPWISECONFIG_H #include <kurlrequester.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tderesources/resource.h> #include <tderesources/configwidget.h> @@ -39,9 +39,9 @@ class ResourceCachedSaveConfig; @see KCalResourceGroupwise */ -class KDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: ResourceGroupwiseConfig( TQWidget *parent = 0, const char *name = 0 ); diff --git a/tderesources/groupwise/soap/groupwiseserver.cpp b/tderesources/groupwise/soap/groupwiseserver.cpp index 07342ec4..3ba461b9 100644 --- a/tderesources/groupwise/soap/groupwiseserver.cpp +++ b/tderesources/groupwise/soap/groupwiseserver.cpp @@ -114,7 +114,7 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *, // kdDebug() << "Creating KSSLSocket()" << endl; m_sock = new KSSLSocket(); m_sock->setTimeout( KProtocolManager::connectTimeout() ); - connect( m_sock, TQT_SIGNAL( sslFailure() ), TQT_SLOT( slotSslError() ) ); + connect( m_sock, TQ_SIGNAL( sslFailure() ), TQ_SLOT( slotSslError() ) ); } else { m_sock = new KExtendedSocket(); } diff --git a/tderesources/groupwise/soap/groupwiseserver.h b/tderesources/groupwise/soap/groupwiseserver.h index 0a0f70e0..31cd8f14 100644 --- a/tderesources/groupwise/soap/groupwiseserver.h +++ b/tderesources/groupwise/soap/groupwiseserver.h @@ -93,7 +93,7 @@ class DeltaInfo class GroupwiseServer : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/groupwise/soap/gwconverter.cpp b/tderesources/groupwise/soap/gwconverter.cpp index bda455f7..b842f15b 100644 --- a/tderesources/groupwise/soap/gwconverter.cpp +++ b/tderesources/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: Qt::ISODate is probably no good here because it expects yyyy-MM-dd not yyyyMMdd - return TQDate::fromString( TQString::fromUtf8( str ), Qt::ISODate ); + 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 ); } 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() ), Qt::ISODate ); + TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str->c_str() ), TQt::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::fromLatin1( str->c_str() ), Qt::ISODate ); + return TQDate::fromString( TQString::fromLatin1( str->c_str() ), TQt::ISODate ); } TQDateTime GWConverter::charToTQDateTime( const char *str ) { if ( !str ) return TQDateTime(); // kdDebug() << "charToTQDateTime(): " << str << endl; - // as above re Qt::ISODate - TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str ), Qt::ISODate ); + // as above re TQt::ISODate + TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str ), TQt::ISODate ); // kdDebug() << " " << dt.toString() << endl; return dt; } diff --git a/tderesources/groupwise/soap/incidenceconverter.cpp b/tderesources/groupwise/soap/incidenceconverter.cpp index 84e28e69..5491f3db 100644 --- a/tderesources/groupwise/soap/incidenceconverter.cpp +++ b/tderesources/groupwise/soap/incidenceconverter.cpp @@ -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 ), Qt::ISODate ); + TQDate date = TQDate::fromString( s2q( *it ), TQt::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( Qt::ISODate ).utf8() ); + startDate.append( recur->recurStart().date().toString( TQt::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( TQString((*it).toString( Qt::ISODate )).utf8() ); + startDate.append( TQString((*it).toString( TQt::ISODate )).utf8() ); item->exdate->date.push_back( startDate ); } } diff --git a/tderesources/groupwise/soap/ksslsocket.cpp b/tderesources/groupwise/soap/ksslsocket.cpp index 2f085cf2..b753249d 100644 --- a/tderesources/groupwise/soap/ksslsocket.cpp +++ b/tderesources/groupwise/soap/ksslsocket.cpp @@ -57,9 +57,9 @@ KSSLSocket::KSSLSocket() : KExtendedSocket() setBlockingMode(false); //Connect internal slots - 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())); + TQObject::connect( this, TQ_SIGNAL(connectionSuccess()), this, TQ_SLOT(slotConnected()) ); + TQObject::connect( this, TQ_SIGNAL(closed(int)), this, TQ_SLOT(slotDisconnected()) ); + TQObject::connect( this, TQ_SIGNAL(connectionFailed(int)), this, TQ_SLOT(slotDisconnected())); } KSSLSocket::~KSSLSocket() diff --git a/tderesources/groupwise/soap/ksslsocket.h b/tderesources/groupwise/soap/ksslsocket.h index 42545948..aa4225b8 100644 --- a/tderesources/groupwise/soap/ksslsocket.h +++ b/tderesources/groupwise/soap/ksslsocket.h @@ -27,7 +27,7 @@ class KSSLSocketPrivate; class KSSLSocket : public KExtendedSocket { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/groupwise/soap/patches/socklen.diff b/tderesources/groupwise/soap/patches/socklen.diff index e6494bc9..8355e1c3 100644 --- a/tderesources/groupwise/soap/patches/socklen.diff +++ b/tderesources/groupwise/soap/patches/socklen.diff @@ -6,7 +6,7 @@ diff -u -3 -p -r1.3 stdsoap2.cpp --- soap/stdsoap2.cpp 3 Dec 2004 17:15:43 -0000 1.3 +++ soap/stdsoap2.cpp 6 Dec 2004 21:27:25 -0000 @@ -3072,7 +3072,7 @@ tcp_connect(struct soap *soap, const cha - #elif defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(TRU64) || defined(VXWORKS) + #elif defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(VXWORKS) int n = sizeof(struct sockaddr_in); #else - size_t n = sizeof(struct sockaddr_in); @@ -15,7 +15,7 @@ diff -u -3 -p -r1.3 stdsoap2.cpp fd_set fds; if (soap->connect_timeout > 0) @@ -3503,7 +3503,10 @@ tcp_accept(struct soap *soap, int s, str - #elif defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(TRU64) || defined(VXWORKS) + #elif defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(VXWORKS) fd = (int)accept((SOAP_SOCKET)s, a, n); #else - fd = (int)accept((SOAP_SOCKET)s, a, (size_t*)n); diff --git a/tderesources/groupwise/soap/stdsoap2.cpp b/tderesources/groupwise/soap/stdsoap2.cpp index b83b2bb4..95987858 100644 --- a/tderesources/groupwise/soap/stdsoap2.cpp +++ b/tderesources/groupwise/soap/stdsoap2.cpp @@ -2996,7 +2996,7 @@ tcp_gethost(struct soap *soap, const char *addr, struct in_addr *inaddr) strncpy(addrcopy, addr, strlen(addr)+1); iadd = inet_addr(addrcopy); #else -#if defined(_AIXVERSION_431) || defined(__osf__) +#if defined(_AIXVERSION_431) struct hostent_data ht_data; #endif iadd = inet_addr(addr); @@ -3011,7 +3011,7 @@ tcp_gethost(struct soap *soap, const char *addr, struct in_addr *inaddr) #if defined(__GLIBC__) if (gethostbyname_r(addr, &hostent, soap->buf, SOAP_BUFLEN, &host, &soap->errnum) < 0) host = NULL; -#elif defined(_AIXVERSION_431) || defined(__osf__) +#elif defined(_AIXVERSION_431) memset((void*)&ht_data, 0, sizeof(ht_data)); if (gethostbyname_r(addr, &hostent, &ht_data) < 0) { host = NULL; @@ -3827,9 +3827,6 @@ soap_accept(struct soap *soap) #elif defined(PALM) fcntl((SOAP_SOCKET)soap->master, F_SETFL, fcntl((SOAP_SOCKET)soap->master, F_GETFL,0)&~O_NONBLOCK); fcntl((SOAP_SOCKET)soap->socket, F_SETFL, fcntl((SOAP_SOCKET)soap->socket, F_GETFL,0)&~O_NONBLOCK); -#elif defined(SYMBIAN) - long blocking = 0; - ioctl((SOAP_SOCKET)soap->master, 0/*FIONBIO*/, &blocking); #else fcntl((SOAP_SOCKET)soap->master, F_SETFL, fcntl((SOAP_SOCKET)soap->master, F_GETFL)&~O_NONBLOCK); fcntl((SOAP_SOCKET)soap->socket, F_SETFL, fcntl((SOAP_SOCKET)soap->socket, F_GETFL)&~O_NONBLOCK); @@ -4246,15 +4243,11 @@ soap_begin_send(struct soap *soap) #ifndef UNDER_CE #ifndef WITH_FASTCGI if (!soap_valid_socket(soap->socket)) /* Set win32 stdout or soap->sendfd to BINARY, e.g. to support DIME */ -#ifdef __BORLANDC__ - setmode((SOAP_SOCKET)soap->sendfd, O_BINARY); -#else _setmode((SOAP_SOCKET)soap->sendfd, _O_BINARY); #endif #endif #endif #endif -#endif if (soap->mode & SOAP_IO) { soap->bufidx = 0; soap->buflen = 0; @@ -10821,14 +10814,10 @@ soap_begin_recv(struct soap *soap) #ifndef UNDER_CE #ifndef WITH_FASTCGI if (!soap_valid_socket(soap->socket)) -#ifdef __BORLANDC__ - setmode((SOAP_SOCKET)soap->recvfd, O_BINARY); -#else _setmode((SOAP_SOCKET)soap->recvfd, _O_BINARY); #endif #endif #endif -#endif #ifdef WITH_ZLIB soap->mode &= ~SOAP_ENC_ZLIB; soap->zlib_in = SOAP_ZLIB_NONE; diff --git a/tderesources/groupwise/soap/stdsoap2.h b/tderesources/groupwise/soap/stdsoap2.h index b68c2407..05fee0bc 100644 --- a/tderesources/groupwise/soap/stdsoap2.h +++ b/tderesources/groupwise/soap/stdsoap2.h @@ -139,25 +139,12 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com # endif #endif -#ifdef __BORLANDC__ -# ifdef __WIN32__ -# ifndef WIN32 -# define WIN32 -# endif -# endif -#endif - #ifdef __CYGWIN__ # ifndef CYGWIN # define CYGWIN # endif #endif -#ifdef __SYMBIAN32__ -# define SYMBIAN -# undef WIN32 -#endif - #if defined(__palmos__) || defined(PALM_GCC) || defined(__PALMOS_TRAPS__) # ifndef PALM # define PALM @@ -291,24 +278,6 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com # define HAVE_WCTOMB # define HAVE_MBTOWC # define HAVE_ISNAN -# elif defined(__osf__) -# define HAVE_STRRCHR -# define HAVE_STRTOD -# define HAVE_SSCANF -# define HAVE_STRTOL -# define HAVE_STRTOUL -# define HAVE_STRTOLL -# define HAVE_STRTOULL -# define HAVE_GETTIMEOFDAY -# define HAVE_SYS_TIMEB_H -# define HAVE_RAND_R -# define HAVE_GMTIME_R -# define HAVE_LOCALTIME_R -# define __USE_STD_IOSTREAM -# define HAVE_WCTOMB -# define HAVE_MBTOWC -# define SOAP_LONG_FORMAT "%ld" -# define SOAP_ULONG_FORMAT "%lu" # elif defined(MAC_CARBON) # define WITH_NOIO # define HAVE_STRRCHR @@ -333,12 +302,6 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com # define O_NONBLOCK FNONBIO # include <sys_socket.h> # include "palmFunctions.h" -# elif defined(SYMBIAN) -# define WITH_LEAN -# define WITH_NONAMESPACES -# define HAVE_STRTOD /* use STRTOD since sscanf doesn't seem to work */ -# include <e32def.h> -# include <sys/ioctl.h> # elif defined(VXWORKS) # define HAVE_STRRCHR # define HAVE_STRTOD @@ -445,9 +408,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com # include <sockLib.h> # endif # ifndef VXWORKS -# ifndef SYMBIAN -# include <strings.h> -# endif +# include <strings.h> # endif # ifdef SUN_OS # include <sys/stream.h> /* SUN */ @@ -549,7 +510,7 @@ extern "C" { # define SOAP_SOCKLEN_T SOCKLEN_T #elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(__TQNX__) || defined(TQNX) || defined(_AIX) || defined(__NetBSD__) || defined(__DragonFly__) # define SOAP_SOCKLEN_T socklen_t -#elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(__osf__) || defined(VXWORKS) +#elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(VXWORKS) # define SOAP_SOCKLEN_T int #else # define SOAP_SOCKLEN_T size_t @@ -565,10 +526,7 @@ extern "C" { #define SOAP_INVALID_SOCKET (-1) #define soap_valid_socket(n) ((n) != SOAP_INVALID_SOCKET) -#if defined(SYMBIAN) -# define LONG64 long -# define ULONG64 unsigned LONG64 -#elif !defined(WIN32) || defined(__GLIBC__) || defined(__GNU__) +#if !defined(WIN32) || defined(__GLIBC__) || defined(__GNU__) # ifndef LONG64 # define LONG64 long long # define ULONG64 unsigned LONG64 @@ -576,15 +534,10 @@ extern "C" { #elif defined(UNDER_CE) # define LONG64 __int64 # define ULONG64 unsigned LONG64 -#elif defined(__BORLANDC__) -# define LONG64 __int64 -# define ULONG64 unsigned LONG64 #endif #if defined(WIN32) # define soap_int32 __int32 -#elif defined(SYMBIAN) -# define soap_int32 long #elif defined(PALM) # define soap_int32 Int32 #else @@ -601,13 +554,8 @@ extern "C" { # define SOAP_ERANGE ERANGE # define SOAP_EINTR EINTR # define SOAP_EAGAIN EAGAIN -# ifdef SYMBIAN -# define SOAP_EWOULDBLOCK 9898 -# define SOAP_EINPROGRESS 9899 -# else -# define SOAP_EWOULDBLOCK EWOULDBLOCK -# define SOAP_EINPROGRESS EINPROGRESS -# endif +# define SOAP_EWOULDBLOCK EWOULDBLOCK +# define SOAP_EINPROGRESS EINPROGRESS #endif #ifdef WIN32 diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise.cpp b/tderesources/groupwise/tdeabc_resourcegroupwise.cpp index 7c3ed791..04ecc769 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwise.cpp +++ b/tderesources/groupwise/tdeabc_resourcegroupwise.cpp @@ -288,8 +288,8 @@ bool ResourceGroupwise::asyncLoad() { mProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n( "Loading GroupWise resource %1" ).arg( resourceName() ), TQString(), true /*CanBeCancelled*/, mPrefs->url().startsWith("https" ) ); - connect( mProgress, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelLoad() ) ); + connect( mProgress, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelLoad() ) ); } if ( addressBooks().isEmpty() ) { @@ -349,15 +349,15 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType ) mJob = TDEIO::get( url, false, false ); // TODO: make the GW jobs call finished if the URL // contains no address book IDs kdDebug() << " Job address: " << mJob << endl; - connect( mJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotReadJobData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( mJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) ); + connect( mJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotReadJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) ); if ( bookType == System ) { - connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( fetchSABResult( TDEIO::Job * ) ) ); + connect( mJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( fetchSABResult( TDEIO::Job * ) ) ); mSABProgress = KPIM::ProgressManager::instance()->createProgressItem( mProgress, KPIM::ProgressManager::getUniqueID(), i18n( "Fetching System Address Book" ), TQString(), @@ -366,8 +366,8 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType ) } else { - connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( fetchUABResult( TDEIO::Job * ) ) ); + connect( mJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( fetchUABResult( TDEIO::Job * ) ) ); mUABProgress = KPIM::ProgressManager::instance()->createProgressItem( mProgress, KPIM::ProgressManager::getUniqueID(), i18n( "Fetching User Address Books" ), TQString(), @@ -446,12 +446,12 @@ void ResourceGroupwise::updateSystemAddressBook() mJob = TDEIO::get( url, false, false ); mJob->setInteractive( false ); - connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( updateSABResult( TDEIO::Job * ) ) ); - connect( mJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotUpdateJobData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( mJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) ); + connect( mJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( updateSABResult( TDEIO::Job * ) ) ); + connect( mJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotUpdateJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) ); return; } diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise.h b/tderesources/groupwise/tdeabc_resourcegroupwise.h index b57c36e8..c573eaf9 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwise.h +++ b/tderesources/groupwise/tdeabc_resourcegroupwise.h @@ -23,7 +23,7 @@ #include "soap/groupwiseserver.h" #include <tdeabcresourcecached.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <libtdepim/progressmanager.h> @@ -37,11 +37,11 @@ namespace TDEABC { class GroupwisePrefs; -class KDE_EXPORT ResourceGroupwise : public ResourceCached +class TDE_EXPORT ResourceGroupwise : public ResourceCached { friend class ResourceGroupwiseConfig; - Q_OBJECT + TQ_OBJECT public: @@ -143,7 +143,7 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached /** DATA PROCESSING SLOTS **/ void slotReadJobData( TDEIO::Job *, const TQByteArray & ); void slotUpdateJobData( TDEIO::Job *, const TQByteArray & ); - /** HELPER TQT_SLOT **/ + /** HELPER TQ_SLOT **/ void slotJobPercent( TDEIO::Job *job, unsigned long percent ); void cancelLoad(); diff --git a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp index 49016cdd..69dd7a6f 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp +++ b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp @@ -102,7 +102,7 @@ ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* parent, const char* mainLayout->addWidget( label, 6, 0 ); mainLayout->addWidget( mAddressBookBox, 6, 1 ); - connect( updateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateAddressBookList() ) ); + connect( updateButton, TQ_SIGNAL( clicked() ), TQ_SLOT( updateAddressBookList() ) ); } void ResourceGroupwiseConfig::loadSettings( KRES::Resource *res ) diff --git a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h index 233743f8..3ebdb52c 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h +++ b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h @@ -23,7 +23,7 @@ #include "soap/groupwiseserver.h" #include <tderesources/configwidget.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tqmap.h> @@ -36,9 +36,9 @@ namespace TDEABC { class ResourceGroupwise; -class KDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/groupwise/tdeioslave/groupwise.cpp b/tderesources/groupwise/tdeioslave/groupwise.cpp index c51fa4e4..47fbb452 100644 --- a/tderesources/groupwise/tdeioslave/groupwise.cpp +++ b/tderesources/groupwise/tdeioslave/groupwise.cpp @@ -33,7 +33,7 @@ #include <tdeabc/addressee.h> #include <tdeabc/vcardconverter.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeio/global.h> #include <kdebug.h> #include <tdelocale.h> @@ -44,7 +44,7 @@ #include <unistd.h> #include <stdlib.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "groupwise.h" @@ -64,7 +64,7 @@ class ResourceMemory : public ResourceCached } extern "C" { -KDE_EXPORT int kdemain( int argc, char **argv ); +TDE_EXPORT int kdemain( int argc, char **argv ); } int kdemain( int argc, char **argv ) @@ -295,14 +295,14 @@ void Groupwise::getAddressbook( const KURL &url ) GroupwiseServer server( u, user, pass, 0 ); - connect( &server, TQT_SIGNAL( readAddressBookTotalSize( int ) ), - TQT_SLOT( slotReadAddressBookTotalSize( int ) ) ); - connect( &server, TQT_SIGNAL( readAddressBookProcessedSize( int ) ), - TQT_SLOT( slotReadAddressBookProcessedSize( int ) ) ); - connect( &server, TQT_SIGNAL( errorMessage( const TQString &, bool ) ), - TQT_SLOT( slotServerErrorMessage( const TQString &, bool ) ) ); - connect( &server, TQT_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ), - TQT_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) ); + connect( &server, TQ_SIGNAL( readAddressBookTotalSize( int ) ), + TQ_SLOT( slotReadAddressBookTotalSize( int ) ) ); + connect( &server, TQ_SIGNAL( readAddressBookProcessedSize( int ) ), + TQ_SLOT( slotReadAddressBookProcessedSize( int ) ) ); + connect( &server, TQ_SIGNAL( errorMessage( const TQString &, bool ) ), + TQ_SLOT( slotServerErrorMessage( const TQString &, bool ) ) ); + connect( &server, TQ_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ), + TQ_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) ); kdDebug() << "Login" << endl; if ( !server.login() ) { @@ -369,10 +369,10 @@ void Groupwise::updateAddressbook( const KURL &url ) debugMessage( "update IDs: " + ids.join( "," ) ); GroupwiseServer server( u, user, pass, 0 ); - connect( &server, TQT_SIGNAL( errorMessage( const TQString &, bool ) ), - TQT_SLOT( slotServerErrorMessage( const TQString &, bool ) ) ); - connect( &server, TQT_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ), - TQT_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) ); + connect( &server, TQ_SIGNAL( errorMessage( const TQString &, bool ) ), + TQ_SLOT( slotServerErrorMessage( const TQString &, bool ) ) ); + connect( &server, TQ_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ), + TQ_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) ); kdDebug() << " Login" << endl; if ( !server.login() ) { diff --git a/tderesources/groupwise/tdeioslave/groupwise.h b/tderesources/groupwise/tdeioslave/groupwise.h index 5004682d..73fb48bb 100644 --- a/tderesources/groupwise/tdeioslave/groupwise.h +++ b/tderesources/groupwise/tdeioslave/groupwise.h @@ -26,7 +26,7 @@ class Groupwise : public TQObject, public TDEIO::SlaveBase { - Q_OBJECT + TQ_OBJECT public: void get( const KURL &url ); |