Rename KInstance and KAboutData to avoid conflicts with KDE4

12 years ago · f38eceb7f3
parent e1e149efa0
commit f38eceb7f3
2 changed files with 4 additions and 4 deletions
--- 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");
--- 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;