diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
| commit | 10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch) | |
| tree | 4bc444c00a79e88105f2cfce5b6209994c413ca0 /kio/kssl/ksslpeerinfo.cc | |
| parent | 307136d8eef0ba133b78ceee8e901138d4c996a1 (diff) | |
| download | tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip | |
Revert automated changes
Sorry guys, they are just not ready for prime time
Work will continue as always
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kio/kssl/ksslpeerinfo.cc')
| -rw-r--r-- | kio/kssl/ksslpeerinfo.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kio/kssl/ksslpeerinfo.cc b/kio/kssl/ksslpeerinfo.cc index c5075e049..d1c2d00fc 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::tqfromLatin1(KNetwork::KResolver::domainToAscii(d->peerHost)); + d->peerHost = TQString::fromLatin1(KNetwork::KResolver::domainToAscii(d->peerHost)); #endif } @@ -95,7 +95,7 @@ bool KSSLPeerInfo::cnMatchesAddress(TQString cn) { // Check for invalid characters if (TQRegExp("[^a-zA-Z0-9\\.\\*\\-]").search(cn) >= 0) { - kdDebug(7029) << "CN tqcontains invalid characters! Failing." << endl; + kdDebug(7029) << "CN contains invalid characters! Failing." << endl; return false; } @@ -117,7 +117,7 @@ bool KSSLPeerInfo::cnMatchesAddress(TQString cn) { if (rx.exactMatch(d->peerHost)) return d->peerHost == cn; - if (cn.tqcontains('*')) { + if (cn.contains('*')) { // First make sure that there are at least two valid parts // after the wildcard (*). TQStringList parts = TQStringList::split('.', cn, false); @@ -129,7 +129,7 @@ bool KSSLPeerInfo::cnMatchesAddress(TQString cn) { return false; // we don't allow *.root - that's bad } - if (parts[0].tqcontains('*') || parts[1].tqcontains('*')) { + if (parts[0].contains('*') || parts[1].contains('*')) { return false; } |