summaryrefslogtreecommitdiffstats
path: root/kioslave/mac/kio_mac.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
commitfd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (patch)
tree9eda848e56fcb862fdfdf479adeccd95b6fe387a /kioslave/mac/kio_mac.cpp
parent02f67d0e1355b79b1806746efb0f2f640e57f13d (diff)
downloadtdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.tar.gz
tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.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/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kioslave/mac/kio_mac.cpp')
-rw-r--r--kioslave/mac/kio_mac.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/kioslave/mac/kio_mac.cpp b/kioslave/mac/kio_mac.cpp
index 13c5d761d..e64d22d65 100644
--- a/kioslave/mac/kio_mac.cpp
+++ b/kioslave/mac/kio_mac.cpp
@@ -157,7 +157,7 @@ void MacProtocol::listDir(const KURL& url) {
while (line != NULL) {
//1.0.4 puts this funny line in sometimes, we don't want it
- if (line.tqcontains("Thread ") == 0) {
+ if (line.contains("Thread ") == 0) {
entry = makeUDS(line);
listEntry(entry, false);
}
@@ -207,11 +207,11 @@ TQValueList<KIO::UDSAtom> MacProtocol::doStat(const KURL& url) {
this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int)));
if (standardOutputStream.isEmpty()) {
- filename.tqreplace("\\ ", " "); //get rid of escapes
- filename.tqreplace("\\&", "&"); //mm, slashes...
- filename.tqreplace("\\!", "!");
- filename.tqreplace("\\(", "(");
- filename.tqreplace("\\)", ")");
+ filename.replace("\\ ", " "); //get rid of escapes
+ filename.replace("\\&", "&"); //mm, slashes...
+ filename.replace("\\!", "!");
+ filename.replace("\\(", "(");
+ filename.replace("\\)", ")");
error(ERR_DOES_NOT_EXIST, filename);
} else {
//remove trailing \n
@@ -264,7 +264,7 @@ TQString MacProtocol::prepareHP(const KURL& url) {
bool version102 = true;
- if (standardOutputStream.tqcontains("options") != 0) {
+ if (standardOutputStream.contains("options") != 0) {
version102 = false;
}
@@ -297,11 +297,11 @@ TQString MacProtocol::prepareHP(const KURL& url) {
//escape any funny characters
//TODO are there any more characters to escape?
- path.tqreplace(" ", "\\ ");
- path.tqreplace("&", "\\&");
- path.tqreplace("!", "\\!");
- path.tqreplace("(", "\\(");
- path.tqreplace(")", "\\)");
+ path.replace(" ", "\\ ");
+ path.replace("&", "\\&");
+ path.replace("!", "\\!");
+ path.replace("(", "\\(");
+ path.replace(")", "\\)");
//then change to the right directory
int s; TQString dir;
@@ -455,12 +455,12 @@ int MacProtocol::makeTime(TQString mday, TQString mon, TQString third) {
// otherwise it only prints the year
TQRegExp hourMin("(..):(..)");
if (hourMin.exactMatch(third)) {
- TQDate tqcurrentDate(TQDate::tqcurrentDate());
+ TQDate currentDate(TQDate::currentDate());
- if (month > tqcurrentDate.month()) {
- year = tqcurrentDate.year() - 1;
+ if (month > currentDate.month()) {
+ year = currentDate.year() - 1;
} else {
- year = tqcurrentDate.year();
+ year = currentDate.year();
}
TQString h(hourMin.cap(1));
TQString m(hourMin.cap(2));