summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:52:19 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:52:19 -0600
commitf38eceb7f39ee09b75698cf2201ff1a6bc894586 (patch)
treeb5349a560b5453f2c36acce3ef7698602487c914
parente1e149efa0bb9d33c4061ae2ea2f2ea747d5192f (diff)
downloadkcmldapmanager-f38eceb7.tar.gz
kcmldapmanager-f38eceb7.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
-rw-r--r--src/ldapmgr.cpp4
-rw-r--r--src/ldapmgr.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ldapmgr.cpp b/src/ldapmgr.cpp
index 7261618..674fe17 100644
--- a/src/ldapmgr.cpp
+++ b/src/ldapmgr.cpp
@@ -123,9 +123,9 @@ LDAPConfig::LDAPConfig(TQWidget *parent, const char *name, const TQStringList&)
load();
- KAboutData* about = new KAboutData("ldapmanager", I18N_NOOP("TDE LDAP Realm Manager"), "0.1",
+ TDEAboutData* about = new TDEAboutData("ldapmanager", I18N_NOOP("TDE LDAP Realm Manager"), "0.1",
I18N_NOOP("TDE LDAP Realm 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/ldapmgr.h b/src/ldapmgr.h
index f28befe..e861279 100644
--- a/src/ldapmgr.h
+++ b/src/ldapmgr.h
@@ -48,7 +48,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; };
private slots:
void processLockouts();
@@ -99,7 +99,7 @@ class LDAPConfig: public KCModule
int setPasswordForUser(LDAPUserInfo user, TQString *errstr);
private:
- KAboutData *myAboutData;
+ TDEAboutData *myAboutData;
LDAPConfigBase *base;
KSimpleConfig *m_systemconfig;