Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 2381863623
commit d6c10444bf

@ -84,7 +84,7 @@ typedef KGenericFactory<LDAPController, TQWidget> ldapFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_ldapcontroller, ldapFactory("kcmldapcontroller"))
LDAPController::LDAPController(TQWidget *parent, const char *name, const TQStringList&)
: KCModule(parent, name), myAboutData(0)
: TDECModule(parent, name), myAboutData(0)
{
TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
m_systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" ));
@ -503,8 +503,8 @@ void LDAPController::btncaExportKey() {
KURL src = KERBEROS_PKI_PEMKEY_FILE;
KURL dest = KFileDialog::getSaveURL(TQString::null, "*.key|Private Key (*.key)", this, i18n("Select a location to save a copy of the private key..."));
if (!dest.isEmpty()) {
KIO::CopyJob* job = KIO::copy(src, dest, true);
connect(job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotCertCopyResult(KIO::Job*)));
TDEIO::CopyJob* job = TDEIO::copy(src, dest, true);
connect(job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotCertCopyResult(TDEIO::Job*)));
}
}
@ -512,8 +512,8 @@ void LDAPController::btncaExportCert() {
KURL src = KERBEROS_PKI_PEM_FILE;
KURL dest = KFileDialog::getSaveURL(TQString::null, "*.pem|PKI Certificate Files (*.pem)", this, i18n("Select a location to save a copy of the certificate..."));
if (!dest.isEmpty()) {
KIO::CopyJob* job = KIO::copy(src, dest, true);
connect(job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotCertCopyResult(KIO::Job*)));
TDEIO::CopyJob* job = TDEIO::copy(src, dest, true);
connect(job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotCertCopyResult(TDEIO::Job*)));
}
}
@ -530,8 +530,8 @@ void LDAPController::btnkrbExportKey() {
KURL src = kdc_keyfile;
KURL dest = KFileDialog::getSaveURL(TQString::null, "*.key|Private Key (*.key)", this, i18n("Select a location to save a copy of the private key..."));
if (!dest.isEmpty()) {
KIO::CopyJob* job = KIO::copy(src, dest, true);
connect(job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotCertCopyResult(KIO::Job*)));
TDEIO::CopyJob* job = TDEIO::copy(src, dest, true);
connect(job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotCertCopyResult(TDEIO::Job*)));
}
}
@ -542,8 +542,8 @@ void LDAPController::btnkrbExportCert() {
KURL src = kdc_certfile;
KURL dest = KFileDialog::getSaveURL(TQString::null, "*.pem|PKI Certificate Files (*.pem)", this, i18n("Select a location to save a copy of the certificate..."));
if (!dest.isEmpty()) {
KIO::CopyJob* job = KIO::copy(src, dest, true);
connect(job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotCertCopyResult(KIO::Job*)));
TDEIO::CopyJob* job = TDEIO::copy(src, dest, true);
connect(job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotCertCopyResult(TDEIO::Job*)));
}
}
@ -569,8 +569,8 @@ void LDAPController::btnldapExportKey() {
KURL src = ldap_keyfile;
KURL dest = KFileDialog::getSaveURL(TQString::null, "*.key|Private Key (*.key)", this, i18n("Select a location to save a copy of the private key..."));
if (!dest.isEmpty()) {
KIO::CopyJob* job = KIO::copy(src, dest, true);
connect(job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotCertCopyResult(KIO::Job*)));
TDEIO::CopyJob* job = TDEIO::copy(src, dest, true);
connect(job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotCertCopyResult(TDEIO::Job*)));
}
}
@ -581,12 +581,12 @@ void LDAPController::btnldapExportCert() {
KURL src = ldap_certfile;
KURL dest = KFileDialog::getSaveURL(TQString::null, "*.pem|PKI Certificate Files (*.pem)", this, i18n("Select a location to save a copy of the certificate..."));
if (!dest.isEmpty()) {
KIO::CopyJob* job = KIO::copy(src, dest, true);
connect(job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotCertCopyResult(KIO::Job*)));
TDEIO::CopyJob* job = TDEIO::copy(src, dest, true);
connect(job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotCertCopyResult(TDEIO::Job*)));
}
}
void LDAPController::slotCertCopyResult(KIO::Job* job) {
void LDAPController::slotCertCopyResult(TDEIO::Job* job) {
if (job->error()) {
job->showErrorDialog(this);
}
@ -1795,7 +1795,7 @@ int LDAPController::createNewLDAPRealm(TQWidget* dialogparent, LDAPRealmConfig r
}
int LDAPController::buttons() {
return KCModule::Apply|KCModule::Help;
return TDECModule::Apply|TDECModule::Help;
}
TQString LDAPController::quickHelp() const

@ -44,7 +44,7 @@ enum sc_command {
SC_SETDBPERMS
};
class LDAPController: public KCModule
class LDAPController: public TDECModule
{
Q_OBJECT
@ -77,7 +77,7 @@ class LDAPController: public KCModule
void btnldapRegenerate();
void btnldapExportKey();
void btnldapExportCert();
void slotCertCopyResult(KIO::Job*);
void slotCertCopyResult(TDEIO::Job*);
void btnChangeLDAPRootPassword();
void btnChangeRealmAdminPassword();

Loading…
Cancel
Save