diff options
Diffstat (limited to 'kpf')
| -rw-r--r-- | kpf/src/AppletItem.cpp | 2 | ||||
| -rw-r--r-- | kpf/src/ByteRange.cpp | 2 | ||||
| -rw-r--r-- | kpf/src/Request.cpp | 6 | ||||
| -rw-r--r-- | kpf/src/Response.cpp | 6 | ||||
| -rw-r--r-- | kpf/src/Server.cpp | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/kpf/src/AppletItem.cpp b/kpf/src/AppletItem.cpp index 9e49679d..f6eb7dd4 100644 --- a/kpf/src/AppletItem.cpp +++ b/kpf/src/AppletItem.cpp @@ -132,7 +132,7 @@ namespace KPF break; } - if (!TQT_TQRECT_OBJECT(rect()).tqcontains(e->pos())) + if (!TQT_TQRECT_OBJECT(rect()).contains(e->pos())) { break; } diff --git a/kpf/src/ByteRange.cpp b/kpf/src/ByteRange.cpp index b5bdf0a1..2db5de6b 100644 --- a/kpf/src/ByteRange.cpp +++ b/kpf/src/ByteRange.cpp @@ -128,7 +128,7 @@ namespace KPF { kpfDebug << "addByteRange(" << s << ")" << endl; - int dashPos = s.tqfind('-'); + int dashPos = s.find('-'); if (-1 == dashPos) { diff --git a/kpf/src/Request.cpp b/kpf/src/Request.cpp index 886aac44..702b4989 100644 --- a/kpf/src/Request.cpp +++ b/kpf/src/Request.cpp @@ -56,7 +56,7 @@ namespace KPF { TQString line(*it); - int colonPos = line.tqfind(':'); + int colonPos = line.find(':'); if (-1 != colonPos) { @@ -114,7 +114,7 @@ namespace KPF s.remove(0, 5); - int dotPos = s.tqfind('.'); + int dotPos = s.find('.'); if (-1 != dotPos) { @@ -367,7 +367,7 @@ namespace KPF // Double slash -> slash. TQRegExp r("\\/\\/+"); - s.tqreplace(r, "/"); + s.replace(r, "/"); return s; } diff --git a/kpf/src/Response.cpp b/kpf/src/Response.cpp index 1299fd44..67d4f206 100644 --- a/kpf/src/Response.cpp +++ b/kpf/src/Response.cpp @@ -152,9 +152,9 @@ namespace KPF { TQString line(str.readLine()); - line.tqreplace(regexpMessage, responseName(code)); - line.tqreplace(regexpCode, TQString::number(code)); - line.tqreplace(regexpResource, request.path()); + line.replace(regexpMessage, responseName(code)); + line.replace(regexpCode, TQString::number(code)); + line.replace(regexpResource, request.path()); html = line + "\r\n"; } diff --git a/kpf/src/Server.cpp b/kpf/src/Server.cpp index 00904132..62566b63 100644 --- a/kpf/src/Server.cpp +++ b/kpf/src/Server.cpp @@ -255,7 +255,7 @@ namespace KPF // simply not be found, but I'm worried that the TQDir/TQFile/TQFileInfo // stuff might try to expand it, so I'm not taking any chances. - if (d->request.path().tqcontains("..") || d->request.path().tqcontains('~')) + if (d->request.path().contains("..") || d->request.path().contains('~')) { kpfDebug << d->id << ": readRequest: bogus path" << endl; d->state = Responding; |