[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:39:02 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 00c21071f0e20a57a3c3322442668e40bd410f1b
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 13 22:26:15 2002 +0000
Quiet error messages related to the slot/signal changes.
* khtml/khtml_part.cpp:
(KHTMLPart::startAutoScroll): Ifdef this out.
(KHTMLPart::stopAutoScroll): Ditto.
* kwq/KWQObject.mm:
(QObject::connect): Add two more expected members to the list for
setStatusBarText and slotViewCleared.
* kwq/KWQSignal.h: Allow 4 slots per signal.
I don't want to make it a variable number, but we can if we have to.
* kwq/KWQSignal.mm:
(KWQSignal::connect): Support multiple slots.
(KWQSignal::disconnect): Support multiple slots.
(KWQSignal::call): Support multiple slots.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2061 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index e764ef5..56bbc95 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,24 @@
2002-09-13 Darin Adler <darin at apple.com>
+ Quiet error messages related to the slot/signal changes.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::startAutoScroll): Ifdef this out.
+ (KHTMLPart::stopAutoScroll): Ditto.
+
+ * kwq/KWQObject.mm:
+ (QObject::connect): Add two more expected members to the list for
+ setStatusBarText and slotViewCleared.
+
+ * kwq/KWQSignal.h: Allow 4 slots per signal.
+ I don't want to make it a variable number, but we can if we have to.
+ * kwq/KWQSignal.mm:
+ (KWQSignal::connect): Support multiple slots.
+ (KWQSignal::disconnect): Support multiple slots.
+ (KWQSignal::call): Support multiple slots.
+
+2002-09-13 Darin Adler <darin at apple.com>
+
Fix assertion that happens on any page that has a non-HTML frame.
We were sending signals for objects in m_objects that are only supposed
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e764ef5..56bbc95 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,24 @@
2002-09-13 Darin Adler <darin at apple.com>
+ Quiet error messages related to the slot/signal changes.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::startAutoScroll): Ifdef this out.
+ (KHTMLPart::stopAutoScroll): Ditto.
+
+ * kwq/KWQObject.mm:
+ (QObject::connect): Add two more expected members to the list for
+ setStatusBarText and slotViewCleared.
+
+ * kwq/KWQSignal.h: Allow 4 slots per signal.
+ I don't want to make it a variable number, but we can if we have to.
+ * kwq/KWQSignal.mm:
+ (KWQSignal::connect): Support multiple slots.
+ (KWQSignal::disconnect): Support multiple slots.
+ (KWQSignal::call): Support multiple slots.
+
+2002-09-13 Darin Adler <darin at apple.com>
+
Fix assertion that happens on any page that has a non-HTML frame.
We were sending signals for objects in m_objects that are only supposed
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e764ef5..56bbc95 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,24 @@
2002-09-13 Darin Adler <darin at apple.com>
+ Quiet error messages related to the slot/signal changes.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::startAutoScroll): Ifdef this out.
+ (KHTMLPart::stopAutoScroll): Ditto.
+
+ * kwq/KWQObject.mm:
+ (QObject::connect): Add two more expected members to the list for
+ setStatusBarText and slotViewCleared.
+
+ * kwq/KWQSignal.h: Allow 4 slots per signal.
+ I don't want to make it a variable number, but we can if we have to.
+ * kwq/KWQSignal.mm:
+ (KWQSignal::connect): Support multiple slots.
+ (KWQSignal::disconnect): Support multiple slots.
+ (KWQSignal::call): Support multiple slots.
+
+2002-09-13 Darin Adler <darin at apple.com>
+
Fix assertion that happens on any page that has a non-HTML frame.
We were sending signals for objects in m_objects that are only supposed
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index a382fa1..0cfff0b 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -4384,15 +4384,19 @@ void KHTMLPart::slotSelectAll()
void KHTMLPart::startAutoScroll()
{
+#ifndef APPLE_CHANGES
connect(&d->m_scrollTimer, SIGNAL( timeout() ), this, SLOT( slotAutoScroll() ));
d->m_scrollTimer.start(100, false);
+#endif
}
void KHTMLPart::stopAutoScroll()
{
+#ifndef APPLE_CHANGES
disconnect(&d->m_scrollTimer, SIGNAL( timeout() ), this, SLOT( slotAutoScroll() ));
if (d->m_scrollTimer.isActive())
d->m_scrollTimer.stop();
+#endif
}
diff --git a/WebCore/kwq/KWQObject.mm b/WebCore/kwq/KWQObject.mm
index a423efb..490ab6d 100644
--- a/WebCore/kwq/KWQObject.mm
+++ b/WebCore/kwq/KWQObject.mm
@@ -54,6 +54,7 @@ void QObject::connect(const QObject *sender, const char *signalName, const QObje
if (!signal) {
#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 *)))
@@ -64,6 +65,7 @@ void QObject::connect(const QObject *sender, const char *signalName, const QObje
&& !KWQNamesMatch(member, SLOT(slotLoaderRequestStarted(khtml::DocLoader *, khtml::CachedObject *)))
&& !KWQNamesMatch(member, SLOT(slotRedirection(KIO::Job *, const KURL &)))
&& !KWQNamesMatch(member, SLOT(slotScrollBarMoved()))
+ && !KWQNamesMatch(member, SLOT(slotViewCleared()))
&& !KWQNamesMatch(member, SLOT(slotWidgetDestructed()))
)
ERROR("connecting member %s to signal %s, but that signal was not found", member, signalName);
diff --git a/WebCore/kwq/KWQSignal.h b/WebCore/kwq/KWQSignal.h
index e6a217a..aa287ed 100644
--- a/WebCore/kwq/KWQSignal.h
+++ b/WebCore/kwq/KWQSignal.h
@@ -50,7 +50,7 @@ private:
QObject *m_object;
KWQSignal *m_next;
const char *m_name;
- KWQSlot m_slot;
+ KWQSlot m_slots[4];
friend class QObject;
};
diff --git a/WebCore/kwq/KWQSignal.mm b/WebCore/kwq/KWQSignal.mm
index c31a723..d99bffa 100644
--- a/WebCore/kwq/KWQSignal.mm
+++ b/WebCore/kwq/KWQSignal.mm
@@ -51,27 +51,36 @@ KWQSignal::~KWQSignal()
void KWQSignal::connect(const KWQSlot &slot)
{
- if (!m_slot.isEmpty()) {
- ERROR("multiple connects to the same signal are not supported");
- return;
+ const int numSlots = sizeof(m_slots) / sizeof(m_slots[0]);
+ for (int i = 0; i != numSlots; ++i) {
+ if (m_slots[i].isEmpty()) {
+ m_slots[i] = slot;
+ return;
+ }
}
- m_slot = slot;
+ ERROR("more than %d connections to the same signal not supported, %s", numSlots, m_name);
}
void KWQSignal::disconnect(const KWQSlot &slot)
{
- if (m_slot != slot) {
- ERROR("disconnecting a signal that wasn't connected");
- return;
+ const int numSlots = sizeof(m_slots) / sizeof(m_slots[0]);
+ for (int i = 0; i != numSlots; ++i) {
+ if (m_slots[i] == slot) {
+ m_slots[i].clear();
+ return;
+ }
}
- m_slot.clear();
+ ERROR("disconnecting a signal that wasn't connected, %s", m_name);
}
void KWQSignal::call() const
{
if (!m_object->m_signalsBlocked) {
KWQObjectSenderScope senderScope(m_object);
- m_slot.call();
+ const int numSlots = sizeof(m_slots) / sizeof(m_slots[0]);
+ for (int i = 0; i != numSlots; ++i) {
+ m_slots[i].call();
+ }
}
}
@@ -79,15 +88,21 @@ void KWQSignal::call(bool b) const
{
if (!m_object->m_signalsBlocked) {
KWQObjectSenderScope senderScope(m_object);
- m_slot.call(b);
+ const int numSlots = sizeof(m_slots) / sizeof(m_slots[0]);
+ for (int i = 0; i != numSlots; ++i) {
+ m_slots[i].call(b);
+ }
}
}
-void KWQSignal::call(int i) const
+void KWQSignal::call(int j) const
{
if (!m_object->m_signalsBlocked) {
KWQObjectSenderScope senderScope(m_object);
- m_slot.call(i);
+ const int numSlots = sizeof(m_slots) / sizeof(m_slots[0]);
+ for (int i = 0; i != numSlots; ++i) {
+ m_slots[i].call(j);
+ }
}
}
@@ -95,7 +110,10 @@ void KWQSignal::call(const QString &s) const
{
if (!m_object->m_signalsBlocked) {
KWQObjectSenderScope senderScope(m_object);
- m_slot.call(s);
+ const int numSlots = sizeof(m_slots) / sizeof(m_slots[0]);
+ for (int i = 0; i != numSlots; ++i) {
+ m_slots[i].call(s);
+ }
}
}
@@ -103,6 +121,9 @@ void KWQSignal::call(Job *j) const
{
if (!m_object->m_signalsBlocked) {
KWQObjectSenderScope senderScope(m_object);
- m_slot.call(j);
+ const int numSlots = sizeof(m_slots) / sizeof(m_slots[0]);
+ for (int i = 0; i != numSlots; ++i) {
+ m_slots[i].call(j);
+ }
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list