rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

40 files changed, 198 insertions, 198 deletions

diff --git a/kviewshell/plugins/djvu/djvumultipage.cpp b/kviewshell/plugins/djvu/djvumultipage.cpp
index 90ec1969..eca33115 100644
--- a/kviewshell/plugins/djvu/djvumultipage.cpp
+++ b/kviewshell/plugins/djvu/djvumultipage.cpp
@@ -314,7 +314,7 @@ void DjVuMultiPage::slotSave()
   // Try to guess the proper ending...
   TQString formats;
   TQString ending;
-  int rindex = m_file.tqfindRev(".");
+  int rindex = m_file.findRev(".");
   if (rindex == -1) {
     ending = TQString();
     formats = TQString();
@@ -330,7 +330,7 @@ void DjVuMultiPage::slotSave()
 
   // Add the ending to the filename. I hope the user likes it that
   // way.
-  if (!ending.isEmpty() && fileName.tqfind(ending) == -1)
+  if (!ending.isEmpty() && fileName.find(ending) == -1)
     fileName = fileName+ending;
 
   if (TQFile(fileName).exists()) {
diff --git a/kviewshell/plugins/djvu/djvurenderer.cpp b/kviewshell/plugins/djvu/djvurenderer.cpp
index 8084e327..a7af2ebf 100644
--- a/kviewshell/plugins/djvu/djvurenderer.cpp
+++ b/kviewshell/plugins/djvu/djvurenderer.cpp
@@ -361,7 +361,7 @@ void DjVuRenderer::getAnnotations(RenderedDocumentPage* page, GP<DjVuImage> djvu
       TQString comment((const char*)map[pos]->comment);
 
       // Create an anchor for this link.
-      if (!anchorList.tqcontains(url))
+      if (!anchorList.contains(url))
 	{
 	  // For now we only accept links to pages in the same document.
 	  if(url[0] == '#' && target == "_self")
diff --git a/kviewshell/plugins/djvu/libdjvu/Arrays.cpp b/kviewshell/plugins/djvu/libdjvu/Arrays.cpp
index 30038734..5cb7b04c 100644
--- a/kviewshell/plugins/djvu/libdjvu/Arrays.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/Arrays.cpp
@@ -190,7 +190,7 @@ ArrayRep::resize(int lo, int hi)
   init1(ndata, hibound+1-nminlo, hi-nminlo);
   destroy(data, lobound-minlo, hibound-minlo);
 
-  // free and tqreplace
+  // free and replace
   void *tmp=data;
   data = ndata;
   ndata=tmp;
diff --git a/kviewshell/plugins/djvu/libdjvu/Arrays.h b/kviewshell/plugins/djvu/libdjvu/Arrays.h
index c0bc75a3..b2676d5a 100644
--- a/kviewshell/plugins/djvu/libdjvu/Arrays.h
+++ b/kviewshell/plugins/djvu/libdjvu/Arrays.h
@@ -319,7 +319,7 @@ public:
    /** Erases the array contents. All elements in the array are destroyed.  
        The valid subscript range is set to the empty range. */
    void empty();
-   /** Extends the subscript range so that is tqcontains #n#.
+   /** Extends the subscript range so that is contains #n#.
        This function does nothing if #n# is already int the valid subscript range.
        If the valid range was empty, both the lower bound and the upper bound
        are set to #n#.  Otherwise the valid subscript range is extended
diff --git a/kviewshell/plugins/djvu/libdjvu/DataPool.cpp b/kviewshell/plugins/djvu/libdjvu/DataPool.cpp
index 176d3915..1190292e 100644
--- a/kviewshell/plugins/djvu/libdjvu/DataPool.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DataPool.cpp
@@ -187,7 +187,7 @@ DataPool::OpenFiles_File::add_pool(GP<DataPool> &pool)
    DEBUG_MSG("DataPool::OpenFiles_File::add_pool: pool=" << (void *) pool << "\n");
    DEBUG_MAKE_INDENT(3);
    GCriticalSectionLock lock(&pools_lock);
-   if (!pools_list.tqcontains(pool))
+   if (!pools_list.contains(pool))
      pools_list.append(pool);
    return pools_list.size();
 }
@@ -381,14 +381,14 @@ FCPools::add_pool(const GURL &url, GP<DataPool> pool)
    if (url.is_local_file_url())
    {
       GPList<DataPool> list;
-      GPosition pos(map.tqcontains(url));
+      GPosition pos(map.contains(url));
       if (! pos)
       {
         map[url]=list;
-        pos=map.tqcontains(url);
+        pos=map.contains(url);
       }
       GPList<DataPool> &plist=map[pos];
-      if (!plist.tqcontains(pool))
+      if (!plist.contains(pool))
         plist.append(pool);
    }
   clean();
@@ -403,7 +403,7 @@ FCPools::get_pool(const GURL &url, int start, int length)
   if (url.is_local_file_url())
   {
     GCriticalSectionLock lock(&map_lock);
-    GPosition pos(map.tqcontains(url));
+    GPosition pos(map.contains(url));
     if (pos)
     {
       GPList<DataPool> &plist=map[pos];
@@ -433,7 +433,7 @@ FCPools::del_pool(const GURL &url, GP<DataPool> pool)
    if (url.is_local_file_url())
    {
       GPosition pos;
-      if (map.tqcontains(url, pos))
+      if (map.contains(url, pos))
       {
 	 GPList<DataPool> &list=map[pos];
 	 GPosition list_pos;
@@ -458,7 +458,7 @@ FCPools::load_file(const GURL &url)
    if (url.is_local_file_url())
    {
       GPosition pos;
-      if (map.tqcontains(url, pos))
+      if (map.contains(url, pos))
       {
 	    // We make here a copy of the list because DataPool::load_file()
 	    // will call FCPools::del_pool(), which will modify the list
diff --git a/kviewshell/plugins/djvu/libdjvu/DataPool.h b/kviewshell/plugins/djvu/libdjvu/DataPool.h
index 4202ef7d..fb4bea4e 100644
--- a/kviewshell/plugins/djvu/libdjvu/DataPool.h
+++ b/kviewshell/plugins/djvu/libdjvu/DataPool.h
@@ -116,7 +116,7 @@ class ByteStream;
     Access to data in a #DataPool# may be direct (Using \Ref{get_data}()
     function) or sequential (See \Ref{get_stream}() function).
 
-    If the #DataPool# is not connected to anything, that is it tqcontains
+    If the #DataPool# is not connected to anything, that is it contains
     some real data, this data can be added to it by means of two
     \Ref{add_data}() functions. One of them adds data sequentially maintaining
     the offset of the last block of data added by it. The other can store
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmDir.cpp b/kviewshell/plugins/djvu/libdjvu/DjVmDir.cpp
index 2d8d2467..83f9df78 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVmDir.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVmDir.cpp
@@ -363,7 +363,7 @@ DjVmDir::decode(const GP<ByteStream> &gstr)
       for(pos=files_list;pos;++pos)
       {
 	       GP<File> file=files_list[pos];
-	       if (name2file.tqcontains(file->name))
+	       if (name2file.contains(file->name))
 	          G_THROW( ERR_MSG("DjVmDir.dupl_name") "\t" + file->name );
 	       name2file[file->name]=file;
       }
@@ -372,7 +372,7 @@ DjVmDir::decode(const GP<ByteStream> &gstr)
       for(pos=files_list;pos;++pos)
       {
 	       GP<File> file=files_list[pos];
-	       if (id2file.tqcontains(file->id))
+	       if (id2file.contains(file->id))
 	          G_THROW( ERR_MSG("DjVmDir.dupl_id") "\t" + file->id);
 	       id2file[file->id]=file;
       }
@@ -383,7 +383,7 @@ DjVmDir::decode(const GP<ByteStream> &gstr)
 	       GP<File> file=files_list[pos];
 	       if (file->title.length())
 	       {
-	          if (title2file.tqcontains(file->title))
+	          if (title2file.contains(file->title))
 	             G_THROW( ERR_MSG("DjVmDir.dupl_title") "\t" + file->title);
 	          title2file[file->title]=file;
 	       }
@@ -542,7 +542,7 @@ DjVmDir::name_to_file(const GUTF8String & name) const
    GCriticalSectionLock lock((GCriticalSection *) &class_lock);
 
    GPosition pos;
-   return (name2file.tqcontains(name, pos))?name2file[pos]:(GP<DjVmDir::File>(0));
+   return (name2file.contains(name, pos))?name2file[pos]:(GP<DjVmDir::File>(0));
 }
 
 GP<DjVmDir::File>
@@ -551,7 +551,7 @@ DjVmDir::id_to_file(const GUTF8String &id) const
    GCriticalSectionLock lock((GCriticalSection *) &class_lock);
 
    GPosition pos;
-   return (id2file.tqcontains(id, pos))?id2file[pos]:(GP<DjVmDir::File>(0));
+   return (id2file.contains(id, pos))?id2file[pos]:(GP<DjVmDir::File>(0));
 }
 
 GP<DjVmDir::File>
@@ -560,7 +560,7 @@ DjVmDir::title_to_file(const GUTF8String &title) const
    GCriticalSectionLock lock((GCriticalSection *) &class_lock);
 
    GPosition pos;
-   return (title2file.tqcontains(title, pos))?title2file[pos]:(GP<DjVmDir::File>(0));
+   return (title2file.contains(title, pos))?title2file[pos]:(GP<DjVmDir::File>(0));
 }
 
 GPList<DjVmDir::File>
@@ -636,15 +636,15 @@ DjVmDir::insert_file(const GP<File> & file, int pos_num)
       // Modify maps
 //   if (! File::is_legal_id(file->id))
 //     G_THROW( ERR_MSG("DjVmDir.bad_file") "\t" + file->id);
-   if (id2file.tqcontains(file->id))
+   if (id2file.contains(file->id))
      G_THROW( ERR_MSG("DjVmDir.dupl_id2") "\t" + file->id);
-   if (name2file.tqcontains(file->name))
+   if (name2file.contains(file->name))
      G_THROW( ERR_MSG("DjVmDir.dupl_name2") "\t" + file->name);
    name2file[file->name]=file;
    id2file[file->id]=file;
    if (file->title.length())
      {
-       if (title2file.tqcontains(file->title))  // duplicate titles may become ok some day
+       if (title2file.contains(file->title))  // duplicate titles may become ok some day
          G_THROW( ERR_MSG("DjVmDir.dupl_title2") "\t" + file->title);
        title2file[file->title]=file;
      }
@@ -749,7 +749,7 @@ DjVmDir::set_file_name(const GUTF8String &id, const GUTF8String &name)
    }
 
       // Check if ID is valid
-   if (!id2file.tqcontains(id, pos))
+   if (!id2file.contains(id, pos))
       G_THROW( ERR_MSG("DjVmDir.no_info") "\t" + GUTF8String(id));
    GP<File> file=id2file[pos];
    name2file.del(file->name);
@@ -776,7 +776,7 @@ DjVmDir::set_file_title(const GUTF8String &id, const GUTF8String &title)
    }
 
       // Check if ID is valid
-   if (!id2file.tqcontains(id, pos))
+   if (!id2file.contains(id, pos))
       G_THROW( ERR_MSG("DjVmDir.no_info") "\t" + GUTF8String(id));
    GP<File> file=id2file[pos];
    title2file.del(file->title);
@@ -795,7 +795,7 @@ DjVmDir::resolve_duplicates(const bool save_as_bundled)
   for(pos=files_list;pos;++pos)
   {
     const GUTF8String save_name=files_list[pos]->check_save_name(save_as_bundled).downcase();
-    if(save_map.tqcontains(save_name))
+    if(save_map.contains(save_name))
     {
       conflicts[save_name].append(files_list[pos]);
     }else
@@ -813,7 +813,7 @@ DjVmDir::resolve_duplicates(const bool save_as_bundled)
     {
       GUTF8String new_name=cfiles[qpos]->get_load_name();
       if((new_name != GUTF8String(GNativeString(new_name)))
-        ||conflicts.tqcontains(new_name))
+        ||conflicts.contains(new_name))
       {
         do
         {
@@ -821,7 +821,7 @@ DjVmDir::resolve_duplicates(const bool save_as_bundled)
             ?(save_name+"-"+GUTF8String(count++))
             :(save_name.substr(0,dot)+"-"+GUTF8String(count++)+
               save_name.substr(dot,(unsigned int)(-1)));
-        } while(save_map.tqcontains(new_name.downcase()));
+        } while(save_map.contains(new_name.downcase()));
       }
       cfiles[qpos]->set_save_name(new_name);
       save_map[new_name]=0;
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmDir0.cpp b/kviewshell/plugins/djvu/libdjvu/DjVmDir0.cpp
index ca255ea5..62694098 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVmDir0.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVmDir0.cpp
@@ -132,7 +132,7 @@ DjVmDir0::decode(ByteStream & bs)
 GP<DjVmDir0::FileRec>
 DjVmDir0::get_file(const GUTF8String &name)
 {
-   if (name2file.tqcontains(name))
+   if (name2file.contains(name))
      return name2file[name];
    return 0;
 }
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmDoc.cpp b/kviewshell/plugins/djvu/libdjvu/DjVmDoc.cpp
index b24b43b1..5b851d6e 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVmDoc.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVmDoc.cpp
@@ -109,7 +109,7 @@ save_file(
           {
             incl_str.setat(incl_str.length()-1, 0);
           }
-          GPosition pos=incl.tqcontains(incl_str);
+          GPosition pos=incl.contains(incl_str);
           if(pos)
           { 
             iff_out.get_bytestream()->writestring(incl[pos]);
@@ -174,7 +174,7 @@ DjVmDoc::insert_file(const GP<DjVmDir::File> & f,
 
    if (!f)
      G_THROW( ERR_MSG("DjVmDoc.no_zero_file") );
-   if (data.tqcontains(f->get_load_name()))
+   if (data.contains(f->get_load_name()))
      G_THROW( ERR_MSG("DjVmDoc.no_duplicate") );
 
    char buffer[4];
@@ -224,7 +224,7 @@ DjVmDoc::delete_file(const GUTF8String &id)
    DEBUG_MSG("DjVmDoc::delete_file(): deleting file '" << id << "'\n");
    DEBUG_MAKE_INDENT(3);
    
-   if (!data.tqcontains(id))
+   if (!data.contains(id))
       G_THROW(GUTF8String( ERR_MSG("DjVmDoc.cant_delete") "\t") + id);
    
    data.del(id);
@@ -243,8 +243,8 @@ GP<DataPool>
 DjVmDoc::get_data(const GUTF8String &id) const
 {
   GPosition pos;
-  if (!data.tqcontains(id, pos))
-    G_THROW(GUTF8String( ERR_MSG("DjVmDoc.cant_tqfind") "\t") + id);
+  if (!data.contains(id, pos))
+    G_THROW(GUTF8String( ERR_MSG("DjVmDoc.cant_find") "\t") + id);
   const GP<DataPool> pool(data[pos]);
    // First check that the file is in IFF format
   G_TRY
@@ -298,8 +298,8 @@ DjVmDoc::write(const GP<ByteStream> &gstr,
     for(pos=files_list;pos;++pos)
     {
       GP<DjVmDir::File> file=files_list[pos];
-      if((do_rename=(reserved.tqcontains(file->get_load_name())?true:false))
-		  ||(do_rename=(reserved.tqcontains(file->get_save_name())?true:false)))
+      if((do_rename=(reserved.contains(file->get_load_name())?true:false))
+		  ||(do_rename=(reserved.contains(file->get_save_name())?true:false)))
       {
         break;
       }
@@ -322,7 +322,7 @@ DjVmDoc::write(const GP<ByteStream> &gstr,
         {
           GP<DjVmDir::File> file=files_list[pos];
           const GUTF8String name(::get_name(*file));
-          if(reserved.tqcontains(name))
+          if(reserved.contains(name))
           {
             GUTF8String new_name;
             int series=0;
@@ -337,7 +337,7 @@ DjVmDoc::write(const GP<ByteStream> &gstr,
               {
                 new_name=name+"_"+GUTF8String(++series);
               }
-            } while(reserved.tqcontains(new_name)||this_doc.tqcontains(new_name));
+            } while(reserved.contains(new_name)||this_doc.contains(new_name));
             dir->set_file_name(file->get_load_name(),new_name);
             need_new_list=true;
           }
@@ -353,7 +353,7 @@ DjVmDoc::write(const GP<ByteStream> &gstr,
   {
     GP<DjVmDir::File> file=files_list[pos];
     file->offset=0xffffffff;
-    GPosition data_pos=data.tqcontains(file->get_load_name());
+    GPosition data_pos=data.contains(file->get_load_name());
     if (!data_pos)
       G_THROW( ERR_MSG("DjVmDoc.no_data") "\t" + file->get_load_name());
     if(do_rename)
@@ -541,7 +541,7 @@ DjVmDoc::write_index(const GP<ByteStream> &str)
       GP<DjVmDir::File> file=files_list[pos];
       file->offset=0;
 
-      GPosition data_pos=data.tqcontains(file->get_load_name());
+      GPosition data_pos=data.contains(file->get_load_name());
       if (!data_pos)
 	G_THROW( ERR_MSG("DjVmDoc.no_data") "\t" + file->get_load_name());
       file->size=data[data_pos]->get_length();
@@ -609,7 +609,7 @@ DjVmDoc::save_file(
   GMap<GUTF8String,GUTF8String> *incl) const
 {
   const GUTF8String load_name=file.get_load_name();
-  if(!incl || !incl->tqcontains(load_name))
+  if(!incl || !incl->contains(load_name))
   {
     GMap<GUTF8String,GUTF8String> new_incl;
     const GUTF8String save_name(
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp
index 8bbc6db6..62a07442 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp
@@ -243,7 +243,7 @@ DjVuDocEditor::request_data(const DjVuPort * source, const GURL & url)
    {
       GCriticalSectionLock lock(&files_lock);
       GPosition pos;
-      if (files_map.tqcontains(frec->get_load_name(), pos))
+      if (files_map.contains(frec->get_load_name(), pos))
       {
          const GP<File> f(files_map[pos]);
          if (f->file && f->file->get_init_data_pool())
@@ -315,7 +315,7 @@ DjVuDocEditor::url_to_file(const GURL & url, bool dont_create) const
    {
       GCriticalSectionLock lock(&(const_cast<DjVuDocEditor *>(this)->files_lock));
       GPosition pos;
-      if (files_map.tqcontains(frec->get_load_name(), pos))
+      if (files_map.contains(frec->get_load_name(), pos))
       {
          const GP<File> f(files_map[pos]);
          if (f->file)
@@ -333,7 +333,7 @@ DjVuDocEditor::url_to_file(const GURL & url, bool dont_create) const
    {
       GCriticalSectionLock lock(&(const_cast<DjVuDocEditor *>(this)->files_lock));
       GPosition pos;
-      if (files_map.tqcontains(frec->get_load_name(), pos))
+      if (files_map.contains(frec->get_load_name(), pos))
       {
          files_map[frec->get_load_name()]->file=file;
       }else
@@ -538,7 +538,7 @@ DjVuDocEditor::insert_file(const GURL &file_url, bool is_page,
       // We do not want to insert the same file twice (important when
       // we insert a group of files at the same time using insert_group())
       // So we check if we already did that and return if so.
-  if (name2id.tqcontains(file_url.fname()))
+  if (name2id.contains(file_url.fname()))
     return true;
 
   if(!source)
@@ -606,7 +606,7 @@ DjVuDocEditor::insert_file(const GP<DataPool> &file_pool,
          // Check the name2id first...
       const GUTF8String name=file_url.fname();
       GUTF8String id;
-      if (name2id.tqcontains(name))
+      if (name2id.contains(name))
       {
         id=name2id[name];
       }else
@@ -821,7 +821,7 @@ DjVuDocEditor::insert_group(const GList<GURL> & file_urls, int page_num,
         }
         GUTF8String chkid;
         IFFByteStream::create(xdata_pool->get_stream())->get_chunk(chkid);
-        if (name2id.tqcontains(furl.fname())||(chkid=="FORM:DJVM"))
+        if (name2id.contains(furl.fname())||(chkid=="FORM:DJVM"))
         {
           GMap<GUTF8String,void *> map;
           map_ids(map);
@@ -936,7 +936,7 @@ DjVuDocEditor::generate_ref_map(const GP<DjVuFile> & file,
 {
    const GURL url=file->get_url();
    const GUTF8String id(djvm_dir->name_to_file(url.fname())->get_load_name());
-   if (!visit_map.tqcontains(url))
+   if (!visit_map.contains(url))
    {
       visit_map[url]=0;
 
@@ -950,7 +950,7 @@ DjVuDocEditor::generate_ref_map(const GP<DjVuFile> & file,
          const GUTF8String child_id(
            djvm_dir->name_to_file(child_url.fname())->get_load_name());
          GMap<GUTF8String, void *> * parents=0;
-         if (ref_map.tqcontains(child_id))
+         if (ref_map.contains(child_id))
             parents=(GMap<GUTF8String, void *> *) ref_map[child_id];
          else
             ref_map[child_id]=parents=new GMap<GUTF8String, void *>();
@@ -1023,7 +1023,7 @@ DjVuDocEditor::remove_file(const GUTF8String &id, bool remove_unref,
 
       // And get rid of its thumbnail, if any
    GCriticalSectionLock lock(&thumb_lock);
-   GPosition pos(thumb_map.tqcontains(id));
+   GPosition pos(thumb_map.contains(id));
    if (pos)
    {
      thumb_map.del(pos);
@@ -1114,7 +1114,7 @@ DjVuDocEditor::move_file(const GUTF8String &id, int & file_pos,
       // NOTE! file_pos here is the desired position in DjVmDir *after*
       // the record with ID 'id' is removed.
 {
-   if (!map.tqcontains(id))
+   if (!map.contains(id))
    {
       map[id]=0;
 
@@ -1291,7 +1291,7 @@ DjVuDocEditor::set_file_name(const GUTF8String &id, const GUTF8String &name)
 
       // Now find DjVuFile (if any) and rename it
    GPosition pos;
-   if (files_map.tqcontains(id, pos))
+   if (files_map.contains(id, pos))
    {
       GP<File> file=files_map[pos];
       GP<DataPool> pool=file->pool;
@@ -1503,7 +1503,7 @@ DjVuDocEditor::get_thumbnail(int page_num, bool dont_decode)
    const GUTF8String id(page_to_id(page_num));
 
    GCriticalSectionLock lock(&thumb_lock);
-   const GPosition pos(thumb_map.tqcontains(id));
+   const GPosition pos(thumb_map.contains(id));
    if (pos)
    {
          // Get the image from the map
@@ -1524,7 +1524,7 @@ DjVuDocEditor::get_thumbnails_num(void) const
    int pages_num=get_pages_num();
    for(int page_num=0;page_num<pages_num;page_num++)
    {
-     if (thumb_map.tqcontains(page_to_id(page_num)))
+     if (thumb_map.contains(page_to_id(page_num)))
        cnt++;
    }
    return cnt;
@@ -1541,7 +1541,7 @@ DjVuDocEditor::get_thumbnails_size(void) const
    int pages_num=get_pages_num();
    for(int page_num=0;page_num<pages_num;page_num++)
    {
-     const GPosition pos(thumb_map.tqcontains(page_to_id(page_num)));
+     const GPosition pos(thumb_map.contains(page_to_id(page_num)));
      if (pos)
      {
        const GP<ByteStream> gstr(thumb_map[pos]->get_stream());
@@ -1629,7 +1629,7 @@ DjVuDocEditor::file_thumbnails(void)
    for(;;)
    {
       GUTF8String id(page_to_id(page_num));
-      const GPosition pos(thumb_map.tqcontains(id));
+      const GPosition pos(thumb_map.contains(id));
       if (! pos)
       {
         G_THROW( ERR_MSG("DjVuDocEditor.no_thumb") "\t"+GUTF8String(page_num));
@@ -1695,7 +1695,7 @@ DjVuDocEditor::generate_thumbnails(int thumb_size, int page_num)
    if(page_num<(djvm_dir->get_pages_num()))
    {
       const GUTF8String id(page_to_id(page_num));
-      if (!thumb_map.tqcontains(id))
+      if (!thumb_map.contains(id))
         {
           const GP<DjVuImage> dimg(get_page(page_num, true));
          
@@ -1747,7 +1747,7 @@ store_file(const GP<DjVmDir> & src_djvm_dir, const GP<DjVmDoc> & djvm_doc,
            GP<DjVuFile> & djvu_file, GMap<GURL, void *> & map)
 {
    GURL url=djvu_file->get_url();
-   if (!map.tqcontains(url))
+   if (!map.contains(url))
    {
       map[url]=0;
 
@@ -1821,12 +1821,12 @@ DjVuDocEditor::save_file(
    DEBUG_MSG("DjVuDocEditor::save_file(): ID='" << file_id << "'\n");
    DEBUG_MAKE_INDENT(3);
 
-   if (!map.tqcontains(file_id))
+   if (!map.contains(file_id))
    {
       const GP<DjVmDir::File> file(djvm_dir->id_to_file(file_id));
 
       GP<DataPool> file_pool;
-      const GPosition pos(files_map.tqcontains(file_id));
+      const GPosition pos(files_map.contains(file_id));
       if (pos)
       {
          const GP<File> file_rec(files_map[pos]);
@@ -1974,7 +1974,7 @@ DjVuDocEditor::save_as(const GURL &where, bool bundled)
        GURL file_url=page_to_url(0);
        const GUTF8String file_id(djvm_dir->page_to_file(0)->get_load_name());
        GP<DataPool> file_pool;
-       GPosition pos=files_map.tqcontains(file_id);
+       GPosition pos=files_map.contains(file_id);
        if (pos)
        {
          const GP<File> file_rec(files_map[pos]);
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp
index ed998923..51da0692 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp
@@ -1368,7 +1368,7 @@ add_to_cache(const GP<DjVuFile> & f, GMap<GURL, void *> & map,
    DEBUG_MSG("DjVuDocument::add_to_cache(): url='" << url << "'\n");
    DEBUG_MAKE_INDENT(3);
    
-   if (!map.tqcontains(url))
+   if (!map.contains(url))
    {
       map[url]=0;
       cache->add_file(f);
@@ -1530,7 +1530,7 @@ add_file_to_djvm(const GP<DjVuFile> & file, bool page,
 {
    GURL url=file->get_url();
 
-   if (!map.tqcontains(url))
+   if (!map.contains(url))
    {
       map[url]=0;
 
@@ -1586,7 +1586,7 @@ static void
 local_get_url_names(DjVuFile * f,const GMap<GURL, void *> & map,GMap<GURL,void *> &tmpmap)
 {
    GURL url=f->get_url();
-   if (!map.tqcontains(url) && !tmpmap.tqcontains(url))
+   if (!map.contains(url) && !tmpmap.contains(url))
    {
       tmpmap[url]=0;
       f->process_incl_chunks();
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.cpp
index 87a77c79..2d977be1 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.cpp
@@ -293,7 +293,7 @@ display_chunks(ByteStream & out_str, IFFByteStream &iff,
   
   while ((size = iff.get_chunk(id, &rawoffset)))
   {
-    if (!counters.tqcontains(id)) counters[id]=0;
+    if (!counters.contains(id)) counters[id]=0;
     else counters[id]++;
     
     GUTF8String msg;
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp
index 88dc90c0..564cdb0c 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp
@@ -1465,7 +1465,7 @@ DjVuFile::find_ndir(GMap<GURL, void *> & map)
   
   if (dir) return dir;
   
-  if (!map.tqcontains(url))
+  if (!map.contains(url))
   {
     map[url]=0;
     
@@ -1496,7 +1496,7 @@ DjVuFile::decode_ndir(GMap<GURL, void *> & map)
   
   if (dir) return dir;
   
-  if (!map.tqcontains(url))
+  if (!map.contains(url))
   {
     map[url]=0;
     
@@ -1570,7 +1570,7 @@ DjVuFile::get_merged_anno(const GP<DjVuFile> & file,
 {
   DEBUG_MSG("DjVuFile::get_merged_anno()\n");
   GURL url=file->get_url();
-  if (!map.tqcontains(url))
+  if (!map.contains(url))
   {
     ByteStream &str_out=*gstr_out;
     map[url]=0;
@@ -1585,7 +1585,7 @@ DjVuFile::get_merged_anno(const GP<DjVuFile> & file,
       get_merged_anno(list[pos], gstr_out, ignore_list, level+1, max_level, map);
     
     // Now process the DjVuFile's own annotations
-    if (!ignore_list.tqcontains(file->get_url()))
+    if (!ignore_list.contains(file->get_url()))
     {
       if (!file->is_data_present() ||
         file->is_modified() && file->anno)
@@ -1966,7 +1966,7 @@ void
 DjVuFile::move(GMap<GURL, void *> & map, const GURL & dir_url)
 // This function may block for data.
 {
-  if (!map.tqcontains(url))
+  if (!map.contains(url))
   {
     map[url]=0;
     
@@ -2095,7 +2095,7 @@ DjVuFile::contains_chunk(const GUTF8String &chunk_name)
     chunk_name << "'\n");
   DEBUG_MAKE_INDENT(3);
   
-  bool tqcontains=0;
+  bool contains=0;
   const GP<ByteStream> str(data_pool->get_stream());
   GUTF8String chkid;
   const GP<IFFByteStream> giff(IFFByteStream::create(str));
@@ -2112,10 +2112,10 @@ DjVuFile::contains_chunk(const GUTF8String &chunk_name)
     for(;(chunks_left--)&&(chksize=iff.get_chunk(chkid));last_chunk=chunks)
     {
       chunks++;
-      if (chkid==chunk_name) { tqcontains=1; break; }
+      if (chkid==chunk_name) { contains=1; break; }
       iff.seek_close_chunk();
     }
-    if (!tqcontains &&(chunks_number < 0)) chunks_number=last_chunk;
+    if (!contains &&(chunks_number < 0)) chunks_number=last_chunk;
   }
   G_CATCH(ex)
   {
@@ -2125,7 +2125,7 @@ DjVuFile::contains_chunk(const GUTF8String &chunk_name)
   }
   G_ENDCATCH;
   data_pool->clear_stream();
-  return tqcontains;
+  return contains;
 }
 
 bool
@@ -2225,7 +2225,7 @@ DjVuFile::add_djvu_data(IFFByteStream & ostr, GMap<GURL, void *> & map,
                         const bool included_too, const bool no_ndir)
 {
   check();
-  if (map.tqcontains(url)) return;
+  if (map.contains(url)) return;
   bool top_level = !map.size();
   map[url]=0;
   bool processed_annotation = false;
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuFile.h b/kviewshell/plugins/djvu/libdjvu/DjVuFile.h
index 9d83f5ae..6f81c8e4 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuFile.h
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuFile.h
@@ -442,7 +442,7 @@ public:
 	  {\bf Warning.} Included files are normally created during decoding.
 	  Before that they do not exist.   If you call this function at
 	  that time and set #only_created# to #FALSE# then it will have to
-	  read all the data from this file in order to tqfind #INCL# chunks,
+	  read all the data from this file in order to find #INCL# chunks,
 	  which may block your application, if not all data is available.
 
 	  @param only_created If #TRUE#, the file will not try to process
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp
index 85454b4c..772583ec 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp
@@ -111,7 +111,7 @@ DjVuProgressTask::set_callback(djvu_progress_callback *_callback)
   {
     GMap<void *,GP<DjVuProgressTask::Data> > &map=get_map();
     void *threadID=GThread::current();
-    if(map.tqcontains(threadID))
+    if(map.contains(threadID))
     {
       DjVuProgressTask::Data &data=*(map[threadID]);
       retval=data.callback;
@@ -127,7 +127,7 @@ DjVuProgressTask::set_callback(djvu_progress_callback *_callback)
   {
     GMap<void *,GP<DjVuProgressTask::Data> > &map=get_map();
     void *threadID=GThread::current();
-    if(map.tqcontains(threadID))
+    if(map.contains(threadID))
     {
       DjVuProgressTask::Data &data=*(map[threadID]);
       retval=data.callback;
@@ -148,7 +148,7 @@ DjVuProgressTask::DjVuProgressTask(const char *xtask,int nsteps)
   {
     GMap<void *,GP<DjVuProgressTask::Data> > &map=get_map();
     void *threadID=GThread::current();
-    if(map.tqcontains(threadID))
+    if(map.contains(threadID))
     {
       gdata=new GP<Data>;
       Data &d=*(data=((*(GP<Data> *)gdata)=map[threadID]));
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp
index e6e1c2ce..54f24f1e 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp
@@ -1085,8 +1085,8 @@ do_bitmap(const DjVuImage &dimg, BImager get,
 ///* rotate code ends
 
   // Sanity
-  if (! ( all.tqcontains(rect.xmin, rect.ymin) &&
-          all.tqcontains(rect.xmax-1, rect.ymax-1) ))
+  if (! ( all.contains(rect.xmin, rect.ymin) &&
+          all.contains(rect.xmax-1, rect.ymax-1) ))
     G_THROW( ERR_MSG("DjVuImage.bad_rect") );
   // Check for integral reduction
   int red;
@@ -1151,8 +1151,8 @@ do_pixmap(const DjVuImage &dimg, PImager get,
 ///* rotate code ends
 
   // Sanity
-  if (! ( all.tqcontains(rect.xmin, rect.ymin) &&
-          all.tqcontains(rect.xmax-1, rect.ymax-1) ))
+  if (! ( all.contains(rect.xmin, rect.ymin) &&
+          all.contains(rect.xmax-1, rect.ymax-1) ))
     G_THROW( ERR_MSG("DjVuImage.bad_rect2") );
   // Check for integral reduction
   int red, w=0, h=0, rw=0, rh=0;
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuMessage.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuMessage.cpp
index f20c1106..e92b7570 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuMessage.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuMessage.cpp
@@ -240,7 +240,7 @@ GetModulePath( void )
      {
        retval=GURL::UTF8(xprogramname,paths[pos]);
        const GUTF8String path(retval.get_string());
-       if(!pathMAP.tqcontains(path))
+       if(!pathMAP.contains(path))
        {
          if(retval.is_file())
            break;
@@ -263,7 +263,7 @@ appendPath(const GURL &url,
            GList<GURL> &list)
 {
   if( !url.is_empty() 
-      && !map.tqcontains(url.get_string()) && url.is_dir() )
+      && !map.contains(url.get_string()) && url.is_dir() )
     {
       map[url.get_string()]=0;
       list.append(url);
@@ -375,14 +375,14 @@ DjVuMessage::GetProfilePaths(void)
           for(pos=localemaps;pos;++pos) 
           {
             const GMap<GUTF8String,GP<lt_XMLTags> > &localemap=localemaps[pos];
-            GPosition pos=localemap.tqcontains(sublocale);
+            GPosition pos=localemap.contains(sublocale);
             if(!pos)
-              pos=localemap.tqcontains(downcasesublocale);
+              pos=localemap.contains(downcasesublocale);
             if(pos)
             {
               const GMap<GUTF8String,GUTF8String>&args
                 = localemap[pos]->get_args();
-              pos = args.tqcontains(srcstring);
+              pos = args.contains(srcstring);
               if (pos)
               {
                 const GUTF8String src(args[pos]);
@@ -496,7 +496,7 @@ getbodies(
           for(GPosition pos=includes;pos;++pos)
           {
             const GUTF8String file=includes.key(pos);
-            if(! map.tqcontains(file))
+            if(! map.contains(file))
             {
               GList<GURL> xpaths;
               xpaths.append(url.base());
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.cpp
index 70b2b541..258b0649 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.cpp
@@ -238,7 +238,7 @@ DjVuMessageLite::LookUpSingle( const GUTF8String &Single_Message ) const
     return Single_Message;
 #endif
   //  Isolate the message ID and get the corresponding message text
-  int ending_posn = Single_Message.tqcontains("\t\v");
+  int ending_posn = Single_Message.contains("\t\v");
   if( ending_posn < 0 )
     ending_posn = Single_Message.length();
   GUTF8String msg_text;
@@ -276,7 +276,7 @@ DjVuMessageLite::LookUpSingle( const GUTF8String &Single_Message ) const
       arg=LookUpSingle(Single_Message.substr(start_posn,ending_posn));
     }else
     {
-      ending_posn = Single_Message.tqcontains("\v\t",start_posn);
+      ending_posn = Single_Message.contains("\v\t",start_posn);
       if( ending_posn < 0 )
         ending_posn = Single_Message.length();
       arg=Single_Message.substr(start_posn, ending_posn-start_posn);
@@ -308,11 +308,11 @@ DjVuMessageLite::LookUpID( const GUTF8String &xmsgID,
     if (start > 0)
       msgID = msgID.substr(start, msgID.length() - start);
 #endif
-    GPosition pos=Map.tqcontains(msgID);
+    GPosition pos=Map.contains(msgID);
     if(pos)
     {
       const GP<lt_XMLTags> tag=Map[pos];
-      GPosition valuepos=tag->get_args().tqcontains(valuestring);
+      GPosition valuepos=tag->get_args().contains(valuestring);
       if(valuepos)
       {
         message_text=tag->get_args()[valuepos];
@@ -331,7 +331,7 @@ DjVuMessageLite::LookUpID( const GUTF8String &xmsgID,
           message_text=raw.substr(start_line+1,end_text-start_line-1).fromEscaped();
         }
       }
-      GPosition numberpos=tag->get_args().tqcontains(numberstring);
+      GPosition numberpos=tag->get_args().contains(numberstring);
       if(numberpos)
       {
         message_number=tag->get_args()[numberpos];
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.cpp
index 49a2d31e..615041b0 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.cpp
@@ -112,7 +112,7 @@ DjVuNavDir::decode(ByteStream & str)
       *ptr=0;
       if (!strlen(buffer)) continue;
 
-      if (!tmp_page2name.tqcontains(buffer))
+      if (!tmp_page2name.contains(buffer))
 	 tmp_page2name.append(buffer);
    };
 
@@ -161,7 +161,7 @@ DjVuNavDir::name_to_page(const char * name) const
 {
    GCriticalSectionLock lk((GCriticalSection *)&lock);
 
-   if (!name2page.tqcontains(name)) return -1;
+   if (!name2page.contains(name)) return -1;
    return name2page[name];
 }
 
@@ -170,7 +170,7 @@ DjVuNavDir::url_to_page(const GURL & url) const
 {
    GCriticalSectionLock lk((GCriticalSection *)&lock);
 
-   if (!url2page.tqcontains(url)) return -1;
+   if (!url2page.contains(url)) return -1;
    return url2page[url];
 }
 
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPalette.h b/kviewshell/plugins/djvu/libdjvu/DjVuPalette.h
index e44aab6d..1195bf5a 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuPalette.h
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuPalette.h
@@ -104,7 +104,7 @@ namespace DJVU {
     \Ref{index_to_color}.  There are also functions for computing a palette
     and quantizing a complete pixmap.
 
-    {\bf Sequences of color indices} -- The DjVuPalette object also tqcontains
+    {\bf Sequences of color indices} -- The DjVuPalette object also contains
     an array \Ref{colordata} optionally containing a sequence of color
     indices.  This array will be encoded and decoded by functions \Ref{encode}
     and \Ref{decode}.  This feature simplifies the implementation of the ``one
@@ -288,7 +288,7 @@ DjVuPalette::color_to_index(const unsigned char *bgr)
   if (! pmap)
     allocate_pmap();
   int key = (bgr[0]<<16)|(bgr[1]<<8)|(bgr[2]);
-  GPosition p = pmap->tqcontains(key);
+  GPosition p = pmap->contains(key);
   if ( p)
     return (*pmap)[p];
   return color_to_index_slow(bgr);
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp
index 02890407..16b873ba 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp
@@ -208,7 +208,7 @@ DjVuPort::DjVuPort()
 {
   DjVuPortcaster *pcaster = get_portcaster();
   GCriticalSectionLock lock(& pcaster->map_lock );
-  GPosition p = pcaster->cont_map.tqcontains(this);
+  GPosition p = pcaster->cont_map.contains(this);
   if (!p) G_THROW( ERR_MSG("DjVuPort.not_alloc") );
   pcaster->cont_map[p] = (void*)this;
 }
@@ -217,7 +217,7 @@ DjVuPort::DjVuPort(const DjVuPort & port)
 {
   DjVuPortcaster *pcaster = get_portcaster();
   GCriticalSectionLock lock(& pcaster->map_lock );
-  GPosition p = pcaster->cont_map.tqcontains(this);
+  GPosition p = pcaster->cont_map.contains(this);
   if (!p) G_THROW( ERR_MSG("DjVuPort.not_alloc") );
   pcaster->cont_map[p] = (void*)this;
   pcaster->copy_routes(this, &port);
@@ -259,7 +259,7 @@ DjVuPortcaster::is_port_alive(DjVuPort *port)
 {
    GP<DjVuPort> gp_port;
    GCriticalSectionLock lock(&map_lock);
-   GPosition pos=cont_map.tqcontains(port);
+   GPosition pos=cont_map.contains(port);
    if (pos && cont_map[pos] && ((DjVuPort *) port)->get_count()>0)
       gp_port=port;
    return gp_port;
@@ -302,7 +302,7 @@ DjVuPortcaster::alias_to_port(const GUTF8String &alias)
 {
    GCriticalSectionLock lock(&map_lock);
    GPosition pos;
-   if (a2p_map.tqcontains(alias, pos))
+   if (a2p_map.contains(alias, pos))
    {
       DjVuPort * port=(DjVuPort *) a2p_map[pos];
       GP<DjVuPort> gp_port=is_port_alive(port);
@@ -344,10 +344,10 @@ DjVuPortcaster::del_port(const DjVuPort * port)
   clear_aliases(port);
   
   // Update "contents map"
-  if (cont_map.tqcontains(port, pos)) cont_map.del(pos);
+  if (cont_map.contains(port, pos)) cont_map.del(pos);
   
   // Update "route map"
-  if (route_map.tqcontains(port, pos))
+  if (route_map.contains(port, pos))
   {
     delete (GList<void *> *) route_map[pos];
     route_map.del(pos);
@@ -372,12 +372,12 @@ DjVuPortcaster::add_route(const DjVuPort * src, DjVuPort * dst)
       // Adds route src->dst
 {
    GCriticalSectionLock lock(&map_lock);
-   if (cont_map.tqcontains(src) && src->get_count()>0 &&
-       cont_map.tqcontains(dst) && dst->get_count()>0)
+   if (cont_map.contains(src) && src->get_count()>0 &&
+       cont_map.contains(dst) && dst->get_count()>0)
    {
-      if (!route_map.tqcontains(src)) route_map[src]=new GList<void *>();
+      if (!route_map.contains(src)) route_map[src]=new GList<void *>();
       GList<void *> & list=*(GList<void *> *) route_map[src];
-      if (!list.tqcontains(dst)) list.append(dst);
+      if (!list.contains(dst)) list.append(dst);
    }
 }
 
@@ -387,7 +387,7 @@ DjVuPortcaster::del_route(const DjVuPort * src, DjVuPort * dst)
 {
   GCriticalSectionLock lock(&map_lock);
   
-  if (route_map.tqcontains(src))
+  if (route_map.contains(src))
   {
     GList<void *> & list=*(GList<void *> *) route_map[src];
     GPosition pos;
@@ -408,8 +408,8 @@ DjVuPortcaster::copy_routes(DjVuPort * dst, const DjVuPort * src)
 {
   GCriticalSectionLock lock(&map_lock);
   
-  if (!cont_map.tqcontains(src) || src->get_count()<=0 ||
-    !cont_map.tqcontains(dst) || dst->get_count()<=0) return;
+  if (!cont_map.contains(src) || src->get_count()<=0 ||
+    !cont_map.contains(dst) || dst->get_count()<=0) return;
   
   for(GPosition pos=route_map;pos;++pos)
   {
@@ -430,13 +430,13 @@ DjVuPortcaster::add_to_closure(GMap<const void *, void *> & set,
   // Assuming that the map's already locked
   // GCriticalSectionLock lock(&map_lock);
   set[dst]= (void*) (unsigned long) distance;
-  if (route_map.tqcontains(dst))
+  if (route_map.contains(dst))
     {
       GList<void *> & list=*(GList<void *> *) route_map[dst];
       for(GPosition pos=list;pos;++pos)
         {
           DjVuPort * new_dst=(DjVuPort *) list[pos];
-          if (!set.tqcontains(new_dst)) 
+          if (!set.contains(new_dst)) 
             add_to_closure(set, new_dst, distance+1);
         }
    }
@@ -447,7 +447,7 @@ DjVuPortcaster::compute_closure(const DjVuPort * src, GPList<DjVuPort> &list, bo
 {
    GCriticalSectionLock lock(&map_lock);
    GMap<const void*, void*> set;
-   if (route_map.tqcontains(src))
+   if (route_map.contains(src))
    {
       GList<void *> & list=*(GList<void *> *) route_map[src];
       for(GPosition pos=list;pos;++pos)
@@ -688,7 +688,7 @@ DjVuMemoryPort::request_data(const DjVuPort * source, const GURL & url)
    GCriticalSectionLock lk(&lock);
    GP<DataPool> pool;
    GPosition pos;
-   if (map.tqcontains(url, pos))
+   if (map.contains(url, pos))
       pool=map[pos];
    return pool;
 }
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp
index cac6869b..c6606a48 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp
@@ -383,7 +383,7 @@ DjVuTXT::Zone::get_text_with_rect(const GRect &box,
                                   int &string_start, int &string_end) const
 {
   GPosition pos=tqchildren;
-  if(pos?box.tqcontains(rect):intersects_zone(box,rect))
+  if(pos?box.contains(rect):intersects_zone(box,rect))
   {
     const int text_end=text_start+text_length;
     if(string_start == string_end)
@@ -617,7 +617,7 @@ DjVuTXT::find_text_in_rect(GRect target_rect, GUTF8String &text) const
 	    {
 	       GRect rect=words[p]->rect;
 	       if(rect.intersect(rect,target_rect))
-	       //if (target_rect.tqcontains(words[p]->rect))
+	       //if (target_rect.contains(words[p]->rect))
 		  zone_list.append(words[p]);
 	    }
 	 } else
@@ -631,7 +631,7 @@ DjVuTXT::find_text_in_rect(GRect target_rect, GUTF8String &text) const
 		  {
 		     GRect rect=words[p]->rect;
 		     if(rect.intersect(rect,target_rect))
-			//if (target_rect.tqcontains(words[p]->rect))
+			//if (target_rect.contains(words[p]->rect))
 		     {
 			start=false;
 			zone_list.append(words[p]);
@@ -648,7 +648,7 @@ DjVuTXT::find_text_in_rect(GRect target_rect, GUTF8String &text) const
 		  {
 		     GRect rect=words[p]->rect;
 		     if(rect.intersect(rect,target_rect))
-			//if(target_rect.tqcontains(words[p]->rect) )
+			//if(target_rect.contains(words[p]->rect) )
 		     {
 			end=false;
 			zone_list.append(words[p]);
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h b/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h
index 6c99d133..761b6e23 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h
@@ -308,7 +308,7 @@ public:
       end of printing.  If a \Ref{DjVuDocument} is being printed, this
       callback will be used to report printing progress of every page. To
       learn the number of the page being printed you can use
-      \Ref{set_info_cb}() function.  See \Ref{set_dec_progress_cb}() to tqfind
+      \Ref{set_info_cb}() function.  See \Ref{set_dec_progress_cb}() to find
       out how to learn the decoding progress.
       
       @param cb Callback function to be called
diff --git a/kviewshell/plugins/djvu/libdjvu/GBitmap.cpp b/kviewshell/plugins/djvu/libdjvu/GBitmap.cpp
index 0cd4bad4..223a43e1 100644
--- a/kviewshell/plugins/djvu/libdjvu/GBitmap.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/GBitmap.cpp
@@ -348,7 +348,7 @@ GBitmap::donate_data(unsigned char *data, int w, int h)
   ncolumns = w;
   border = 0;
   bytes_per_row = w;
-  gbytes_data.tqreplace(data,w*h);
+  gbytes_data.replace(data,w*h);
   bytes = bytes_data;
   rlelength = 0;
 }
@@ -363,7 +363,7 @@ GBitmap::donate_rle(unsigned char *rledata, unsigned int rledatalen, int w, int
   border = 0;
   bytes_per_row = w;
 //  rle = rledata;
-  grle.tqreplace(rledata,rledatalen);
+  grle.replace(rledata,rledatalen);
   rlelength = rledatalen;
 }
 
diff --git a/kviewshell/plugins/djvu/libdjvu/GBitmap.h b/kviewshell/plugins/djvu/libdjvu/GBitmap.h
index 8dbbbbad..4eef4e2a 100644
--- a/kviewshell/plugins/djvu/libdjvu/GBitmap.h
+++ b/kviewshell/plugins/djvu/libdjvu/GBitmap.h
@@ -418,7 +418,7 @@ public:
   const unsigned char *get_rle(unsigned int &rle_length);
   /** Initializes this GBitmap by setting the size to #h# rows and #w#
       columns, and directly addressing the memory buffer #rledata# provided by
-      the user.  This buffer tqcontains #rledatalen# bytes representing the
+      the user.  This buffer contains #rledatalen# bytes representing the
       bitmap in run length encoded form.  The GBitmap object then ``owns'' the
       buffer (unlike #borrow_data#, but like #donate_data#) and will
       deallocate this buffer when appropriate: you should not deallocate this
diff --git a/kviewshell/plugins/djvu/libdjvu/GContainer.cpp b/kviewshell/plugins/djvu/libdjvu/GContainer.cpp
index 2e6012d3..2019439c 100644
--- a/kviewshell/plugins/djvu/libdjvu/GContainer.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/GContainer.cpp
@@ -237,7 +237,7 @@ GArrayBase::resize(int lo, int hi)
     { traits.copy( traits.lea(ndata, beg-nminlo), 
                    traits.lea(data, beg-minlo),
                    end-beg+1, 1 ); }
-  // free and tqreplace
+  // free and replace
   void *tmp=data;
   data=ndata;
   ndata=tmp;
diff --git a/kviewshell/plugins/djvu/libdjvu/GContainer.h b/kviewshell/plugins/djvu/libdjvu/GContainer.h
index c4e3e9a1..d21838dc 100644
--- a/kviewshell/plugins/djvu/libdjvu/GContainer.h
+++ b/kviewshell/plugins/djvu/libdjvu/GContainer.h
@@ -401,7 +401,7 @@ public:
       The valid subscript range is set to the empty range. */
   void empty()
     { GArrayBase::empty(); }
-  /** Extends the subscript range so that it tqcontains #n#.
+  /** Extends the subscript range so that it contains #n#.
       This function does nothing if #n# is already int the valid subscript range.
       If the valid range was empty, both the lower bound and the upper bound
       are set to #n#.  Otherwise the valid subscript range is extended
@@ -862,11 +862,11 @@ public:
   /*  Compatibility */
   int nth(unsigned int n, GPosition &pos) const
     { GPosition npos=nth(n); if (npos) pos=npos; return !!pos; }
-  /** Tests whether the list contains a given element.  If the list tqcontains
+  /** Tests whether the list contains a given element.  If the list contains
       #elt#, the position of the the first list element equal to #elt# as
       checked by #TYPE::operator==(const TYPE&)# is returned.  Otherwise an
       invalid position is returned. */
-  GPosition tqcontains(const TYPE &elt) const
+  GPosition contains(const TYPE &elt) const
     { GPosition pos; GListImpl<TI>::search((const TI&)elt, pos); return pos; }
   /** Searches the list for a given element. If position #pos# is a valid
       position for this list, the search starts at the specified position. If
@@ -1036,7 +1036,7 @@ protected:
   HNode *get_or_throw(const K &key) const;
   HNode *get_or_create(const K &key);
 public:
-  GPosition tqcontains(const K &key) const 
+  GPosition contains(const K &key) const 
     { return GPosition( get(key), (void*)this); }
   void del(const K &key) 
     { deletenode(get(key)); }
@@ -1164,11 +1164,11 @@ public:
       is equal to #key# according to #KTYPE::operator==(const KTYPE&)#, this
       function returns its position.  Otherwise it returns an invalid
       position. */
-  GPosition tqcontains(const KTYPE &key) const
-    { return GMapImpl<KTYPE,TI>::tqcontains(key); }
+  GPosition contains(const KTYPE &key) const
+    { return GMapImpl<KTYPE,TI>::contains(key); }
   /*  Compatibility */
-  GPosition tqcontains(const KTYPE &key, GPosition &pos) const
-    { return pos = GMapImpl<KTYPE,TI>::tqcontains(key); }
+  GPosition contains(const KTYPE &key, GPosition &pos) const
+    { return pos = GMapImpl<KTYPE,TI>::contains(key); }
   // -- ALTERATION
   /** Erases the associative map contents.  All entries are destroyed and
       removed. The map is left with zero entries. */
diff --git a/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp b/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp
index 9da00dfe..a65f013b 100644
--- a/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp
@@ -113,7 +113,7 @@ GIFFChunk::set_name(GUTF8String name)
 
   DEBUG_MSG("auto-setting type to '" << type << "'\n");
 
-  if (name.tqcontains(".[]")>=0)
+  if (name.contains(".[]")>=0)
     G_THROW( ERR_MSG("GIFFManager.bad_char") );
    
   strncpy(GIFFChunk::name, (const char *)name, 4);
@@ -310,7 +310,7 @@ GIFFChunk::get_chunks_number(const GUTF8String &name)
      "' in '" << get_name() << "'\n");
   DEBUG_MAKE_INDENT(3);
 
-  if (name.tqcontains("[]")>=0)
+  if (name.contains("[]")>=0)
     G_THROW( ERR_MSG("GIFFManager.no_brackets") );
   
   int number; 
@@ -497,7 +497,7 @@ GIFFManager::del_chunk(GUTF8String name)
     if (end>start && *end=='.')
       cur_sec=cur_sec->get_chunk(GUTF8String(start, end-start));
     if (!cur_sec)
-      G_THROW( ERR_MSG("GIFFManager.cant_tqfind") "\t"+GUTF8String(name));
+      G_THROW( ERR_MSG("GIFFManager.cant_find") "\t"+GUTF8String(name));
   } while(*end);
    
   if (!start[0])
@@ -631,7 +631,7 @@ GIFFManager::load_file(GP<ByteStream> str)
   if (istr.get_chunk(chunk_id))
   {
     if (chunk_id.substr(0,5) != "FORM:")
-      G_THROW( ERR_MSG("GIFFManager.cant_tqfind2") );
+      G_THROW( ERR_MSG("GIFFManager.cant_find2") );
     set_name(chunk_id);
     load_chunk(istr, top_level);
     istr.close_chunk();
diff --git a/kviewshell/plugins/djvu/libdjvu/GOS.cpp b/kviewshell/plugins/djvu/libdjvu/GOS.cpp
index 716c49c9..ebfaddfa 100644
--- a/kviewshell/plugins/djvu/libdjvu/GOS.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/GOS.cpp
@@ -167,9 +167,9 @@ finddirsep(const GUTF8String &fname)
 #if defined(UNIX)
   return fname.rsearch('/',0);
 #elif defined(WIN32) || defined(OS2)
-  return fname.rtqcontains("\\/",0);
+  return fname.rcontains("\\/",0);
 #elif defined(macintosh)
-  return fname.rtqcontains(":/",0);
+  return fname.rcontains(":/",0);
 #else
 #error "Define something here for your operating system"
 #endif  
diff --git a/kviewshell/plugins/djvu/libdjvu/GRect.cpp b/kviewshell/plugins/djvu/libdjvu/GRect.cpp
index 1cc49e8f..1ac0a87c 100644
--- a/kviewshell/plugins/djvu/libdjvu/GRect.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/GRect.cpp
@@ -184,7 +184,7 @@ GRect::recthull(const GRect &rect1, const GRect &rect2)
 }
 
 int
-GRect::tqcontains(const GRect & rect) const
+GRect::contains(const GRect & rect) const
 {
    GRect tmp_rect;
    tmp_rect.intersect(*this, rect);
diff --git a/kviewshell/plugins/djvu/libdjvu/GRect.h b/kviewshell/plugins/djvu/libdjvu/GRect.h
index f3e031e1..51770cbb 100644
--- a/kviewshell/plugins/djvu/libdjvu/GRect.h
+++ b/kviewshell/plugins/djvu/libdjvu/GRect.h
@@ -209,11 +209,11 @@ public:
       contains all pixels with horizontal pixel coordinates in range #xmin#
       (inclusive) to #xmax# (exclusive) and vertical coordinates #ymin#
       (inclusive) to #ymax# (exclusive). */
-  int  tqcontains(int x, int y) const;
+  int  contains(int x, int y) const;
   /** Returns true if this rectangle contains the passed rectangle #rect#.
       The function basically checks, that the intersection of this rectangle
       with #rect# is #rect#. */
-  int  tqcontains(const GRect & rect) const;
+  int  contains(const GRect & rect) const;
   /** Returns true if rectangles #r1# and #r2# are equal. */
   friend int operator==(const GRect & r1, const GRect & r2);
   /** Returns true if rectangles #r1# and #r2# are not equal. */
@@ -379,7 +379,7 @@ GRect::area() const
 }
 
 inline int
-GRect::tqcontains(int x, int y) const
+GRect::contains(int x, int y) const
 {
   return (x>=xmin && x<xmax && y>=ymin && y<ymax);
 }
diff --git a/kviewshell/plugins/djvu/libdjvu/GSmartPointer.cpp b/kviewshell/plugins/djvu/libdjvu/GSmartPointer.cpp
index a55e8cdf..8c17755d 100644
--- a/kviewshell/plugins/djvu/libdjvu/GSmartPointer.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/GSmartPointer.cpp
@@ -187,7 +187,7 @@ GPBase::assign (const GPBase &sptr)
 
 
 void
-GPBufferBase::tqreplace(void *nptr,const size_t n)
+GPBufferBase::replace(void *nptr,const size_t n)
 {
   resize(0,0);
   ptr=nptr;
diff --git a/kviewshell/plugins/djvu/libdjvu/GSmartPointer.h b/kviewshell/plugins/djvu/libdjvu/GSmartPointer.h
index b10ca83a..937a783d 100644
--- a/kviewshell/plugins/djvu/libdjvu/GSmartPointer.h
+++ b/kviewshell/plugins/djvu/libdjvu/GSmartPointer.h
@@ -118,7 +118,7 @@ public:
   GPBufferBase(void *&,const size_t n,const size_t t);
   void swap(GPBufferBase &p);
   void resize(const size_t n,const size_t t);
-  void tqreplace(void *nptr,const size_t n);
+  void replace(void *nptr,const size_t n);
   void set(const size_t t,const char c);
   ~GPBufferBase();
   operator int(void) const { return ptr ? num : 0; }
diff --git a/kviewshell/plugins/djvu/libdjvu/GString.cpp b/kviewshell/plugins/djvu/libdjvu/GString.cpp
index 8242279a..a618055e 100644
--- a/kviewshell/plugins/djvu/libdjvu/GString.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/GString.cpp
@@ -1538,14 +1538,14 @@ GUTF8String::fromEscaped( const GMap<GUTF8String,GUTF8String> ConvMap ) const
         }
       }else
       {  
-        GPosition map_entry = ConvMap.tqcontains( key );
+        GPosition map_entry = ConvMap.contains( key );
         if( map_entry )
         {                           // Found in the conversion map, substitute
           ret += ConvMap[map_entry];
         } else
         {
           static const GMap<GUTF8String,GUTF8String> &Basic = BasicMap();
-          GPosition map_entry = Basic.tqcontains( key );
+          GPosition map_entry = Basic.contains( key );
           if ( map_entry )
           {
             ret += Basic[map_entry];
@@ -1799,7 +1799,7 @@ GStringRep::rsearch(char const *ptr, int from) const
 }
 
 int
-GStringRep::tqcontains(const char accept[],int from) const
+GStringRep::contains(const char accept[],int from) const
 {
   if(from<0)
   {
@@ -1821,10 +1821,10 @@ GStringRep::tqcontains(const char accept[],int from) const
 }
 
 int
-GStringRep::rtqcontains(const char accept[],int from) const
+GStringRep::rcontains(const char accept[],int from) const
 {
   int retval=(-1);
-  while((from=tqcontains(accept,from)) >= 0)
+  while((from=contains(accept,from)) >= 0)
   {
     retval=from++;
   }
diff --git a/kviewshell/plugins/djvu/libdjvu/GString.h b/kviewshell/plugins/djvu/libdjvu/GString.h
index 9614d328..601db983 100644
--- a/kviewshell/plugins/djvu/libdjvu/GString.h
+++ b/kviewshell/plugins/djvu/libdjvu/GString.h
@@ -306,9 +306,9 @@ public:
 
   int rsearch(char const *str, int from=0) const;
 
-  int tqcontains(char const accept[], int from=0) const;
+  int contains(char const accept[], int from=0) const;
 
-  int rtqcontains(char const accept[], int from=0) const;
+  int rcontains(char const accept[], int from=0) const;
 
 protected:
   // Return the next character and increment the source pointer.
@@ -551,11 +551,11 @@ public:
   /** Searches for any of the specified characters in the accept
       string.  It returns #-1# if the none of the characters and
       be found, otherwise the position of the first match. */
-  int tqcontains(const char accept[], const int from=0) const;
+  int contains(const char accept[], const int from=0) const;
   /** Searches for any of the specified characters in the accept
       string.  It returns #-1# if the none of the characters and be
       found, otherwise the position of the last match. */
-  int rtqcontains(const char accept[], const int from=0) const;
+  int rcontains(const char accept[], const int from=0) const;
 
   /** Concatenates strings. Returns a string composed by concatenating
       the characters of strings #s1# and #s2#. */
@@ -1282,12 +1282,12 @@ GBaseString::rsearch(const char *str, const int from) const
 { return ptr?((*this)->rsearch(str,from)):(-1); }
 
 inline int
-GBaseString::tqcontains(const char accept[], const int from) const
-{ return ptr?((*this)->tqcontains(accept,from)):(-1); }
+GBaseString::contains(const char accept[], const int from) const
+{ return ptr?((*this)->contains(accept,from)):(-1); }
 
 inline int
-GBaseString::rtqcontains(const char accept[], const int from) const
-{ return ptr?((*this)->rtqcontains(accept,from)):(-1); }
+GBaseString::rcontains(const char accept[], const int from) const
+{ return ptr?((*this)->rcontains(accept,from)):(-1); }
 
 inline int
 GBaseString::cmp(const GBaseString &s2, const int len) const
diff --git a/kviewshell/plugins/djvu/libdjvu/GURL.h b/kviewshell/plugins/djvu/libdjvu/GURL.h
index b76d000b..eb3ed4bc 100644
--- a/kviewshell/plugins/djvu/libdjvu/GURL.h
+++ b/kviewshell/plugins/djvu/libdjvu/GURL.h
@@ -106,7 +106,7 @@ namespace DJVU {
     to the same file name. Compare #file:/dir/file.djvu# and
     #file://localhost/dir/file.djvu#.
 
-    To simplify a developer's life we have created this class, which tqcontains
+    To simplify a developer's life we have created this class, which contains
     inside a canonical representation of URLs.
 
     File URLs are converted to internal format with the help of \Ref{GOS} class.
diff --git a/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp b/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp
index b936affb..77f3bec9 100644
--- a/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp
@@ -301,7 +301,7 @@ lt_XMLParser::Impl::ChangeAnno(
   const GP<DjVuAnno> ganno(DjVuAnno::create());
   DjVuAnno &anno=*ganno;
   GPosition map_pos;
-  map_pos=map.tqcontains(areatag);
+  map_pos=map.contains(areatag);
   if(dfile.contains_anno())
   {
     GP<ByteStream> annobs=dfile.get_merged_anno();
@@ -350,7 +350,7 @@ lt_XMLParser::Impl::ChangeAnno(
         // with no matching y).
         // ******************************************************
         {
-          GPosition coords_pos=args.tqcontains("coords");
+          GPosition coords_pos=args.contains("coords");
           if(coords_pos)
           {
             GList<int> raw_coords;
@@ -375,7 +375,7 @@ lt_XMLParser::Impl::ChangeAnno(
         }
         GUTF8String tqshape;
         {
-          GPosition tqshape_pos=args.tqcontains("tqshape");
+          GPosition tqshape_pos=args.contains("tqshape");
           if(tqshape_pos)
           {
             tqshape=args[tqshape_pos];
@@ -494,23 +494,23 @@ lt_XMLParser::Impl::ChangeAnno(
         if(a)
         {
           GPosition pos;
-          if((pos=args.tqcontains("href")))
+          if((pos=args.contains("href")))
           {
             a->url=args[pos];
           }
-          if((pos=args.tqcontains("target")))
+          if((pos=args.contains("target")))
           {
             a->target=args[pos];
           }
-          if((pos=args.tqcontains("alt")))
+          if((pos=args.contains("alt")))
           {
             a->comment=args[pos];
           }
-          if((pos=args.tqcontains("bordertype")))
+          if((pos=args.contains("bordertype")))
           {
             GUTF8String b=args[pos];
             static const GMap<GUTF8String,GMapArea::BorderType> typeMap=BorderTypeMap();
-            if((pos=typeMap.tqcontains(b)))
+            if((pos=typeMap.contains(b)))
             {
               a->border_type=typeMap[pos];
             }else
@@ -518,16 +518,16 @@ lt_XMLParser::Impl::ChangeAnno(
               G_THROW( (ERR_MSG("XMLAnno.unknown_border") "\t")+b );
             }
           }
-          a->border_always_visible=!!args.tqcontains("visible");
-          if((pos=args.tqcontains("bordercolor")))
+          a->border_always_visible=!!args.contains("visible");
+          if((pos=args.contains("bordercolor")))
           {
             a->border_color=convertToColor(args[pos]);
           }
-          if((pos=args.tqcontains("highlight")))
+          if((pos=args.contains("highlight")))
           {
             a->hilite_color=convertToColor(args[pos]);
           }
-          if((pos=args.tqcontains("border")))
+          if((pos=args.contains("border")))
           {
              a->border_width=args[pos].toInt(); //atoi(args[pos]);
           }
@@ -548,7 +548,7 @@ lt_XMLParser::Impl::get_file(const GURL &url,GUTF8String id)
   GP<DjVuDocument> doc;
   GCriticalSectionLock lock(&xmlparser_lock);
   {
-    GPosition pos=m_docs.tqcontains(url.get_string());
+    GPosition pos=m_docs.contains(url.get_string());
     if(pos)
     {
       doc=m_docs[pos];
@@ -572,10 +572,10 @@ lt_XMLParser::Impl::get_file(const GURL &url,GUTF8String id)
     }
   }
   const GURL fileurl(doc->id_to_url(id));
-  GPosition dpos(m_files.tqcontains(fileurl.get_string()));
+  GPosition dpos(m_files.contains(fileurl.get_string()));
   if(!dpos)
   {
-    if(!doc->get_id_list().tqcontains(id))
+    if(!doc->get_id_list().contains(id))
     {
       G_THROW( ERR_MSG("XMLAnno.bad_page") );
     }
@@ -622,7 +622,7 @@ lt_XMLParser::Impl::parse(const lt_XMLTags &tags)
     GURL codebase;
     {
       DEBUG_MSG("Setting up codebase... m_codebase = " << m_codebase << "\n");
-      GPosition codebasePos=args.tqcontains("codebase");
+      GPosition codebasePos=args.contains("codebase");
       // If user specified a codebase attribute, assume it is correct (absolute URL):
       //  the GURL constructor will throw an exception if it isn't
       if(codebasePos)
@@ -642,11 +642,11 @@ lt_XMLParser::Impl::parse(const lt_XMLTags &tags)
     //  URL (for now, just a path and file name).  If it's absolute,
     //  our GURL will adequately wrap it.  If it's relative, we need
     //  to use the codebase attribute to form an absolute URL first.
-    GPosition datapos=args.tqcontains("data");
+    GPosition datapos=args.contains("data");
     if(datapos)
     {
       bool isDjVuType=false;
-      GPosition typePos(args.tqcontains("type"));
+      GPosition typePos(args.contains("type"));
       if(typePos)
       {
         if(args[typePos] != mimetype)
@@ -659,12 +659,12 @@ lt_XMLParser::Impl::parse(const lt_XMLTags &tags)
       const GURL url=GURL::UTF8(args[datapos],(args[datapos][0] == '/')?codebase.base():codebase);
       int width;
       {
-        GPosition widthPos=args.tqcontains("width");
+        GPosition widthPos=args.contains("width");
         width=(widthPos)?args[widthPos].toInt():0;
       }
       int height;
       {
-        GPosition heightPos=args.tqcontains("height");
+        GPosition heightPos=args.contains("height");
         height=(heightPos)?args[heightPos].toInt():0;
       }
       GUTF8String gamma;
@@ -672,17 +672,17 @@ lt_XMLParser::Impl::parse(const lt_XMLTags &tags)
       GUTF8String page;
       GUTF8String do_ocr;
       {
-        GPosition paramPos(GObject.tqcontains(paramtag));
+        GPosition paramPos(GObject.contains(paramtag));
         if(paramPos)
         {
           const GPList<lt_XMLTags> Params(GObject[paramPos]);
           for(GPosition loc=Params;loc;++loc)
           {
             const GMap<GUTF8String,GUTF8String> &pargs=Params[loc]->get_args();
-            GPosition namepos=pargs.tqcontains("name");
+            GPosition namepos=pargs.contains("name");
             if(namepos)
             {
-              GPosition valuepos=pargs.tqcontains("value");
+              GPosition valuepos=pargs.contains("value");
               if(valuepos)
               {
                 const GUTF8String name=pargs[namepos].downcase();
@@ -691,19 +691,19 @@ lt_XMLParser::Impl::parse(const lt_XMLTags &tags)
                 {
                   GMap<GUTF8String,GUTF8String> args;
                   lt_XMLTags::ParseValues(value,args,true);
-                  if(args.tqcontains("page"))
+                  if(args.contains("page"))
                   {
                     page=args["page"];
                   }
-                  if(args.tqcontains("dpi"))
+                  if(args.contains("dpi"))
                   {
                     dpi=args["dpi"];
                   }
-                  if(args.tqcontains("gamma"))
+                  if(args.contains("gamma"))
                   {
                     gamma=args["gamma"];
                   }
-                  if(args.tqcontains("ocr"))
+                  if(args.contains("ocr"))
                   {
                     do_ocr=args["ocr"];
                   }
@@ -749,14 +749,14 @@ lt_XMLParser::Impl::parse_anno(
 {
   GP<lt_XMLTags> map;
   {
-    GPosition usemappos=GObject.get_args().tqcontains("usemap");
+    GPosition usemappos=GObject.get_args().contains("usemap");
     if(usemappos)
     {
       const GUTF8String mapname(GObject.get_args()[usemappos]);
-      GPosition mappos=Maps.tqcontains(mapname);
+      GPosition mappos=Maps.contains(mapname);
       if(!mappos)
       {
-        G_THROW((ERR_MSG("XMLAnno.map_tqfind") "\t")+mapname );
+        G_THROW((ERR_MSG("XMLAnno.map_find") "\t")+mapname );
       }else
       {
         map=Maps[mappos];
@@ -838,7 +838,7 @@ make_child_layer(
   default_rect.ymin=max(tqparent.rect.ymax,tqparent.rect.ymin);
   default_rect.ymax=min(tqparent.rect.ymax,tqparent.rect.ymin);
   // Now if there are coordinates, use those.
-  GPosition pos(tag.get_args().tqcontains("coords"));
+  GPosition pos(tag.get_args().contains("coords"));
   if(pos)
   {
     GList<int> rectArgs;
@@ -1062,7 +1062,7 @@ lt_XMLParser::Impl::parse_text(
   const lt_XMLTags &GObject,
   DjVuFile &dfile )
 {
-  GPosition textPos = GObject.tqcontains(hiddentexttag);
+  GPosition textPos = GObject.contains(hiddentexttag);
   if(textPos)
   {
     // loop through the hidden text - there should only be one 
@@ -1078,7 +1078,7 @@ lt_XMLParser::Impl::parse_meta(
   const lt_XMLTags &GObject,
   DjVuFile &dfile )
 {
-  GPosition metaPos = GObject.tqcontains(metadatatag);
+  GPosition metaPos = GObject.contains(metadatatag);
   if(metaPos)
   {
     // loop through the hidden text - there should only be one 
diff --git a/kviewshell/plugins/djvu/libdjvu/XMLTags.cpp b/kviewshell/plugins/djvu/libdjvu/XMLTags.cpp
index 9c1ad58a..2511a585 100644
--- a/kviewshell/plugins/djvu/libdjvu/XMLTags.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/XMLTags.cpp
@@ -321,7 +321,7 @@ lt_XMLTags::init(XMLByteStream &xmlbs)
 GPList<lt_XMLTags>
 lt_XMLTags::get_Tags(char const tagname[]) const
 {
-  GPosition pos=allTags.tqcontains(tagname);
+  GPosition pos=allTags.contains(tagname);
   GPList<lt_XMLTags> retval;
   return (pos?allTags[pos]:retval);
 }
@@ -338,7 +338,7 @@ lt_XMLTags::get_Maps(char const tagname[],
     if(tag)
     {
       GPosition loc;
-      if((loc=tag->tqcontains(tagname)))
+      if((loc=tag->contains(tagname)))
       {
         GPList<lt_XMLTags> maps=(GPList<lt_XMLTags> &)((*tag)[loc]);
         for(GPosition mloc=maps;mloc;++mloc)
@@ -348,7 +348,7 @@ lt_XMLTags::get_Maps(char const tagname[],
           {
             GMap<GUTF8String,GUTF8String> &args=gtag->args;
             GPosition gpos;
-            if((gpos=args.tqcontains(argn)))
+            if((gpos=args.contains(argn)))
             {
               map[args[gpos]]=gtag;
             }
diff --git a/kviewshell/plugins/djvu/libdjvu/XMLTags.h b/kviewshell/plugins/djvu/libdjvu/XMLTags.h
index df5974d0..027e629b 100644
--- a/kviewshell/plugins/djvu/libdjvu/XMLTags.h
+++ b/kviewshell/plugins/djvu/libdjvu/XMLTags.h
@@ -121,7 +121,7 @@ public:
 
   inline void addtag(GP<lt_XMLTags> x);
   inline void addraw(GUTF8String raw);
-  inline GPosition tqcontains(GUTF8String name) const;
+  inline GPosition contains(GUTF8String name) const;
   inline const GPList<lt_XMLTags> & operator [] (const GUTF8String name) const;
   inline const GPList<lt_XMLTags> & operator [] (const GPosition &pos) const;
   static void ParseValues(char const *t, GMap<GUTF8String,GUTF8String> &args,bool downcase=true);
@@ -213,9 +213,9 @@ inline const GMap<GUTF8String,GPList<lt_XMLTags> > &
 lt_XMLTags::get_allTags(void) const { return allTags; }
 
 inline GPosition
-lt_XMLTags::tqcontains(GUTF8String name) const
+lt_XMLTags::contains(GUTF8String name) const
 {
-  return allTags.tqcontains(name);
+  return allTags.contains(name);
 }
 
 inline const GPList<lt_XMLTags> &
diff --git a/kviewshell/plugins/djvu/libdjvu/ZPCodec.h b/kviewshell/plugins/djvu/libdjvu/ZPCodec.h
index 1483b93e..4e29fc74 100644
--- a/kviewshell/plugins/djvu/libdjvu/ZPCodec.h
+++ b/kviewshell/plugins/djvu/libdjvu/ZPCodec.h
@@ -615,7 +615,7 @@ ZPCodec::IWencoder(const bool bit)
     numbers are much more probable than large numbers.  We will first group
     our numbers into several sets.  Each number is coded by first coding which
     set contains the number and then coding a position within the set.  Each
-    set tqcontains #2^n# numbers that we consider roughly equiprobable.  Since
+    set contains #2^n# numbers that we consider roughly equiprobable.  Since
     the most probable values occur much more often, we want to model their
     probability more precisely. Therefore we use small sets for the most
     probable values and large sets for the least probable values, as