diff options
Diffstat (limited to 'kresources/scalix')
23 files changed, 173 insertions, 173 deletions
diff --git a/kresources/scalix/kabc/resourcescalix.cpp b/kresources/scalix/kabc/resourcescalix.cpp index 94cec32a..42aef92d 100644 --- a/kresources/scalix/kabc/resourcescalix.cpp +++ b/kresources/scalix/kabc/resourcescalix.cpp @@ -59,7 +59,7 @@ using namespace Scalix; class ScalixFactory : public KRES::PluginFactoryBase { public: - KRES::Resource *resource( const KConfig *config ) + KRES::Resource *resource( const TDEConfig *config ) { return new KABC::ResourceScalix( config ); } @@ -77,7 +77,7 @@ static const char* s_attachmentMimeTypeContact = "application/x-vnd.kolab.contac static const char* s_attachmentMimeTypeDistList = "application/x-vnd.kolab.contact.distlist"; static const char* s_inlineMimeType = "application/scalix-properties"; -KABC::ResourceScalix::ResourceScalix( const KConfig *config ) +KABC::ResourceScalix::ResourceScalix( const TDEConfig *config ) : KPIM::ResourceABC( config ), Scalix::ResourceScalixBase( "ResourceScalix-KABC" ), mCachedSubresource( TQString() ), mLocked( false ) @@ -94,12 +94,12 @@ KABC::ResourceScalix::~ResourceScalix() } } -void KABC::ResourceScalix::loadSubResourceConfig( KConfig& config, +void KABC::ResourceScalix::loadSubResourceConfig( TDEConfig& config, const TQString& name, const TQString& label, bool writable ) { - KConfigGroup group( &config, name ); + TDEConfigGroup group( &config, name ); bool active = group.readBoolEntry( "Active", true ); int completionWeight = group.readNumEntry( "CompletionWeight", 80 ); mSubResources.insert( name, Scalix::SubResource( active, writable, label, @@ -108,7 +108,7 @@ void KABC::ResourceScalix::loadSubResourceConfig( KConfig& config, bool KABC::ResourceScalix::doOpen() { - KConfig config( configFile() ); + TDEConfig config( configFile() ); // Read the calendar entries TQValueList<KMailICalIface::SubResource> subResources; @@ -125,7 +125,7 @@ bool KABC::ResourceScalix::doOpen() void KABC::ResourceScalix::doClose() { - KConfig config( configFile() ); + TDEConfig config( configFile() ); Scalix::ResourceMap::ConstIterator it; for ( it = mSubResources.begin(); it != mSubResources.end(); ++it ) { @@ -487,7 +487,7 @@ void KABC::ResourceScalix::fromKMailAddSubresource( const TQString& type, // Already registered return; - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.setGroup( "Contact" ); loadSubResourceConfig( config, subResource, label, writable ); loadSubResource( subResource ); @@ -507,7 +507,7 @@ void KABC::ResourceScalix::fromKMailDelSubresource( const TQString& type, // Ok, it's our job, and we have it here mSubResources.erase( subResource ); - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.deleteGroup( subResource ); config.sync(); diff --git a/kresources/scalix/kabc/resourcescalix.h b/kresources/scalix/kabc/resourcescalix.h index 82c23819..dbb0b93c 100644 --- a/kresources/scalix/kabc/resourcescalix.h +++ b/kresources/scalix/kabc/resourcescalix.h @@ -60,7 +60,7 @@ public: /** * Constructor */ - ResourceScalix( const KConfig* ); + ResourceScalix( const TDEConfig* ); /** * Destructor. @@ -149,7 +149,7 @@ protected: void doClose(); - void loadSubResourceConfig( KConfig& config, const TQString& name, + void loadSubResourceConfig( TDEConfig& config, const TQString& name, const TQString& label, bool writable ); bool loadSubResource( const TQString& subResource ); bool loadSubResourceHelper( const TQString& subResource, const char* mimetype, KMailICalIface::StorageFormat format ); diff --git a/kresources/scalix/kabc/resourcescalix_plugin.cpp b/kresources/scalix/kabc/resourcescalix_plugin.cpp index c6fe224c..bbf7a436 100644 --- a/kresources/scalix/kabc/resourcescalix_plugin.cpp +++ b/kresources/scalix/kabc/resourcescalix_plugin.cpp @@ -38,7 +38,7 @@ using namespace Scalix; class ScalixFactory : public KRES::PluginFactoryBase { public: - KRES::Resource *resource( const KConfig *config ) + KRES::Resource *resource( const TDEConfig *config ) { return new KABC::ResourceScalix( config ); } diff --git a/kresources/scalix/kcal/resourcescalix.cpp b/kresources/scalix/kcal/resourcescalix.cpp index eeebb32f..a757c81f 100644 --- a/kresources/scalix/kcal/resourcescalix.cpp +++ b/kresources/scalix/kcal/resourcescalix.cpp @@ -61,7 +61,7 @@ static const char* journalAttachmentMimeType = "application/x-vnd.kolab.journal" static const char* incidenceInlineMimeType = "text/calendar"; -ResourceScalix::ResourceScalix( const KConfig *config ) +ResourceScalix::ResourceScalix( const TDEConfig *config ) : ResourceCalendar( config ), ResourceScalixBase( "ResourceScalix-libkcal" ), mCalendar( TQString::fromLatin1("UTC") ), mOpen( false ) { @@ -79,18 +79,18 @@ ResourceScalix::~ResourceScalix() } } -void ResourceScalix::loadSubResourceConfig( KConfig& config, +void ResourceScalix::loadSubResourceConfig( TDEConfig& config, const TQString& name, const TQString& label, bool writable, ResourceMap& subResource ) { - KConfigGroup group( &config, name ); + TDEConfigGroup group( &config, name ); bool active = group.readBoolEntry( "Active", true ); subResource.insert( name, Scalix::SubResource( active, writable, label ) ); } -bool ResourceScalix::openResource( KConfig& config, const char* contentType, +bool ResourceScalix::openResource( TDEConfig& config, const char* contentType, ResourceMap& map ) { // Read the subresource entries from KMail @@ -111,7 +111,7 @@ bool ResourceScalix::doOpen() return true; mOpen = true; - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.setGroup( "General" ); mProgressDialogIncidenceLimit = config.readNumEntry("ProgressDialogIncidenceLimit", 200); @@ -120,7 +120,7 @@ bool ResourceScalix::doOpen() && openResource( config, kmailJournalContentsType, mJournalSubResources ); } -static void closeResource( KConfig& config, ResourceMap& map ) +static void closeResource( TDEConfig& config, ResourceMap& map ) { ResourceMap::ConstIterator it; for ( it = map.begin(); it != map.end(); ++it ) { @@ -136,7 +136,7 @@ void ResourceScalix::doClose() return; mOpen = false; - KConfig config( configFile() ); + TDEConfig config( configFile() ); closeResource( config, mEventSubResources ); closeResource( config, mTodoSubResources ); closeResource( config, mJournalSubResources ); @@ -745,7 +745,7 @@ void ResourceScalix::fromKMailAddSubresource( const TQString& type, // Already registered return; - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.setGroup( subResource ); bool active = config.readBoolEntry( subResource, true ); @@ -767,7 +767,7 @@ void ResourceScalix::fromKMailDelSubresource( const TQString& type, return; // Delete from the config file - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.deleteGroup( subResource ); config.sync(); diff --git a/kresources/scalix/kcal/resourcescalix.h b/kresources/scalix/kcal/resourcescalix.h index cfcf7140..dcd78397 100644 --- a/kresources/scalix/kcal/resourcescalix.h +++ b/kresources/scalix/kcal/resourcescalix.h @@ -55,7 +55,7 @@ class KDE_EXPORT ResourceScalix : public KCal::ResourceCalendar, friend struct TemporarySilencer; public: - ResourceScalix( const KConfig* ); + ResourceScalix( const TDEConfig* ); virtual ~ResourceScalix(); /// Load resource data. @@ -167,9 +167,9 @@ private: /// Reimplemented from IncidenceBase::Observer to know when an incidence was changed void incidenceUpdated( KCal::IncidenceBase* ); - bool openResource( KConfig& config, const char* contentType, + bool openResource( TDEConfig& config, const char* contentType, Scalix::ResourceMap& map ); - void loadSubResourceConfig( KConfig& config, const TQString& name, + void loadSubResourceConfig( TDEConfig& config, const TQString& name, const TQString& label, bool writable, Scalix::ResourceMap& subResource ); bool loadSubResource( const TQString& subResource, const char* mimetype ); diff --git a/kresources/scalix/kcal/resourcescalix_plugin.cpp b/kresources/scalix/kcal/resourcescalix_plugin.cpp index 728dc280..036c2f45 100644 --- a/kresources/scalix/kcal/resourcescalix_plugin.cpp +++ b/kresources/scalix/kcal/resourcescalix_plugin.cpp @@ -36,7 +36,7 @@ class ScalixFactory : public KRES::PluginFactoryBase { public: - KRES::Resource *resource( const KConfig *config ) + KRES::Resource *resource( const TDEConfig *config ) { return new KCal::ResourceScalix( config ); } diff --git a/kresources/scalix/kioslave/scalix.cpp b/kresources/scalix/kioslave/scalix.cpp index 52384afa..1b4cc7b8 100644 --- a/kresources/scalix/kioslave/scalix.cpp +++ b/kresources/scalix/kioslave/scalix.cpp @@ -76,7 +76,7 @@ void Scalix::get( const KURL &url ) if ( path.contains( "/freebusy/" ) ) { retrieveFreeBusy( url ); } else { - error( KIO::ERR_SLAVE_DEFINED, i18n( "Unknown path. Known path is '/freebusy/'" ) ); + error( TDEIO::ERR_SLAVE_DEFINED, i18n( "Unknown path. Known path is '/freebusy/'" ) ); } } @@ -87,7 +87,7 @@ void Scalix::put( const KURL& url, int, bool, bool ) if ( path.contains( "/freebusy/" ) ) { publishFreeBusy( url ); } else { - error( KIO::ERR_SLAVE_DEFINED, i18n( "Unknown path. Known path is '/freebusy/'" ) ); + error( TDEIO::ERR_SLAVE_DEFINED, i18n( "Unknown path. Known path is '/freebusy/'" ) ); } } @@ -115,11 +115,11 @@ void Scalix::retrieveFreeBusy( const KURL &url ) mFreeBusyData = TQString(); - KIO::SimpleJob *job = KIO::special( imapUrl, packedArgs, false ); - connect( job, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString& ) ) ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), - this, TQT_SLOT( slotRetrieveResult( KIO::Job* ) ) ); + TDEIO::SimpleJob *job = TDEIO::special( imapUrl, packedArgs, false ); + connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), + this, TQT_SLOT( slotRetrieveResult( TDEIO::Job* ) ) ); tqApp->eventLoop()->enterLoop(); } @@ -144,7 +144,7 @@ void Scalix::publishFreeBusy( const KURL &url ) calendar = path.mid( secondSlash + 1, lastSlash - secondSlash - 1 ); if ( requestUser.isEmpty() || calendar.isEmpty() ) { - error( KIO::ERR_SLAVE_DEFINED, i18n( "No user or calendar given!" ) ); + error( TDEIO::ERR_SLAVE_DEFINED, i18n( "No user or calendar given!" ) ); return; }; @@ -157,7 +157,7 @@ void Scalix::publishFreeBusy( const KURL &url ) const int newSize = readData(buffer); if ( newSize < 0 ) { // read error: network in unknown state so disconnect - error( KIO::ERR_COULD_NOT_READ, i18n("KIO data supply error.") ); + error( TDEIO::ERR_COULD_NOT_READ, i18n("KIO data supply error.") ); return; } @@ -181,14 +181,14 @@ void Scalix::publishFreeBusy( const KURL &url ) url.user() : url.user() + ":" + url.pass() ) .arg( url.host() ); - KIO::SimpleJob *job = KIO::special( imapUrl, packedArgs, false ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), - this, TQT_SLOT( slotPublishResult( KIO::Job* ) ) ); + TDEIO::SimpleJob *job = TDEIO::special( imapUrl, packedArgs, false ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), + this, TQT_SLOT( slotPublishResult( TDEIO::Job* ) ) ); tqApp->eventLoop()->enterLoop(); } -void Scalix::slotInfoMessage( KIO::Job *job, const TQString &data ) +void Scalix::slotInfoMessage( TDEIO::Job *job, const TQString &data ) { if ( job->error() ) { // error is handled in slotResult @@ -199,10 +199,10 @@ void Scalix::slotInfoMessage( KIO::Job *job, const TQString &data ) } -void Scalix::slotRetrieveResult( KIO::Job *job ) +void Scalix::slotRetrieveResult( TDEIO::Job *job ) { if ( job->error() ) { - error( KIO::ERR_SLAVE_DEFINED, job->errorString() ); + error( TDEIO::ERR_SLAVE_DEFINED, job->errorString() ); } else { data( mFreeBusyData.utf8() ); finished(); @@ -211,10 +211,10 @@ void Scalix::slotRetrieveResult( KIO::Job *job ) tqApp->eventLoop()->exitLoop(); } -void Scalix::slotPublishResult( KIO::Job *job ) +void Scalix::slotPublishResult( TDEIO::Job *job ) { if ( job->error() ) { - error( KIO::ERR_SLAVE_DEFINED, job->errorString() ); + error( TDEIO::ERR_SLAVE_DEFINED, job->errorString() ); } else { finished(); } diff --git a/kresources/scalix/kioslave/scalix.h b/kresources/scalix/kioslave/scalix.h index 62c2428b..dc034b7b 100644 --- a/kresources/scalix/kioslave/scalix.h +++ b/kresources/scalix/kioslave/scalix.h @@ -26,7 +26,7 @@ #include <tqobject.h> -class Scalix : public TQObject, public KIO::SlaveBase +class Scalix : public TQObject, public TDEIO::SlaveBase { Q_OBJECT @@ -38,9 +38,9 @@ class Scalix : public TQObject, public KIO::SlaveBase void put( const KURL &url, int permissions, bool overwrite, bool resume ); private slots: - void slotRetrieveResult( KIO::Job* ); - void slotPublishResult( KIO::Job* ); - void slotInfoMessage( KIO::Job*, const TQString& ); + void slotRetrieveResult( TDEIO::Job* ); + void slotPublishResult( TDEIO::Job* ); + void slotInfoMessage( TDEIO::Job*, const TQString& ); private: void retrieveFreeBusy( const KURL& ); diff --git a/kresources/scalix/knotes/resourcescalix.cpp b/kresources/scalix/knotes/resourcescalix.cpp index 0289fab0..62b0daf4 100644 --- a/kresources/scalix/knotes/resourcescalix.cpp +++ b/kresources/scalix/knotes/resourcescalix.cpp @@ -47,7 +47,7 @@ static const char* kmailContentsType = "Note"; static const char* attachmentMimeType = "application/x-vnd.kolab.note"; static const char* inlineMimeType = "text/calendar"; -ResourceScalix::ResourceScalix( const KConfig *config ) +ResourceScalix::ResourceScalix( const TDEConfig *config ) : ResourceNotes( config ), ResourceScalixBase( "ResourceScalix-KNotes" ), mCalendar( TQString::fromLatin1("UTC") ) { @@ -60,7 +60,7 @@ ResourceScalix::~ResourceScalix() bool ResourceScalix::doOpen() { - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.setGroup( configGroupName ); // Get the list of Notes folders from KMail @@ -82,7 +82,7 @@ bool ResourceScalix::doOpen() void ResourceScalix::doClose() { - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.setGroup( configGroupName ); Scalix::ResourceMap::ConstIterator it; for ( it = mSubResources.begin(); it != mSubResources.end(); ++it ) @@ -331,7 +331,7 @@ void ResourceScalix::fromKMailAddSubresource( const TQString& type, // Already registered return; - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.setGroup( configGroupName ); bool active = config.readBoolEntry( subResource, true ); @@ -354,7 +354,7 @@ void ResourceScalix::fromKMailDelSubresource( const TQString& type, // Ok, it's our job, and we have it here mSubResources.erase( subResource ); - KConfig config( configFile() ); + TDEConfig config( configFile() ); config.setGroup( configGroupName ); config.deleteEntry( subResource ); config.sync(); diff --git a/kresources/scalix/knotes/resourcescalix.h b/kresources/scalix/knotes/resourcescalix.h index 000b2e91..6a3676c1 100644 --- a/kresources/scalix/knotes/resourcescalix.h +++ b/kresources/scalix/knotes/resourcescalix.h @@ -56,7 +56,7 @@ class KDE_EXPORT ResourceScalix : public ResourceNotes, public: - ResourceScalix( const KConfig* ); + ResourceScalix( const TDEConfig* ); virtual ~ResourceScalix(); /// Load resource data. diff --git a/kresources/scalix/knotes/resourcescalix_plugin.cpp b/kresources/scalix/knotes/resourcescalix_plugin.cpp index 1cb83556..925c27b0 100644 --- a/kresources/scalix/knotes/resourcescalix_plugin.cpp +++ b/kresources/scalix/knotes/resourcescalix_plugin.cpp @@ -36,7 +36,7 @@ class ScalixFactory : public KRES::PluginFactoryBase { public: - KRES::Resource *resource( const KConfig *config ) + KRES::Resource *resource( const TDEConfig *config ) { return new Scalix::ResourceScalix( config ); } diff --git a/kresources/scalix/scalixadmin/delegatepage.cpp b/kresources/scalix/scalixadmin/delegatepage.cpp index 03347290..169ff085 100644 --- a/kresources/scalix/scalixadmin/delegatepage.cpp +++ b/kresources/scalix/scalixadmin/delegatepage.cpp @@ -69,7 +69,7 @@ void DelegatePage::loadAllDelegates() { Scalix::GetDelegatesJob *job = Scalix::getDelegates( Settings::self()->globalSlave(), Settings::self()->accountUrl() ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( allDelegates( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( allDelegates( TDEIO::Job* ) ) ); } void DelegatePage::addDelegate() @@ -88,7 +88,7 @@ void DelegatePage::addDelegate() Scalix::SetDelegateJob *job = Scalix::setDelegate( Settings::self()->globalSlave(), Settings::self()->accountUrl(), delegate.email(), delegate.rights() ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( delegateAdded( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( delegateAdded( TDEIO::Job* ) ) ); } void DelegatePage::editDelegate() @@ -113,7 +113,7 @@ void DelegatePage::editDelegate() Scalix::SetDelegateJob *job = Scalix::setDelegate( Settings::self()->globalSlave(), Settings::self()->accountUrl(), delegate.email(), delegate.rights() ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( delegateAdded( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( delegateAdded( TDEIO::Job* ) ) ); } void DelegatePage::removeDelegate() @@ -124,10 +124,10 @@ void DelegatePage::removeDelegate() Scalix::DeleteDelegateJob *job = Scalix::deleteDelegate( Settings::self()->globalSlave(), Settings::self()->accountUrl(), delegate.email() ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( delegateRemoved( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( delegateRemoved( TDEIO::Job* ) ) ); } -void DelegatePage::allDelegates( KIO::Job *job ) +void DelegatePage::allDelegates( TDEIO::Job *job ) { if ( job->error() ) KMessageBox::error( this, job->errorString() ); @@ -143,7 +143,7 @@ void DelegatePage::allDelegates( KIO::Job *job ) selectionChanged(); } -void DelegatePage::delegateAdded( KIO::Job *job ) +void DelegatePage::delegateAdded( TDEIO::Job *job ) { if ( job->error() ) KMessageBox::error( this, job->errorString() ); @@ -151,7 +151,7 @@ void DelegatePage::delegateAdded( KIO::Job *job ) loadAllDelegates(); // update the GUI } -void DelegatePage::delegateRemoved( KIO::Job *job ) +void DelegatePage::delegateRemoved( TDEIO::Job *job ) { if ( job->error() ) KMessageBox::error( this, job->errorString() ); diff --git a/kresources/scalix/scalixadmin/delegatepage.h b/kresources/scalix/scalixadmin/delegatepage.h index 0f1b9c79..0523effe 100644 --- a/kresources/scalix/scalixadmin/delegatepage.h +++ b/kresources/scalix/scalixadmin/delegatepage.h @@ -43,9 +43,9 @@ class DelegatePage : public TQWidget void editDelegate(); void removeDelegate(); - void delegateAdded( KIO::Job* ); - void delegateRemoved( KIO::Job* ); - void allDelegates( KIO::Job* ); + void delegateAdded( TDEIO::Job* ); + void delegateRemoved( TDEIO::Job* ); + void allDelegates( TDEIO::Job* ); void selectionChanged(); diff --git a/kresources/scalix/scalixadmin/jobs.cpp b/kresources/scalix/scalixadmin/jobs.cpp index f1bce9f2..49b0a8fe 100644 --- a/kresources/scalix/scalixadmin/jobs.cpp +++ b/kresources/scalix/scalixadmin/jobs.cpp @@ -67,7 +67,7 @@ TQString Delegate::rightsAsString( int rights ) } -SetPasswordJob* Scalix::setPassword( KIO::Slave* slave, const KURL& url, +SetPasswordJob* Scalix::setPassword( TDEIO::Slave* slave, const KURL& url, const TQString &oldPassword, const TQString& newPassword ) { TQByteArray packedArgs; @@ -76,11 +76,11 @@ SetPasswordJob* Scalix::setPassword( KIO::Slave* slave, const KURL& url, << TQString( "X-SCALIX-PASSWORD" ) << TQString( "%1 %2" ).arg( oldPassword ).arg( newPassword ); SetPasswordJob* job = new SetPasswordJob( url, packedArgs, false ); - KIO::Scheduler::assignJobToSlave( slave, job ); + TDEIO::Scheduler::assignJobToSlave( slave, job ); return job; } -SetDelegateJob* Scalix::setDelegate( KIO::Slave* slave, const KURL& url, const TQString& email, int params ) +SetDelegateJob* Scalix::setDelegate( TDEIO::Slave* slave, const KURL& url, const TQString& email, int params ) { TQStringList types; if ( params & SendOnBehalfOf ) @@ -98,11 +98,11 @@ SetDelegateJob* Scalix::setDelegate( KIO::Slave* slave, const KURL& url, const T << TQString( "X-SET-DELEGATE" ) << TQString( "%1 %2" ).arg( email ).arg( types.join( " " ) ); SetDelegateJob* job = new SetDelegateJob( url, packedArgs, false ); - KIO::Scheduler::assignJobToSlave( slave, job ); + TDEIO::Scheduler::assignJobToSlave( slave, job ); return job; } -DeleteDelegateJob* Scalix::deleteDelegate( KIO::Slave* slave, const KURL& url, const TQString& email ) +DeleteDelegateJob* Scalix::deleteDelegate( TDEIO::Slave* slave, const KURL& url, const TQString& email ) { TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); @@ -110,22 +110,22 @@ DeleteDelegateJob* Scalix::deleteDelegate( KIO::Slave* slave, const KURL& url, c << TQString( "X-DELETE-DELEGATE" ) << email; DeleteDelegateJob* job = new DeleteDelegateJob( url, packedArgs, false ); - KIO::Scheduler::assignJobToSlave( slave, job ); + TDEIO::Scheduler::assignJobToSlave( slave, job ); return job; } -GetDelegatesJob* Scalix::getDelegates( KIO::Slave* slave, const KURL& url ) +GetDelegatesJob* Scalix::getDelegates( TDEIO::Slave* slave, const KURL& url ) { TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream << (int)'X' << (int)'N' << TQString( "X-GET-DELEGATES" ) << TQString(); GetDelegatesJob* job = new GetDelegatesJob( url, packedArgs, false ); - KIO::Scheduler::assignJobToSlave( slave, job ); + TDEIO::Scheduler::assignJobToSlave( slave, job ); return job; } -AddOtherUserJob* Scalix::addOtherUser( KIO::Slave* slave, const KURL& url, const TQString& email ) +AddOtherUserJob* Scalix::addOtherUser( TDEIO::Slave* slave, const KURL& url, const TQString& email ) { TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); @@ -133,11 +133,11 @@ AddOtherUserJob* Scalix::addOtherUser( KIO::Slave* slave, const KURL& url, const << TQString( "X-ADD-OTHER-USER" ) << email; AddOtherUserJob* job = new AddOtherUserJob( url, packedArgs, false ); - KIO::Scheduler::assignJobToSlave( slave, job ); + TDEIO::Scheduler::assignJobToSlave( slave, job ); return job; } -DeleteOtherUserJob* Scalix::deleteOtherUser( KIO::Slave* slave, const KURL& url, const TQString& email ) +DeleteOtherUserJob* Scalix::deleteOtherUser( TDEIO::Slave* slave, const KURL& url, const TQString& email ) { TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); @@ -145,11 +145,11 @@ DeleteOtherUserJob* Scalix::deleteOtherUser( KIO::Slave* slave, const KURL& url, << TQString( "X-DELETE-OTHER-USER" ) << email; DeleteOtherUserJob* job = new DeleteOtherUserJob( url, packedArgs, false ); - KIO::Scheduler::assignJobToSlave( slave, job ); + TDEIO::Scheduler::assignJobToSlave( slave, job ); return job; } -GetOtherUsersJob* Scalix::getOtherUsers( KIO::Slave* slave, const KURL& url ) +GetOtherUsersJob* Scalix::getOtherUsers( TDEIO::Slave* slave, const KURL& url ) { TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); @@ -157,11 +157,11 @@ GetOtherUsersJob* Scalix::getOtherUsers( KIO::Slave* slave, const KURL& url ) << TQString( "X-GET-OTHER-USERS" ) << TQString(); GetOtherUsersJob* job = new GetOtherUsersJob( url, packedArgs, false ); - KIO::Scheduler::assignJobToSlave( slave, job ); + TDEIO::Scheduler::assignJobToSlave( slave, job ); return job; } -SetOutOfOfficeJob* Scalix::setOutOfOffice( KIO::Slave* slave, const KURL& url, bool enabled, const TQString& msg ) +SetOutOfOfficeJob* Scalix::setOutOfOffice( TDEIO::Slave* slave, const KURL& url, bool enabled, const TQString& msg ) { const TQString argument = msg; const TQString command = TQString( "X-SET-OUT-OF-OFFICE %1 %2 {%3}" ).arg( enabled ? "ENABLED" : "DISABLED" ) @@ -173,11 +173,11 @@ SetOutOfOfficeJob* Scalix::setOutOfOffice( KIO::Slave* slave, const KURL& url, b stream << (int) 'X' << (int)'E' << command << argument; SetOutOfOfficeJob* job = new SetOutOfOfficeJob( url, packedArgs, false ); - KIO::Scheduler::assignJobToSlave( slave, job ); + TDEIO::Scheduler::assignJobToSlave( slave, job ); return job; } -GetOutOfOfficeJob* Scalix::getOutOfOffice( KIO::Slave* slave, const KURL& url ) +GetOutOfOfficeJob* Scalix::getOutOfOffice( TDEIO::Slave* slave, const KURL& url ) { TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); @@ -185,30 +185,30 @@ GetOutOfOfficeJob* Scalix::getOutOfOffice( KIO::Slave* slave, const KURL& url ) << TQString( "X-GET-OUT-OF-OFFICE" ) << TQString(); GetOutOfOfficeJob* job = new GetOutOfOfficeJob( url, packedArgs, false ); - KIO::Scheduler::assignJobToSlave( slave, job ); + TDEIO::Scheduler::assignJobToSlave( slave, job ); return job; } SetPasswordJob::SetPasswordJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) - : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo ) + : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { } SetDelegateJob::SetDelegateJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) - : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo ) + : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { } DeleteDelegateJob::DeleteDelegateJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) - : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo ) + : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { } GetDelegatesJob::GetDelegatesJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) - : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo ) + : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { - connect( this, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString& ) ) ); + connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); } Delegate::List GetDelegatesJob::delegates() const @@ -216,7 +216,7 @@ Delegate::List GetDelegatesJob::delegates() const return mDelegates; } -void GetDelegatesJob::slotInfoMessage( KIO::Job*, const TQString &data ) +void GetDelegatesJob::slotInfoMessage( TDEIO::Job*, const TQString &data ) { /** * The passed data have the following form: @@ -247,20 +247,20 @@ void GetDelegatesJob::slotInfoMessage( KIO::Job*, const TQString &data ) } AddOtherUserJob::AddOtherUserJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) - : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo ) + : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { } DeleteOtherUserJob::DeleteOtherUserJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) - : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo ) + : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { } GetOtherUsersJob::GetOtherUsersJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) - : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo ) + : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { - connect( this, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString& ) ) ); + connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); } TQStringList GetOtherUsersJob::otherUsers() const @@ -268,21 +268,21 @@ TQStringList GetOtherUsersJob::otherUsers() const return mOtherUsers; } -void GetOtherUsersJob::slotInfoMessage( KIO::Job*, const TQString &data ) +void GetOtherUsersJob::slotInfoMessage( TDEIO::Job*, const TQString &data ) { mOtherUsers = TQStringList::split( ' ', data ); } SetOutOfOfficeJob::SetOutOfOfficeJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) - : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo ) + : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { } GetOutOfOfficeJob::GetOutOfOfficeJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) - : KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo ) + : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { - connect( this, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString& ) ) ); + connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); } bool GetOutOfOfficeJob::enabled() const @@ -295,7 +295,7 @@ TQString GetOutOfOfficeJob::message() const return mMessage; } -void GetOutOfOfficeJob::slotInfoMessage( KIO::Job*, const TQString &data ) +void GetOutOfOfficeJob::slotInfoMessage( TDEIO::Job*, const TQString &data ) { const TQStringList fields = TQStringList::split( '^', data ); diff --git a/kresources/scalix/scalixadmin/jobs.h b/kresources/scalix/scalixadmin/jobs.h index 27efbb72..0c73fb50 100644 --- a/kresources/scalix/scalixadmin/jobs.h +++ b/kresources/scalix/scalixadmin/jobs.h @@ -66,37 +66,37 @@ namespace Scalix { /** * Sets/Changes the password of the user encoded in @p url. */ - SetPasswordJob* setPassword( KIO::Slave* slave, const KURL& url, const TQString& oldPassword, const TQString& newPassword ); + SetPasswordJob* setPassword( TDEIO::Slave* slave, const KURL& url, const TQString& oldPassword, const TQString& newPassword ); /** * Adds a delegate represented by @p email with the given @p params for the user encoded in @p url. */ - SetDelegateJob* setDelegate( KIO::Slave* slave, const KURL& url, const TQString& email, int params ); + SetDelegateJob* setDelegate( TDEIO::Slave* slave, const KURL& url, const TQString& email, int params ); /** * Deletes the delegate represented by @p email for the user encoded in @p url. */ - DeleteDelegateJob* deleteDelegate( KIO::Slave* slave, const KURL& url, const TQString& email ); + DeleteDelegateJob* deleteDelegate( TDEIO::Slave* slave, const KURL& url, const TQString& email ); /** * Retrieves the delegates for the user encoded in @p url. */ - GetDelegatesJob* getDelegates( KIO::Slave* slave, const KURL& url ); + GetDelegatesJob* getDelegates( TDEIO::Slave* slave, const KURL& url ); /** * Adds the mailbox of another user represented by @p email to the users 'Other Users' namespace. */ - AddOtherUserJob* addOtherUser( KIO::Slave* slave, const KURL& url, const TQString& email ); + AddOtherUserJob* addOtherUser( TDEIO::Slave* slave, const KURL& url, const TQString& email ); /** * Deletes the mailbox of another user represented by @p email from the users 'Other Users' namespace. */ - DeleteOtherUserJob* deleteOtherUser( KIO::Slave* slave, const KURL& url, const TQString& email ); + DeleteOtherUserJob* deleteOtherUser( TDEIO::Slave* slave, const KURL& url, const TQString& email ); /** * Retrieves the list of all other users. */ - GetOtherUsersJob* getOtherUsers( KIO::Slave* slave, const KURL& url ); + GetOtherUsersJob* getOtherUsers( TDEIO::Slave* slave, const KURL& url ); /** * Sets the out-of-office data. @@ -104,33 +104,33 @@ namespace Scalix { * @param enabled Whether the out-of-office functionality is enabled. * @param msg The out-of-office message. */ - SetOutOfOfficeJob* setOutOfOffice( KIO::Slave* slave, const KURL& url, bool enabled, const TQString& msg ); + SetOutOfOfficeJob* setOutOfOffice( TDEIO::Slave* slave, const KURL& url, bool enabled, const TQString& msg ); /** * Retrieves the out-of-office data. */ - GetOutOfOfficeJob* getOutOfOffice( KIO::Slave* slave, const KURL& url ); + GetOutOfOfficeJob* getOutOfOffice( TDEIO::Slave* slave, const KURL& url ); - class SetPasswordJob : public KIO::SimpleJob + class SetPasswordJob : public TDEIO::SimpleJob { public: SetPasswordJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ); }; - class SetDelegateJob : public KIO::SimpleJob + class SetDelegateJob : public TDEIO::SimpleJob { public: SetDelegateJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ); }; - class DeleteDelegateJob : public KIO::SimpleJob + class DeleteDelegateJob : public TDEIO::SimpleJob { public: DeleteDelegateJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ); }; - class GetDelegatesJob : public KIO::SimpleJob + class GetDelegatesJob : public TDEIO::SimpleJob { Q_OBJECT @@ -141,25 +141,25 @@ namespace Scalix { Delegate::List delegates() const; private slots: - void slotInfoMessage( KIO::Job*, const TQString& ); + void slotInfoMessage( TDEIO::Job*, const TQString& ); private: Delegate::List mDelegates; }; - class AddOtherUserJob : public KIO::SimpleJob + class AddOtherUserJob : public TDEIO::SimpleJob { public: AddOtherUserJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ); }; - class DeleteOtherUserJob : public KIO::SimpleJob + class DeleteOtherUserJob : public TDEIO::SimpleJob { public: DeleteOtherUserJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ); }; - class GetOtherUsersJob : public KIO::SimpleJob + class GetOtherUsersJob : public TDEIO::SimpleJob { Q_OBJECT @@ -170,19 +170,19 @@ namespace Scalix { TQStringList otherUsers() const; private slots: - void slotInfoMessage( KIO::Job*, const TQString& ); + void slotInfoMessage( TDEIO::Job*, const TQString& ); private: TQStringList mOtherUsers; }; - class SetOutOfOfficeJob : public KIO::SimpleJob + class SetOutOfOfficeJob : public TDEIO::SimpleJob { public: SetOutOfOfficeJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ); }; - class GetOutOfOfficeJob : public KIO::SimpleJob + class GetOutOfOfficeJob : public TDEIO::SimpleJob { Q_OBJECT @@ -194,7 +194,7 @@ namespace Scalix { TQString message() const; private slots: - void slotInfoMessage( KIO::Job*, const TQString& ); + void slotInfoMessage( TDEIO::Job*, const TQString& ); private: bool mEnabled; diff --git a/kresources/scalix/scalixadmin/otheruserpage.cpp b/kresources/scalix/scalixadmin/otheruserpage.cpp index 98b7b226..3aac47c9 100644 --- a/kresources/scalix/scalixadmin/otheruserpage.cpp +++ b/kresources/scalix/scalixadmin/otheruserpage.cpp @@ -67,7 +67,7 @@ void OtherUserPage::loadAllUsers() { Scalix::GetOtherUsersJob *job = Scalix::getOtherUsers( Settings::self()->globalSlave(), Settings::self()->accountUrl() ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( allUsers( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( allUsers( TDEIO::Job* ) ) ); } void OtherUserPage::addUser() @@ -82,7 +82,7 @@ void OtherUserPage::addUser() Scalix::AddOtherUserJob *job = Scalix::addOtherUser( Settings::self()->globalSlave(), Settings::self()->accountUrl(), email ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( userAdded( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( userAdded( TDEIO::Job* ) ) ); } void OtherUserPage::removeUser() @@ -93,10 +93,10 @@ void OtherUserPage::removeUser() Scalix::DeleteOtherUserJob *job = Scalix::deleteOtherUser( Settings::self()->globalSlave(), Settings::self()->accountUrl(), email ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( userRemoved( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( userRemoved( TDEIO::Job* ) ) ); } -void OtherUserPage::allUsers( KIO::Job *job ) +void OtherUserPage::allUsers( TDEIO::Job *job ) { if ( job->error() ) KMessageBox::error( this, job->errorString() ); @@ -112,7 +112,7 @@ void OtherUserPage::allUsers( KIO::Job *job ) selectionChanged(); } -void OtherUserPage::userAdded( KIO::Job *job ) +void OtherUserPage::userAdded( TDEIO::Job *job ) { if ( job->error() ) KMessageBox::error( this, job->errorString() ); @@ -122,7 +122,7 @@ void OtherUserPage::userAdded( KIO::Job *job ) updateKmail(); } -void OtherUserPage::userRemoved( KIO::Job *job ) +void OtherUserPage::userRemoved( TDEIO::Job *job ) { if ( job->error() ) KMessageBox::error( this, job->errorString() ); diff --git a/kresources/scalix/scalixadmin/otheruserpage.h b/kresources/scalix/scalixadmin/otheruserpage.h index 67ec4fe9..e8c5e269 100644 --- a/kresources/scalix/scalixadmin/otheruserpage.h +++ b/kresources/scalix/scalixadmin/otheruserpage.h @@ -42,9 +42,9 @@ class OtherUserPage : public TQWidget void addUser(); void removeUser(); - void userAdded( KIO::Job* ); - void userRemoved( KIO::Job* ); - void allUsers( KIO::Job* ); + void userAdded( TDEIO::Job* ); + void userRemoved( TDEIO::Job* ); + void allUsers( TDEIO::Job* ); void selectionChanged(); diff --git a/kresources/scalix/scalixadmin/outofofficepage.cpp b/kresources/scalix/scalixadmin/outofofficepage.cpp index e1e331fc..4e34a914 100644 --- a/kresources/scalix/scalixadmin/outofofficepage.cpp +++ b/kresources/scalix/scalixadmin/outofofficepage.cpp @@ -71,10 +71,10 @@ void OutOfOfficePage::load() { Scalix::GetOutOfOfficeJob *job = Scalix::getOutOfOffice( Settings::self()->globalSlave(), Settings::self()->accountUrl() ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( loaded( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( loaded( TDEIO::Job* ) ) ); } -void OutOfOfficePage::loaded( KIO::Job* job ) +void OutOfOfficePage::loaded( TDEIO::Job* job ) { if ( job->error() ) { KMessageBox::error( this, job->errorString() ); @@ -98,12 +98,12 @@ void OutOfOfficePage::store() mEnabled->isChecked(), mMessage->text() ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( stored( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( stored( TDEIO::Job* ) ) ); mSaveButton->setEnabled( false ); } -void OutOfOfficePage::stored( KIO::Job* job ) +void OutOfOfficePage::stored( TDEIO::Job* job ) { if ( job->error() ) KMessageBox::error( this, job->errorString() ); diff --git a/kresources/scalix/scalixadmin/outofofficepage.h b/kresources/scalix/scalixadmin/outofofficepage.h index dbd845ba..f9863fa1 100644 --- a/kresources/scalix/scalixadmin/outofofficepage.h +++ b/kresources/scalix/scalixadmin/outofofficepage.h @@ -39,9 +39,9 @@ class OutOfOfficePage : public TQWidget private slots: void load(); - void loaded( KIO::Job* ); + void loaded( TDEIO::Job* ); void store(); - void stored( KIO::Job* ); + void stored( TDEIO::Job* ); void statusChanged(); void changed(); diff --git a/kresources/scalix/scalixadmin/passwordpage.cpp b/kresources/scalix/scalixadmin/passwordpage.cpp index 23f4304c..120de86f 100644 --- a/kresources/scalix/scalixadmin/passwordpage.cpp +++ b/kresources/scalix/scalixadmin/passwordpage.cpp @@ -77,7 +77,7 @@ void PasswordPage::buttonClicked() mJob = Scalix::setPassword( Settings::self()->globalSlave(), Settings::self()->accountUrl(), Settings::self()->accountPassword(), mPassword->text() ); - connect( mJob, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( finished( KIO::Job* ) ) ); + connect( mJob, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( finished( TDEIO::Job* ) ) ); updateState( true ); } else { @@ -107,7 +107,7 @@ void PasswordPage::textChanged() !mPasswordRetype->text().isEmpty() ); } -void PasswordPage::finished( KIO::Job* job ) +void PasswordPage::finished( TDEIO::Job* job ) { mJob = 0; @@ -123,26 +123,26 @@ void PasswordPage::finished( KIO::Job* job ) const TQString newPassword = mPassword->text(); { // ScalixAdmin config - KConfig config( "scalixadminrc" ); - KConfigGroup group( &config, "Account" ); + TDEConfig config( "scalixadminrc" ); + TDEConfigGroup group( &config, "Account" ); group.writeEntry( "pass", KStringHandler::obscure( newPassword ) ); } { // ScalixWizard config - KConfig config( "scalixrc" ); - KConfigGroup group( &config, "General" ); + TDEConfig config( "scalixrc" ); + TDEConfigGroup group( &config, "General" ); group.writeEntry( "Password", KStringHandler::obscure( newPassword ) ); } { // KMail config - KConfig config( "kmailrc" ); + TDEConfig config( "kmailrc" ); // Try to find account group for Scalix TQString scalixAccount; const TQStringList groupList = config.groupList(); for ( uint i = 0; i < groupList.count(); ++i ) { if ( groupList[ i ].startsWith( "Account " ) ) { - KConfigGroup group( &config, groupList[ i ] ); + TDEConfigGroup group( &config, groupList[ i ] ); if ( group.hasKey( "groupwareType" ) && group.readNumEntry( "groupwareType" ) == 2 ) { scalixAccount = groupList[ i ]; break; @@ -157,7 +157,7 @@ void PasswordPage::finished( KIO::Job* job ) const int accountId = scalixAccount.mid( 8 ).toInt(); - KConfigGroup group( &config, scalixAccount ); + TDEConfigGroup group( &config, scalixAccount ); // Save only if the user choose it before bool storePassword = group.readBoolEntry( "store-passwd", false ); @@ -179,7 +179,7 @@ void PasswordPage::finished( KIO::Job* job ) group.writeEntry( "pass", KStringHandler::obscure( newPassword ) ); } - KConfigGroup fileGroup( &config, TQString( "Folder-%1" ).arg( group.readNumEntry( "Folder" ) ) ); + TDEConfigGroup fileGroup( &config, TQString( "Folder-%1" ).arg( group.readNumEntry( "Folder" ) ) ); fileGroup.writeEntry( "pass", KStringHandler::obscure( newPassword ) ); } } diff --git a/kresources/scalix/scalixadmin/passwordpage.h b/kresources/scalix/scalixadmin/passwordpage.h index 450bde67..5255193e 100644 --- a/kresources/scalix/scalixadmin/passwordpage.h +++ b/kresources/scalix/scalixadmin/passwordpage.h @@ -26,7 +26,7 @@ class TQLineEdit; class TQPushButton; -namespace KIO { +namespace TDEIO { class Job; } @@ -40,7 +40,7 @@ class PasswordPage : public TQWidget private slots: void buttonClicked(); - void finished( KIO::Job* ); + void finished( TDEIO::Job* ); void textChanged(); private: @@ -50,7 +50,7 @@ class PasswordPage : public TQWidget TQLineEdit *mPasswordRetype; TQPushButton *mButton; - KIO::Job *mJob; + TDEIO::Job *mJob; }; #endif diff --git a/kresources/scalix/scalixadmin/settings.cpp b/kresources/scalix/scalixadmin/settings.cpp index 52f72296..279491c5 100644 --- a/kresources/scalix/scalixadmin/settings.cpp +++ b/kresources/scalix/scalixadmin/settings.cpp @@ -28,7 +28,7 @@ Settings* Settings::mSelf = 0; Settings::Settings() { - mSlave = KIO::Scheduler::getConnectedSlave( accountUrl(), + mSlave = TDEIO::Scheduler::getConnectedSlave( accountUrl(), accountData() ); } @@ -44,12 +44,12 @@ Settings* Settings::self() return mSelf; } -KIO::MetaData Settings::accountData() const +TDEIO::MetaData Settings::accountData() const { - KConfig config( "scalixadminrc" ); - KConfigGroup group( &config, "Account" ); + TDEConfig config( "scalixadminrc" ); + TDEConfigGroup group( &config, "Account" ); - KIO::MetaData data; + TDEIO::MetaData data; data.insert( "auth", group.readEntry( "auth" ) ); data.insert( "tls", group.readBoolEntry( "use-tls" ) ? "on" : "off" ); @@ -58,8 +58,8 @@ KIO::MetaData Settings::accountData() const KURL Settings::accountUrl() const { - KConfig config( "scalixadminrc" ); - KConfigGroup group( &config, "Account" ); + TDEConfig config( "scalixadminrc" ); + TDEConfigGroup group( &config, "Account" ); KURL url; url.setProtocol( group.readBoolEntry( "use-ssl" ) ? "imaps" : "imap" ); @@ -73,25 +73,25 @@ KURL Settings::accountUrl() const TQString Settings::accountPassword() const { - KConfig config( "scalixadminrc" ); - KConfigGroup group( &config, "Account" ); + TDEConfig config( "scalixadminrc" ); + TDEConfigGroup group( &config, "Account" ); return KStringHandler::obscure( group.readEntry( "pass" ) ); } -KIO::Slave* Settings::globalSlave() const +TDEIO::Slave* Settings::globalSlave() const { return mSlave; } TQString Settings::rulesWizardUrl() const { - KConfig config( "scalixadminrc" ); - KConfigGroup group( &config, "Misc" ); + TDEConfig config( "scalixadminrc" ); + TDEConfigGroup group( &config, "Misc" ); TQString url = group.readEntry( "rulesWizardUrl" ); if ( url.isEmpty() ) { - KConfigGroup group( &config, "Account" ); + TDEConfigGroup group( &config, "Account" ); url = TQString( "http://%1/Scalix/rw/?username=%2" ).arg( group.readEntry( "host" ) ) .arg( group.readEntry( "user" ) ); } @@ -101,36 +101,36 @@ TQString Settings::rulesWizardUrl() const TQString Settings::ldapHost() const { - KConfig config( "scalixadminrc" ); - KConfigGroup group( &config, "LDAP" ); + TDEConfig config( "scalixadminrc" ); + TDEConfigGroup group( &config, "LDAP" ); return group.readEntry( "host" ); } TQString Settings::ldapPort() const { - KConfig config( "scalixadminrc" ); - KConfigGroup group( &config, "LDAP" ); + TDEConfig config( "scalixadminrc" ); + TDEConfigGroup group( &config, "LDAP" ); return group.readEntry( "port" ); } TQString Settings::ldapBase() const { - KConfig config( "scalixadminrc" ); - KConfigGroup group( &config, "LDAP" ); + TDEConfig config( "scalixadminrc" ); + TDEConfigGroup group( &config, "LDAP" ); return group.readEntry( "base" ); } TQString Settings::ldapBindDn() const { - KConfig config( "scalixadminrc" ); - KConfigGroup group( &config, "LDAP" ); + TDEConfig config( "scalixadminrc" ); + TDEConfigGroup group( &config, "LDAP" ); return group.readEntry( "bindDn" ); } TQString Settings::ldapPassword() const { - KConfig config( "scalixadminrc" ); - KConfigGroup group( &config, "LDAP" ); + TDEConfig config( "scalixadminrc" ); + TDEConfigGroup group( &config, "LDAP" ); return group.readEntry( "password" ); } diff --git a/kresources/scalix/scalixadmin/settings.h b/kresources/scalix/scalixadmin/settings.h index 1e36833a..29028f3b 100644 --- a/kresources/scalix/scalixadmin/settings.h +++ b/kresources/scalix/scalixadmin/settings.h @@ -32,11 +32,11 @@ class Settings static Settings* self(); - KIO::MetaData accountData() const; + TDEIO::MetaData accountData() const; KURL accountUrl() const; TQString accountPassword() const; - KIO::Slave *globalSlave() const; + TDEIO::Slave *globalSlave() const; TQString rulesWizardUrl() const; @@ -48,7 +48,7 @@ class Settings private: Settings(); - KIO::Slave *mSlave; + TDEIO::Slave *mSlave; static Settings* mSelf; }; |