diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:52:15 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:52:15 -0600 |
| commit | b3a60a442221f51446ad46d1ce12113cccf89981 (patch) | |
| tree | a9eb07da2bc33cbdd34fd95aa5850cc1af6d375b | |
| parent | 523e2ceee59649bb79cae12b6b5ac4ba8c35716b (diff) | |
| download | kcmldap-b3a60a442221f51446ad46d1ce12113cccf89981.tar.gz kcmldap-b3a60a442221f51446ad46d1ce12113cccf89981.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
| -rw-r--r-- | src/ldapbonding.cpp | 4 | ||||
| -rw-r--r-- | src/ldapbonding.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ldapbonding.cpp b/src/ldapbonding.cpp index de5c99b..78b1bfc 100644 --- a/src/ldapbonding.cpp +++ b/src/ldapbonding.cpp @@ -68,9 +68,9 @@ LDAPConfig::LDAPConfig(TQWidget *parent, const char *name, const TQStringList&) systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" )); systemconfig->setFileWriteMode(S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); - KAboutData* about = new KAboutData("ldap", I18N_NOOP("TDE LDAP Manager"), "0.1", + TDEAboutData* about = new TDEAboutData("ldap", I18N_NOOP("TDE LDAP Manager"), "0.1", I18N_NOOP("TDE LDAP Manager Control Panel Module"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("(c) 2012 Timothy Pearson"), 0, 0); about->addAuthor("Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net"); diff --git a/src/ldapbonding.h b/src/ldapbonding.h index 7a86edd..ba7aec9 100644 --- a/src/ldapbonding.h +++ b/src/ldapbonding.h @@ -53,7 +53,7 @@ class LDAPConfig: public KCModule virtual void defaults(); virtual int buttons(); virtual TQString quickHelp() const; - virtual const KAboutData *aboutData() const { return myAboutData; }; + virtual const TDEAboutData *aboutData() const { return myAboutData; }; int bondRealm(LDAPRealmConfig realmcfg, TQString adminUserName, const char * adminPassword, TQString adminRealm, TQString *errstr=0); int unbondRealm(LDAPRealmConfig realmcfg, TQString adminUserName, const char * adminPassword, TQString adminRealm, TQString *errstr=0); @@ -74,7 +74,7 @@ class LDAPConfig: public KCModule void writePAMFiles(); private: - KAboutData *myAboutData; + TDEAboutData *myAboutData; KGlobalSettings *kgs; LDAPConfigBase *base; LDAPRealmConfigList m_realms; |