From 10308be19ef7fa44699562cc75946e7ea1fdf6b9 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 7 Jan 2011 03:45:53 +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/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kio/bookmarks/kbookmarkimporter_ns.cc | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'kio/bookmarks/kbookmarkimporter_ns.cc')

diff --git a/kio/bookmarks/kbookmarkimporter_ns.cc b/kio/bookmarks/kbookmarkimporter_ns.cc
index f9e0c7be4..5521bee7e 100644
--- a/kio/bookmarks/kbookmarkimporter_ns.cc
+++ b/kio/bookmarks/kbookmarkimporter_ns.cc
@@ -50,7 +50,7 @@ void KNSBookmarkImporterImpl::parse()
         static const int g_lineLimit = 16*1024;
         TQCString s(g_lineLimit);
         // skip header
-        while(f.readLine(s.data(), g_lineLimit) >= 0 && !s.tqcontains("<DL>"));
+        while(f.readLine(s.data(), g_lineLimit) >= 0 && !s.contains("<DL>"));
 
         while(f.readLine(s.data(), g_lineLimit)>=0) {
             if ( s[s.length()-1] != '\n' ) // Gosh, this line is longer than g_lineLimit. Skipping.
@@ -61,14 +61,14 @@ void KNSBookmarkImporterImpl::parse()
             TQCString t = s.stripWhiteSpace();
             if(t.left(12).upper() == "<DT><A HREF=" ||
                t.left(16).upper() == "<DT><H3><A HREF=") {
-              int firstQuotes = t.tqfind('"')+1;
-              int secondQuotes = t.tqfind('"', firstQuotes);
+              int firstQuotes = t.find('"')+1;
+              int secondQuotes = t.find('"', firstQuotes);
               if (firstQuotes != -1 && secondQuotes != -1)
               {
                 TQCString link = t.mid(firstQuotes, secondQuotes-firstQuotes);
-                int endTag = t.tqfind('>', secondQuotes+1);
+                int endTag = t.find('>', secondQuotes+1);
                 TQCString name = t.mid(endTag+1);
-                name = name.left(name.tqfindRev('<'));
+                name = name.left(name.findRev('<'));
                 if ( name.right(4) == "</A>" )
                     name = name.left( name.length() - 4 );
                 TQString qname = KCharsets::resolveEntities( codec->toUnicode( name ) );
@@ -79,9 +79,9 @@ void KNSBookmarkImporterImpl::parse()
               }
             }
             else if(t.left(7).upper() == "<DT><H3") {
-                int endTag = t.tqfind('>', 7);
+                int endTag = t.find('>', 7);
                 TQCString name = t.mid(endTag+1);
-                name = name.left(name.tqfindRev('<'));
+                name = name.left(name.findRev('<'));
                 TQString qname = KCharsets::resolveEntities( codec->toUnicode( name ) );
                 TQCString additionalInfo = t.mid( 8, endTag-8 );
                 bool folded = (additionalInfo.left(6) == "FOLDED");
@@ -101,7 +101,7 @@ void KNSBookmarkImporterImpl::parse()
     }
 }
 
-TQString KNSBookmarkImporterImpl::tqfindDefaultLocation(bool forSaving) const
+TQString KNSBookmarkImporterImpl::findDefaultLocation(bool forSaving) const
 {
     if (m_utf8) 
     {
@@ -138,7 +138,7 @@ TQString KNSBookmarkImporter::netscapeBookmarksFile( bool forSaving )
         p = new KNSBookmarkImporterImpl;
         p->setUtf8(false);
     }
-    return p->tqfindDefaultLocation(forSaving);
+    return p->findDefaultLocation(forSaving);
 }
 
 TQString KNSBookmarkImporter::mozillaBookmarksFile( bool forSaving )
@@ -149,7 +149,7 @@ TQString KNSBookmarkImporter::mozillaBookmarksFile( bool forSaving )
         p = new KNSBookmarkImporterImpl;
         p->setUtf8(true);
     }
-    return p->tqfindDefaultLocation(forSaving);
+    return p->findDefaultLocation(forSaving);
 }
 
 
@@ -191,7 +191,7 @@ void KNSBookmarkExporterImpl::write(KBookmarkGroup parent) {
    fstream.setEncoding(m_utf8 ? TQTextStream::UnicodeUTF8 : TQTextStream::Locale);
 
    TQString charset 
-      = m_utf8 ? "UTF-8" : TQString::tqfromLatin1(TQTextCodec::codecForLocale()->name()).upper();
+      = m_utf8 ? "UTF-8" : TQString::fromLatin1(TQTextCodec::codecForLocale()->name()).upper();
 
    fstream << "<!DOCTYPE NETSCAPE-Bookmark-file-1>" << endl
            << i18n("<!-- This file was generated by Konqueror -->") << endl
-- 
cgit v1.2.1