Rename KInstance and KAboutData to avoid conflicts with KDE4

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, "kb9vqf@pearsoncomputing.net");
 	TDECmdLineArgs::init( argc, argv, &aboutData );

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, "kb9vqf@pearsoncomputing.net");

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;