summaryrefslogtreecommitdiffstats
path: root/kio/kssl
diff options
context:
space:
mode:
Diffstat (limited to 'kio/kssl')
-rw-r--r--kio/kssl/keygenwizard.ui6
-rw-r--r--kio/kssl/keygenwizard2.ui14
-rw-r--r--kio/kssl/kopenssl.cc2
-rw-r--r--kio/kssl/kssl/caroot/ca-bundle.crt4
-rw-r--r--kio/kssl/ksslcertdlg.cc4
-rw-r--r--kio/kssl/ksslcertificate.cc6
-rw-r--r--kio/kssl/ksslcertificatecache.cc4
-rw-r--r--kio/kssl/ksslinfodlg.cc26
-rw-r--r--kio/kssl/ksslpeerinfo.cc2
-rw-r--r--kio/kssl/ksslsettings.cc2
-rw-r--r--kio/kssl/ksslx509map.cc10
11 files changed, 40 insertions, 40 deletions
diff --git a/kio/kssl/keygenwizard.ui b/kio/kssl/keygenwizard.ui
index 1cecbd5fc..2130c767b 100644
--- a/kio/kssl/keygenwizard.ui
+++ b/kio/kssl/keygenwizard.ui
@@ -1,7 +1,7 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>KGWizardPage1</class>
<author>George Staikos &lt;staikos@kde.org&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>KGWizardPage1</cstring>
</property>
@@ -17,7 +17,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>TextLabel1</cstring>
</property>
@@ -30,7 +30,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter|AlignLeft</set>
</property>
<property name="wordwrap" stdset="0">
diff --git a/kio/kssl/keygenwizard2.ui b/kio/kssl/keygenwizard2.ui
index 9512e4ba9..a0d200428 100644
--- a/kio/kssl/keygenwizard2.ui
+++ b/kio/kssl/keygenwizard2.ui
@@ -1,7 +1,7 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>KGWizardPage2</class>
<author>George Staikos &lt;staikos@kde.org&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>KGWizardPage2</cstring>
</property>
@@ -17,20 +17,20 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>TextLabel4</cstring>
</property>
<property name="text">
<string>You must now provide a password for the certificate request. Please choose a very secure password as this will be used to encrypt your private key.</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter|AlignLeft</set>
</property>
<property name="wordwrap" stdset="0">
</property>
</widget>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>TextLabel6</cstring>
</property>
@@ -41,7 +41,7 @@
<cstring>_password2</cstring>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>TextLabel5</cstring>
</property>
@@ -52,7 +52,7 @@
<cstring>_password1</cstring>
</property>
</widget>
- <widget class="QLineEdit" row="1" column="1">
+ <widget class="TQLineEdit" row="1" column="1">
<property name="name">
<cstring>_password1</cstring>
</property>
@@ -60,7 +60,7 @@
<enum>Password</enum>
</property>
</widget>
- <widget class="QLineEdit" row="2" column="1">
+ <widget class="TQLineEdit" row="2" column="1">
<property name="name">
<cstring>_password2</cstring>
</property>
diff --git a/kio/kssl/kopenssl.cc b/kio/kssl/kopenssl.cc
index 70d36cd8e..79a36ba5f 100644
--- a/kio/kssl/kopenssl.cc
+++ b/kio/kssl/kopenssl.cc
@@ -245,7 +245,7 @@ static TQString findMostRecentLib(TQString dir, TQString name)
uint s = filter.length()-1;
for (TQStringList::Iterator it = l.begin(); it != l.end(); ++it) {
TQString numberpart = (*it).mid(s);
- uint endmaj = numberpart.find('.');
+ uint endmaj = numberpart.tqfind('.');
if (endmaj == -1)
continue;
bool ok;
diff --git a/kio/kssl/kssl/caroot/ca-bundle.crt b/kio/kssl/kssl/caroot/ca-bundle.crt
index ca5d292c9..c9bb22213 100644
--- a/kio/kssl/kssl/caroot/ca-bundle.crt
+++ b/kio/kssl/kssl/caroot/ca-bundle.crt
@@ -1442,7 +1442,7 @@ QTEvMC0GA1UECxMmVmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRp
b24xEjAQBgNVBAMTCUdQIFJvb3QgMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
AQoCggEBALrsQ7g06qNn33cJHxoQoh6pTpVMdOcM3GzGmNCr+hckmmejSRRkiY+T
Ei/vj9jOEASLhcDcL7wpmK+cQsXL0pbP9KXFLW5NjDiOsmoImdWRG6jtM5NJXcvn
-FUNtUvHI6NfaMOCYKqlbo8PRAQOBXX62CZXo2zJu/TrDtZ6b/VkZILMjwOJq7kSW
+FUNtUvHI6NfaTQMOCYKqlbo8PRAQOBXX62CZXo2zJu/TrDtZ6b/VkZILMjwOJq7kSW
gO9oCUCUwrczSYPlya4tIDeQGD0gNtp5Oa+4V59672AqIYT4/6A5IdPYbVTHw2o8
yFwfLkdyFGxVSwkGzY7FawvnB0c6fZJffQ+wXDNXg4M/HoSoeZCfl04i3HUiyG4v
1tDLduEMV5fhJo8phFPy5Y6TykuKTDUCAwEAAaNCMEAwHQYDVR0OBBYEFKJcbg1l
@@ -2931,7 +2931,7 @@ O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOfMke6UiI0HTJ6CVanfCU2qT1L2sCC
bwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6mGu6uLftIdxf+u+yv
GPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxpmo/a
77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCC
-hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid3
+hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmtqtKay20EIhid3
92qgQmwLOM7XdVAyksLfKzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEpp
Ld6leNcG2mqeSz53OiATIgHQv2ieY2BrNU0LbbqhPcCT4H8js1WtciVORvnSFu+w
ZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+htt
diff --git a/kio/kssl/ksslcertdlg.cc b/kio/kssl/ksslcertdlg.cc
index 21bff52b1..511bd4021 100644
--- a/kio/kssl/ksslcertdlg.cc
+++ b/kio/kssl/ksslcertdlg.cc
@@ -155,13 +155,13 @@ void KSSLCertDlg::slotDont() {
TQDataStream& operator<<(TQDataStream& s, const KSSLCertDlgRet& r) {
- s << Q_INT8(r.ok?1:0) << r.choice << Q_INT8(r.save?1:0) << Q_INT8(r.send?1:0);
+ s << TQ_INT8(r.ok?1:0) << r.choice << TQ_INT8(r.save?1:0) << TQ_INT8(r.send?1:0);
return s;
}
TQDataStream& operator>>(TQDataStream& s, KSSLCertDlgRet& r) {
-Q_INT8 tmp;
+TQ_INT8 tmp;
s >> tmp; r.ok = (tmp == 1);
s >> r.choice;
s >> tmp; r.save = (tmp == 1);
diff --git a/kio/kssl/ksslcertificate.cc b/kio/kssl/ksslcertificate.cc
index 285bb1d2d..d712c185c 100644
--- a/kio/kssl/ksslcertificate.cc
+++ b/kio/kssl/ksslcertificate.cc
@@ -243,7 +243,7 @@ TQString KSSLCertificate::getKDEKey() const {
TQString KSSLCertificate::getMD5DigestFromKDEKey(const TQString &k) {
TQString rc;
- int pos = k.findRev('(');
+ int pos = k.tqfindRev('(');
if (pos != -1) {
unsigned int len = k.length();
if (k.at(len-1) == ')') {
@@ -871,7 +871,7 @@ TQDateTime KSSLCertificate::getQDTNotBefore() const {
#ifdef KSSL_HAVE_SSL
return ASN1_UTCTIME_QDateTime(X509_get_notBefore(d->m_cert), NULL);
#else
-return TQDateTime::currentDateTime();
+return TQDateTime::tqcurrentDateTime();
#endif
}
@@ -880,7 +880,7 @@ TQDateTime KSSLCertificate::getQDTNotAfter() const {
#ifdef KSSL_HAVE_SSL
return ASN1_UTCTIME_QDateTime(X509_get_notAfter(d->m_cert), NULL);
#else
-return TQDateTime::currentDateTime();
+return TQDateTime::tqcurrentDateTime();
#endif
}
diff --git a/kio/kssl/ksslcertificatecache.cc b/kio/kssl/ksslcertificatecache.cc
index eb4ff2d86..226e21c71 100644
--- a/kio/kssl/ksslcertificatecache.cc
+++ b/kio/kssl/ksslcertificatecache.cc
@@ -381,13 +381,13 @@ KSSLCertificate *KSSLCertificateCache::getCertByMD5Digest(const TQString &key) {
TQDataStream& operator<<(TQDataStream& s, const KSSLCertificateCache::KSSLCertificatePolicy& p) {
- s << (Q_UINT32)p;
+ s << (TQ_UINT32)p;
return s;
}
TQDataStream& operator>>(TQDataStream& s, KSSLCertificateCache::KSSLCertificatePolicy& p) {
- Q_UINT32 pd;
+ TQ_UINT32 pd;
s >> pd;
p = (KSSLCertificateCache::KSSLCertificatePolicy) pd;
return s;
diff --git a/kio/kssl/ksslinfodlg.cc b/kio/kssl/ksslinfodlg.cc
index 70e8a094c..ea7dd1457 100644
--- a/kio/kssl/ksslinfodlg.cc
+++ b/kio/kssl/ksslinfodlg.cc
@@ -73,7 +73,7 @@ class KSSLInfoDlg::KSSLInfoDlgPrivate {
KSSLInfoDlg::KSSLInfoDlg(bool secureConnection, TQWidget *parent, const char *name, bool modal)
- : KDialog(parent, name, modal, Qt::WDestructiveClose), d(new KSSLInfoDlgPrivate) {
+ : KDialog(parent, name, modal, (WFlags)TQt::WDestructiveClose), d(new KSSLInfoDlgPrivate) {
TQVBoxLayout *topLayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
d->m_secCon = secureConnection;
d->m_layout = new TQGridLayout(topLayout, 3, 3, KDialog::spacingHint());
@@ -273,14 +273,14 @@ void KSSLInfoDlg::displayCert(KSSLCertificate *x) {
d->_serialNum->setText(x->getSerialNumber());
cspl = d->_validFrom->palette();
- if (x->getQDTNotBefore() > TQDateTime::currentDateTime(Qt::UTC))
+ if (x->getQDTNotBefore() > TQDateTime::tqcurrentDateTime(Qt::UTC))
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
else cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
d->_validFrom->setPalette(cspl);
d->_validFrom->setText(x->getNotBefore());
cspl = d->_validUntil->palette();
- if (x->getQDTNotAfter() < TQDateTime::currentDateTime(Qt::UTC))
+ if (x->getQDTNotAfter() < TQDateTime::tqcurrentDateTime(Qt::UTC))
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
else cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
d->_validUntil->setPalette(cspl);
@@ -305,8 +305,8 @@ void KSSLInfoDlg::displayCert(KSSLCertificate *x) {
ksv = ksvl.first();
if (ksv == KSSLCertificate::SelfSigned) {
- if (x->getQDTNotAfter() > TQDateTime::currentDateTime(Qt::UTC) &&
- x->getQDTNotBefore() < TQDateTime::currentDateTime(Qt::UTC)) {
+ if (x->getQDTNotAfter() > TQDateTime::tqcurrentDateTime(Qt::UTC) &&
+ x->getQDTNotBefore() < TQDateTime::tqcurrentDateTime(Qt::UTC)) {
if (KSSLSigners().useForSSL(*x))
ksv = KSSLCertificate::Ok;
} else {
@@ -331,7 +331,7 @@ void KSSLInfoDlg::displayCert(KSSLCertificate *x) {
}
d->_csl->setText(errorStr);
- d->_csl->setMinimumSize(d->_csl->sizeHint());
+ d->_csl->setMinimumSize(d->_csl->tqsizeHint());
d->_subject->setValues(x->getSubject());
d->_issuer->setValues(x->getIssuer());
@@ -399,37 +399,37 @@ void KSSLCertBox::setValues(TQString certName, TQWidget *mailCatcher) {
TQLabel *label = 0L;
if (!(tmp = cert.getValue("O")).isEmpty()) {
label = new TQLabel(i18n("Organization:"), _frame);
- label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
+ label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop);
new TQLabel(tmp, _frame);
}
if (!(tmp = cert.getValue("OU")).isEmpty()) {
label = new TQLabel(i18n("Organizational unit:"), _frame);
- label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
+ label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop);
new TQLabel(tmp, _frame);
}
if (!(tmp = cert.getValue("L")).isEmpty()) {
label = new TQLabel(i18n("Locality:"), _frame);
- label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
+ label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop);
new TQLabel(tmp, _frame);
}
if (!(tmp = cert.getValue("ST")).isEmpty()) {
label = new TQLabel(i18n("Federal State","State:"), _frame);
- label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
+ label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop);
new TQLabel(tmp, _frame);
}
if (!(tmp = cert.getValue("C")).isEmpty()) {
label = new TQLabel(i18n("Country:"), _frame);
- label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
+ label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop);
new TQLabel(tmp, _frame);
}
if (!(tmp = cert.getValue("CN")).isEmpty()) {
label = new TQLabel(i18n("Common name:"), _frame);
- label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
+ label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop);
new TQLabel(tmp, _frame);
}
if (!(tmp = cert.getValue("Email")).isEmpty()) {
label = new TQLabel(i18n("Email:"), _frame);
- label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
+ label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop);
if (mailCatcher) {
KURLLabel *mail = new KURLLabel(tmp, tmp, _frame);
connect(mail, TQT_SIGNAL(leftClickedURL(const TQString &)), mailCatcher, TQT_SLOT(mailClicked(const TQString &)));
diff --git a/kio/kssl/ksslpeerinfo.cc b/kio/kssl/ksslpeerinfo.cc
index d1c2d00fc..8d960ceb7 100644
--- a/kio/kssl/ksslpeerinfo.cc
+++ b/kio/kssl/ksslpeerinfo.cc
@@ -65,7 +65,7 @@ void KSSLPeerInfo::setPeerHost(TQString realHost) {
#ifdef Q_WS_WIN //TODO kresolver not ported
d->peerHost = d->peerHost.lower();
#else
- d->peerHost = TQString::fromLatin1(KNetwork::KResolver::domainToAscii(d->peerHost));
+ d->peerHost = TQString::tqfromLatin1(KNetwork::KResolver::domainToAscii(d->peerHost));
#endif
}
diff --git a/kio/kssl/ksslsettings.cc b/kio/kssl/ksslsettings.cc
index 5a77b12bf..40b3493cd 100644
--- a/kio/kssl/ksslsettings.cc
+++ b/kio/kssl/ksslsettings.cc
@@ -169,7 +169,7 @@ TQString KSSLSettings::getCipherList() {
int bits = d->kossl->SSL_CIPHER_get_bits(sc, NULL);
if (m_cfg->readBoolEntry(tcipher, bits >= 56)) {
CipherNode *xx = new CipherNode(sc->name,bits);
- if (!cipherList.contains(xx))
+ if (!cipherList.tqcontains(xx))
cipherList.prepend(xx);
else
delete xx;
diff --git a/kio/kssl/ksslx509map.cc b/kio/kssl/ksslx509map.cc
index 7896fdfcf..222d187cb 100644
--- a/kio/kssl/ksslx509map.cc
+++ b/kio/kssl/ksslx509map.cc
@@ -33,12 +33,12 @@ KSSLX509Map::~KSSLX509Map() {
void KSSLX509Map::setValue(const TQString& key, const TQString& value) {
- m_pairs.replace(key, value);
+ m_pairs.tqreplace(key, value);
}
TQString KSSLX509Map::getValue(const TQString& key) const {
- if (!m_pairs.contains(key)) {
+ if (!m_pairs.tqcontains(key)) {
return TQString::null;
}
@@ -63,7 +63,7 @@ unsigned int length = str.length();
for(head = 0, tail = 0; tail < length-1; head = tail+1) {
TQString thisline;
- tail = str.find(tok, head);
+ tail = str.tqfind(tok, head);
if (tail > length) // last token - none at end
tail = length;
@@ -85,11 +85,11 @@ TQStringList vl = tokenizeBy(name, TQRegExp("/[A-Za-z]+="), false);
for (TQStringList::Iterator j = vl.begin(); j != vl.end(); ++j) {
TQStringList apair = tokenizeBy(*j, TQRegExp("="), false);
- if (m_pairs.contains(apair[0])) {
+ if (m_pairs.tqcontains(apair[0])) {
TQString oldValue = m_pairs[apair[0]];
oldValue += "\n";
oldValue += apair[1];
- m_pairs.replace(apair[0], oldValue);
+ m_pairs.tqreplace(apair[0], oldValue);
} else {
m_pairs.insert(apair[0], apair[1]);
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-24 22:38:16 +0000