From d7633c195a464e4d344ada9eea61afd10110598a Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 4 May 2011 19:54:24 +0000
Subject: Port kdesvn to TQt4 This enables compilation under both Qt3 and Qt4

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdesvn@1230412 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 src/svnqt/client_property.cpp | 54 +++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

(limited to 'src/svnqt/client_property.cpp')

diff --git a/src/svnqt/client_property.cpp b/src/svnqt/client_property.cpp
index 6438ff6..7aec642 100644
--- a/src/svnqt/client_property.cpp
+++ b/src/svnqt/client_property.cpp
@@ -69,10 +69,10 @@ namespace svn
             void *val;
 
             apr_hash_this (hi, &key, NULL, &val);
-            prop_map[ QString::FROMUTF8( (const char *)key ) ] =
-                    QString::FROMUTF8( ((const svn_string_t *)val)->data );
+            prop_map[ TQString::FROMUTF8( (const char *)key ) ] =
+                    TQString::FROMUTF8( ((const svn_string_t *)val)->data );
         }
-        mapList->push_back(PathPropertiesMapEntry(QString::FROMUTF8(path), prop_map ));
+        mapList->push_back(PathPropertiesMapEntry(TQString::FROMUTF8(path), prop_map ));
         return 0;
     }
 
@@ -138,18 +138,18 @@ namespace svn
         void *val;
 
         apr_hash_this (hi, &key, NULL, &val);
-        prop_map[ QString::FROMUTF8( (const char *)key ) ] =
-             QString::FROMUTF8( ((const svn_string_t *)val)->data );
+        prop_map[ TQString::FROMUTF8( (const char *)key ) ] =
+             TQString::FROMUTF8( ((const svn_string_t *)val)->data );
       }
 
-      path_prop_map_list->push_back( PathPropertiesMapEntry( QString::FROMUTF8(item->node_name->data), prop_map ) );
+      path_prop_map_list->push_back( PathPropertiesMapEntry( TQString::FROMUTF8(item->node_name->data), prop_map ) );
     }
 #endif
     return path_prop_map_list;
   }
 
-  QPair<QLONG,PathPropertiesMapList>
-  Client_impl::propget(const QString& propName,
+  TQPair<TQLONG,PathPropertiesMapList>
+  Client_impl::propget(const TQString& propName,
                   const Path &path,
                   const Revision &revision,
                   const Revision &peg,
@@ -205,16 +205,16 @@ namespace svn
       void *val;
 
       apr_hash_this (hi, &key, NULL, &val);
-      prop_map[propName] = QString::FROMUTF8( ((const svn_string_t *)val)->data );
-      path_prop_map_list.push_back( PathPropertiesMapEntry(QString::FROMUTF8((const char *)key), prop_map ) );
+      prop_map[propName] = TQString::FROMUTF8( ((const svn_string_t *)val)->data );
+      path_prop_map_list.push_back( PathPropertiesMapEntry(TQString::FROMUTF8((const char *)key), prop_map ) );
     }
 
-    return QPair<QLONG,PathPropertiesMapList>(actual,path_prop_map_list);
+    return TQPair<TQLONG,PathPropertiesMapList>(actual,path_prop_map_list);
   }
 
   void
-  Client_impl::propset(const QString& propName,
-                  const QString& propValue,
+  Client_impl::propset(const TQString& propName,
+                  const TQString& propValue,
                   const Path &path,
                   Depth depth,
                   bool skip_checks,
@@ -261,14 +261,14 @@ namespace svn
     }
 
   void
-  Client_impl::propdel(const QString& propName,
+  Client_impl::propdel(const TQString& propName,
                        const Path &path,
                        Depth depth,
                        bool skip_checks,
                        const Revision&base_revision,
                        const StringArray&changelists)
   {
-      propset(propName,QString::null,path,depth,skip_checks,base_revision,changelists);
+      propset(propName,TQString(),path,depth,skip_checks,base_revision,changelists);
   }
 
 //--------------------------------------------------------------------------------
@@ -285,7 +285,7 @@ namespace svn
    * @param recurse
    * @return PropertiesList
    */
-  QPair<QLONG,PropertiesMap>
+  TQPair<TQLONG,PropertiesMap>
   Client_impl::revproplist(const Path &path,
                       const Revision &revision)
   {
@@ -315,10 +315,10 @@ namespace svn
       void *val;
 
       apr_hash_this (hi, &key, NULL, &val);
-      prop_map[ QString::FROMUTF8( (const char *)key ) ] = QString::FROMUTF8( ((const svn_string_t *)val)->data );
+      prop_map[ TQString::FROMUTF8( (const char *)key ) ] = TQString::FROMUTF8( ((const svn_string_t *)val)->data );
     }
 
-    return QPair<QLONG,PropertiesMap>( revnum, prop_map );
+    return TQPair<TQLONG,PropertiesMap>( revnum, prop_map );
   }
 
   /**
@@ -331,8 +331,8 @@ namespace svn
    * @return PropertiesList
    */
 
-  QPair<QLONG,QString>
-  Client_impl::revpropget(const QString& propName,
+  TQPair<TQLONG,TQString>
+  Client_impl::revpropget(const TQString& propName,
                      const Path &path,
                      const Revision &revision)
   {
@@ -356,9 +356,9 @@ namespace svn
 
     // if the property does not exist NULL is returned
     if( propval == NULL )
-        return QPair<QLONG,QString>( 0, QString() );
+        return TQPair<TQLONG,TQString>( 0, TQString() );
 
-    return QPair<QLONG,QString>( revnum, QString::FROMUTF8(propval->data) );
+    return TQPair<TQLONG,TQString>( revnum, TQString::FROMUTF8(propval->data) );
   }
 
   /**
@@ -373,9 +373,9 @@ namespace svn
    * @param revprop
    * @return PropertiesList
    */
-  QLONG
-  Client_impl::revpropset(const QString& propName,
-                     const QString& propValue,
+  TQLONG
+  Client_impl::revpropset(const TQString& propName,
+                     const TQString& propValue,
                      const Path &path,
                      const Revision &revision,
                      bool force)
@@ -416,8 +416,8 @@ namespace svn
    * @param revprop
    * @return PropertiesList
    */
-  QLONG
-  Client_impl::revpropdel(const QString& propName,
+  TQLONG
+  Client_impl::revpropdel(const TQString& propName,
                   const Path &path,
                   const Revision &revision,
                   bool force)
-- 
cgit v1.2.1