From 86d8364ac704bdc8ad2dfcf52307d9626cfac567 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:37:21 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kioslaves/opengroupware/opengroupware.cpp | 12 ++++++------ kioslaves/opengroupware/opengroupware.h | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'kioslaves/opengroupware') diff --git a/kioslaves/opengroupware/opengroupware.cpp b/kioslaves/opengroupware/opengroupware.cpp index 70ffd7dcc..b4c19b711 100644 --- a/kioslaves/opengroupware/opengroupware.cpp +++ b/kioslaves/opengroupware/opengroupware.cpp @@ -193,9 +193,9 @@ void OpenGroupware::getCalendar( const KURL &_url ) kdDebug(7000) << "getCalendar: " << url.prettyURL() << endl; // FIXME do progress handling - mListEventsJob = KIO::davPropFind( url, props, "0", false ); - connect( mListEventsJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotGetCalendarListingResult( KIO::Job * ) ) ); + mListEventsJob = TDEIO::davPropFind( url, props, "0", false ); + connect( mListEventsJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotGetCalendarListingResult( TDEIO::Job * ) ) ); } void OpenGroupware::getAddressbook( const KURL &url ) @@ -205,7 +205,7 @@ void OpenGroupware::getAddressbook( const KURL &url ) void OpenGroupware::errorMessage( const TQString &msg ) { - error( KIO::ERR_SLAVE_DEFINED, msg ); + error( TDEIO::ERR_SLAVE_DEFINED, msg ); } void OpenGroupware::debugMessage( const TQString &msg ) @@ -218,7 +218,7 @@ void OpenGroupware::debugMessage( const TQString &msg ) } -void OpenGroupware::slotGetCalendarListingResult( KIO::Job *job ) +void OpenGroupware::slotGetCalendarListingResult( TDEIO::Job *job ) { kdDebug(7000) << k_funcinfo << endl; @@ -242,7 +242,7 @@ void OpenGroupware::slotGetCalendarListingResult( KIO::Job *job ) } -void OpenGroupware::slotGetCalendarResult( KIO::Job *job ) +void OpenGroupware::slotGetCalendarResult( TDEIO::Job *job ) { Q_UNUSED( job ); } diff --git a/kioslaves/opengroupware/opengroupware.h b/kioslaves/opengroupware/opengroupware.h index 075af372a..da104c8cf 100644 --- a/kioslaves/opengroupware/opengroupware.h +++ b/kioslaves/opengroupware/opengroupware.h @@ -24,13 +24,13 @@ #include -namespace KIO { +namespace TDEIO { class Job; class DavJob; } -class OpenGroupware : public TQObject, public KIO::SlaveBase +class OpenGroupware : public TQObject, public TDEIO::SlaveBase { Q_OBJECT @@ -48,10 +48,10 @@ class OpenGroupware : public TQObject, public KIO::SlaveBase void getCalendar( const KURL &url ); void getAddressbook( const KURL &url ); protected slots: - void slotGetCalendarListingResult( KIO::Job* ); - void slotGetCalendarResult( KIO::Job* ); + void slotGetCalendarListingResult( TDEIO::Job* ); + void slotGetCalendarResult( TDEIO::Job* ); private: - KIO::DavJob *mListEventsJob; + TDEIO::DavJob *mListEventsJob; }; #endif -- cgit v1.2.1