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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 5550e4f41a0c5fb19a69cc3bbb2810d33a9d91d0
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 30 15:47:29 2001 +0000

    Changed definitions of SIGNAL and SLOT macros to be strings
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQObject.h b/WebCore/kwq/KWQObject.h
index 64955ec..9cd0352 100644
--- a/WebCore/kwq/KWQObject.h
+++ b/WebCore/kwq/KWQObject.h
@@ -29,21 +29,22 @@
 // includes added to help in compilation of khtml/khtmlview.h
 #include "qobjectdefs.h"
 #include "qevent.h"
+#include "qvariant.h"
 
 // FIXME: should these macros be in "kwq.h" or other header file?
 #define slots
-#define SLOT(x) x
+#define SLOT(x) "x"
 #define signals protected
-#define SIGNAL(x) x
+#define SIGNAL(x) "x"
 #define emit
 #define Q_OBJECT
-//#define connect(arg1, arg2, arg3, arg4)
 
 class QObject {
 public:
     QObject(QObject *parent=0, const char *name=0);
     const char *name() const;
     virtual void setName(const char *);
+    QVariant property(const char *name) const;
     bool inherits(const char *) const;
     static bool connect(const QObject *, const char *, const QObject *, const
             char *);
diff --git a/WebCore/kwq/qt/qobject.h b/WebCore/kwq/qt/qobject.h
index 64955ec..9cd0352 100644
--- a/WebCore/kwq/qt/qobject.h
+++ b/WebCore/kwq/qt/qobject.h
@@ -29,21 +29,22 @@
 // includes added to help in compilation of khtml/khtmlview.h
 #include "qobjectdefs.h"
 #include "qevent.h"
+#include "qvariant.h"
 
 // FIXME: should these macros be in "kwq.h" or other header file?
 #define slots
-#define SLOT(x) x
+#define SLOT(x) "x"
 #define signals protected
-#define SIGNAL(x) x
+#define SIGNAL(x) "x"
 #define emit
 #define Q_OBJECT
-//#define connect(arg1, arg2, arg3, arg4)
 
 class QObject {
 public:
     QObject(QObject *parent=0, const char *name=0);
     const char *name() const;
     virtual void setName(const char *);
+    QVariant property(const char *name) const;
     bool inherits(const char *) const;
     static bool connect(const QObject *, const char *, const QObject *, const
             char *);
diff --git a/WebCore/src/kwq/qt/qobject.h b/WebCore/src/kwq/qt/qobject.h
index 64955ec..9cd0352 100644
--- a/WebCore/src/kwq/qt/qobject.h
+++ b/WebCore/src/kwq/qt/qobject.h
@@ -29,21 +29,22 @@
 // includes added to help in compilation of khtml/khtmlview.h
 #include "qobjectdefs.h"
 #include "qevent.h"
+#include "qvariant.h"
 
 // FIXME: should these macros be in "kwq.h" or other header file?
 #define slots
-#define SLOT(x) x
+#define SLOT(x) "x"
 #define signals protected
-#define SIGNAL(x) x
+#define SIGNAL(x) "x"
 #define emit
 #define Q_OBJECT
-//#define connect(arg1, arg2, arg3, arg4)
 
 class QObject {
 public:
     QObject(QObject *parent=0, const char *name=0);
     const char *name() const;
     virtual void setName(const char *);
+    QVariant property(const char *name) const;
     bool inherits(const char *) const;
     static bool connect(const QObject *, const char *, const QObject *, const
             char *);

-- 
WebKit Debian packaging