TQt4 port kdegraphics

This enables compilation under both Qt3 and Qt4


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

1 files changed, 24 insertions, 24 deletions

diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp
index 5e8a25c9..02890407 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.contains(this);
+  GPosition p = pcaster->cont_map.tqcontains(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.contains(this);
+  GPosition p = pcaster->cont_map.tqcontains(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.contains(port);
+   GPosition pos=cont_map.tqcontains(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.contains(alias, pos))
+   if (a2p_map.tqcontains(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.contains(port, pos)) cont_map.del(pos);
+  if (cont_map.tqcontains(port, pos)) cont_map.del(pos);
   
   // Update "route map"
-  if (route_map.contains(port, pos))
+  if (route_map.tqcontains(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.contains(src) && src->get_count()>0 &&
-       cont_map.contains(dst) && dst->get_count()>0)
+   if (cont_map.tqcontains(src) && src->get_count()>0 &&
+       cont_map.tqcontains(dst) && dst->get_count()>0)
    {
-      if (!route_map.contains(src)) route_map[src]=new GList<void *>();
+      if (!route_map.tqcontains(src)) route_map[src]=new GList<void *>();
       GList<void *> & list=*(GList<void *> *) route_map[src];
-      if (!list.contains(dst)) list.append(dst);
+      if (!list.tqcontains(dst)) list.append(dst);
    }
 }
 
@@ -387,7 +387,7 @@ DjVuPortcaster::del_route(const DjVuPort * src, DjVuPort * dst)
 {
   GCriticalSectionLock lock(&map_lock);
   
-  if (route_map.contains(src))
+  if (route_map.tqcontains(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.contains(src) || src->get_count()<=0 ||
-    !cont_map.contains(dst) || dst->get_count()<=0) return;
+  if (!cont_map.tqcontains(src) || src->get_count()<=0 ||
+    !cont_map.tqcontains(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.contains(dst))
+  if (route_map.tqcontains(dst))
     {
       GList<void *> & list=*(GList<void *> *) route_map[dst];
       for(GPosition pos=list;pos;++pos)
         {
           DjVuPort * new_dst=(DjVuPort *) list[pos];
-          if (!set.contains(new_dst)) 
+          if (!set.tqcontains(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.contains(src))
+   if (route_map.tqcontains(src))
    {
       GList<void *> & list=*(GList<void *> *) route_map[src];
       for(GPosition pos=list;pos;++pos)
@@ -557,12 +557,12 @@ DjVuPortcaster::notify_redisplay(const DjVuImage * source)
 }
 
 void
-DjVuPortcaster::notify_relayout(const DjVuImage * source)
+DjVuPortcaster::notify_retqlayout(const DjVuImage * source)
 {
    GPList<DjVuPort> list;
    compute_closure(source, list);
    for(GPosition pos=list; pos; ++pos)
-     list[pos]->notify_relayout(source);
+     list[pos]->notify_retqlayout(source);
 }
 
 void
@@ -576,22 +576,22 @@ DjVuPortcaster::notify_chunk_done(const DjVuPort * source, const GUTF8String &na
 
 void
 DjVuPortcaster::notify_file_flags_changed(const DjVuFile * source,
-					  long set_mask, long clr_mask)
+					  long set_tqmask, long clr_tqmask)
 {
    GPList<DjVuPort> list;
    compute_closure(source, list);
    for(GPosition pos=list; pos; ++pos)
-     list[pos]->notify_file_flags_changed(source, set_mask, clr_mask);
+     list[pos]->notify_file_flags_changed(source, set_tqmask, clr_tqmask);
 }
 
 void
 DjVuPortcaster::notify_doc_flags_changed(const DjVuDocument * source,
-					 long set_mask, long clr_mask)
+					 long set_tqmask, long clr_tqmask)
 {
    GPList<DjVuPort> list;
    compute_closure(source, list);
    for(GPosition pos=list; pos; ++pos)
-     list[pos]->notify_doc_flags_changed(source, set_mask, clr_mask);
+     list[pos]->notify_doc_flags_changed(source, set_tqmask, clr_tqmask);
 }
 
 void
@@ -626,7 +626,7 @@ void
 DjVuPort::notify_redisplay(const DjVuImage *) {}
 
 void
-DjVuPort::notify_relayout(const DjVuImage *) {}
+DjVuPort::notify_retqlayout(const DjVuImage *) {}
 
 void
 DjVuPort::notify_chunk_done(const DjVuPort *, const GUTF8String &) {}
@@ -688,7 +688,7 @@ DjVuMemoryPort::request_data(const DjVuPort * source, const GURL & url)
    GCriticalSectionLock lk(&lock);
    GP<DataPool> pool;
    GPosition pos;
-   if (map.contains(url, pos))
+   if (map.tqcontains(url, pos))
       pool=map[pos];
    return pool;
 }