[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 1d53b5f1e84435983ce7937340cf599c48a393b4
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 29 01:31:52 2001 +0000

    Minor tweaks
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@231 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index 7ffa64e..6108208 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -31,12 +31,15 @@
 #endif
 
 #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 used
-// for immutable strings.
-#define QSTRING_TO_NSSTRING(aString)    [NSString stringWithCString: aString.latin1()]
-#define QSTRING_TO_NSSTRING_LENGTH(aString,l)    [NSString stringWithCString: aString.latin1() length: l]
-#define NSSTRING_TO_QSTRING(aString)    QString([aString cString])
+// These macros are TEMPORARY hacks to convert between NSString and QString.
+// They should be replaced with correct implementations.  They should only be
+// used for immutable strings.
+#define QSTRING_TO_NSSTRING(aString) \
+    [NSString stringWithCString: aString.latin1()]
+#define QSTRING_TO_NSSTRING_LENGTH(aString,l) \
+    [NSString stringWithCString: aString.latin1() length: l]
+#define NSSTRING_TO_QSTRING(aString) \
+    QString([aString cString])
 #endif
 
 // USING_BORROWED_QSTRING ======================================================
@@ -45,7 +48,6 @@
 
 #else
 
-// FIXME: this clever hack may need to be moved into KWQDef.h or elsewhere
 #define Fixed MacFixed
 #define Rect MacRect
 #define Boolean MacBoolean
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index 7ffa64e..6108208 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -31,12 +31,15 @@
 #endif
 
 #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 used
-// for immutable strings.
-#define QSTRING_TO_NSSTRING(aString)    [NSString stringWithCString: aString.latin1()]
-#define QSTRING_TO_NSSTRING_LENGTH(aString,l)    [NSString stringWithCString: aString.latin1() length: l]
-#define NSSTRING_TO_QSTRING(aString)    QString([aString cString])
+// These macros are TEMPORARY hacks to convert between NSString and QString.
+// They should be replaced with correct implementations.  They should only be
+// used for immutable strings.
+#define QSTRING_TO_NSSTRING(aString) \
+    [NSString stringWithCString: aString.latin1()]
+#define QSTRING_TO_NSSTRING_LENGTH(aString,l) \
+    [NSString stringWithCString: aString.latin1() length: l]
+#define NSSTRING_TO_QSTRING(aString) \
+    QString([aString cString])
 #endif
 
 // USING_BORROWED_QSTRING ======================================================
@@ -45,7 +48,6 @@
 
 #else
 
-// FIXME: this clever hack may need to be moved into KWQDef.h or elsewhere
 #define Fixed MacFixed
 #define Rect MacRect
 #define Boolean MacBoolean
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index 7ffa64e..6108208 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -31,12 +31,15 @@
 #endif
 
 #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 used
-// for immutable strings.
-#define QSTRING_TO_NSSTRING(aString)    [NSString stringWithCString: aString.latin1()]
-#define QSTRING_TO_NSSTRING_LENGTH(aString,l)    [NSString stringWithCString: aString.latin1() length: l]
-#define NSSTRING_TO_QSTRING(aString)    QString([aString cString])
+// These macros are TEMPORARY hacks to convert between NSString and QString.
+// They should be replaced with correct implementations.  They should only be
+// used for immutable strings.
+#define QSTRING_TO_NSSTRING(aString) \
+    [NSString stringWithCString: aString.latin1()]
+#define QSTRING_TO_NSSTRING_LENGTH(aString,l) \
+    [NSString stringWithCString: aString.latin1() length: l]
+#define NSSTRING_TO_QSTRING(aString) \
+    QString([aString cString])
 #endif
 
 // USING_BORROWED_QSTRING ======================================================
@@ -45,7 +48,6 @@
 
 #else
 
-// FIXME: this clever hack may need to be moved into KWQDef.h or elsewhere
 #define Fixed MacFixed
 #define Rect MacRect
 #define Boolean MacBoolean

-- 
WebKit Debian packaging