TDE
/
libtdeldap
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/libtdeldap
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename many classes and header files to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent c2be672ba8
commit e4aee49e75
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

2
src/ldappasswddlg.cpp
Unescape View File

@ -22,7 +22,7 @@
#include <klineedit.h> #include <klineedit.h>
#include <ktextedit.h> #include <ktextedit.h>
#include <knuminput.h> #include <knuminput.h>
#include <kactionselector.h> #include <tdeactionselector.h>
#include <tqlistbox.h> #include <tqlistbox.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <tqpixmap.h> #include <tqpixmap.h>

14
src/libtdeldap.cpp
Unescape View File

@ -987,7 +987,7 @@ int LDAPManager::setPasswordForUser(LDAPUserInfo user, TQString *errstr) {
return 1; // Failure return 1; // Failure
} }
TQString klistDateTimeToRFCDateTime(TQString datetime) { TQString tdelistDateTimeToRFCDateTime(TQString datetime) {
// HACK HACK HACK // HACK HACK HACK
// FIXME // FIXME
TQString ret; TQString ret;
@ -1015,7 +1015,7 @@ TQString klistDateTimeToRFCDateTime(TQString datetime) {
#define KLIST_STOPTIME_STRING "End time: " #define KLIST_STOPTIME_STRING "End time: "
#define KLIST_FLAGS_STRING "Ticket flags: " #define KLIST_FLAGS_STRING "Ticket flags: "
#define KLIST_ADDRESSES_STRING "Ticket flags: " #define KLIST_ADDRESSES_STRING "Ticket flags: "
#define KLIST_NO_TICKET_FILE "klist: No ticket file: " #define KLIST_NO_TICKET_FILE "tdelist: No ticket file: "
#define KLIST_KVNO_STRING "kvno" #define KLIST_KVNO_STRING "kvno"
#define KLIST_ADDRESSLESS_STRING "addressless" #define KLIST_ADDRESSLESS_STRING "addressless"
@ -1048,10 +1048,10 @@ KerberosTicketInfoList LDAPManager::getKerberosTicketList(TQString cache, TQStri
TQString line; TQString line;
FILE *output; FILE *output;
if (cache != "") { if (cache != "") {
output = popen((TQString("klist --cache=%1 -v 2>&1").arg(cache)).ascii(), "r"); output = popen((TQString("tdelist --cache=%1 -v 2>&1").arg(cache)).ascii(), "r");
} }
else { else {
output = popen("klist -v 2>&1", "r"); output = popen("tdelist -v 2>&1", "r");
} }
TQFile f; TQFile f;
f.open(IO_ReadOnly, output); f.open(IO_ReadOnly, output);
@ -1117,7 +1117,7 @@ KerberosTicketInfoList LDAPManager::getKerberosTicketList(TQString cache, TQStri
line.remove(0, strlen(KLIST_AUTHTIME_STRING)); line.remove(0, strlen(KLIST_AUTHTIME_STRING));
line.replace("(expired)", ""); line.replace("(expired)", "");
line = line.simplifyWhiteSpace(); line = line.simplifyWhiteSpace();
line = klistDateTimeToRFCDateTime(line); line = tdelistDateTimeToRFCDateTime(line);
ticket.authenticationTime.setTime_t(KRFCDate::parseDate(line)); ticket.authenticationTime.setTime_t(KRFCDate::parseDate(line));
ticket.informationValid = true; ticket.informationValid = true;
} }
@ -1125,7 +1125,7 @@ KerberosTicketInfoList LDAPManager::getKerberosTicketList(TQString cache, TQStri
line.remove(0, strlen(KLIST_STARTTIME_STRING)); line.remove(0, strlen(KLIST_STARTTIME_STRING));
line.replace("(expired)", ""); line.replace("(expired)", "");
line = line.simplifyWhiteSpace(); line = line.simplifyWhiteSpace();
line = klistDateTimeToRFCDateTime(line); line = tdelistDateTimeToRFCDateTime(line);
ticket.validStartTime.setTime_t(KRFCDate::parseDate(line)); ticket.validStartTime.setTime_t(KRFCDate::parseDate(line));
ticket.informationValid = true; ticket.informationValid = true;
} }
@ -1133,7 +1133,7 @@ KerberosTicketInfoList LDAPManager::getKerberosTicketList(TQString cache, TQStri
line.remove(0, strlen(KLIST_STOPTIME_STRING)); line.remove(0, strlen(KLIST_STOPTIME_STRING));
line.replace("(expired)", ""); line.replace("(expired)", "");
line = line.simplifyWhiteSpace(); line = line.simplifyWhiteSpace();
line = klistDateTimeToRFCDateTime(line); line = tdelistDateTimeToRFCDateTime(line);
ticket.validEndTime.setTime_t(KRFCDate::parseDate(line)); ticket.validEndTime.setTime_t(KRFCDate::parseDate(line));
ticket.informationValid = true; ticket.informationValid = true;
} }

Write Preview
Loading…
Cancel
Save