[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[gramps]

The following commit has been merged in the debian/unstable branch:
commit b6314d7ee71d1ca164cfe91e24bd288809feaaf2
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 13 01:07:26 2001 +0000

    Implemented NSString conversion macros
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@320 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index 1470654..63ad48b 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -30,6 +30,9 @@
 #include <config.h>
 #endif
 
+// USING_BORROWED_QSTRING ======================================================
+#ifdef USING_BORROWED_QSTRING
+
 #if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
 // These macros are TEMPORARY hacks to convert between NSString and QString.
 // They should be replaced with correct implementations.  They should only be
@@ -42,8 +45,6 @@
     QString([aString cString])
 #endif
 
-// USING_BORROWED_QSTRING ======================================================
-#ifdef USING_BORROWED_QSTRING
 #include <_qstring.h>
 
 #else
@@ -58,6 +59,15 @@
 
 #include "qcstring.h"
 
+#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
+#define QSTRING_TO_NSSTRING(aString) \
+    (NSString *)(aString.getCFMutableString())
+#define QSTRING_TO_NSSTRING_LENGTH(aString,l) \
+    [(NSString *)(aString.getCFMutableString()) substringToIndex: l]
+#define NSSTRING_TO_QSTRING(aString) \
+    QString::fromCFMutableString((CFMutableStringRef)aString)
+#endif
+
 class QString;
 class QRegExp;
 
@@ -183,6 +193,7 @@ public:
 #ifdef USING_BORROWED_KURL
     static QString fromLocal8Bit(const char *, int len=-1);
 #endif
+    static QString fromCFMutableString(CFMutableStringRef);
 
     // constructors, copy constructors, and destructors ------------------------
 
@@ -303,6 +314,8 @@ public:
     void compose();
     QString visual();
 
+    CFMutableStringRef getCFMutableString() const;
+
     // operators ---------------------------------------------------------------
 
     bool operator!() const;
diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index acface6..e707b3c 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -118,6 +118,17 @@ QString QString::fromLocal8Bit(const char *chs, int len)
 }
 #endif // USING_BORROWED_KURL
 
+QString QString::fromCFMutableString(CFMutableStringRef cfs)
+{
+    QString qs;
+    // shared copy
+    if (cfs) {
+        CFRetain(cfs);
+        qs.s = cfs;
+    }
+    return qs;
+}
+
 // constructors, copy constructors, and destructors ----------------------------
 
 QString::QString()
@@ -1126,6 +1137,11 @@ QString QString::visual()
     return QString(*this);
 }
 
+CFMutableStringRef QString::getCFMutableString() const
+{
+    return s;
+}
+
 // operators -------------------------------------------------------------------
 
 bool QString::operator!() const
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index 1470654..63ad48b 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -30,6 +30,9 @@
 #include <config.h>
 #endif
 
+// USING_BORROWED_QSTRING ======================================================
+#ifdef USING_BORROWED_QSTRING
+
 #if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
 // These macros are TEMPORARY hacks to convert between NSString and QString.
 // They should be replaced with correct implementations.  They should only be
@@ -42,8 +45,6 @@
     QString([aString cString])
 #endif
 
-// USING_BORROWED_QSTRING ======================================================
-#ifdef USING_BORROWED_QSTRING
 #include <_qstring.h>
 
 #else
@@ -58,6 +59,15 @@
 
 #include "qcstring.h"
 
+#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
+#define QSTRING_TO_NSSTRING(aString) \
+    (NSString *)(aString.getCFMutableString())
+#define QSTRING_TO_NSSTRING_LENGTH(aString,l) \
+    [(NSString *)(aString.getCFMutableString()) substringToIndex: l]
+#define NSSTRING_TO_QSTRING(aString) \
+    QString::fromCFMutableString((CFMutableStringRef)aString)
+#endif
+
 class QString;
 class QRegExp;
 
@@ -183,6 +193,7 @@ public:
 #ifdef USING_BORROWED_KURL
     static QString fromLocal8Bit(const char *, int len=-1);
 #endif
+    static QString fromCFMutableString(CFMutableStringRef);
 
     // constructors, copy constructors, and destructors ------------------------
 
@@ -303,6 +314,8 @@ public:
     void compose();
     QString visual();
 
+    CFMutableStringRef getCFMutableString() const;
+
     // operators ---------------------------------------------------------------
 
     bool operator!() const;
diff --git a/WebCore/src/kwq/KWQString.mm b/WebCore/src/kwq/KWQString.mm
index acface6..e707b3c 100644
--- a/WebCore/src/kwq/KWQString.mm
+++ b/WebCore/src/kwq/KWQString.mm
@@ -118,6 +118,17 @@ QString QString::fromLocal8Bit(const char *chs, int len)
 }
 #endif // USING_BORROWED_KURL
 
+QString QString::fromCFMutableString(CFMutableStringRef cfs)
+{
+    QString qs;
+    // shared copy
+    if (cfs) {
+        CFRetain(cfs);
+        qs.s = cfs;
+    }
+    return qs;
+}
+
 // constructors, copy constructors, and destructors ----------------------------
 
 QString::QString()
@@ -1126,6 +1137,11 @@ QString QString::visual()
     return QString(*this);
 }
 
+CFMutableStringRef QString::getCFMutableString() const
+{
+    return s;
+}
+
 // operators -------------------------------------------------------------------
 
 bool QString::operator!() const
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index 1470654..63ad48b 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -30,6 +30,9 @@
 #include <config.h>
 #endif
 
+// USING_BORROWED_QSTRING ======================================================
+#ifdef USING_BORROWED_QSTRING
+
 #if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
 // These macros are TEMPORARY hacks to convert between NSString and QString.
 // They should be replaced with correct implementations.  They should only be
@@ -42,8 +45,6 @@
     QString([aString cString])
 #endif
 
-// USING_BORROWED_QSTRING ======================================================
-#ifdef USING_BORROWED_QSTRING
 #include <_qstring.h>
 
 #else
@@ -58,6 +59,15 @@
 
 #include "qcstring.h"
 
+#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
+#define QSTRING_TO_NSSTRING(aString) \
+    (NSString *)(aString.getCFMutableString())
+#define QSTRING_TO_NSSTRING_LENGTH(aString,l) \
+    [(NSString *)(aString.getCFMutableString()) substringToIndex: l]
+#define NSSTRING_TO_QSTRING(aString) \
+    QString::fromCFMutableString((CFMutableStringRef)aString)
+#endif
+
 class QString;
 class QRegExp;
 
@@ -183,6 +193,7 @@ public:
 #ifdef USING_BORROWED_KURL
     static QString fromLocal8Bit(const char *, int len=-1);
 #endif
+    static QString fromCFMutableString(CFMutableStringRef);
 
     // constructors, copy constructors, and destructors ------------------------
 
@@ -303,6 +314,8 @@ public:
     void compose();
     QString visual();
 
+    CFMutableStringRef getCFMutableString() const;
+
     // operators ---------------------------------------------------------------
 
     bool operator!() const;

-- 
WebKit Debian packaging