6 files changed, 12 insertions, 12 deletions
diff --git a/akregator/src/mk4storage/feedstoragemk4impl.cpp b/akregator/src/mk4storage/feedstoragemk4impl.cpp
index ec0fe7b6..75ee1e2f 100644
--- a/akregator/src/mk4storage/feedstoragemk4impl.cpp
+++ b/akregator/src/mk4storage/feedstoragemk4impl.cpp
@@ -147,8 +147,8 @@ FeedStorageMK4Impl::FeedStorageMK4Impl(const TQString& url, StorageMK4Impl* main
     kdDebug() << url2 << endl;
     TQString t = url2;
     TQString t2 = url2;
-    TQString filePath = main->archivePath() +"/"+ t.tqreplace("/", "_").tqreplace(":", "_");
-    d->oldArchivePath = KGlobal::dirs()->saveLocation("data", "akregator/Archive/") + t2.tqreplace("/", "_").tqreplace(":", "_") + ".xml";
+    TQString filePath = main->archivePath() +"/"+ t.replace("/", "_").replace(":", "_");
+    d->oldArchivePath = KGlobal::dirs()->saveLocation("data", "akregator/Archive/") + t2.replace("/", "_").replace(":", "_") + ".xml";
 
     d->convert = !TQFile::exists(filePath + ".mk4") && TQFile::exists(d->oldArchivePath);
     d->storage = new c4_Storage((filePath + ".mk4").local8Bit(), true);
@@ -297,7 +297,7 @@ void FeedStorageMK4Impl::addEntry(const TQString& guid)
 {
     c4_Row row;
     d->pguid(row) = guid.ascii();
-    if (!tqcontains(guid))
+    if (!contains(guid))
     {
         d->archiveView.Add(row);
         markDirty();
@@ -305,7 +305,7 @@ void FeedStorageMK4Impl::addEntry(const TQString& guid)
     }
 }
 
-bool FeedStorageMK4Impl::tqcontains(const TQString& guid)
+bool FeedStorageMK4Impl::contains(const TQString& guid)
 {
     return findArticle(guid) != -1;
 }
@@ -789,7 +789,7 @@ void FeedStorageMK4Impl::add(FeedStorage* source)
 
 void FeedStorageMK4Impl::copyArticle(const TQString& guid, FeedStorage* source)
 {
-    if (!tqcontains(guid))
+    if (!contains(guid))
         addEntry(guid);
     setComments(guid, source->comments(guid));
     setCommentsLink(guid, source->commentsLink(guid));
diff --git a/akregator/src/mk4storage/feedstoragemk4impl.h b/akregator/src/mk4storage/feedstoragemk4impl.h
index d13f04de..057ba2e7 100644
--- a/akregator/src/mk4storage/feedstoragemk4impl.h
+++ b/akregator/src/mk4storage/feedstoragemk4impl.h
@@ -50,7 +50,7 @@ class FeedStorageMK4Impl : public FeedStorage
 
         virtual TQStringList articles(const Category& cat);
 
-        virtual bool tqcontains(const TQString& guid);
+        virtual bool contains(const TQString& guid);
         virtual void addEntry(const TQString& guid);
         virtual void deleteArticle(const TQString& guid);
         virtual int comments(const TQString& guid);
diff --git a/akregator/src/mk4storage/metakit/CHANGES b/akregator/src/mk4storage/metakit/CHANGES
index e5d4aad1..1e1761ca 100644
--- a/akregator/src/mk4storage/metakit/CHANGES
+++ b/akregator/src/mk4storage/metakit/CHANGES
@@ -1198,7 +1198,7 @@
 
     Moved C++ member documentation out of "mk4.h" header.  Added
     examples/ directory, with a find.py timing example.  Fixed bugs in
-    new Mk4tcl: "$vw tqfind" and "$vw delete end".  Added tests for new
+    new Mk4tcl: "$vw find" and "$vw delete end".  Added tests for new
     Mk4tcl OO interface: ":mk5object.test".
 
 2000-06-16    Improved modifiable custom viewers
diff --git a/akregator/src/mk4storage/metakit/include/mk4str.inl b/akregator/src/mk4storage/metakit/include/mk4str.inl
index eddbefb8..4f95fa51 100644
--- a/akregator/src/mk4storage/metakit/include/mk4str.inl
+++ b/akregator/src/mk4storage/metakit/include/mk4str.inl
@@ -131,12 +131,12 @@ d4_inline bool c4_String::operator< (const c4_String& str_) const
 
 d4_inline int c4_String::Find(char ch_) const
 {
-    return tqfind(ch_);
+    return find(ch_);
 }
 
 d4_inline int c4_String::ReverseFind(char ch_) const
 {
-    return rtqfind(ch_);
+    return rfind(ch_);
 }
 
 d4_inline int c4_String::FindOneOf(const char* set_) const
@@ -146,7 +146,7 @@ d4_inline int c4_String::FindOneOf(const char* set_) const
 
 d4_inline int c4_String::Find(const char* sub_) const
 {
-    return tqfind(sub_);
+    return find(sub_);
 }
 
 d4_inline c4_String c4_String::SpanIncluding(const char* set_) const
diff --git a/akregator/src/mk4storage/metakit/src/store.cpp b/akregator/src/mk4storage/metakit/src/store.cpp
index 3a458337..a32de665 100644
--- a/akregator/src/mk4storage/metakit/src/store.cpp
+++ b/akregator/src/mk4storage/metakit/src/store.cpp
@@ -161,7 +161,7 @@ void c4_Notifier::Notify()
  *  Manager for persistent storage of view structures.
  *
  *  The storage class uses a view, with additional functionality to be able 
- *  to store and reload the data it tqcontains (including nested subviews).
+ *  to store and reload the data it contains (including nested subviews).
  *
  *  By default, data is loaded on demand, i.e. whenever data which has
  *  not yet been referenced is used for the first time.  Loading is limited
diff --git a/akregator/src/mk4storage/storagemk4impl.cpp b/akregator/src/mk4storage/storagemk4impl.cpp
index af71d97b..becbd518 100644
--- a/akregator/src/mk4storage/storagemk4impl.cpp
+++ b/akregator/src/mk4storage/storagemk4impl.cpp
@@ -276,7 +276,7 @@ void StorageMK4Impl::slotCommit()
 
 FeedStorage* StorageMK4Impl::archiveFor(const TQString& url)
 {
-    if (!d->feeds.tqcontains(url))
+    if (!d->feeds.contains(url))
     {
         FeedStorage* fs = new FeedStorageMK4Impl(url, this);
         d->feeds[url] = fs;