[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:45:51 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 3b270ebd1570144842c7cb95b473c913e9b716ef
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Sep 30 17:52:28 2002 +0000
* kwq/qt/qobject.h: Add the destroyed signal.
* kwq/KWQObject.mm:
(QObject::connect): Remove names of parentDestroyed and slotWidgetDestructed
from the list of "slots OK to fail to connect without complaining".
(QObject::QObject): Initialize the destroyed signal.
* kwq/qt/qguardedptr.h:
* kwq/KWQGuardedPtr.mm:
* kwq/KWQSignal.h:
* kwq/KWQSlot.h:
Rearrange includes so qobject.h can include KWQSignal.h.
* kwq/KWQSignal.mm: Tweak.
* kwq/KWQSlot.mm: Added support for the parentDestroyed slot in KJS::WindowQObject
and the slotWidgetDestructed slot in khtml::RenderWidget.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2207 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 4b71abb..be7849a 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,22 @@
+2002-09-30 Darin Adler <darin at apple.com>
+
+ * kwq/qt/qobject.h: Add the destroyed signal.
+ * kwq/KWQObject.mm:
+ (QObject::connect): Remove names of parentDestroyed and slotWidgetDestructed
+ from the list of "slots OK to fail to connect without complaining".
+ (QObject::QObject): Initialize the destroyed signal.
+
+ * kwq/qt/qguardedptr.h:
+ * kwq/KWQGuardedPtr.mm:
+ * kwq/KWQSignal.h:
+ * kwq/KWQSlot.h:
+ Rearrange includes so qobject.h can include KWQSignal.h.
+
+ * kwq/KWQSignal.mm: Tweak.
+
+ * kwq/KWQSlot.mm: Added support for the parentDestroyed slot in KJS::WindowQObject
+ and the slotWidgetDestructed slot in khtml::RenderWidget.
+
2002-09-28 Darin Adler <darin at apple.com>
Turn -Werror back on. There must have been some miscommunication
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 4b71abb..be7849a 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,22 @@
+2002-09-30 Darin Adler <darin at apple.com>
+
+ * kwq/qt/qobject.h: Add the destroyed signal.
+ * kwq/KWQObject.mm:
+ (QObject::connect): Remove names of parentDestroyed and slotWidgetDestructed
+ from the list of "slots OK to fail to connect without complaining".
+ (QObject::QObject): Initialize the destroyed signal.
+
+ * kwq/qt/qguardedptr.h:
+ * kwq/KWQGuardedPtr.mm:
+ * kwq/KWQSignal.h:
+ * kwq/KWQSlot.h:
+ Rearrange includes so qobject.h can include KWQSignal.h.
+
+ * kwq/KWQSignal.mm: Tweak.
+
+ * kwq/KWQSlot.mm: Added support for the parentDestroyed slot in KJS::WindowQObject
+ and the slotWidgetDestructed slot in khtml::RenderWidget.
+
2002-09-28 Darin Adler <darin at apple.com>
Turn -Werror back on. There must have been some miscommunication
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4b71abb..be7849a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,22 @@
+2002-09-30 Darin Adler <darin at apple.com>
+
+ * kwq/qt/qobject.h: Add the destroyed signal.
+ * kwq/KWQObject.mm:
+ (QObject::connect): Remove names of parentDestroyed and slotWidgetDestructed
+ from the list of "slots OK to fail to connect without complaining".
+ (QObject::QObject): Initialize the destroyed signal.
+
+ * kwq/qt/qguardedptr.h:
+ * kwq/KWQGuardedPtr.mm:
+ * kwq/KWQSignal.h:
+ * kwq/KWQSlot.h:
+ Rearrange includes so qobject.h can include KWQSignal.h.
+
+ * kwq/KWQSignal.mm: Tweak.
+
+ * kwq/KWQSlot.mm: Added support for the parentDestroyed slot in KJS::WindowQObject
+ and the slotWidgetDestructed slot in khtml::RenderWidget.
+
2002-09-28 Darin Adler <darin at apple.com>
Turn -Werror back on. There must have been some miscommunication
diff --git a/WebCore/kwq/KWQGuardedPtr.h b/WebCore/kwq/KWQGuardedPtr.h
index 6bf51e6..bd0962c 100644
--- a/WebCore/kwq/KWQGuardedPtr.h
+++ b/WebCore/kwq/KWQGuardedPtr.h
@@ -26,7 +26,9 @@
#ifndef QGUARDEDPTR_H_
#define QGUARDEDPTR_H_
-#include "qobject.h"
+#include "qptrlist.h"
+
+class QObject;
class KWQGuardedPtrBase {
public:
diff --git a/WebCore/kwq/KWQGuardedPtr.mm b/WebCore/kwq/KWQGuardedPtr.mm
index c560abe..301c282 100644
--- a/WebCore/kwq/KWQGuardedPtr.mm
+++ b/WebCore/kwq/KWQGuardedPtr.mm
@@ -23,11 +23,13 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <qguardedptr.h>
+#import "qguardedptr.h"
+
+#import "qobject.h"
KWQGuardedPtrBase::KWQGuardedPtrBase(QObject *o)
{
if (o) {
- iterator = QPtrListIterator<QObject>(o->guardedPtrDummyList);
+ iterator = QPtrListIterator<QObject>(o->_guardedPtrDummyList);
}
}
diff --git a/WebCore/kwq/KWQObject.h b/WebCore/kwq/KWQObject.h
index 9f0b233..123ff2d 100644
--- a/WebCore/kwq/KWQObject.h
+++ b/WebCore/kwq/KWQObject.h
@@ -27,6 +27,7 @@
#define QOBJECT_H_
#include <KWQDef.h>
+#include <KWQSignal.h>
#include "qnamespace.h"
#include "qstring.h"
@@ -83,15 +84,15 @@ public:
void killTimers();
virtual void timerEvent(QTimerEvent *);
- void installEventFilter(const QObject *o) { m_eventFilterObject = o; }
- void removeEventFilter(const QObject *) { m_eventFilterObject = 0; }
- const QObject *eventFilterObject() const { return m_eventFilterObject; }
+ void installEventFilter(const QObject *o) { _eventFilterObject = o; }
+ void removeEventFilter(const QObject *) { _eventFilterObject = 0; }
+ const QObject *eventFilterObject() const { return _eventFilterObject; }
- void blockSignals(bool b) { m_signalsBlocked = b; }
+ void blockSignals(bool b) { _signalsBlocked = b; }
virtual bool event(QEvent *);
- static const QObject *sender() { return m_sender; }
+ static const QObject *sender() { return _sender; }
private:
// no copying or assignment
@@ -100,14 +101,16 @@ private:
KWQSignal *findSignal(const char *signalName) const;
- QPtrList<QObject> guardedPtrDummyList;
- mutable KWQSignal *m_signalListHead;
- bool m_signalsBlocked;
+ QPtrList<QObject> _guardedPtrDummyList;
- const QObject *m_eventFilterObject;
-
- static const QObject *m_sender;
+ mutable KWQSignal *_signalListHead;
+ bool _signalsBlocked;
+ static const QObject *_sender;
+ KWQSignal _destroyed;
+
+ const QObject *_eventFilterObject;
+
friend class KWQGuardedPtrBase;
friend class KWQSignal;
friend class KWQObjectSenderScope;
@@ -120,7 +123,7 @@ public:
~KWQObjectSenderScope();
private:
- const QObject *m_savedSender;
+ const QObject *_savedSender;
};
#endif
diff --git a/WebCore/kwq/KWQObject.mm b/WebCore/kwq/KWQObject.mm
index cf598aa..851b9ce 100644
--- a/WebCore/kwq/KWQObject.mm
+++ b/WebCore/kwq/KWQObject.mm
@@ -23,15 +23,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <qobject.h>
+#import "qobject.h"
-#import <qvariant.h>
-#import <qguardedptr.h>
-#import <KWQAssertions.h>
-#import <KWQSignal.h>
-#import <KWQSlot.h>
+#import "qvariant.h"
+#import "KWQAssertions.h"
-const QObject *QObject::m_sender;
+const QObject *QObject::_sender;
static CFMutableDictionaryRef timerDictionaries;
@@ -48,8 +45,8 @@ static CFMutableDictionaryRef timerDictionaries;
KWQSignal *QObject::findSignal(const char *signalName) const
{
- for (KWQSignal *signal = m_signalListHead; signal; signal = signal->m_next) {
- if (KWQNamesMatch(signalName, signal->m_name)) {
+ for (KWQSignal *signal = _signalListHead; signal; signal = signal->_next) {
+ if (KWQNamesMatch(signalName, signal->_name)) {
return signal;
}
}
@@ -68,7 +65,6 @@ void QObject::connect(const QObject *sender, const char *signalName, const QObje
#if !ERROR_DISABLED
if (1
&& !KWQNamesMatch(member, SIGNAL(setStatusBarText(const QString &)))
- && !KWQNamesMatch(member, SLOT(parentDestroyed()))
&& !KWQNamesMatch(member, SLOT(slotData(KIO::Job *, const QByteArray &)))
&& !KWQNamesMatch(member, SLOT(slotFinished(KIO::Job *)))
&& !KWQNamesMatch(member, SLOT(slotHistoryChanged()))
@@ -76,11 +72,10 @@ void QObject::connect(const QObject *sender, const char *signalName, const QObje
&& !KWQNamesMatch(member, SLOT(slotJobSpeed(KIO::Job *, unsigned long)))
&& !KWQNamesMatch(member, SLOT(slotLoaderRequestDone(khtml::DocLoader *, khtml::CachedObject *)))
&& !KWQNamesMatch(member, SLOT(slotLoaderRequestStarted(khtml::DocLoader *, khtml::CachedObject *)))
- && !KWQNamesMatch(member, SLOT(slotRedirection(KIO::Job *, const KURL &)))
+ && !KWQNamesMatch(member, SLOT(slotRedirection(KIO::Job *, const KURL &))) // FIXME: Should implement this one?
&& !KWQNamesMatch(member, SLOT(slotScrollBarMoved()))
&& !KWQNamesMatch(member, SLOT(slotShowDocument(const QString &, const QString &)))
- && !KWQNamesMatch(member, SLOT(slotViewCleared()))
- && !KWQNamesMatch(member, SLOT(slotWidgetDestructed()))
+ && !KWQNamesMatch(member, SLOT(slotViewCleared())) // FIXME: Should implement this one!
)
ERROR("connecting member %s to signal %s, but that signal was not found", member, signalName);
#endif
@@ -104,25 +99,27 @@ void QObject::disconnect(const QObject *sender, const char *signalName, const QO
}
KWQObjectSenderScope::KWQObjectSenderScope(const QObject *o)
- : m_savedSender(QObject::m_sender)
+ : _savedSender(QObject::_sender)
{
- QObject::m_sender = o;
+ QObject::_sender = o;
}
KWQObjectSenderScope::~KWQObjectSenderScope()
{
- QObject::m_sender = m_savedSender;
+ QObject::_sender = _savedSender;
}
QObject::QObject(QObject *parent, const char *name)
- : m_signalListHead(0), m_signalsBlocked(false), m_eventFilterObject(0)
+ : _signalListHead(0), _signalsBlocked(false)
+ , _destroyed(this, SIGNAL(destroyed()))
+ , _eventFilterObject(0)
{
- guardedPtrDummyList.append(this);
+ _guardedPtrDummyList.append(this);
}
QObject::~QObject()
{
- ASSERT(m_signalListHead == 0);
+ ASSERT(_signalListHead == &_destroyed);
killTimers();
}
diff --git a/WebCore/kwq/KWQSignal.h b/WebCore/kwq/KWQSignal.h
index 331b7f3..7b33b05 100644
--- a/WebCore/kwq/KWQSignal.h
+++ b/WebCore/kwq/KWQSignal.h
@@ -27,6 +27,7 @@
#define KWQSIGNAL_H
#include "KWQSlot.h"
+#include "qvaluelist.h"
class KWQSignal {
public:
@@ -47,10 +48,10 @@ private:
KWQSignal(const KWQSignal &);
KWQSignal &operator=(const KWQSignal &);
- QObject *m_object;
- KWQSignal *m_next;
- const char *m_name;
- QValueList<KWQSlot> m_slots;
+ QObject *_object;
+ KWQSignal *_next;
+ const char *_name;
+ QValueList<KWQSlot> _slots;
friend class QObject;
};
diff --git a/WebCore/kwq/KWQSignal.mm b/WebCore/kwq/KWQSignal.mm
index 94ad8a1..1b8c439 100644
--- a/WebCore/kwq/KWQSignal.mm
+++ b/WebCore/kwq/KWQSignal.mm
@@ -31,49 +31,49 @@
using KIO::Job;
KWQSignal::KWQSignal(QObject *object, const char *name)
- : m_object(object), m_next(object->m_signalListHead), m_name(name)
+ : _object(object), _next(object->_signalListHead), _name(name)
{
- object->m_signalListHead = this;
+ object->_signalListHead = this;
}
KWQSignal::~KWQSignal()
{
- KWQSignal **prev = &m_object->m_signalListHead;
+ KWQSignal **prev = &_object->_signalListHead;
KWQSignal *signal;
while ((signal = *prev)) {
if (signal == this) {
- *prev = m_next;
+ *prev = _next;
break;
}
- prev = &signal->m_next;
+ prev = &signal->_next;
}
}
void KWQSignal::connect(const KWQSlot &slot)
{
#if !ERROR_DISABLED
- if (m_slots.contains(slot)) {
- ERROR("connecting the same slot to a signal twice, %s", m_name);
+ if (_slots.contains(slot)) {
+ ERROR("connecting the same slot to a signal twice, %s", _name);
}
#endif
- m_slots.append(slot);
+ _slots.append(slot);
}
void KWQSignal::disconnect(const KWQSlot &slot)
{
#if !ERROR_DISABLED
- if (!m_slots.contains(slot)) {
- ERROR("disconnecting a signal that wasn't connected, %s", m_name);
+ if (!_slots.contains(slot)) {
+ ERROR("disconnecting a signal that wasn't connected, %s", _name);
}
#endif
- m_slots.remove(slot);
+ _slots.remove(slot);
}
void KWQSignal::call() const
{
- if (!m_object->m_signalsBlocked) {
- KWQObjectSenderScope senderScope(m_object);
- QValueList<KWQSlot> copiedSlots(m_slots);
+ if (!_object->_signalsBlocked) {
+ KWQObjectSenderScope senderScope(_object);
+ QValueList<KWQSlot> copiedSlots(_slots);
QValueListConstIterator<KWQSlot> end = copiedSlots.end();
for (QValueListConstIterator<KWQSlot> it = copiedSlots.begin(); it != end; ++it) {
(*it).call();
@@ -83,9 +83,9 @@ void KWQSignal::call() const
void KWQSignal::call(bool b) const
{
- if (!m_object->m_signalsBlocked) {
- KWQObjectSenderScope senderScope(m_object);
- QValueList<KWQSlot> copiedSlots(m_slots);
+ if (!_object->_signalsBlocked) {
+ KWQObjectSenderScope senderScope(_object);
+ QValueList<KWQSlot> copiedSlots(_slots);
QValueListConstIterator<KWQSlot> end = copiedSlots.end();
for (QValueListConstIterator<KWQSlot> it = copiedSlots.begin(); it != end; ++it) {
(*it).call(b);
@@ -95,9 +95,9 @@ void KWQSignal::call(bool b) const
void KWQSignal::call(int i) const
{
- if (!m_object->m_signalsBlocked) {
- KWQObjectSenderScope senderScope(m_object);
- QValueList<KWQSlot> copiedSlots(m_slots);
+ if (!_object->_signalsBlocked) {
+ KWQObjectSenderScope senderScope(_object);
+ QValueList<KWQSlot> copiedSlots(_slots);
QValueListConstIterator<KWQSlot> end = copiedSlots.end();
for (QValueListConstIterator<KWQSlot> it = copiedSlots.begin(); it != end; ++it) {
(*it).call(i);
@@ -107,9 +107,9 @@ void KWQSignal::call(int i) const
void KWQSignal::call(const QString &s) const
{
- if (!m_object->m_signalsBlocked) {
- KWQObjectSenderScope senderScope(m_object);
- QValueList<KWQSlot> copiedSlots(m_slots);
+ if (!_object->_signalsBlocked) {
+ KWQObjectSenderScope senderScope(_object);
+ QValueList<KWQSlot> copiedSlots(_slots);
QValueListConstIterator<KWQSlot> end = copiedSlots.end();
for (QValueListConstIterator<KWQSlot> it = copiedSlots.begin(); it != end; ++it) {
(*it).call(s);
@@ -119,9 +119,9 @@ void KWQSignal::call(const QString &s) const
void KWQSignal::call(Job *j) const
{
- if (!m_object->m_signalsBlocked) {
- KWQObjectSenderScope senderScope(m_object);
- QValueList<KWQSlot> copiedSlots(m_slots);
+ if (!_object->_signalsBlocked) {
+ KWQObjectSenderScope senderScope(_object);
+ QValueList<KWQSlot> copiedSlots(_slots);
QValueListConstIterator<KWQSlot> end = copiedSlots.end();
for (QValueListConstIterator<KWQSlot> it = copiedSlots.begin(); it != end; ++it) {
(*it).call(j);
diff --git a/WebCore/kwq/KWQSlot.h b/WebCore/kwq/KWQSlot.h
index 7669408..95ec54f 100644
--- a/WebCore/kwq/KWQSlot.h
+++ b/WebCore/kwq/KWQSlot.h
@@ -26,7 +26,9 @@
#ifndef KWQSLOT_H
#define KWQSLOT_H
-#import <qguardedptr.h>
+#include "qguardedptr.h"
+
+class QString;
namespace KIO {
class Job;
diff --git a/WebCore/kwq/KWQSlot.mm b/WebCore/kwq/KWQSlot.mm
index ef573de..52eb9e9 100644
--- a/WebCore/kwq/KWQSlot.mm
+++ b/WebCore/kwq/KWQSlot.mm
@@ -25,11 +25,12 @@
#import "KWQSlot.h"
-#import <KWQAssertions.h>
+#import "KWQAssertions.h"
-#import <dom_docimpl.h>
-#import <khtml_part.h>
-#import <render_form.h>
+#import "dom_docimpl.h"
+#import "khtml_part.h"
+#import "kjs_window.h"
+#import "render_form.h"
using DOM::DocumentImpl;
using khtml::RenderCheckBox;
@@ -38,7 +39,9 @@ using khtml::RenderFormElement;
using khtml::RenderLineEdit;
using khtml::RenderSelect;
using khtml::RenderTextArea;
+using khtml::RenderWidget;
using KIO::Job;
+using KJS::WindowQObject;
enum FunctionNumber {
signalFinishedParsing,
@@ -49,13 +52,15 @@ enum FunctionNumber {
slotClicked,
slotFinishedParsing,
slotParentCompleted,
+ slotParentDestroyed,
slotRedirect,
slotReturnPressed,
slotSelected,
slotSelectionChanged,
slotStateChanged,
slotTextChanged,
- slotTextChangedWithString
+ slotTextChangedWithString,
+ slotWidgetDestructed
};
KWQSlot::KWQSlot(QObject *object, const char *member) : m_object(0)
@@ -84,6 +89,9 @@ KWQSlot::KWQSlot(QObject *object, const char *member) : m_object(0)
} else if (KWQNamesMatch(member, SLOT(slotParentCompleted()))) {
ASSERT(dynamic_cast<KHTMLPart *>(object));
m_function = slotParentCompleted;
+ } else if (KWQNamesMatch(member, SLOT(parentDestroyed()))) {
+ ASSERT(dynamic_cast<WindowQObject *>(object));
+ m_function = slotParentDestroyed;
} else if (KWQNamesMatch(member, SLOT(slotRedirect()))) {
ASSERT(dynamic_cast<KHTMLPart *>(object));
m_function = slotRedirect;
@@ -105,6 +113,9 @@ KWQSlot::KWQSlot(QObject *object, const char *member) : m_object(0)
} else if (KWQNamesMatch(member, SLOT(slotTextChanged(const QString &)))) {
ASSERT(dynamic_cast<RenderLineEdit *>(object) || dynamic_cast<RenderFileButton *>(object));
m_function = slotTextChangedWithString;
+ } else if (KWQNamesMatch(member, SLOT(slotWidgetDestructed()))) {
+ ASSERT(dynamic_cast<RenderWidget *>(object));
+ m_function = slotWidgetDestructed;
} else {
ERROR("trying to create a slot for unknown member %s", member);
return;
@@ -130,9 +141,11 @@ void KWQSlot::call() const
CASE(slotClicked, RenderFormElement, slotClicked)
CASE(slotFinishedParsing, KHTMLPart, slotFinishedParsing)
CASE(slotParentCompleted, KHTMLPart, slotParentCompleted)
+ CASE(slotParentDestroyed, WindowQObject, parentDestroyed)
CASE(slotRedirect, KHTMLPart, slotRedirect)
CASE(slotSelectionChanged, RenderSelect, slotSelectionChanged)
CASE(slotTextChanged, RenderTextArea, slotTextChanged)
+ CASE(slotWidgetDestructed, RenderWidget, slotWidgetDestructed)
case slotReturnPressed: {
RenderLineEdit *edit = dynamic_cast<RenderLineEdit *>(m_object.pointer());
diff --git a/WebCore/kwq/qt/qguardedptr.h b/WebCore/kwq/qt/qguardedptr.h
index 6bf51e6..bd0962c 100644
--- a/WebCore/kwq/qt/qguardedptr.h
+++ b/WebCore/kwq/qt/qguardedptr.h
@@ -26,7 +26,9 @@
#ifndef QGUARDEDPTR_H_
#define QGUARDEDPTR_H_
-#include "qobject.h"
+#include "qptrlist.h"
+
+class QObject;
class KWQGuardedPtrBase {
public:
diff --git a/WebCore/kwq/qt/qobject.h b/WebCore/kwq/qt/qobject.h
index 9f0b233..123ff2d 100644
--- a/WebCore/kwq/qt/qobject.h
+++ b/WebCore/kwq/qt/qobject.h
@@ -27,6 +27,7 @@
#define QOBJECT_H_
#include <KWQDef.h>
+#include <KWQSignal.h>
#include "qnamespace.h"
#include "qstring.h"
@@ -83,15 +84,15 @@ public:
void killTimers();
virtual void timerEvent(QTimerEvent *);
- void installEventFilter(const QObject *o) { m_eventFilterObject = o; }
- void removeEventFilter(const QObject *) { m_eventFilterObject = 0; }
- const QObject *eventFilterObject() const { return m_eventFilterObject; }
+ void installEventFilter(const QObject *o) { _eventFilterObject = o; }
+ void removeEventFilter(const QObject *) { _eventFilterObject = 0; }
+ const QObject *eventFilterObject() const { return _eventFilterObject; }
- void blockSignals(bool b) { m_signalsBlocked = b; }
+ void blockSignals(bool b) { _signalsBlocked = b; }
virtual bool event(QEvent *);
- static const QObject *sender() { return m_sender; }
+ static const QObject *sender() { return _sender; }
private:
// no copying or assignment
@@ -100,14 +101,16 @@ private:
KWQSignal *findSignal(const char *signalName) const;
- QPtrList<QObject> guardedPtrDummyList;
- mutable KWQSignal *m_signalListHead;
- bool m_signalsBlocked;
+ QPtrList<QObject> _guardedPtrDummyList;
- const QObject *m_eventFilterObject;
-
- static const QObject *m_sender;
+ mutable KWQSignal *_signalListHead;
+ bool _signalsBlocked;
+ static const QObject *_sender;
+ KWQSignal _destroyed;
+
+ const QObject *_eventFilterObject;
+
friend class KWQGuardedPtrBase;
friend class KWQSignal;
friend class KWQObjectSenderScope;
@@ -120,7 +123,7 @@ public:
~KWQObjectSenderScope();
private:
- const QObject *m_savedSender;
+ const QObject *_savedSender;
};
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list