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 | |
| parent | ad81fe266aa8c0e02a310b9e9e846d47d3542a4a (diff) | |
| download | kcmldapcontroller-2eea079643df4f211d55f3133aee26c6daa15bf4.tar.gz kcmldapcontroller-2eea079643df4f211d55f3133aee26c6daa15bf4.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
| -rw-r--r-- | cert-updater/main.cpp | 4 | ||||
| -rw-r--r-- | src/ldapcontroller.cpp | 4 | ||||
| -rw-r--r-- | src/ldapcontroller.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/cert-updater/main.cpp b/cert-updater/main.cpp index b9bac42..c45b13a 100644 --- a/cert-updater/main.cpp +++ b/cert-updater/main.cpp @@ -59,8 +59,8 @@ int uploadKerberosCAFileToLDAP(LDAPManager* ldap_mgr, TQString* errstr) { int main(int argc, char *argv[]) { - KAboutData aboutData( "primaryrccertupdater", I18N_NOOP("Realm Certificate Updater"), - version, description, KAboutData::License_GPL, + TDEAboutData aboutData( "primaryrccertupdater", I18N_NOOP("Realm Certificate Updater"), + version, description, TDEAboutData::License_GPL, "(c) 2012, Timothy Pearson"); aboutData.addAuthor("Timothy Pearson",0, "[email protected]"); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/src/ldapcontroller.cpp b/src/ldapcontroller.cpp index 92832fa..55b385a 100644 --- a/src/ldapcontroller.cpp +++ b/src/ldapcontroller.cpp @@ -90,9 +90,9 @@ LDAPController::LDAPController(TQWidget *parent, const char *name, const TQStrin m_systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" )); m_systemconfig->setFileWriteMode(S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); - KAboutData* about = new KAboutData("ldapcontroller", I18N_NOOP("TDE LDAP Controller"), "0.1", + TDEAboutData* about = new TDEAboutData("ldapcontroller", I18N_NOOP("TDE LDAP Controller"), "0.1", I18N_NOOP("TDE LDAP Controller Control Panel Module"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("(c) 2012 Timothy Pearson"), 0, 0); about->addAuthor("Timothy Pearson", 0, "[email protected]"); 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; |