summaryrefslogtreecommitdiffstats
path: root/kio/kssl
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-12-16 09:59:13 -0600
committerTimothy Pearson <[email protected]>2011-12-16 09:59:13 -0600
commit56160bf4dfe503631ef6373367b281f081bab2b4 (patch)
tree7fcea2ffd9c3420af999c3dcad0ed032eef93956 /kio/kssl
parent13281e2856a2ef43bbab78c5528470309c23aa77 (diff)
downloadtdelibs-56160bf4dfe503631ef6373367b281f081bab2b4.tar.gz
tdelibs-56160bf4dfe503631ef6373367b281f081bab2b4.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77.
Diffstat (limited to 'kio/kssl')
-rw-r--r--kio/kssl/keygenwizard.ui2
-rw-r--r--kio/kssl/keygenwizard2.ui2
-rw-r--r--kio/kssl/ksslcertdlg.cc2
-rw-r--r--kio/kssl/ksslcertificate.cc6
-rw-r--r--kio/kssl/ksslinfodlg.cc12
-rw-r--r--kio/kssl/ksslpeerinfo.cc2
-rw-r--r--kio/kssl/ksslsettings.cc2
7 files changed, 14 insertions, 14 deletions
diff --git a/kio/kssl/keygenwizard.ui b/kio/kssl/keygenwizard.ui
index 4cb5fe1df..2130c767b 100644
--- a/kio/kssl/keygenwizard.ui
+++ b/kio/kssl/keygenwizard.ui
@@ -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 90fef8fef..a0d200428 100644
--- a/kio/kssl/keygenwizard2.ui
+++ b/kio/kssl/keygenwizard2.ui
@@ -24,7 +24,7 @@
<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">
diff --git a/kio/kssl/ksslcertdlg.cc b/kio/kssl/ksslcertdlg.cc
index 88de77c90..511bd4021 100644
--- a/kio/kssl/ksslcertdlg.cc
+++ b/kio/kssl/ksslcertdlg.cc
@@ -22,7 +22,7 @@
#include <kssl.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqradiobutton.h>
#include <tqcheckbox.h>
#include <tqlistview.h>
diff --git a/kio/kssl/ksslcertificate.cc b/kio/kssl/ksslcertificate.cc
index 285bb1d2d..7211e510f 100644
--- a/kio/kssl/ksslcertificate.cc
+++ b/kio/kssl/ksslcertificate.cc
@@ -246,7 +246,7 @@ TQString KSSLCertificate::getMD5DigestFromKDEKey(const TQString &k) {
int pos = k.findRev('(');
if (pos != -1) {
unsigned int len = k.length();
- if (k.at(len-1) == ')') {
+ if (k.tqat(len-1) == ')') {
rc = k.mid(pos+1, len-pos-2);
}
}
@@ -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/ksslinfodlg.cc b/kio/kssl/ksslinfodlg.cc
index cb7dc2e96..32580e932 100644
--- a/kio/kssl/ksslinfodlg.cc
+++ b/kio/kssl/ksslinfodlg.cc
@@ -23,7 +23,7 @@
#include <kssl.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <kpushbutton.h>
#include <tqframe.h>
#include <tqlabel.h>
@@ -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 {
@@ -348,7 +348,7 @@ void KSSLInfoDlg::slotChain(int x) {
cl.setAutoDelete(true);
for (int i = 0; i < x-1; i++)
cl.remove((unsigned int)0);
- KSSLCertificate thisCert = *(cl.at(0));
+ KSSLCertificate thisCert = *(cl.tqat(0));
cl.remove((unsigned int)0);
thisCert.chain().setChain(cl);
displayCert(&thisCert);
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..d9286433e 100644
--- a/kio/kssl/ksslsettings.cc
+++ b/kio/kssl/ksslsettings.cc
@@ -182,7 +182,7 @@ TQString KSSLSettings::getCipherList() {
// Also remove NULL ciphers and 168bit ciphers
for (unsigned int i = 0; i < cipherList.count(); i++) {
CipherNode *j = 0L;
- while ((j = cipherList.at(i)) != 0L) {
+ while ((j = cipherList.tqat(i)) != 0L) {
if (j->name.contains("ADH-") || j->name.contains("NULL-") || j->name.contains("DES-CBC3-SHA") || j->name.contains("FZA")) {
cipherList.remove(j);
} else {