[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 a02208352a39d9e3cc4419d667a77783c2828ad5
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 10 16:28:12 2001 +0000

    Added file
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/src/kwq/KWQDef.h b/WebCore/kwq/KWQString.mm
similarity index 67%
copy from WebCore/src/kwq/KWQDef.h
copy to WebCore/kwq/KWQString.mm
index b4a79cf..e4ca8aa 100644
--- a/WebCore/src/kwq/KWQDef.h
+++ b/WebCore/kwq/KWQString.mm
@@ -23,44 +23,41 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef KWQDEF_H_
-#define KWQDEF_H_
-
-typedef unsigned char uchar;
-typedef unsigned short ushort;
-typedef unsigned uint;
-
-typedef int Q_INT32;  
-typedef unsigned int Q_UINT32;  
-
-typedef Q_INT32 QCOORD;
-
-typedef uint WFlags;
-typedef int WId;
-
-#define QMAX(a,b) ((a) > (b) ? (a) : (b))
-#define QMIN(a,b) ((a) < (b) ? (a) : (b))
-
-#define KMAX(a,b) QMAX(a, b)
-#define KMIN(a,b) QMIN(a, b)
-
-#define QABS(a) (((a) >= 0) ? (a) : -(a))
-
-#ifndef TRUE
-#define TRUE (1)
-#endif
-
-#ifndef FALSE
-#define FALSE (0)
-#endif
-
-#define ASSERT(a)
-
-void qDebug(const char *msg, ...);
-void qWarning(const char *msg, ...);
-
-#ifdef NEED_BOGUS_X_DEFINES
-typedef int XEvent;
-#endif
-
-#endif
+#include <qstring.h>
+
+QString::QString()
+{
+    s = NULL;
+}
+
+QString::QString(QChar qc)
+{
+    s = CFStringCreateMutable(NULL, 0);
+    CFStringAppendCharacters(s, &qc.c, 1);
+}
+
+QString::QString(const QChar *qc, uint len)
+{
+    if (qc || len) {
+        s = CFStringCreateMutable(NULL, 0);
+        CFStringAppendCharacters(s, &qc->c, len);
+    } else {
+        s = NULL;
+    }
+}
+
+QString::QString(const char *ch)
+{
+    if (ch) {
+        s = CFStringCreateMutable(NULL, 0);
+        // FIXME: is ISO Latin-1 the correct encoding?
+        CFStringAppendCString(s, ch, kCFStringEncodingISOLatin1);
+    } else {
+        s = NULL;
+    }
+}
+
+QString::~QString()
+{
+    CFRelease(s);
+}
diff --git a/WebCore/src/kwq/KWQDef.h b/WebCore/src/kwq/KWQString.mm
similarity index 67%
copy from WebCore/src/kwq/KWQDef.h
copy to WebCore/src/kwq/KWQString.mm
index b4a79cf..e4ca8aa 100644
--- a/WebCore/src/kwq/KWQDef.h
+++ b/WebCore/src/kwq/KWQString.mm
@@ -23,44 +23,41 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef KWQDEF_H_
-#define KWQDEF_H_
-
-typedef unsigned char uchar;
-typedef unsigned short ushort;
-typedef unsigned uint;
-
-typedef int Q_INT32;  
-typedef unsigned int Q_UINT32;  
-
-typedef Q_INT32 QCOORD;
-
-typedef uint WFlags;
-typedef int WId;
-
-#define QMAX(a,b) ((a) > (b) ? (a) : (b))
-#define QMIN(a,b) ((a) < (b) ? (a) : (b))
-
-#define KMAX(a,b) QMAX(a, b)
-#define KMIN(a,b) QMIN(a, b)
-
-#define QABS(a) (((a) >= 0) ? (a) : -(a))
-
-#ifndef TRUE
-#define TRUE (1)
-#endif
-
-#ifndef FALSE
-#define FALSE (0)
-#endif
-
-#define ASSERT(a)
-
-void qDebug(const char *msg, ...);
-void qWarning(const char *msg, ...);
-
-#ifdef NEED_BOGUS_X_DEFINES
-typedef int XEvent;
-#endif
-
-#endif
+#include <qstring.h>
+
+QString::QString()
+{
+    s = NULL;
+}
+
+QString::QString(QChar qc)
+{
+    s = CFStringCreateMutable(NULL, 0);
+    CFStringAppendCharacters(s, &qc.c, 1);
+}
+
+QString::QString(const QChar *qc, uint len)
+{
+    if (qc || len) {
+        s = CFStringCreateMutable(NULL, 0);
+        CFStringAppendCharacters(s, &qc->c, len);
+    } else {
+        s = NULL;
+    }
+}
+
+QString::QString(const char *ch)
+{
+    if (ch) {
+        s = CFStringCreateMutable(NULL, 0);
+        // FIXME: is ISO Latin-1 the correct encoding?
+        CFStringAppendCString(s, ch, kCFStringEncodingISOLatin1);
+    } else {
+        s = NULL;
+    }
+}
+
+QString::~QString()
+{
+    CFRelease(s);
+}

-- 
WebKit Debian packaging