CMakeLists.txt

@@ -7,11 +7,7 @@
 ############################################
 
 
-##### set project version ########################
-
-include( TDEVersion )
-cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
-tde_set_project_version( )
+cmake_minimum_required( VERSION 3.1 )
 
 
 #### general package setup
@@ -35,6 +31,11 @@ include( CheckCXXSourceCompiles )
 include( TDEMacros )
 
 
+##### set version number ########################
+
+tde_set_project_version( )
+
+
 ##### setup install paths
 
 include( TDESetupPaths )

ConfigureChecks.cmake

@@ -115,7 +115,7 @@ endif( )
 
 tde_save_and_set( CMAKE_REQUIRED_INCLUDES "${TDE_INCLUDE_DIR}" )
 check_cxx_source_compiles( "
-  #include <tdemacros.h>
+  #include <kdemacros.h>
     #ifndef __TDE_HAVE_TDEHWLIB
     #error tdecore is not build with tdehwlib
     #endif

config.h.cmake

@@ -1,7 +1,7 @@
 #define VERSION "@VERSION@"
 
 // Defined if you have fvisibility and fvisibility-inlines-hidden support.
-#cmakedefine __TDE_HAVE_GCC_VISIBILITY 1
+#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */

src/ldaplogindlg.cpp

@@ -23,13 +23,13 @@
 #include <tqmap.h>
 
 #include <tdeapplication.h>
-#include <tdesimpleconfig.h>
+#include <ksimpleconfig.h>
 #include <tdelocale.h>
 #include <kdebug.h>
-#include <tdestandarddirs.h>
+#include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <dcopclient.h>
-#include <tdeprocess.h>
+#include <kprocess.h>
 #include <kcombobox.h>
 
 #include "ldaplogindlg.h"

src/ldaplogindlg.h

@@ -30,7 +30,7 @@ class TQStringList;
   */
 
 class LDAPLogin : public LDAPLoginDlg  {
-	TQ_OBJECT
+	Q_OBJECT
 public:
 	LDAPLogin(TQWidget *parent=0, const char *name=0);
 	~LDAPLogin();

src/ldappasswddlg.h

@@ -26,9 +26,9 @@
 
 class LDAPLogin;
 
-class TDE_EXPORT LDAPPasswordDialog : public KDialogBase
+class KDE_EXPORT LDAPPasswordDialog : public KDialogBase
 {
-	TQ_OBJECT
+	Q_OBJECT
 
 public:
 	LDAPPasswordDialog(TQWidget* parent = 0, const char* name = 0, bool allowGSSAPI = true, bool allowSmartCard = false);

src/libtdeldap.cpp

@@ -35,7 +35,7 @@
 #include <tdemessagebox.h>
 #include <klineedit.h>
 #include <kpassdlg.h>
-#include <tdesimpleconfig.h>
+#include <ksimpleconfig.h>
 #include <tdesu/process.h>
 #include <ksslcertificate.h>
 #include <krfcdate.h>
@@ -1081,7 +1081,7 @@ int LDAPManager::updateUserInfo(LDAPUserInfo user, TQString *errstr) {
 			KSSLCertificate* cert = KSSLCertificate::fromString(ssldata);
 			if (cert) {
 				bool expired = false;
-				if (TQDateTime::currentDateTime(TQt::UTC) > cert->getQDTNotAfter()) {
+				if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
 					expired = true;
 				}
 
@@ -1592,7 +1592,7 @@ KerberosTicketInfoList LDAPManager::getKerberosTicketList(TQString cache, TQStri
 		}
 		else if (line.startsWith(KLIST_FLAGS_STRING)) {
 			line.remove(0, strlen(KLIST_FLAGS_STRING));
-			TQStringList flags = TQStringList::split(",", line, false);
+			TQStringList flags = TQStringList::split(",", line, FALSE);
 			for (TQStringList::Iterator it = flags.begin(); it != flags.end(); ++it) {
 				if ((*it) == KLIST_KRB5_TICKET_RESERVED) {
 					ticket.flags = ticket.flags | KRB5_TICKET_RESERVED;
@@ -1663,7 +1663,7 @@ KerberosTicketInfoList LDAPManager::getKerberosTicketList(TQString cache, TQStri
 
 LDAPRealmConfigList LDAPManager::fetchAndReadTDERealmList(TQString *defaultRealm)
 {
-	TDESimpleConfig* systemconfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" ));
+	KSimpleConfig* systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" ));
 	systemconfig->setGroup(NULL);
 	if (defaultRealm != NULL) {
 		*defaultRealm = systemconfig->readEntry("DefaultRealm", TQString::null);
@@ -1728,7 +1728,7 @@ int LDAPManager::obtainKerberosTicket(LDAPCredentials creds, TQString principal,
 	QCStringList args;
 	if (creds.use_smartcard) {
 		// Get PKCS#11 slot number from the LDAP configuration file
-		TDESimpleConfig* systemconfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" ));
+		KSimpleConfig* systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" ));
 		systemconfig->setGroup(NULL);
 		int pkcs11_login_card_slot = systemconfig->readNumEntry("PKCS11LoginCardSlot", 0);
 		delete systemconfig;
@@ -3296,7 +3296,7 @@ int LDAPManager::moveKerberosEntries(TQString newSuffix, TQString* errstr) {
 }
 
 int LDAPManager::writeLDAPConfFile(LDAPRealmConfig realmcfg, LDAPMachineRole machineRole, TQString *errstr) {
-	TDESimpleConfig* systemconfig;
+	KSimpleConfig* systemconfig;
 	TQString m_defaultRealm;
 	int m_ldapVersion;
 	int m_ldapTimeout;
@@ -3306,7 +3306,7 @@ int LDAPManager::writeLDAPConfFile(LDAPRealmConfig realmcfg, LDAPMachineRole mac
 	TQString m_ignoredUsers;
 	TQCString command;
 
-	systemconfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" ));
+	systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" ));
 	systemconfig->setGroup(NULL);
 	m_defaultRealm = systemconfig->readEntry("DefaultRealm", TQString::null);
 
@@ -3491,7 +3491,7 @@ LDAPMasterReplicationInfo LDAPManager::parseLDAPMasterReplicationRecord(LDAPMast
 			if (ldap_field == "olcServerID") {
 				i=0;
 				while (vals[i] != NULL) {
-					TQStringList serverIDMapping = TQStringList::split(" ", TQString(vals[i]->bv_val), false);
+					TQStringList serverIDMapping = TQStringList::split(" ", TQString(vals[i]->bv_val), FALSE);
 					LDAPMasterReplicationMapping mapping;
 					mapping.id = serverIDMapping[0].toInt();
 					mapping.fqdn = serverIDMapping[1];
@@ -4301,7 +4301,7 @@ int LDAPManager::installCACertificateInHostCAStore(TQString *errstr) {
 int LDAPManager::retrieveAndInstallCaCrl(LDAPManager* manager, TQString *errstr) {
 	int retcode = 0;
 	LDAPManager* ldap_mgr = manager;
-	TDESimpleConfig* systemconfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" ));
+	KSimpleConfig* systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" ));
 	LDAPRealmConfigList realms = LDAPManager::readTDERealmList(systemconfig, false);
 
 	if (!ldap_mgr) {
@@ -4336,7 +4336,7 @@ int LDAPManager::retrieveAndInstallCaCrl(LDAPManager* manager, TQString *errstr)
 	return retcode;
 }
 
-LDAPRealmConfigList LDAPManager::readTDERealmList(TDESimpleConfig* config, bool disableAllBonds) {
+LDAPRealmConfigList LDAPManager::readTDERealmList(KSimpleConfig* config, bool disableAllBonds) {
 	LDAPRealmConfigList realms;
 
 	TQStringList cfgRealms = config->groupList();
@@ -4375,7 +4375,7 @@ LDAPRealmConfigList LDAPManager::readTDERealmList(TDESimpleConfig* config, bool
 	return realms;
 }
 
-int LDAPManager::writeTDERealmList(LDAPRealmConfigList realms, TDESimpleConfig* config, TQString *errstr) {
+int LDAPManager::writeTDERealmList(LDAPRealmConfigList realms, KSimpleConfig* config, TQString *errstr) {
 	Q_UNUSED(errstr)
 
 	LDAPRealmConfigList::Iterator it;
@@ -4766,7 +4766,7 @@ int LDAPManager::generatePKICRL(int expirydays, LDAPRealmConfig realmcfg, TQStri
 				KSSLCertificate* cert = KSSLCertificate::fromString(ssldata);
 				if (cert) {
 					bool expired = false;
-					if (TQDateTime::currentDateTime(TQt::UTC) > cert->getQDTNotAfter()) {
+					if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
 						expired = true;
 					}
 
@@ -4860,7 +4860,7 @@ TQString LDAPManager::getMachineFQDN() {
 	return fqdn;
 }
 
-LDAPClientRealmConfig LDAPManager::loadClientRealmConfig(TDESimpleConfig* config, bool useDefaults) {
+LDAPClientRealmConfig LDAPManager::loadClientRealmConfig(KSimpleConfig* config, bool useDefaults) {
 	LDAPClientRealmConfig clientRealmConfig;
 
 	config->setReadDefaults(useDefaults);
@@ -4894,7 +4894,7 @@ LDAPClientRealmConfig LDAPManager::loadClientRealmConfig(TDESimpleConfig* config
 	return clientRealmConfig;
 }
 
-int LDAPManager::saveClientRealmConfig(LDAPClientRealmConfig clientRealmConfig, TDESimpleConfig* config, TQString *errstr) {
+int LDAPManager::saveClientRealmConfig(LDAPClientRealmConfig clientRealmConfig, KSimpleConfig* config, TQString *errstr) {
 	Q_UNUSED(errstr)
 
 	config->setGroup(NULL);
@@ -4936,7 +4936,7 @@ int LDAPManager::writeClientKrb5ConfFile(LDAPClientRealmConfig clientRealmConfig
 		stream << "\n";
 
 		// Get PKCS#11 slot number from the LDAP configuration file
-		TDESimpleConfig* systemconfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" ));
+		KSimpleConfig* systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" ));
 		systemconfig->setGroup(NULL);
 		int pkcs11_login_card_slot = systemconfig->readNumEntry("PKCS11LoginCardSlot", 0);
 		delete systemconfig;
@@ -5560,7 +5560,7 @@ int LDAPManager::writeOpenSSLConfigurationFile(LDAPRealmConfig realmcfg, LDAPUse
 bool LDAPManager::pkcsLoginEnabled() {
 	bool enabled;
 
-	TDESimpleConfig* systemconfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" ));
+	KSimpleConfig* systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" ));
 	systemconfig->setGroup(NULL);
 	enabled = systemconfig->readBoolEntry("EnablePKCS11Login", false);
 	delete systemconfig;

src/libtdeldap.h

@@ -33,7 +33,7 @@
 #include <tqvaluelist.h>
 #include <tqfile.h>
 
-#include <tdesimpleconfig.h>
+#include <ksimpleconfig.h>
 
 // FIXME
 // Connect this to CMake/Automake
@@ -168,7 +168,7 @@ typedef TQValueList<TQByteArray> TQByteArrayList;
 typedef TQPair<uint32_t, TQByteArray> PKICertificateEntry;
 typedef TQValueList<PKICertificateEntry> PKICertificateEntryList;
 
-class TDE_EXPORT LDAPCredentials
+class KDE_EXPORT LDAPCredentials
 {
 	public:
 		LDAPCredentials();
@@ -185,7 +185,7 @@ class TDE_EXPORT LDAPCredentials
 };
 
 // PRIVATE
-class TDE_EXPORT LDAPRealmConfig
+class KDE_EXPORT LDAPRealmConfig
 {
 	public:
 		TQString name;
@@ -205,7 +205,7 @@ class TDE_EXPORT LDAPRealmConfig
 };
 
 // PRIVATE
-class TDE_EXPORT LDAPCertConfig
+class KDE_EXPORT LDAPCertConfig
 {
 	public:
 		LDAPCertConfig();
@@ -235,7 +235,7 @@ class TDE_EXPORT LDAPCertConfig
 };
 
 // PRIVATE
-class TDE_EXPORT LDAPPamConfig
+class KDE_EXPORT LDAPPamConfig
 {
 	public:
 		LDAPPamConfig();
@@ -251,7 +251,7 @@ class TDE_EXPORT LDAPPamConfig
 };
 
 // PRIVATE
-class TDE_EXPORT LDAPClientRealmConfig
+class KDE_EXPORT LDAPClientRealmConfig
 {
 	public:
 		bool enable_bonding;
@@ -274,7 +274,7 @@ class TDE_EXPORT LDAPClientRealmConfig
 
 typedef TQMap<TQString, LDAPRealmConfig> LDAPRealmConfigList;
 
-class TDE_EXPORT LDAPUserInfo
+class KDE_EXPORT LDAPUserInfo
 {
 	public:
 		LDAPUserInfo();
@@ -357,7 +357,7 @@ class TDE_EXPORT LDAPUserInfo
 		PKICertificateEntryList pkiCertificates;
 };
 
-class TDE_EXPORT LDAPGroupInfo
+class KDE_EXPORT LDAPGroupInfo
 {
 	public:
 		LDAPGroupInfo();
@@ -374,7 +374,7 @@ class TDE_EXPORT LDAPGroupInfo
 		TQStringList userlist;
 };
 
-class TDE_EXPORT LDAPMachineInfo
+class KDE_EXPORT LDAPMachineInfo
 {
 	public:
 		LDAPMachineInfo();
@@ -391,7 +391,7 @@ class TDE_EXPORT LDAPMachineInfo
 		LDAPKRB5Flags status;		// Default is 126 [KRB5_MACHINE_ACCOUNT_DEFAULT]
 };
 
-class TDE_EXPORT LDAPServiceInfo
+class KDE_EXPORT LDAPServiceInfo
 {
 	public:
 		LDAPServiceInfo();
@@ -409,7 +409,7 @@ class TDE_EXPORT LDAPServiceInfo
 		LDAPKRB5Flags status;		// Default is 126 [KRB5_SERVICE_PRINCIPAL_DEFAULT]
 };
 
-class TDE_EXPORT LDAPTDEBuiltinsInfo
+class KDE_EXPORT LDAPTDEBuiltinsInfo
 {
 	public:
 		LDAPTDEBuiltinsInfo();
@@ -423,7 +423,7 @@ class TDE_EXPORT LDAPTDEBuiltinsInfo
 		TQString builtinStandardUserGroup;
 };
 
-class TDE_EXPORT LDAPMasterReplicationMapping
+class KDE_EXPORT LDAPMasterReplicationMapping
 {
 	public:
 		LDAPMasterReplicationMapping();
@@ -436,7 +436,7 @@ class TDE_EXPORT LDAPMasterReplicationMapping
 
 typedef TQValueList<LDAPMasterReplicationMapping> LDAPMasterReplicationMap;
 
-class TDE_EXPORT LDAPMasterReplicationInfo
+class KDE_EXPORT LDAPMasterReplicationInfo
 {
 	public:
 		LDAPMasterReplicationInfo();
@@ -457,7 +457,7 @@ class TDE_EXPORT LDAPMasterReplicationInfo
 		bool replicate_olcGlobal;
 };
 
-class TDE_EXPORT KerberosTicketInfo
+class KDE_EXPORT KerberosTicketInfo
 {
 	public:
 		KerberosTicketInfo();
@@ -488,8 +488,8 @@ typedef TQValueList<KerberosTicketInfo> KerberosTicketInfoList;
 
 class PtyProcess;
 
-class TDE_EXPORT LDAPManager : public TQObject {
-	TQ_OBJECT
+class KDE_EXPORT LDAPManager : public TQObject {
+	Q_OBJECT
 
 	public:
 		LDAPManager(TQString realm, TQString host, TQObject *parent=0, const char *name=0);
@@ -548,9 +548,9 @@ class TDE_EXPORT LDAPManager : public TQObject {
 		static int installCACertificateInHostCAStore(TQString *errstr=0);
 		static int retrieveAndInstallCaCrl(LDAPManager* manager=0, TQString *errstr=0);
 		static TQString getMachineFQDN();
-		static int writeTDERealmList(LDAPRealmConfigList realms, TDESimpleConfig* config, TQString *errstr=0);
+		static int writeTDERealmList(LDAPRealmConfigList realms, KSimpleConfig* config, TQString *errstr=0);
 		static LDAPRealmConfigList fetchAndReadTDERealmList(TQString *defaultRealm=0);
-		static LDAPRealmConfigList readTDERealmList(TDESimpleConfig* config, bool disableAllBonds=false);
+		static LDAPRealmConfigList readTDERealmList(KSimpleConfig* config, bool disableAllBonds=false);
 		static TQDateTime getCertificateExpiration(TQString certfile);
 		static TQDateTime getCertificateExpiration(TQByteArray certfileContents);
 
@@ -577,8 +577,8 @@ class TDE_EXPORT LDAPManager : public TQObject {
 		static TQString detailedKAdminErrorMessage(TQString initialMessage);
 		static TQString readFullLineFromPtyProcess(PtyProcess* proc);
 
-		static LDAPClientRealmConfig loadClientRealmConfig(TDESimpleConfig* config, bool useDefaults=false);
-		static int saveClientRealmConfig(LDAPClientRealmConfig clientRealmConfig, TDESimpleConfig* config, TQString *errstr=0);
+		static LDAPClientRealmConfig loadClientRealmConfig(KSimpleConfig* config, bool useDefaults=false);
+		static int saveClientRealmConfig(LDAPClientRealmConfig clientRealmConfig, KSimpleConfig* config, TQString *errstr=0);
 		static int writeClientKrb5ConfFile(LDAPClientRealmConfig clientRealmConfig, LDAPRealmConfigList realmList, TQString *errstr=0);
 		static int writeLDAPConfFile(LDAPRealmConfig realmcfg, LDAPMachineRole machineRole, TQString *errstr=0);
 		static int writeNSSwitchFile(TQString *errstr=0);