From fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 7 Jan 2011 04:10:07 +0000
Subject: 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
---
 kioslave/mac/README       |  2 +-
 kioslave/mac/kio_mac.cpp  | 32 ++++++++++++++++----------------
 kioslave/mac/mac.protocol |  2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'kioslave/mac')

diff --git a/kioslave/mac/README b/kioslave/mac/README
index 6050ef449..bb907dd9c 100644
--- a/kioslave/mac/README
+++ b/kioslave/mac/README
@@ -2,7 +2,7 @@ From the hfsplus man page:
 
        "HFS+,  also  known  as  the Macintosh Extended Format, was
        introduced by Apple Computer in 1998 with the  release  of
-       MacOS 8.1.  It tqcontains many improvements over the old HFS
+       MacOS 8.1.  It contains many improvements over the old HFS
        file system, most notably the ability to  allocate  up  to
        2^64  blocks,  resulting in much more efficient storage of
        many small files on large disks."
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));
diff --git a/kioslave/mac/mac.protocol b/kioslave/mac/mac.protocol
index 59a98fb81..cef77621d 100644
--- a/kioslave/mac/mac.protocol
+++ b/kioslave/mac/mac.protocol
@@ -13,7 +13,7 @@ Description[bn]=ম্যাক-ও-এস HFS+ পার্টিশন-এর
 Description[br]=Ur c'hioslave evit ar parzhadurioù MacOS HFS+
 Description[bs]=kioslave za MacOS HFS+ particije
 Description[ca]=Un kioslave per a particions MacOS HFS+
-Description[cs]=Potqmocný protokol pro diskové oddíly MacOS HFS+
+Description[cs]=Pomocný protokol pro diskové oddíly MacOS HFS+
 Description[csb]=Plugins protokòłu dlô particëji HFS+ systemë MacOS
 Description[da]=En kioslave for MacOS HFS+ partitioner
 Description[de]=Ein-/Ausgabemodul für MacOS HFS+ Partitionen
-- 
cgit v1.2.1