diff options
author | Timothy Pearson <[email protected]> | 2013-01-22 19:52:17 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-22 19:52:17 -0600 |
commit | 2eea079643df4f211d55f3133aee26c6daa15bf4 (patch) | |
tree | 4e8f614eec9d2d8764d1ffc1ba459e4d89ea8b88 /src/ldapcontroller.h | |
parent | ad81fe266aa8c0e02a310b9e9e846d47d3542a4a (diff) | |
download | kcmldapcontroller-2eea079643df4f211d55f3133aee26c6daa15bf4.tar.gz kcmldapcontroller-2eea079643df4f211d55f3133aee26c6daa15bf4.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'src/ldapcontroller.h')
-rw-r--r-- | src/ldapcontroller.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ldapcontroller.h b/src/ldapcontroller.h index 6aed18d..40f17f7 100644 --- a/src/ldapcontroller.h +++ b/src/ldapcontroller.h @@ -57,7 +57,7 @@ class LDAPController: 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; }; public: int createNewLDAPRealm(TQWidget* dialogparent, LDAPRealmConfig realmconfig, TQString adminUserName, TQString adminGroupName, TQString machineAdminGroupName, TQString standardUserGroupName, const char * adminPassword, TQString rootUserName, const char * rootPassword, TQString adminRealm, LDAPCertConfig certinfo, TQString *errstr); @@ -96,7 +96,7 @@ class LDAPController: public KCModule int uploadKerberosCAKeyFileToLDAP(LDAPManager* ldap_mgr, TQString* errstr=0); private: - KAboutData *myAboutData; + TDEAboutData *myAboutData; LDAPControllerConfigBase *m_base; KSimpleConfig *m_systemconfig; |