From 2c48a779bdae10697b43c37d5bc6e19f4483c35c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:07:13 -0600 Subject: [PATCH] Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- src/ldapmgr.cpp | 4 ++-- src/ldapmgr.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ldapmgr.cpp b/src/ldapmgr.cpp index 674fe17..a0fd164 100644 --- a/src/ldapmgr.cpp +++ b/src/ldapmgr.cpp @@ -59,7 +59,7 @@ typedef KGenericFactory LDAPConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_ldapmanager, LDAPConfigFactory("kcmldapmanager")) LDAPConfig::LDAPConfig(TQWidget *parent, const char *name, const TQStringList&) - : KCModule(parent, name), myAboutData(0), m_ldapmanager(0) + : TDECModule(parent, name), myAboutData(0), m_ldapmanager(0) { m_systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" )); @@ -899,7 +899,7 @@ int LDAPConfig::setPasswordForUser(LDAPUserInfo user, TQString *errstr) { } int LDAPConfig::buttons() { - return KCModule::Apply|KCModule::Help; + return TDECModule::Apply|TDECModule::Help; } TQString LDAPConfig::quickHelp() const diff --git a/src/ldapmgr.h b/src/ldapmgr.h index e861279..2af5602 100644 --- a/src/ldapmgr.h +++ b/src/ldapmgr.h @@ -35,7 +35,7 @@ class KSimpleConfig; -class LDAPConfig: public KCModule +class LDAPConfig: public TDECModule { Q_OBJECT