summaryrefslogtreecommitdiffstats
path: root/kresources/groupwise
diff options
context:
space:
mode:
Diffstat (limited to 'kresources/groupwise')
-rw-r--r--kresources/groupwise/kabc_resourcegroupwise.cpp52
-rw-r--r--kresources/groupwise/kabc_resourcegroupwise.h22
-rw-r--r--kresources/groupwise/kcal_resourcegroupwise.cpp20
-rw-r--r--kresources/groupwise/kcal_resourcegroupwise.h12
-rw-r--r--kresources/groupwise/kioslave/groupwise.cpp4
-rw-r--r--kresources/groupwise/kioslave/groupwise.h2
-rw-r--r--kresources/groupwise/soap/groupwiseserver.cpp2
-rw-r--r--kresources/groupwise/soap/ksslsocket.cpp10
-rw-r--r--kresources/groupwise/soap/ksslsocket.h2
9 files changed, 63 insertions, 63 deletions
diff --git a/kresources/groupwise/kabc_resourcegroupwise.cpp b/kresources/groupwise/kabc_resourcegroupwise.cpp
index d14d1a419..b3930bfbe 100644
--- a/kresources/groupwise/kabc_resourcegroupwise.cpp
+++ b/kresources/groupwise/kabc_resourcegroupwise.cpp
@@ -33,7 +33,7 @@
using namespace KABC;
-ResourceGroupwise::ResourceGroupwise( const KConfig *config )
+ResourceGroupwise::ResourceGroupwise( const TDEConfig *config )
: ResourceCached( config )
{
init();
@@ -95,14 +95,14 @@ ResourceGroupwise::~ResourceGroupwise()
mPrefs = 0;
}
-void ResourceGroupwise::readConfig( const KConfig * )
+void ResourceGroupwise::readConfig( const TDEConfig * )
{
mPrefs->readConfig();
readAddressBooks();
}
-void ResourceGroupwise::writeConfig( KConfig *config )
+void ResourceGroupwise::writeConfig( TDEConfig *config )
{
Resource::writeConfig( config );
@@ -346,18 +346,18 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType )
return;
}
- mJob = KIO::get( url, false, false ); // TODO: make the GW jobs call finished if the URL
+ 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( KIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotReadJobData( KIO::Job *, const TQByteArray & ) ) );
- connect( mJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ),
- TQT_SLOT( slotJobPercent( KIO::Job *, unsigned long ) ) );
+ 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 ) ) );
if ( bookType == System )
{
- connect( mJob, TQT_SIGNAL( result( KIO::Job * ) ),
- TQT_SLOT( fetchSABResult( KIO::Job * ) ) );
+ connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ TQT_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( KIO::Job * ) ),
- TQT_SLOT( fetchUABResult( KIO::Job * ) ) );
+ connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ TQT_SLOT( fetchUABResult( TDEIO::Job * ) ) );
mUABProgress = KPIM::ProgressManager::instance()->createProgressItem(
mProgress, KPIM::ProgressManager::getUniqueID(),
i18n( "Fetching User Address Books" ), TQString(),
@@ -378,7 +378,7 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType )
return;
}
-void ResourceGroupwise::fetchSABResult( KIO::Job *job )
+void ResourceGroupwise::fetchSABResult( TDEIO::Job *job )
{
kdDebug() << "ResourceGroupwise::fetchSABResult() " << endl;
@@ -402,7 +402,7 @@ void ResourceGroupwise::fetchSABResult( KIO::Job *job )
loadCompleted();
}
-void ResourceGroupwise::fetchUABResult( KIO::Job *job )
+void ResourceGroupwise::fetchUABResult( TDEIO::Job *job )
{
kdDebug() << "ResourceGroupwise::fetchUABResult() " << endl;
@@ -444,19 +444,19 @@ void ResourceGroupwise::updateSystemAddressBook()
false /*CannotBeCancelled*/,
mPrefs->url().startsWith("https" ) );
- mJob = KIO::get( url, false, false );
+ mJob = TDEIO::get( url, false, false );
mJob->setInteractive( false );
- connect( mJob, TQT_SIGNAL( result( KIO::Job * ) ),
- TQT_SLOT( updateSABResult( KIO::Job * ) ) );
- connect( mJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotUpdateJobData( KIO::Job *, const TQByteArray & ) ) );
- connect( mJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ),
- TQT_SLOT( slotJobPercent( KIO::Job *, unsigned long ) ) );
+ 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 ) ) );
return;
}
-void ResourceGroupwise::updateSABResult( KIO::Job *job )
+void ResourceGroupwise::updateSABResult( TDEIO::Job *job )
{
kdDebug() << "ResourceGroupwise::updateSABResult() " << endl;
@@ -467,7 +467,7 @@ void ResourceGroupwise::updateSABResult( KIO::Job *job )
int errorCode = job->error();
if ( errorCode != 0 ) {
- if ( errorCode == KIO::ERR_NO_CONTENT ) // we need to refresh the SAB
+ if ( errorCode == TDEIO::ERR_NO_CONTENT ) // we need to refresh the SAB
{
kdDebug() << " update SAB failed, fetching all of it again" << endl;
mPrefs->setLastSequenceNumber( 0 );
@@ -486,7 +486,7 @@ void ResourceGroupwise::updateSABResult( KIO::Job *job )
loadCompleted();
}
-void ResourceGroupwise::slotReadJobData( KIO::Job *job , const TQByteArray &data )
+void ResourceGroupwise::slotReadJobData( TDEIO::Job *job , const TQByteArray &data )
{
kdDebug() << "ResourceGroupwise::slotReadJobData()" << endl;
Q_UNUSED( job );
@@ -520,7 +520,7 @@ void ResourceGroupwise::slotReadJobData( KIO::Job *job , const TQByteArray &data
mJobData = TQString();
}
-void ResourceGroupwise::slotUpdateJobData( KIO::Job *job, const TQByteArray &data )
+void ResourceGroupwise::slotUpdateJobData( TDEIO::Job *job, const TQByteArray &data )
{
kdDebug() << "ResourceGroupwise::slotUpdateJobData()" << endl;
kdDebug() << " Job address: " << job << endl;
@@ -585,7 +585,7 @@ void ResourceGroupwise::loadCompleted()
addressBook()->emitAddressBookChanged();
}
-void ResourceGroupwise::slotJobPercent( KIO::Job *, unsigned long percent )
+void ResourceGroupwise::slotJobPercent( TDEIO::Job *, unsigned long percent )
{
// TODO: make this act on the correct progress item
kdDebug() << "ResourceGroupwise::slotJobPercent() " << percent << endl;
diff --git a/kresources/groupwise/kabc_resourcegroupwise.h b/kresources/groupwise/kabc_resourcegroupwise.h
index 23912916e..658ddd76b 100644
--- a/kresources/groupwise/kabc_resourcegroupwise.h
+++ b/kresources/groupwise/kabc_resourcegroupwise.h
@@ -29,7 +29,7 @@
#include <kio/job.h>
-class KConfig;
+class TDEConfig;
class GroupwiseServer;
@@ -45,15 +45,15 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached
public:
- ResourceGroupwise( const KConfig * );
+ ResourceGroupwise( const TDEConfig * );
ResourceGroupwise( const KURL &url,
const TQString &user, const TQString &password,
const TQStringList &readAddressBooks,
const TQString &writeAddressBook );
~ResourceGroupwise();
- void readConfig( const KConfig * );
- void writeConfig( KConfig * );
+ void readConfig( const TDEConfig * );
+ void writeConfig( TDEConfig * );
void readAddressBooks();
void writeAddressBooks();
@@ -137,14 +137,14 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached
private slots:
/** STATE CHANGING SLOTS **/
- void fetchSABResult( KIO::Job * );
- void fetchUABResult( KIO::Job * );
- void updateSABResult( KIO::Job * );
+ void fetchSABResult( TDEIO::Job * );
+ void fetchUABResult( TDEIO::Job * );
+ void updateSABResult( TDEIO::Job * );
/** DATA PROCESSING SLOTS **/
- void slotReadJobData( KIO::Job *, const TQByteArray & );
- void slotUpdateJobData( KIO::Job *, const TQByteArray & );
+ void slotReadJobData( TDEIO::Job *, const TQByteArray & );
+ void slotUpdateJobData( TDEIO::Job *, const TQByteArray & );
/** HELPER TQT_SLOT **/
- void slotJobPercent( KIO::Job *job, unsigned long percent );
+ void slotJobPercent( TDEIO::Job *job, unsigned long percent );
void cancelLoad();
private:
@@ -153,7 +153,7 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached
GroupwiseServer *mServer;
- KIO::TransferJob *mJob;
+ TDEIO::TransferJob *mJob;
KPIM::ProgressItem *mProgress;
KPIM::ProgressItem *mSABProgress;
KPIM::ProgressItem *mUABProgress;
diff --git a/kresources/groupwise/kcal_resourcegroupwise.cpp b/kresources/groupwise/kcal_resourcegroupwise.cpp
index 060fe5f20..ed5fd3ae7 100644
--- a/kresources/groupwise/kcal_resourcegroupwise.cpp
+++ b/kresources/groupwise/kcal_resourcegroupwise.cpp
@@ -55,7 +55,7 @@ ResourceGroupwise::ResourceGroupwise()
mPrefs->addGroupPrefix( identifier() );
}
-ResourceGroupwise::ResourceGroupwise( const KConfig *config )
+ResourceGroupwise::ResourceGroupwise( const TDEConfig *config )
: ResourceCached( config ), mLock( true )
{
init();
@@ -92,7 +92,7 @@ GroupwisePrefsBase *ResourceGroupwise::prefs()
return mPrefs;
}
-void ResourceGroupwise::readConfig( const KConfig *config )
+void ResourceGroupwise::readConfig( const TDEConfig *config )
{
kdDebug() << "KCal::ResourceGroupwise::readConfig()" << endl;
@@ -101,7 +101,7 @@ void ResourceGroupwise::readConfig( const KConfig *config )
ResourceCached::readConfig( config );
}
-void ResourceGroupwise::writeConfig( KConfig *config )
+void ResourceGroupwise::writeConfig( TDEConfig *config )
{
kdDebug() << "KCal::ResourceGroupwise::writeConfig()" << endl;
@@ -157,11 +157,11 @@ bool ResourceGroupwise::doLoad()
mJobData = TQString();
- mDownloadJob = KIO::get( url, false, false );
- connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ),
- TQT_SLOT( slotJobResult( KIO::Job * ) ) );
- connect( mDownloadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotJobData( KIO::Job *, const TQByteArray & ) ) );
+ 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 & ) ) );
mProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Downloading calendar") );
@@ -172,7 +172,7 @@ bool ResourceGroupwise::doLoad()
return true;
}
-void ResourceGroupwise::slotJobResult( KIO::Job *job )
+void ResourceGroupwise::slotJobResult( TDEIO::Job *job )
{
kdDebug() << "ResourceGroupwise::slotJobResult(): " << endl;
@@ -220,7 +220,7 @@ void ResourceGroupwise::slotJobResult( KIO::Job *job )
mProgress = 0;
}
-void ResourceGroupwise::slotJobData( KIO::Job *, const TQByteArray &data )
+void ResourceGroupwise::slotJobData( TDEIO::Job *, const TQByteArray &data )
{
// kdDebug() << "ResourceGroupwise::slotJobData()" << endl;
diff --git a/kresources/groupwise/kcal_resourcegroupwise.h b/kresources/groupwise/kcal_resourcegroupwise.h
index 09e0b6d47..088e624a6 100644
--- a/kresources/groupwise/kcal_resourcegroupwise.h
+++ b/kresources/groupwise/kcal_resourcegroupwise.h
@@ -49,11 +49,11 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached
public:
ResourceGroupwise();
- ResourceGroupwise( const KConfig * );
+ ResourceGroupwise( const TDEConfig * );
virtual ~ResourceGroupwise();
- void readConfig( const KConfig *config );
- void writeConfig( KConfig *config );
+ void readConfig( const TDEConfig *config );
+ void writeConfig( TDEConfig *config );
GroupwisePrefsBase *prefs();
@@ -73,8 +73,8 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached
bool confirmSave();
protected slots:
- void slotJobResult( KIO::Job * );
- void slotJobData( KIO::Job *, const TQByteArray & );
+ void slotJobResult( TDEIO::Job * );
+ void slotJobData( TDEIO::Job *, const TQByteArray & );
void cancelLoad();
@@ -82,7 +82,7 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached
GroupwisePrefsBase *mPrefs;
KABC::LockNull mLock;
- KIO::TransferJob *mDownloadJob;
+ TDEIO::TransferJob *mDownloadJob;
KPIM::ProgressItem *mProgress;
TQString mJobData;
diff --git a/kresources/groupwise/kioslave/groupwise.cpp b/kresources/groupwise/kioslave/groupwise.cpp
index e22d95dd5..c3addd3b0 100644
--- a/kresources/groupwise/kioslave/groupwise.cpp
+++ b/kresources/groupwise/kioslave/groupwise.cpp
@@ -381,7 +381,7 @@ void Groupwise::updateAddressbook( const KURL &url )
kdDebug() << " Updating Addressbook" << endl;
if ( !server.updateAddressBooks( ids, lastSequenceNumber + 1, lastPORebuildTime ) )
{
- error( KIO::ERR_NO_CONTENT, server.errorText() );
+ error( TDEIO::ERR_NO_CONTENT, server.errorText() );
//errorMessage( i18n("Unable to update addressbook data: ") + server.errorText() );
}
kdDebug() << " Logout" << endl;
@@ -393,7 +393,7 @@ void Groupwise::updateAddressbook( const KURL &url )
void Groupwise::errorMessage( const TQString &msg )
{
- error( KIO::ERR_SLAVE_DEFINED, msg );
+ error( TDEIO::ERR_SLAVE_DEFINED, msg );
}
void Groupwise::debugMessage( const TQString &msg )
diff --git a/kresources/groupwise/kioslave/groupwise.h b/kresources/groupwise/kioslave/groupwise.h
index 3d110af8e..c5f109d30 100644
--- a/kresources/groupwise/kioslave/groupwise.h
+++ b/kresources/groupwise/kioslave/groupwise.h
@@ -24,7 +24,7 @@
#include <tqobject.h>
-class Groupwise : public TQObject, public KIO::SlaveBase
+class Groupwise : public TQObject, public TDEIO::SlaveBase
{
Q_OBJECT
diff --git a/kresources/groupwise/soap/groupwiseserver.cpp b/kresources/groupwise/soap/groupwiseserver.cpp
index 9a2f44274..9112fdeab 100644
--- a/kresources/groupwise/soap/groupwiseserver.cpp
+++ b/kresources/groupwise/soap/groupwiseserver.cpp
@@ -284,7 +284,7 @@ GroupwiseServer::GroupwiseServer( const TQString &url, const TQString &user,
mSoap->frecv = myReceiveCallback;
mSoap->fclose = myClose;
- KConfig cfg( "groupwiserc" );
+ TDEConfig cfg( "groupwiserc" );
cfg.setGroup( "Debug" );
mLogFile = cfg.readEntry( "LogFile" );
diff --git a/kresources/groupwise/soap/ksslsocket.cpp b/kresources/groupwise/soap/ksslsocket.cpp
index cd66fc500..90ccf83d6 100644
--- a/kresources/groupwise/soap/ksslsocket.cpp
+++ b/kresources/groupwise/soap/ksslsocket.cpp
@@ -161,14 +161,14 @@ TQString KSSLSocket::metaData( const TQString &key )
}
/*
-I basically copied the below from tcpKIO::SlaveBase.hpp, with some modificaions and formatting.
+I basically copied the below from tcpTDEIO::SlaveBase.hpp, with some modificaions and formatting.
* Copyright (C) 2000 Alex Zepeda <zipzippy@sonic.net
* Copyright (C) 2001-2003 George Staikos <staikos@kde.org>
* Copyright (C) 2001 Dawit Alemayehu <adawit@kde.org>
*/
-int KSSLSocket::messageBox( KIO::SlaveBase::MessageBoxType type, const TQString &text, const TQString &caption,
+int KSSLSocket::messageBox( TDEIO::SlaveBase::MessageBoxType type, const TQString &text, const TQString &caption,
const TQString &buttonYes, const TQString &buttonNo )
{
kdDebug(0) << "messageBox " << type << " " << text << " - " << caption << buttonYes << buttonNo << endl;
@@ -324,7 +324,7 @@ int KSSLSocket::verifyCertificate()
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,
+ result = messageBox( TDEIO::SlaveBase::WarningYesNoCancel,
msg.arg(ourHost),
i18n("Server Authentication"),
i18n("&Details"),
@@ -334,7 +334,7 @@ int KSSLSocket::verifyCertificate()
{
TQString msg = i18n("The server certificate failed the "
"authenticity test (%1).");
- result = messageBox( KIO::SlaveBase::WarningYesNoCancel,
+ result = messageBox( TDEIO::SlaveBase::WarningYesNoCancel,
msg.arg(ourHost),
i18n("Server Authentication"),
i18n("&Details"),
@@ -348,7 +348,7 @@ int KSSLSocket::verifyCertificate()
rc = 1;
cp = KSSLCertificateCache::Accept;
doAddHost = true;
- result = messageBox( KIO::SlaveBase::WarningYesNo,
+ result = messageBox( TDEIO::SlaveBase::WarningYesNo,
i18n("Would you like to accept this "
"certificate forever without "
"being prompted?"),
diff --git a/kresources/groupwise/soap/ksslsocket.h b/kresources/groupwise/soap/ksslsocket.h
index a83672369..c19b440a1 100644
--- a/kresources/groupwise/soap/ksslsocket.h
+++ b/kresources/groupwise/soap/ksslsocket.h
@@ -46,7 +46,7 @@ class KSSLSocket : public KExtendedSocket
private:
int verifyCertificate();
- int messageBox( KIO::SlaveBase::MessageBoxType type, const TQString &text,
+ int messageBox( TDEIO::SlaveBase::MessageBoxType type, const TQString &text,
const TQString &caption, const TQString &buttonYes, const TQString &buttonNo );
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-06 01:46:41 +0000