From 555ea1c7f342582df2985a7c02e880174877526e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:28:32 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kuser/editDefaults.cpp | 20 ++++++++++---------- kuser/editDefaults.h | 10 +++++----- kuser/kgroupldap.cpp | 26 +++++++++++++------------- kuser/kgroupldap.h | 6 +++--- kuser/kuser.cpp | 4 ++-- kuser/kuserldap.cpp | 26 +++++++++++++------------- kuser/kuserldap.h | 6 +++--- kuser/kuserprefs.kcfgc | 2 +- 8 files changed, 50 insertions(+), 50 deletions(-) (limited to 'kuser') diff --git a/kuser/editDefaults.cpp b/kuser/editDefaults.cpp index 75ca1e7..5b4b7c8 100644 --- a/kuser/editDefaults.cpp +++ b/kuser/editDefaults.cpp @@ -37,8 +37,8 @@ #include "passwordpolicy.h" #include "misc.h" -editDefaults::editDefaults( KConfigSkeleton *config, TQWidget *parent, const char *name ) : - KConfigDialog( parent, name, config, IconList, +editDefaults::editDefaults( TDEConfigSkeleton *config, TQWidget *parent, const char *name ) : + TDEConfigDialog( parent, name, config, IconList, Default|Ok|Apply|Cancel|Help, Ok, true ) { KTabWidget *page1 = new KTabWidget( this ); @@ -105,12 +105,12 @@ void editDefaults::slotQueryClicked() kdDebug() << "sendQuery url: " << _url.prettyURL() << endl; mLdif.startParsing(); - KIO::Job *job = KIO::get( _url, true, false ); + TDEIO::Job *job = TDEIO::get( _url, true, false ); // job->addMetaData("no-auth-prompt","true"); - connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( loadData( KIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), - this, TQT_SLOT( loadResult( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQT_SLOT( loadData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), + this, TQT_SLOT( loadResult( TDEIO::Job* ) ) ); mProg = new KProgressDialog( this, 0, i18n("LDAP Query"), _url.prettyURL(), true ); mProg->progressBar()->setValue( 0 ); @@ -135,7 +135,7 @@ void editDefaults::slotQueryClicked() kdDebug() << "domQueryx" << endl; } -void editDefaults::loadData( KIO::Job*, const TQByteArray& d ) +void editDefaults::loadData( TDEIO::Job*, const TQByteArray& d ) { KABC::LDIF::ParseVal ret; @@ -168,10 +168,10 @@ void editDefaults::loadData( KIO::Job*, const TQByteArray& d ) } while ( ret != KABC::LDIF::MoreData ); } -void editDefaults::loadResult( KIO::Job* job) +void editDefaults::loadResult( TDEIO::Job* job) { int error = job->error(); - if ( error && error != KIO::ERR_USER_CANCELED ) + if ( error && error != TDEIO::ERR_USER_CANCELED ) mErrorMsg = job->errorString(); else mErrorMsg = ""; diff --git a/kuser/editDefaults.h b/kuser/editDefaults.h index 0deea58..954ae80 100644 --- a/kuser/editDefaults.h +++ b/kuser/editDefaults.h @@ -29,7 +29,7 @@ class LdapSamba; namespace KABC { class LdapConfigWidget; } -namespace KIO { class Job; } +namespace TDEIO { class Job; } typedef struct SambaDomain { TQString name; @@ -37,11 +37,11 @@ typedef struct SambaDomain { uint ridbase; }; -class editDefaults : public KConfigDialog { +class editDefaults : public TDEConfigDialog { Q_OBJECT public: - editDefaults( KConfigSkeleton *config, TQWidget* parent, const char * name = 0 ); + editDefaults( TDEConfigSkeleton *config, TQWidget* parent, const char * name = 0 ); private: KProgressDialog *mProg; LdapSamba *page3c; @@ -53,8 +53,8 @@ private: SambaDomain mDomain; private slots: void slotQueryClicked(); - void loadData( KIO::Job*, const TQByteArray& d ); - void loadResult( KIO::Job* job); + void loadData( TDEIO::Job*, const TQByteArray& d ); + void loadResult( TDEIO::Job* job); }; #endif // _KU_EDITDEFAULTS_H_ diff --git a/kuser/kgroupldap.cpp b/kuser/kgroupldap.cpp index 2f66b27..80e6cf8 100644 --- a/kuser/kgroupldap.cpp +++ b/kuser/kgroupldap.cpp @@ -82,7 +82,7 @@ TQString KGroupLDAP::getRDN( KU::KGroup *group ) } } -void KGroupLDAP::result( KIO::Job *job ) +void KGroupLDAP::result( TDEIO::Job *job ) { delete mProg; mCancel = false; @@ -100,7 +100,7 @@ void KGroupLDAP::result( KIO::Job *job ) } } -void KGroupLDAP::data( KIO::Job*, const TQByteArray& data ) +void KGroupLDAP::data( TDEIO::Job*, const TQByteArray& data ) { if ( data.size() ) { mParser.setLDIF( data ); @@ -169,11 +169,11 @@ bool KGroupLDAP::reload() mCancel = true; ldif = ""; - KIO::Job *job = KIO::get( mUrl, true, false ); - connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( data( KIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), - this, TQT_SLOT( result( KIO::Job* ) ) ); + TDEIO::Job *job = TDEIO::get( mUrl, true, false ); + connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), + this, TQT_SLOT( result( TDEIO::Job* ) ) ); mProg->exec(); if ( mCancel ) job->kill(); @@ -192,16 +192,16 @@ bool KGroupLDAP::dbcommit() ldif = ""; mProg = new KProgressDialog( 0, "", i18n("LDAP Operation"), "", true ); - KIO::Job *job = KIO::put( mUrl, -1, false, false, false ); - connect( job, TQT_SIGNAL( dataReq( KIO::Job*, TQByteArray& ) ), - this, TQT_SLOT( putData( KIO::Job*, TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), - this, TQT_SLOT( result( KIO::Job* ) ) ); + TDEIO::Job *job = TDEIO::put( mUrl, -1, false, false, false ); + connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), + this, TQT_SLOT( putData( TDEIO::Job*, TQByteArray& ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), + this, TQT_SLOT( result( TDEIO::Job* ) ) ); mProg->exec(); return( mOk ); } -void KGroupLDAP::putData( KIO::Job*, TQByteArray& data ) +void KGroupLDAP::putData( TDEIO::Job*, TQByteArray& data ) { ModIt mit = mMod.begin(); diff --git a/kuser/kgroupldap.h b/kuser/kgroupldap.h index a9dd21b..acb2ba9 100644 --- a/kuser/kgroupldap.h +++ b/kuser/kgroupldap.h @@ -43,9 +43,9 @@ public: virtual bool dbcommit(); private slots: - void data( KIO::Job*, const TQByteArray& ); - void putData( KIO::Job *job, TQByteArray& data ); - void result( KIO::Job* ); + void data( TDEIO::Job*, const TQByteArray& ); + void putData( TDEIO::Job *job, TQByteArray& data ); + void result( TDEIO::Job* ); private: KABC::LDIF mParser; KABC::LDAPUrl mUrl; diff --git a/kuser/kuser.cpp b/kuser/kuser.cpp index fb4ffdc..c903500 100644 --- a/kuser/kuser.cpp +++ b/kuser/kuser.cpp @@ -748,9 +748,9 @@ int KU::KUser::removeHome() if (!stat(TQFile::encodeName(p_dir), &sb)) if (S_ISDIR(sb.st_mode) && sb.st_uid == p_uid) { - if (!KIO::NetAccess::del(KURL::fromPathOrURL(p_dir))) { + if (!TDEIO::NetAccess::del(KURL::fromPathOrURL(p_dir))) { KMessageBox::error( 0, i18n("Cannot remove home folder %1.\nError: %2") - .arg(p_dir).arg(KIO::NetAccess::lastErrorString()) ); + .arg(p_dir).arg(TDEIO::NetAccess::lastErrorString()) ); } } else { KMessageBox::error( 0, i18n("Removal of home folder %1 failed (uid = %2, gid = %3).").arg(p_dir).arg(sb.st_uid).arg(sb.st_gid) ); diff --git a/kuser/kuserldap.cpp b/kuser/kuserldap.cpp index 74ee465..de3aa9d 100644 --- a/kuser/kuserldap.cpp +++ b/kuser/kuserldap.cpp @@ -76,7 +76,7 @@ KUserLDAP::~KUserLDAP() mUsers.clear(); } -void KUserLDAP::result( KIO::Job *job ) +void KUserLDAP::result( TDEIO::Job *job ) { delete mProg; mCancel = false; @@ -94,7 +94,7 @@ void KUserLDAP::result( KIO::Job *job ) } } -void KUserLDAP::data( KIO::Job *, const TQByteArray& data ) +void KUserLDAP::data( TDEIO::Job *, const TQByteArray& data ) { if ( data.size() ) { mParser.setLDIF( data ); @@ -247,11 +247,11 @@ bool KUserLDAP::reload() mAdv = 1; ldif = ""; - KIO::Job *job = KIO::get( mUrl, true, false ); - connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( data( KIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), - this, TQT_SLOT( result( KIO::Job* ) ) ); + TDEIO::Job *job = TDEIO::get( mUrl, true, false ); + connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), + this, TQT_SLOT( result( TDEIO::Job* ) ) ); // job->addMetaData( "SERVER_CTRL0", "1.2.840.113556.1.4.473 true: uidNumber"); mProg->exec(); if ( mCancel ) job->kill(); @@ -609,16 +609,16 @@ bool KUserLDAP::dbcommit() mAddUser = 0; mDelUser = 0; mUser = 0; mProg = new KProgressDialog( 0, "", i18n("LDAP Operation"), "", true ); - KIO::Job *job = KIO::put( mUrl, -1, false, false, false ); - connect( job, TQT_SIGNAL( dataReq( KIO::Job*, TQByteArray& ) ), - this, TQT_SLOT( putData( KIO::Job*, TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), - this, TQT_SLOT( result( KIO::Job* ) ) ); + TDEIO::Job *job = TDEIO::put( mUrl, -1, false, false, false ); + connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), + this, TQT_SLOT( putData( TDEIO::Job*, TQByteArray& ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), + this, TQT_SLOT( result( TDEIO::Job* ) ) ); mProg->exec(); return( mOk ); } -void KUserLDAP::putData( KIO::Job *, TQByteArray& data ) +void KUserLDAP::putData( TDEIO::Job *, TQByteArray& data ) { ModIt mit = mMod.begin(); diff --git a/kuser/kuserldap.h b/kuser/kuserldap.h index 57c97b8..d60227d 100644 --- a/kuser/kuserldap.h +++ b/kuser/kuserldap.h @@ -43,9 +43,9 @@ public: virtual bool dbcommit(); private slots: - void data( KIO::Job*, const TQByteArray& ); - void putData( KIO::Job *job, TQByteArray& data ); - void result( KIO::Job* ); + void data( TDEIO::Job*, const TQByteArray& ); + void putData( TDEIO::Job *job, TQByteArray& data ); + void result( TDEIO::Job* ); private: KABC::LDIF mParser; KABC::LDAPUrl mUrl; diff --git a/kuser/kuserprefs.kcfgc b/kuser/kuserprefs.kcfgc index 252d4e1..923cb4d 100644 --- a/kuser/kuserprefs.kcfgc +++ b/kuser/kuserprefs.kcfgc @@ -5,7 +5,7 @@ SetUserTexts=true # # Singleton=false # -# Inherits=KConfigSkeleton +# Inherits=TDEConfigSkeleton # # IncludeFiles=libtdepim/kpimprefs.h # -- cgit v1.2.3