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 --- kresources/egroupware/kabc_resourcexmlrpc.cpp | 4 ++-- kresources/egroupware/kabc_resourcexmlrpc.h | 6 +++--- kresources/egroupware/kcal_resourcexmlrpc.cpp | 6 +++--- kresources/egroupware/kcal_resourcexmlrpc.h | 6 +++--- kresources/egroupware/knotes_resourcexmlrpc.cpp | 6 +++--- kresources/egroupware/knotes_resourcexmlrpc.h | 6 +++--- kresources/egroupware/synchronizer.h | 8 ++++---- kresources/egroupware/xmlrpciface.cpp | 16 ++++++++-------- kresources/egroupware/xmlrpciface.h | 8 ++++---- 9 files changed, 33 insertions(+), 33 deletions(-) (limited to 'kresources/egroupware') diff --git a/kresources/egroupware/kabc_resourcexmlrpc.cpp b/kresources/egroupware/kabc_resourcexmlrpc.cpp index 222c4f4f..84e78382 100644 --- a/kresources/egroupware/kabc_resourcexmlrpc.cpp +++ b/kresources/egroupware/kabc_resourcexmlrpc.cpp @@ -57,7 +57,7 @@ static int rights( const KABC::Addressee &addr ) return addr.custom( "EGWRESOURCE", "RIGHTS" ).toInt(); } -ResourceXMLRPC::ResourceXMLRPC( const KConfig *config ) +ResourceXMLRPC::ResourceXMLRPC( const TDEConfig *config ) : ResourceCached( config ), mServer( 0 ) { init(); @@ -122,7 +122,7 @@ ResourceXMLRPC::~ResourceXMLRPC() mSynchronizer = 0; } -void ResourceXMLRPC::writeConfig( KConfig *config ) +void ResourceXMLRPC::writeConfig( TDEConfig *config ) { Resource::writeConfig( config ); diff --git a/kresources/egroupware/kabc_resourcexmlrpc.h b/kresources/egroupware/kabc_resourcexmlrpc.h index 93ba6650..d9b745aa 100644 --- a/kresources/egroupware/kabc_resourcexmlrpc.h +++ b/kresources/egroupware/kabc_resourcexmlrpc.h @@ -26,7 +26,7 @@ #include "libtdepim/kabcresourcecached.h" -class KConfig; +class TDEConfig; class Synchronizer; namespace KXMLRPC { @@ -43,12 +43,12 @@ class KDE_EXPORT ResourceXMLRPC : public ResourceCached public: - ResourceXMLRPC( const KConfig* ); + ResourceXMLRPC( const TDEConfig* ); ResourceXMLRPC( const TQString &url, const TQString &domain, const TQString &user, const TQString &password ); ~ResourceXMLRPC(); - virtual void writeConfig( KConfig* ); + virtual void writeConfig( TDEConfig* ); EGroupwarePrefs *prefs() const { return mPrefs; } diff --git a/kresources/egroupware/kcal_resourcexmlrpc.cpp b/kresources/egroupware/kcal_resourcexmlrpc.cpp index 8841da75..1224a27c 100644 --- a/kresources/egroupware/kcal_resourcexmlrpc.cpp +++ b/kresources/egroupware/kcal_resourcexmlrpc.cpp @@ -103,7 +103,7 @@ static int rights( Incidence *incidence ) return incidence->customProperty( "EGWRESOURCE", "RIGHTS" ).toInt(); } -ResourceXMLRPC::ResourceXMLRPC( const KConfig* config ) +ResourceXMLRPC::ResourceXMLRPC( const TDEConfig* config ) : ResourceCached( config ), mServer( 0 ), mLock( 0 ) { init(); @@ -164,14 +164,14 @@ void ResourceXMLRPC::initEGroupware() KURL url( mPrefs->url() ); } -void ResourceXMLRPC::readConfig( const KConfig* config ) +void ResourceXMLRPC::readConfig( const TDEConfig* config ) { mPrefs->readConfig(); ResourceCached::readConfig( config ); } -void ResourceXMLRPC::writeConfig( KConfig* config ) +void ResourceXMLRPC::writeConfig( TDEConfig* config ) { ResourceCalendar::writeConfig( config ); diff --git a/kresources/egroupware/kcal_resourcexmlrpc.h b/kresources/egroupware/kcal_resourcexmlrpc.h index de603307..5253baba 100644 --- a/kresources/egroupware/kcal_resourcexmlrpc.h +++ b/kresources/egroupware/kcal_resourcexmlrpc.h @@ -56,12 +56,12 @@ class KDE_EXPORT ResourceXMLRPC : public ResourceCached public: - ResourceXMLRPC( const KConfig* ); + ResourceXMLRPC( const TDEConfig* ); ResourceXMLRPC(); virtual ~ResourceXMLRPC(); - void readConfig( const KConfig* config ); - void writeConfig( KConfig* config ); + void readConfig( const TDEConfig* config ); + void writeConfig( TDEConfig* config ); EGroupwarePrefs *prefs() const { return mPrefs; } diff --git a/kresources/egroupware/knotes_resourcexmlrpc.cpp b/kresources/egroupware/knotes_resourcexmlrpc.cpp index c9a9a1bf..1b19831b 100644 --- a/kresources/egroupware/knotes_resourcexmlrpc.cpp +++ b/kresources/egroupware/knotes_resourcexmlrpc.cpp @@ -49,7 +49,7 @@ static const TQString AddNoteCommand = "infolog.boinfolog.write"; static const TQString DeleteNoteCommand = "infolog.boinfolog.delete"; static const TQString LoadNoteCategoriesCommand = "infolog.boinfolog.categories"; -ResourceXMLRPC::ResourceXMLRPC( const KConfig* config ) +ResourceXMLRPC::ResourceXMLRPC( const TDEConfig* config ) : ResourceNotes( config ), mCalendar( TQString::fromLatin1("UTC") ), mServer( 0 ) { @@ -94,12 +94,12 @@ void ResourceXMLRPC::init() mSynchronizer = new Synchronizer; } -void ResourceXMLRPC::readConfig( const KConfig* ) +void ResourceXMLRPC::readConfig( const TDEConfig* ) { mPrefs->readConfig(); } -void ResourceXMLRPC::writeConfig( KConfig* config ) +void ResourceXMLRPC::writeConfig( TDEConfig* config ) { ResourceNotes::writeConfig( config ); diff --git a/kresources/egroupware/knotes_resourcexmlrpc.h b/kresources/egroupware/knotes_resourcexmlrpc.h index c7bee901..df8a4dd3 100644 --- a/kresources/egroupware/knotes_resourcexmlrpc.h +++ b/kresources/egroupware/knotes_resourcexmlrpc.h @@ -52,12 +52,12 @@ class KDE_EXPORT ResourceXMLRPC : public ResourceNotes public: - ResourceXMLRPC( const KConfig* ); + ResourceXMLRPC( const TDEConfig* ); ResourceXMLRPC(); virtual ~ResourceXMLRPC(); - void readConfig( const KConfig* config ); - void writeConfig( KConfig* config ); + void readConfig( const TDEConfig* config ); + void writeConfig( TDEConfig* config ); EGroupwarePrefs *prefs() const { return mPrefs; } diff --git a/kresources/egroupware/synchronizer.h b/kresources/egroupware/synchronizer.h index 97270e31..e9183bd2 100644 --- a/kresources/egroupware/synchronizer.h +++ b/kresources/egroupware/synchronizer.h @@ -36,15 +36,15 @@ ... - job = KIO::file_copy( url, file, -1, true ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotResult( KIO::Job * ) ) ); + job = TDEIO::file_copy( url, file, -1, true ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotResult( TDEIO::Job * ) ) ); mSynchronizer.start(); // will block here until the slot was called ... - void slotResult( KIO::Job* ) + void slotResult( TDEIO::Job* ) { mSynchronizer.stop(); } diff --git a/kresources/egroupware/xmlrpciface.cpp b/kresources/egroupware/xmlrpciface.cpp index fd12d174..d43613e6 100644 --- a/kresources/egroupware/xmlrpciface.cpp +++ b/kresources/egroupware/xmlrpciface.cpp @@ -69,7 +69,7 @@ void Query::call( const TQString &server, const TQString &method, TQDataStream stream( postData, IO_WriteOnly ); stream.writeRawBytes( xmlMarkup.utf8(), xmlMarkup.utf8().length() ); - KIO::TransferJob *job = KIO::http_post( KURL( server ), postData, false ); + TDEIO::TransferJob *job = TDEIO::http_post( KURL( server ), postData, false ); if ( !job ) { kdWarning() << "Unable to create KIO job for " << server << endl; return; @@ -78,22 +78,22 @@ void Query::call( const TQString &server, const TQString &method, job->addMetaData( "content-type", "Content-Type: text/xml; charset=utf-8" ); job->addMetaData( "ConnectTimeout", "50" ); - connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), - this, TQT_SLOT( slotData( KIO::Job *, const TQByteArray & ) ) ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - this, TQT_SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + this, TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); m_pendingJobs.append( job ); } -void Query::slotData( KIO::Job *, const TQByteArray &data ) +void Query::slotData( TDEIO::Job *, const TQByteArray &data ) { unsigned int oldSize = m_buffer.size(); m_buffer.resize( oldSize + data.size() ); memcpy( m_buffer.data() + oldSize, data.data(), data.size() ); } -void Query::slotResult( KIO::Job *job ) +void Query::slotResult( TDEIO::Job *job ) { m_pendingJobs.remove( job ); @@ -316,7 +316,7 @@ Query::Query( const TQVariant &id, TQObject *parent, const char *name ) Query::~Query() { - TQValueList::Iterator it; + TQValueList::Iterator it; for ( it = m_pendingJobs.begin(); it != m_pendingJobs.end(); ++it ) (*it)->kill(); } diff --git a/kresources/egroupware/xmlrpciface.h b/kresources/egroupware/xmlrpciface.h index 395cf237..df2f3a6d 100644 --- a/kresources/egroupware/xmlrpciface.h +++ b/kresources/egroupware/xmlrpciface.h @@ -18,7 +18,7 @@ #include #include -namespace KIO +namespace TDEIO { class Job; } @@ -51,8 +51,8 @@ namespace KXMLRPC void finished( Query* ); private slots: - void slotData( KIO::Job *job, const TQByteArray &data ); - void slotResult( KIO::Job *job ); + void slotData( TDEIO::Job *job, const TQByteArray &data ); + void slotResult( TDEIO::Job *job ); private: bool isMessageResponse( const TQDomDocument &doc ) const; @@ -72,7 +72,7 @@ namespace KXMLRPC TQByteArray m_buffer; TQVariant m_id; - TQValueList m_pendingJobs; + TQValueList m_pendingJobs; }; class Server : public TQObject -- cgit v1.2.3