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, 5 insertions, 5 deletions

diff --git a/kviewshell/plugins/djvu/libdjvu/GString.cpp b/kviewshell/plugins/djvu/libdjvu/GString.cpp
index a618055e..8242279a 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.contains( key );
+        GPosition map_entry = ConvMap.tqcontains( 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.contains( key );
+          GPosition map_entry = Basic.tqcontains( key );
           if ( map_entry )
           {
             ret += Basic[map_entry];
@@ -1799,7 +1799,7 @@ GStringRep::rsearch(char const *ptr, int from) const
 }
 
 int
-GStringRep::contains(const char accept[],int from) const
+GStringRep::tqcontains(const char accept[],int from) const
 {
   if(from<0)
   {
@@ -1821,10 +1821,10 @@ GStringRep::contains(const char accept[],int from) const
 }
 
 int
-GStringRep::rcontains(const char accept[],int from) const
+GStringRep::rtqcontains(const char accept[],int from) const
 {
   int retval=(-1);
-  while((from=contains(accept,from)) >= 0)
+  while((from=tqcontains(accept,from)) >= 0)
   {
     retval=from++;
   }