[webkit-changes] cvs commit: WebCore/kwq KWQArrayImpl.h
KWQArrayImpl.mm KWQClipboard.mm KWQFontMetrics.h
KWQFontMetrics.mm KWQKHTMLPart.mm KWQMapImpl.h KWQMapImpl.mm
KWQRegExp.h KWQRegExp.mm KWQValueListImpl.h
KWQValueListImpl.mm KWQVariant.h KWQVariant.mm KWQRefPtr.h
Maciej
mjs at opensource.apple.com
Thu Dec 1 19:48:19 PST 2005
mjs 05/12/01 19:48:19
Modified: . ChangeLog
kxmlcore RefPtr.h
. ChangeLog
khtml khtml_part.cpp khtmlview.cpp
khtml/ecma kjs_dom.cpp kjs_html.cpp xmlhttprequest.cpp
khtml/editing edit_command.cpp
khtml/html html_tableimpl.cpp
khtml/rendering render_block.cpp render_text.cpp
khtml/xml dom_docimpl.cpp dom_elementimpl.cpp dom_nodeimpl.h
kwq KWQArrayImpl.h KWQArrayImpl.mm KWQClipboard.mm
KWQFontMetrics.h KWQFontMetrics.mm KWQKHTMLPart.mm
KWQMapImpl.h KWQMapImpl.mm KWQRegExp.h KWQRegExp.mm
KWQValueListImpl.h KWQValueListImpl.mm KWQVariant.h
KWQVariant.mm
Removed: kwq KWQRefPtr.h
Log:
JavaScriptCore:
Reviewed by Tim Hatcher.
- removed deprecated reset, isNull and nonNull methods
* kxmlcore/RefPtr.h:
WebCore:
Reviewed by Tim Hatcher.
- removed deprecated reset, isNull and nonNull methods
- replaced use of KWQRefPtr with RefPtr
* khtml/ecma/kjs_dom.cpp:
(KJS::DOMNode::toBoolean):
(KJS::DOMNode::toPrimitive):
(KJS::DOMNode::toString):
(KJS::DOMNodeList::toPrimitive):
* khtml/ecma/kjs_html.cpp:
(KJS::OptionConstructorImp::construct):
* khtml/ecma/xmlhttprequest.cpp:
(KJS::XMLHttpRequest::getValueProperty):
(KJS::XMLHttpRequest::putValueProperty):
(KJS::XMLHttpRequest::mark):
(KJS::XMLHttpRequest::changeState):
(KJS::XMLHttpRequest::open):
* khtml/editing/edit_command.cpp:
* khtml/html/html_tableimpl.cpp:
(DOM::HTMLTableSectionElementImpl::insertRow):
(DOM::HTMLTableSectionElementImpl::deleteRow):
(DOM::HTMLTableRowElementImpl::insertCell):
(DOM::HTMLTableRowElementImpl::deleteCell):
* khtml/khtml_part.cpp:
(KHTMLPart::scheduleScript):
(KHTMLPart::executeScheduledScript):
(KHTMLPart::clear):
(KHTMLPart::khtmlMousePressEvent):
* khtml/khtmlview.cpp:
(KHTMLViewPrivate::reset):
(KHTMLView::updateDragAndDrop):
(KHTMLView::cancelDragAndDrop):
(KHTMLView::performDragAndDrop):
* khtml/rendering/render_block.cpp:
(khtml::RenderBlock::updateFirstLetter):
* khtml/rendering/render_text.cpp:
(RenderText::setStyle):
* khtml/xml/dom_docimpl.cpp:
(DocumentImpl::prepareMouseEvent):
* khtml/xml/dom_elementimpl.cpp:
(NamedAttrMapImpl::setNamedItem):
* khtml/xml/dom_nodeimpl.h:
(DOM::NodeImpl::MouseEvent::MouseEvent):
* kwq/KWQArrayImpl.h:
* kwq/KWQArrayImpl.mm:
(KWQArrayImpl::KWQArrayPrivate::KWQArrayPrivate):
(KWQArrayImpl::duplicate):
(KWQArrayImpl::detach):
* kwq/KWQClipboard.mm:
(KWQClipboard::setDragImage):
(KWQClipboard::dragNSImage):
* kwq/KWQFontMetrics.h:
* kwq/KWQFontMetrics.mm:
(QFontMetricsPrivate::QFontMetricsPrivate):
(QFontMetrics::setFont):
(QFontMetrics::ascent):
(QFontMetrics::descent):
(QFontMetrics::lineSpacing):
(QFontMetrics::xHeight):
(QFontMetrics::width):
(QFontMetrics::floatWidth):
(QFontMetrics::checkSelectionPoint):
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::paint):
(KWQKHTMLPart::openURLFromPageCache):
(KWQKHTMLPart::khtmlMousePressEvent):
(KWQKHTMLPart::khtmlMouseMoveEvent):
(KWQKHTMLPart::dragSourceMovedTo):
(KWQKHTMLPart::dragSourceEndedAt):
(KWQKHTMLPart::mouseDown):
(KWQKHTMLPart::snapshotDragImage):
(KWQKHTMLPart::markMisspellings):
(KWQKHTMLPart::setMarkedTextRange):
* kwq/KWQMapImpl.h:
* kwq/KWQMapImpl.mm:
(KWQMapImpl::KWQMapPrivate::KWQMapPrivate):
(KWQMapImpl::copyOnWrite):
(KWQMapImpl::swap):
* kwq/KWQRefPtr.h: Removed.
* kwq/KWQRegExp.h:
* kwq/KWQRegExp.mm:
(QRegExp::KWQRegExpPrivate::KWQRegExpPrivate):
(QRegExp::operator=):
* kwq/KWQValueListImpl.h:
* kwq/KWQValueListImpl.mm:
(KWQValueListImpl::KWQValueListPrivate::KWQValueListPrivate):
(KWQValueListImpl::operator=):
(KWQValueListImpl::copyOnWrite):
* kwq/KWQVariant.h:
* kwq/KWQVariant.mm:
(QVariant::QVariantPrivate::):
(QVariant::QVariantPrivate::QVariantPrivate):
Revision Changes Path
1.890 +8 -0 JavaScriptCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
retrieving revision 1.889
retrieving revision 1.890
diff -u -r1.889 -r1.890
--- ChangeLog 1 Dec 2005 17:59:23 -0000 1.889
+++ ChangeLog 2 Dec 2005 03:47:59 -0000 1.890
@@ -1,3 +1,11 @@
+2005-12-01 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Tim Hatcher.
+
+ - removed deprecated reset, isNull and nonNull methods
+
+ * kxmlcore/RefPtr.h:
+
2005-12-01 Anders Carlsson <andersca at mac.com>
Reviewed by Darin.
1.2 +0 -8 JavaScriptCore/kxmlcore/RefPtr.h
Index: RefPtr.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/kxmlcore/RefPtr.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RefPtr.h 1 Dec 2005 10:32:01 -0000 1.1
+++ RefPtr.h 2 Dec 2005 03:48:00 -0000 1.2
@@ -36,14 +36,6 @@
template <class U> RefPtr(const RefPtr<U> &o) : m_ptr(o.get()) { if (T *ptr = m_ptr) ptr->ref(); }
- // FIXME: Deprecate in favor of operators below, then remove?
- bool isNull() const { return m_ptr == NULL; }
- bool notNull() const { return m_ptr != NULL; }
-
- // FIXME: Deprecate in favor of operator=, then remove?
- void reset() { if (T *ptr = m_ptr) ptr->deref(); m_ptr = NULL; }
- void reset(T *o) { if (o) o->ref(); if (T *ptr = m_ptr) ptr->deref(); m_ptr = o; }
-
T *get() const { return m_ptr; }
T &operator*() const { return *m_ptr; }
1.447 +191 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -r1.446 -r1.447
--- ChangeLog 1 Dec 2005 23:50:32 -0000 1.446
+++ ChangeLog 2 Dec 2005 03:48:00 -0000 1.447
@@ -1,3 +1,99 @@
+2005-12-01 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Tim Hatcher.
+
+ - removed deprecated reset, isNull and nonNull methods
+ - replaced use of KWQRefPtr with RefPtr
+
+ * khtml/ecma/kjs_dom.cpp:
+ (KJS::DOMNode::toBoolean):
+ (KJS::DOMNode::toPrimitive):
+ (KJS::DOMNode::toString):
+ (KJS::DOMNodeList::toPrimitive):
+ * khtml/ecma/kjs_html.cpp:
+ (KJS::OptionConstructorImp::construct):
+ * khtml/ecma/xmlhttprequest.cpp:
+ (KJS::XMLHttpRequest::getValueProperty):
+ (KJS::XMLHttpRequest::putValueProperty):
+ (KJS::XMLHttpRequest::mark):
+ (KJS::XMLHttpRequest::changeState):
+ (KJS::XMLHttpRequest::open):
+ * khtml/editing/edit_command.cpp:
+ * khtml/html/html_tableimpl.cpp:
+ (DOM::HTMLTableSectionElementImpl::insertRow):
+ (DOM::HTMLTableSectionElementImpl::deleteRow):
+ (DOM::HTMLTableRowElementImpl::insertCell):
+ (DOM::HTMLTableRowElementImpl::deleteCell):
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::scheduleScript):
+ (KHTMLPart::executeScheduledScript):
+ (KHTMLPart::clear):
+ (KHTMLPart::khtmlMousePressEvent):
+ * khtml/khtmlview.cpp:
+ (KHTMLViewPrivate::reset):
+ (KHTMLView::updateDragAndDrop):
+ (KHTMLView::cancelDragAndDrop):
+ (KHTMLView::performDragAndDrop):
+ * khtml/rendering/render_block.cpp:
+ (khtml::RenderBlock::updateFirstLetter):
+ * khtml/rendering/render_text.cpp:
+ (RenderText::setStyle):
+ * khtml/xml/dom_docimpl.cpp:
+ (DocumentImpl::prepareMouseEvent):
+ * khtml/xml/dom_elementimpl.cpp:
+ (NamedAttrMapImpl::setNamedItem):
+ * khtml/xml/dom_nodeimpl.h:
+ (DOM::NodeImpl::MouseEvent::MouseEvent):
+ * kwq/KWQArrayImpl.h:
+ * kwq/KWQArrayImpl.mm:
+ (KWQArrayImpl::KWQArrayPrivate::KWQArrayPrivate):
+ (KWQArrayImpl::duplicate):
+ (KWQArrayImpl::detach):
+ * kwq/KWQClipboard.mm:
+ (KWQClipboard::setDragImage):
+ (KWQClipboard::dragNSImage):
+ * kwq/KWQFontMetrics.h:
+ * kwq/KWQFontMetrics.mm:
+ (QFontMetricsPrivate::QFontMetricsPrivate):
+ (QFontMetrics::setFont):
+ (QFontMetrics::ascent):
+ (QFontMetrics::descent):
+ (QFontMetrics::lineSpacing):
+ (QFontMetrics::xHeight):
+ (QFontMetrics::width):
+ (QFontMetrics::floatWidth):
+ (QFontMetrics::checkSelectionPoint):
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::paint):
+ (KWQKHTMLPart::openURLFromPageCache):
+ (KWQKHTMLPart::khtmlMousePressEvent):
+ (KWQKHTMLPart::khtmlMouseMoveEvent):
+ (KWQKHTMLPart::dragSourceMovedTo):
+ (KWQKHTMLPart::dragSourceEndedAt):
+ (KWQKHTMLPart::mouseDown):
+ (KWQKHTMLPart::snapshotDragImage):
+ (KWQKHTMLPart::markMisspellings):
+ (KWQKHTMLPart::setMarkedTextRange):
+ * kwq/KWQMapImpl.h:
+ * kwq/KWQMapImpl.mm:
+ (KWQMapImpl::KWQMapPrivate::KWQMapPrivate):
+ (KWQMapImpl::copyOnWrite):
+ (KWQMapImpl::swap):
+ * kwq/KWQRefPtr.h: Removed.
+ * kwq/KWQRegExp.h:
+ * kwq/KWQRegExp.mm:
+ (QRegExp::KWQRegExpPrivate::KWQRegExpPrivate):
+ (QRegExp::operator=):
+ * kwq/KWQValueListImpl.h:
+ * kwq/KWQValueListImpl.mm:
+ (KWQValueListImpl::KWQValueListPrivate::KWQValueListPrivate):
+ (KWQValueListImpl::operator=):
+ (KWQValueListImpl::copyOnWrite):
+ * kwq/KWQVariant.h:
+ * kwq/KWQVariant.mm:
+ (QVariant::QVariantPrivate::):
+ (QVariant::QVariantPrivate::QVariantPrivate):
+
2005-12-01 Timothy Hatcher <timothy at apple.com>
Reviewed by Beth.
@@ -35,6 +131,101 @@
2005-12-01 Maciej Stachowiak <mjs at apple.com>
+ Reviewed by NOBODY (OOPS!).
+
+ WARNING: NO TEST CASES ADDED
+
+ * khtml/ecma/kjs_dom.cpp:
+ (KJS::DOMNode::toBoolean):
+ (KJS::DOMNode::toPrimitive):
+ (KJS::DOMNode::toString):
+ (KJS::DOMNodeList::toPrimitive):
+ * khtml/ecma/kjs_html.cpp:
+ (KJS::OptionConstructorImp::construct):
+ * khtml/ecma/xmlhttprequest.cpp:
+ (KJS::XMLHttpRequest::getValueProperty):
+ (KJS::XMLHttpRequest::putValueProperty):
+ (KJS::XMLHttpRequest::mark):
+ (KJS::XMLHttpRequest::changeState):
+ (KJS::XMLHttpRequest::open):
+ * khtml/editing/edit_command.cpp:
+ * khtml/html/html_tableimpl.cpp:
+ (DOM::HTMLTableSectionElementImpl::insertRow):
+ (DOM::HTMLTableSectionElementImpl::deleteRow):
+ (DOM::HTMLTableRowElementImpl::insertCell):
+ (DOM::HTMLTableRowElementImpl::deleteCell):
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::scheduleScript):
+ (KHTMLPart::executeScheduledScript):
+ (KHTMLPart::clear):
+ (KHTMLPart::khtmlMousePressEvent):
+ * khtml/khtmlview.cpp:
+ (KHTMLViewPrivate::reset):
+ (KHTMLView::updateDragAndDrop):
+ (KHTMLView::cancelDragAndDrop):
+ (KHTMLView::performDragAndDrop):
+ * khtml/rendering/render_block.cpp:
+ (khtml::RenderBlock::updateFirstLetter):
+ * khtml/rendering/render_text.cpp:
+ (RenderText::setStyle):
+ * khtml/xml/dom_docimpl.cpp:
+ (DocumentImpl::prepareMouseEvent):
+ * khtml/xml/dom_elementimpl.cpp:
+ (NamedAttrMapImpl::setNamedItem):
+ * khtml/xml/dom_nodeimpl.h:
+ (DOM::NodeImpl::MouseEvent::MouseEvent):
+ * kwq/KWQArrayImpl.h:
+ * kwq/KWQArrayImpl.mm:
+ (KWQArrayImpl::KWQArrayPrivate::KWQArrayPrivate):
+ (KWQArrayImpl::duplicate):
+ (KWQArrayImpl::detach):
+ * kwq/KWQClipboard.mm:
+ (KWQClipboard::setDragImage):
+ (KWQClipboard::dragNSImage):
+ * kwq/KWQFontMetrics.h:
+ * kwq/KWQFontMetrics.mm:
+ (QFontMetricsPrivate::QFontMetricsPrivate):
+ (QFontMetrics::setFont):
+ (QFontMetrics::ascent):
+ (QFontMetrics::descent):
+ (QFontMetrics::lineSpacing):
+ (QFontMetrics::xHeight):
+ (QFontMetrics::width):
+ (QFontMetrics::floatWidth):
+ (QFontMetrics::checkSelectionPoint):
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::paint):
+ (KWQKHTMLPart::openURLFromPageCache):
+ (KWQKHTMLPart::khtmlMousePressEvent):
+ (KWQKHTMLPart::khtmlMouseMoveEvent):
+ (KWQKHTMLPart::dragSourceMovedTo):
+ (KWQKHTMLPart::dragSourceEndedAt):
+ (KWQKHTMLPart::mouseDown):
+ (KWQKHTMLPart::snapshotDragImage):
+ (KWQKHTMLPart::markMisspellings):
+ (KWQKHTMLPart::setMarkedTextRange):
+ * kwq/KWQMapImpl.h:
+ * kwq/KWQMapImpl.mm:
+ (KWQMapImpl::KWQMapPrivate::KWQMapPrivate):
+ (KWQMapImpl::copyOnWrite):
+ (KWQMapImpl::swap):
+ * kwq/KWQRefPtr.h: Removed.
+ * kwq/KWQRegExp.h:
+ * kwq/KWQRegExp.mm:
+ (QRegExp::KWQRegExpPrivate::KWQRegExpPrivate):
+ (QRegExp::operator=):
+ * kwq/KWQValueListImpl.h:
+ * kwq/KWQValueListImpl.mm:
+ (KWQValueListImpl::KWQValueListPrivate::KWQValueListPrivate):
+ (KWQValueListImpl::operator=):
+ (KWQValueListImpl::copyOnWrite):
+ * kwq/KWQVariant.h:
+ * kwq/KWQVariant.mm:
+ (QVariant::QVariantPrivate::):
+ (QVariant::QVariantPrivate::QVariantPrivate):
+
+2005-12-01 Maciej Stachowiak <mjs at apple.com>
+
Rubber stamped by Eric.
- renamed SharedPtr to RefPtr via script
1.362 +4 -4 WebCore/khtml/khtml_part.cpp
Index: khtml_part.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/khtml_part.cpp,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- khtml_part.cpp 1 Dec 2005 10:32:06 -0000 1.361
+++ khtml_part.cpp 2 Dec 2005 03:48:03 -0000 1.362
@@ -645,7 +645,7 @@
//kdDebug(6050) << "KHTMLPart::scheduleScript "<< script << endl;
d->scheduledScript = script;
- d->scheduledScriptNode.reset(n);
+ d->scheduledScriptNode = n;
return true;
}
@@ -659,7 +659,7 @@
QVariant ret = executeScript( d->scheduledScriptNode.get(), d->scheduledScript );
d->scheduledScript = QString();
- d->scheduledScriptNode.reset();
+ d->scheduledScriptNode = 0;
return ret;
}
@@ -758,7 +758,7 @@
d->m_bClearing = true;
- d->m_mousePressNode.reset();
+ d->m_mousePressNode = 0;
if ( d->m_doc )
@@ -2655,7 +2655,7 @@
QMouseEvent *mouse = event->qmouseEvent();
NodeImpl *innerNode = event->innerNode();
- d->m_mousePressNode.reset(innerNode);
+ d->m_mousePressNode = innerNode;
d->m_dragStartPos = mouse->pos();
if (!event->url().isNull()) {
1.155 +7 -7 WebCore/khtml/khtmlview.cpp
Index: khtmlview.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/khtmlview.cpp,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- khtmlview.cpp 1 Dec 2005 10:32:07 -0000 1.154
+++ khtmlview.cpp 2 Dec 2005 03:48:04 -0000 1.155
@@ -139,7 +139,7 @@
underMouse = 0;
linkPressed = false;
useSlowRepaints = false;
- dragTarget.reset();
+ dragTarget = 0;
borderTouched = false;
scrollBarMoved = false;
ignoreWheelEvents = false;
@@ -945,32 +945,32 @@
if (newTarget) {
accept = dispatchDragEvent(dragenterEvent, newTarget, loc, clipboard);
}
- if (!d->dragTarget.isNull()) {
+ if (d->dragTarget) {
dispatchDragEvent(dragleaveEvent, d->dragTarget.get(), loc, clipboard);
}
} else if (newTarget) {
accept = dispatchDragEvent(dragoverEvent, newTarget, loc, clipboard);
}
- d->dragTarget.reset(newTarget);
+ d->dragTarget = newTarget;
return accept;
}
void KHTMLView::cancelDragAndDrop(const QPoint &loc, DOM::ClipboardImpl *clipboard)
{
- if (!d->dragTarget.isNull()) {
+ if (d->dragTarget) {
dispatchDragEvent(dragleaveEvent, d->dragTarget.get(), loc, clipboard);
}
- d->dragTarget.reset();
+ d->dragTarget = 0;
}
bool KHTMLView::performDragAndDrop(const QPoint &loc, DOM::ClipboardImpl *clipboard)
{
bool accept = false;
- if (!d->dragTarget.isNull()) {
+ if (d->dragTarget) {
accept = dispatchDragEvent(dropEvent, d->dragTarget.get(), loc, clipboard);
}
- d->dragTarget.reset();
+ d->dragTarget = 0;
return accept;
}
1.116 +4 -4 WebCore/khtml/ecma/kjs_dom.cpp
Index: kjs_dom.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_dom.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- kjs_dom.cpp 1 Dec 2005 10:32:09 -0000 1.115
+++ kjs_dom.cpp 2 Dec 2005 03:48:05 -0000 1.116
@@ -190,7 +190,7 @@
bool DOMNode::toBoolean(ExecState *) const
{
- return m_impl.notNull();
+ return m_impl;
}
/* Source for DOMNodeTable. Use "make hashtables" to regenerate.
@@ -607,7 +607,7 @@
ValueImp *DOMNode::toPrimitive(ExecState *exec, Type /*preferred*/) const
{
- if (m_impl.isNull())
+ if (!m_impl)
return Null();
return String(toString(exec));
@@ -615,7 +615,7 @@
UString DOMNode::toString(ExecState *) const
{
- if (m_impl.isNull())
+ if (!m_impl)
return "null";
return "[object " + (m_impl->isElementNode() ? m_impl->nodeName() : className()) + "]";
}
@@ -731,7 +731,7 @@
ValueImp *DOMNodeList::toPrimitive(ExecState *exec, Type /*preferred*/) const
{
- if (m_impl.isNull())
+ if (!m_impl)
return Null();
return String(toString(exec));
1.148 +1 -1 WebCore/khtml/ecma/kjs_html.cpp
Index: kjs_html.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_html.cpp,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- kjs_html.cpp 1 Dec 2005 10:32:09 -0000 1.147
+++ kjs_html.cpp 2 Dec 2005 03:48:05 -0000 1.148
@@ -3566,7 +3566,7 @@
int exception = 0;
RefPtr<ElementImpl> el(m_doc->createElement("option", exception));
HTMLOptionElementImpl *opt = 0;
- if (el.notNull()) {
+ if (el) {
opt = static_cast<HTMLOptionElementImpl *>(el.get());
int sz = args.size();
TextImpl *t = m_doc->createTextNode("");
1.49 +10 -10 WebCore/khtml/ecma/xmlhttprequest.cpp
Index: xmlhttprequest.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/xmlhttprequest.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- xmlhttprequest.cpp 27 Nov 2005 07:54:51 -0000 1.48
+++ xmlhttprequest.cpp 2 Dec 2005 03:48:06 -0000 1.49
@@ -152,7 +152,7 @@
}
if (typeIsXML = DOMImplementationImpl::isXMLMIMEType(mimeType)) {
- responseXML.reset(doc->implementation()->createDocument());
+ responseXML = doc->implementation()->createDocument();
DocumentImpl *docImpl = responseXML.get();
@@ -174,13 +174,13 @@
case StatusText:
return getStatusText();
case Onreadystatechange:
- if (onReadyStateChangeListener.notNull() && onReadyStateChangeListener->listenerObjImp()) {
+ if (onReadyStateChangeListener && onReadyStateChangeListener->listenerObjImp()) {
return onReadyStateChangeListener->listenerObj();
} else {
return Null();
}
case Onload:
- if (onLoadListener.notNull() && onLoadListener->listenerObjImp()) {
+ if (onLoadListener && onLoadListener->listenerObjImp()) {
return onLoadListener->listenerObj();
} else {
return Null();
@@ -200,10 +200,10 @@
{
switch(token) {
case Onreadystatechange:
- onReadyStateChangeListener.reset(Window::retrieveActive(exec)->getJSUnprotectedEventListener(value, true));
+ onReadyStateChangeListener = Window::retrieveActive(exec)->getJSUnprotectedEventListener(value, true);
break;
case Onload:
- onLoadListener.reset(Window::retrieveActive(exec)->getJSUnprotectedEventListener(value, true));
+ onLoadListener = Window::retrieveActive(exec)->getJSUnprotectedEventListener(value, true);
break;
default:
kdWarning() << "HTMLDocument::putValueProperty unhandled token " << token << endl;
@@ -214,10 +214,10 @@
{
DOMObject::mark();
- if (onReadyStateChangeListener.notNull())
+ if (onReadyStateChangeListener)
onReadyStateChangeListener->mark();
- if (onLoadListener.notNull())
+ if (onLoadListener)
onLoadListener->mark();
}
@@ -248,7 +248,7 @@
if (state != newState) {
state = newState;
- if (doc && doc->part() && onReadyStateChangeListener.notNull()) {
+ if (doc && doc->part() && onReadyStateChangeListener) {
int ignoreException;
EventImpl *ev = doc->createEvent("HTMLEvents", ignoreException);
ev->ref();
@@ -257,7 +257,7 @@
ev->deref();
}
- if (doc && doc->part() && state == Completed && onLoadListener.notNull()) {
+ if (doc && doc->part() && state == Completed && onLoadListener) {
int ignoreException;
EventImpl *ev = doc->createEvent("HTMLEvents", ignoreException);
ev->ref();
@@ -297,7 +297,7 @@
responseHeaders = QString();
response = QString();
createdDocument = false;
- responseXML.reset();
+ responseXML = 0;
changeState(Uninitialized);
1.13 +2 -2 WebCore/khtml/editing/edit_command.cpp
Index: edit_command.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/edit_command.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- edit_command.cpp 1 Dec 2005 10:32:14 -0000 1.12
+++ edit_command.cpp 2 Dec 2005 03:48:07 -0000 1.13
@@ -42,11 +42,11 @@
using DOM::CSSComputedStyleDeclarationImpl;
#define IF_IMPL_NULL_RETURN_ARG(arg) do { \
- if (isNull()) { return arg; } \
+ if (*this == 0) { return arg; } \
} while (0)
#define IF_IMPL_NULL_RETURN do { \
- if (isNull()) { return; } \
+ if (*this == 0) { return; } \
} while (0)
namespace khtml {
1.70 +4 -4 WebCore/khtml/html/html_tableimpl.cpp
Index: html_tableimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_tableimpl.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- html_tableimpl.cpp 1 Dec 2005 10:32:19 -0000 1.69
+++ html_tableimpl.cpp 2 Dec 2005 03:48:07 -0000 1.70
@@ -766,7 +766,7 @@
{
HTMLTableRowElementImpl *r = 0L;
RefPtr<NodeListImpl> children = childNodes();
- int numRows = children.notNull() ? (int)children->length() : 0;
+ int numRows = children ? (int)children->length() : 0;
//kdDebug(6030) << k_funcinfo << "index=" << index << " numRows=" << numRows << endl;
if ( index < -1 || index > numRows ) {
exceptioncode = DOMException::INDEX_SIZE_ERR; // per the DOM
@@ -791,7 +791,7 @@
void HTMLTableSectionElementImpl::deleteRow( int index, int &exceptioncode )
{
RefPtr<NodeListImpl> children = childNodes();
- int numRows = children.notNull() ? (int)children->length() : 0;
+ int numRows = children ? (int)children->length() : 0;
if ( index == -1 ) index = numRows - 1;
if( index >= 0 && index < numRows ) {
NodeImpl *row = children->item(index);
@@ -939,7 +939,7 @@
{
HTMLTableCellElementImpl *c = 0L;
RefPtr<NodeListImpl> children = childNodes();
- int numCells = children.notNull() ? children->length() : 0;
+ int numCells = children ? children->length() : 0;
if ( index < -1 || index > numCells )
exceptioncode = DOMException::INDEX_SIZE_ERR; // per the DOM
else
@@ -962,7 +962,7 @@
void HTMLTableRowElementImpl::deleteCell( int index, int &exceptioncode )
{
RefPtr<NodeListImpl> children = childNodes();
- int numCells = children.notNull() ? children->length() : 0;
+ int numCells = children ? children->length() : 0;
if ( index == -1 ) index = numCells-1;
if( index >= 0 && index < numCells ) {
NodeImpl *row = children->item(index);
1.218 +1 -1 WebCore/khtml/rendering/render_block.cpp
Index: render_block.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_block.cpp,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- render_block.cpp 1 Dec 2005 10:32:23 -0000 1.217
+++ render_block.cpp 2 Dec 2005 03:48:08 -0000 1.218
@@ -3350,7 +3350,7 @@
RefPtr<DOMStringImpl> oldText = textObj->originalString();
KHTMLAssert(oldText);
- if (oldText.notNull() && oldText->l > 0) {
+ if (oldText && oldText->l > 0) {
unsigned int length = 0;
// account for leading spaces and punctuation
1.209 +1 -1 WebCore/khtml/rendering/render_text.cpp
Index: render_text.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_text.cpp,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- render_text.cpp 1 Dec 2005 10:32:23 -0000 1.208
+++ render_text.cpp 2 Dec 2005 03:48:08 -0000 1.209
@@ -811,7 +811,7 @@
if (needToTransformText) {
RefPtr<DOMStringImpl> textToTransform = originalString();
- if (textToTransform.notNull())
+ if (textToTransform)
setText(textToTransform.get(), true);
}
// setText also calls cacheWidths(), so there is no need to call it again in that case.
1.281 +1 -1 WebCore/khtml/xml/dom_docimpl.cpp
Index: dom_docimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_docimpl.cpp,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -r1.280 -r1.281
--- dom_docimpl.cpp 1 Dec 2005 10:32:26 -0000 1.280
+++ dom_docimpl.cpp 2 Dec 2005 03:48:09 -0000 1.281
@@ -1919,7 +1919,7 @@
assert(m_render->isCanvas());
RenderObject::NodeInfo renderInfo(readonly, active, ev->type == MouseMove);
bool isInside = m_render->layer()->hitTest(renderInfo, _x, _y);
- ev->innerNode.reset(renderInfo.innerNode());
+ ev->innerNode = renderInfo.innerNode();
if (renderInfo.URLElement()) {
assert(renderInfo.URLElement()->isElementNode());
1.97 +1 -1 WebCore/khtml/xml/dom_elementimpl.cpp
Index: dom_elementimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_elementimpl.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- dom_elementimpl.cpp 1 Dec 2005 10:32:26 -0000 1.96
+++ dom_elementimpl.cpp 2 Dec 2005 03:48:10 -0000 1.97
@@ -916,7 +916,7 @@
if (old) {
if (!old->attrImpl())
old->allocateImpl(element);
- r.reset(old->m_impl);
+ r = old->m_impl;
removeAttribute(a->name());
}
1.118 +1 -1 WebCore/khtml/xml/dom_nodeimpl.h
Index: dom_nodeimpl.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_nodeimpl.h,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- dom_nodeimpl.h 1 Dec 2005 10:32:27 -0000 1.117
+++ dom_nodeimpl.h 2 Dec 2005 03:48:10 -0000 1.118
@@ -198,7 +198,7 @@
{
button = _button; type = _type;
url = _url; target = _target;
- innerNode.reset(_innerNode);
+ innerNode = _innerNode;
}
int button;
1.11 +4 -4 WebCore/kwq/KWQArrayImpl.h
Index: KWQArrayImpl.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQArrayImpl.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- KWQArrayImpl.h 3 Oct 2005 21:13:01 -0000 1.10
+++ KWQArrayImpl.h 2 Dec 2005 03:48:12 -0000 1.11
@@ -26,10 +26,11 @@
#ifndef KWQ_ARRAY_IMPL_H
#define KWQ_ARRAY_IMPL_H
-#include "KWQRefPtr.h"
#include "KWQDef.h"
#include <stddef.h>
+#include "kxmlcore/RefPtr.h"
#include "kxmlcore/FastMalloc.h"
+#include "misc/shared.h"
class KWQArrayImpl
{
@@ -52,7 +53,7 @@
bool operator==(const KWQArrayImpl &) const;
private:
- class KWQArrayPrivate
+ class KWQArrayPrivate : public khtml::Shared<KWQArrayPrivate>
{
public:
KWQArrayPrivate(size_t pNumItems, size_t pItemSize);
@@ -61,10 +62,9 @@
size_t numItems;
size_t itemSize;
char *data;
- int refCount;
};
- KWQRefPtr<KWQArrayPrivate> d;
+ RefPtr<KWQArrayPrivate> d;
};
inline uint KWQArrayImpl::size() const
1.15 +4 -7 WebCore/kwq/KWQArrayImpl.mm
Index: KWQArrayImpl.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQArrayImpl.mm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- KWQArrayImpl.mm 3 Oct 2005 21:13:01 -0000 1.14
+++ KWQArrayImpl.mm 2 Dec 2005 03:48:12 -0000 1.15
@@ -36,8 +36,7 @@
KWQArrayImpl::KWQArrayPrivate::KWQArrayPrivate(size_t pItemSize, size_t pNumItems) :
numItems(pNumItems),
itemSize(pItemSize),
- data(pNumItems > 0 ? static_cast<char *>(fastMalloc(itemSize * numItems)) : NULL),
- refCount(0)
+ data(pNumItems > 0 ? static_cast<char *>(fastMalloc(itemSize * numItems)) : NULL)
{
}
@@ -100,9 +99,8 @@
newSize = 0;
}
- if (d->refCount > 1) {
- d = KWQRefPtr<KWQArrayPrivate>(new KWQArrayPrivate(d->itemSize, newSize));
- }
+ if (!d->hasOneRef())
+ d = new KWQArrayPrivate(d->itemSize, newSize);
if (d->numItems != newSize) {
resize(newSize);
@@ -113,9 +111,8 @@
void KWQArrayImpl::detach()
{
- if (d->refCount > 1) {
+ if (!d->hasOneRef())
duplicate(d->data, d->numItems);
- }
}
bool KWQArrayImpl::fill(const void *item, int numItems)
1.21 +2 -2 WebCore/kwq/KWQClipboard.mm
Index: KWQClipboard.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQClipboard.mm,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- KWQClipboard.mm 6 Nov 2005 21:47:28 -0000 1.20
+++ KWQClipboard.mm 2 Dec 2005 03:48:12 -0000 1.21
@@ -313,7 +313,7 @@
if (m_policy == ImageWritable || m_policy == Writable) {
m_dragImage = pm;
m_dragLoc = loc;
- m_dragImageElement.reset(node);
+ m_dragImageElement = node;
if (m_dragStarted && m_changeCount == [m_pasteboard changeCount]) {
NSPoint cocoaLoc;
@@ -331,7 +331,7 @@
NSImage *KWQClipboard::dragNSImage(NSPoint *loc)
{
NSImage *result = nil;
- if (!m_dragImageElement.isNull()) {
+ if (m_dragImageElement) {
if (m_part) {
NSRect imageRect;
NSRect elementRect;
1.43 +1 -1 WebCore/kwq/KWQFontMetrics.h
Index: KWQFontMetrics.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQFontMetrics.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- KWQFontMetrics.h 20 Oct 2005 06:02:26 -0000 1.42
+++ KWQFontMetrics.h 2 Dec 2005 03:48:12 -0000 1.43
@@ -65,7 +65,7 @@
int baselineOffset() const { return ascent(); }
private:
- KWQRefPtr<QFontMetricsPrivate> data;
+ RefPtr<QFontMetricsPrivate> data;
};
1.93 +15 -15 WebCore/kwq/KWQFontMetrics.mm
Index: KWQFontMetrics.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQFontMetrics.mm,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- KWQFontMetrics.mm 20 Oct 2005 06:02:26 -0000 1.92
+++ KWQFontMetrics.mm 2 Dec 2005 03:48:12 -0000 1.93
@@ -32,6 +32,8 @@
#import "KWQLogging.h"
#import "KWQFoundationExtras.h"
+#import "misc/shared.h"
+
#import "WebCoreTextRenderer.h"
#import "WebCoreTextRendererFactory.h"
@@ -39,10 +41,10 @@
// because they are all calls to WebCoreTextRenderer, which has a
// contract of not raising.
-struct QFontMetricsPrivate
+struct QFontMetricsPrivate : public khtml::Shared<QFontMetricsPrivate>
{
QFontMetricsPrivate(const QFont &font)
- : refCount(0), _font(font), _renderer(nil)
+ : _font(font), _renderer(nil)
{
}
~QFontMetricsPrivate()
@@ -66,9 +68,7 @@
KWQRelease(_renderer);
_renderer = nil;
}
-
- int refCount;
-
+
private:
QFont _font;
id <WebCoreTextRenderer> _renderer;
@@ -103,8 +103,8 @@
void QFontMetrics::setFont(const QFont &font)
{
- if (data.isNull()) {
- data = KWQRefPtr<QFontMetricsPrivate>(new QFontMetricsPrivate(font));
+ if (!data) {
+ data = new QFontMetricsPrivate(font);
} else {
data->setFont(font);
}
@@ -112,7 +112,7 @@
int QFontMetrics::ascent() const
{
- if (data.isNull()) {
+ if (!data) {
ERROR("called ascent on an empty QFontMetrics");
return 0;
}
@@ -122,7 +122,7 @@
int QFontMetrics::descent() const
{
- if (data.isNull()) {
+ if (!data) {
ERROR("called descent on an empty QFontMetrics");
return 0;
}
@@ -140,7 +140,7 @@
int QFontMetrics::lineSpacing() const
{
- if (data.isNull()) {
+ if (!data) {
ERROR("called lineSpacing on an empty QFontMetrics");
return 0;
}
@@ -149,7 +149,7 @@
float QFontMetrics::xHeight() const
{
- if (data.isNull()) {
+ if (!data) {
ERROR("called xHeight on an empty QFontMetrics");
return 0;
}
@@ -158,7 +158,7 @@
int QFontMetrics::width(const QString &qstring, int tabWidth, int xpos, int len) const
{
- if (data.isNull()) {
+ if (!data) {
ERROR("called width on an empty QFontMetrics");
return 0;
}
@@ -181,7 +181,7 @@
int QFontMetrics::width(const QChar *uchars, int len, int tabWidth, int xpos) const
{
- if (data.isNull()) {
+ if (!data) {
ERROR("called width on an empty QFontMetrics");
return 0;
}
@@ -202,7 +202,7 @@
float QFontMetrics::floatWidth(const QChar *uchars, int slen, int pos, int len, int tabWidth, int xpos, int letterSpacing, int wordSpacing, bool smallCaps) const
{
- if (data.isNull()) {
+ if (!data) {
ERROR("called floatWidth on an empty QFontMetrics");
return 0;
}
@@ -226,7 +226,7 @@
int QFontMetrics::checkSelectionPoint(QChar *s, int slen, int pos, int len, int toAdd, int tabWidth, int xpos, int letterSpacing, int wordSpacing, bool smallCaps, int x, bool reversed, bool includePartialGlyphs) const
{
- if (data.isNull()) {
+ if (!data) {
ERROR("called checkSelectionPoint on an empty QFontMetrics");
return 0;
}
1.692 +15 -15 WebCore/kwq/KWQKHTMLPart.mm
Index: KWQKHTMLPart.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKHTMLPart.mm,v
retrieving revision 1.691
retrieving revision 1.692
diff -u -r1.691 -r1.692
--- KWQKHTMLPart.mm 1 Dec 2005 10:32:31 -0000 1.691
+++ KWQKHTMLPart.mm 2 Dec 2005 03:48:13 -0000 1.692
@@ -1162,7 +1162,7 @@
if (renderer()) {
// _elementToDraw is used to draw only one element
- RenderObject *eltRenderer = _elementToDraw.notNull() ? _elementToDraw->renderer() : 0;
+ RenderObject *eltRenderer = _elementToDraw ? _elementToDraw->renderer() : 0;
renderer()->layer()->paint(p, rect, _drawSelectionOnly, eltRenderer);
#if APPLE_CHANGES
@@ -1604,7 +1604,7 @@
d->m_doc = doc;
d->m_doc->ref();
- d->m_mousePressNode.reset(mousePressNode);
+ d->m_mousePressNode = mousePressNode;
Decoder *decoder = doc->decoder();
if (decoder) {
@@ -2032,7 +2032,7 @@
// Careful that the drag starting logic stays in sync with eventMayStartDrag()
_mouseDownMayStartDrag = singleClick;
- d->m_mousePressNode.reset(event->innerNode());
+ d->m_mousePressNode = event->innerNode();
if (!passWidgetMouseDownEventToWidget(event)) {
// We don't do this at the start of mouse down handling (before calling into WebCore),
@@ -2296,7 +2296,7 @@
// Careful that the drag starting logic stays in sync with eventMayStartDrag()
- if (_mouseDownMayStartDrag && _dragSrc.isNull()) {
+ if (_mouseDownMayStartDrag && !_dragSrc) {
BOOL tempFlag1, tempFlag2;
[_bridge allowDHTMLDrag:&tempFlag1 UADrag:&tempFlag2];
_dragSrcMayBeDHTML = tempFlag1;
@@ -2306,7 +2306,7 @@
}
}
- if (_mouseDownMayStartDrag && _dragSrc.isNull()) {
+ if (_mouseDownMayStartDrag && !_dragSrc) {
// try to find an element that wants to be dragged
RenderObject::NodeInfo nodeInfo(true, false);
renderer()->layer()->hitTest(nodeInfo, _mouseDownX, _mouseDownY);
@@ -2404,7 +2404,7 @@
if (!_mouseDownMayStartDrag) {
// something failed to start the drag, cleanup
freeClipboard();
- _dragSrc.reset();
+ _dragSrc = 0;
}
}
@@ -2436,7 +2436,7 @@
void KWQKHTMLPart::dragSourceMovedTo(const QPoint &loc)
{
- if (!_dragSrc.isNull() && _dragSrcMayBeDHTML) {
+ if (_dragSrc && _dragSrcMayBeDHTML) {
// for now we don't care if event handler cancels default behavior, since there is none
dispatchDragSrcEvent(dragEvent, loc);
}
@@ -2444,13 +2444,13 @@
void KWQKHTMLPart::dragSourceEndedAt(const QPoint &loc, NSDragOperation operation)
{
- if (!_dragSrc.isNull() && _dragSrcMayBeDHTML) {
+ if (_dragSrc && _dragSrcMayBeDHTML) {
_dragClipboard->setDestinationOperation(operation);
// for now we don't care if event handler cancels default behavior, since there is none
dispatchDragSrcEvent(dragendEvent, loc);
}
freeClipboard();
- _dragSrc.reset();
+ _dragSrc = 0;
}
// Returns whether caller should continue with "the default processing", which is the same as
@@ -2675,7 +2675,7 @@
prepareForUserAction();
_mouseDownView = nil;
- _dragSrc.reset();
+ _dragSrc = 0;
NSEvent *oldCurrentEvent = _currentEvent;
_currentEvent = KWQRetain(event);
@@ -3491,11 +3491,11 @@
QRect topLevelRect;
NSRect paintingRect = renderer->paintingRootRect(topLevelRect);
- _elementToDraw.reset(node); // invoke special sub-tree drawing mode
+ _elementToDraw = node; // invoke special sub-tree drawing mode
NSImage *result = imageFromRect(paintingRect);
renderer->updateDragState(false);
d->m_doc->updateLayout();
- _elementToDraw.reset();
+ _elementToDraw = 0;
if (elementRect) {
*elementRect = topLevelRect;
@@ -4069,7 +4069,7 @@
return;
RefPtr<RangeImpl> searchRange(selection.toRange());
- if (searchRange.isNull() || searchRange->isDetached())
+ if (!searchRange || searchRange->isDetached())
return;
// If we're not in an editable node, bail.
@@ -4249,9 +4249,9 @@
}
if ( range && range->collapsed(exception) ) {
- m_markedTextRange.reset();
+ m_markedTextRange = 0;
} else {
- m_markedTextRange.reset(const_cast<RangeImpl *>(range));
+ m_markedTextRange = const_cast<RangeImpl *>(range);
}
if (m_markedTextRange.get() && xmlDocImpl() && m_markedTextRange->startContainer(exception)->renderer()) {
1.12 +2 -2 WebCore/kwq/KWQMapImpl.h
Index: KWQMapImpl.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQMapImpl.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- KWQMapImpl.h 3 Oct 2005 21:13:06 -0000 1.11
+++ KWQMapImpl.h 2 Dec 2005 03:48:14 -0000 1.12
@@ -28,8 +28,8 @@
#include <new>
-#include "KWQRefPtr.h"
#include "kxmlcore/FastMalloc.h"
+#include "kxmlcore/RefPtr.h"
class KWQMapImpl;
@@ -113,7 +113,7 @@
class KWQMapPrivate;
- KWQRefPtr<KWQMapPrivate> d;
+ RefPtr<KWQMapPrivate> d;
#ifdef QMAP_TESTING
friend bool CheckRedBlackRules(KWQMapImpl *impl);
1.13 +5 -8 WebCore/kwq/KWQMapImpl.mm
Index: KWQMapImpl.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQMapImpl.mm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- KWQMapImpl.mm 3 Oct 2005 21:13:06 -0000 1.12
+++ KWQMapImpl.mm 2 Dec 2005 03:48:14 -0000 1.13
@@ -25,6 +25,7 @@
#include "config.h"
#import "KWQMapImpl.h"
+#import "misc/shared.h"
KWQMapNodeImpl::KWQMapNodeImpl() :
prev(NULL),
@@ -116,7 +117,7 @@
// KWQMapImplPrivate
-class KWQMapImpl::KWQMapPrivate
+class KWQMapImpl::KWQMapPrivate : public khtml::Shared<KWQMapImpl::KWQMapPrivate>
{
public:
KWQMapPrivate(KWQMapNodeImpl *node,
@@ -127,9 +128,7 @@
KWQMapNodeImpl *guard;
uint numNodes;
- int refCount;
void (*deleteNode)(KWQMapNodeImpl *);
- friend class KWQRefPtr<KWQMapImpl::KWQMapPrivate>;
};
KWQMapImpl::KWQMapPrivate::KWQMapPrivate(KWQMapNodeImpl *node,
@@ -137,7 +136,6 @@
void (*deleteFunc)(KWQMapNodeImpl *)) :
guard(node),
numNodes(count),
- refCount(0),
deleteNode(deleteFunc)
{
}
@@ -165,9 +163,8 @@
void KWQMapImpl::copyOnWrite()
{
- if (d->refCount > 1) {
- d = KWQRefPtr<KWQMapPrivate>(new KWQMapPrivate(copyTree(d->guard, NULL, NULL), d->numNodes, d->deleteNode));
- }
+ if (!d->hasOneRef())
+ d = new KWQMapPrivate(copyTree(d->guard, NULL, NULL), d->numNodes, d->deleteNode);
}
KWQMapNodeImpl *KWQMapImpl::copyTree(const KWQMapNodeImpl *node,
@@ -590,7 +587,7 @@
void KWQMapImpl::swap(KWQMapImpl &map)
{
- KWQRefPtr<KWQMapPrivate> tmp = d;
+ RefPtr<KWQMapPrivate> tmp = d;
d = map.d;
map.d = d;
}
1.21 +2 -2 WebCore/kwq/KWQRegExp.h
Index: KWQRegExp.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQRegExp.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- KWQRegExp.h 9 Jul 2005 01:01:10 -0000 1.20
+++ KWQRegExp.h 2 Dec 2005 03:48:14 -0000 1.21
@@ -28,7 +28,7 @@
#include "KWQString.h"
-#include "KWQRefPtr.h"
+#include "kxmlcore/RefPtr.h"
class QRegExp {
public:
@@ -53,7 +53,7 @@
private:
class KWQRegExpPrivate;
- KWQRefPtr<KWQRegExpPrivate> d;
+ RefPtr<KWQRegExpPrivate> d;
};
#endif
1.16 +5 -6 WebCore/kwq/KWQRegExp.mm
Index: KWQRegExp.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQRegExp.mm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- KWQRegExp.mm 3 Oct 2005 21:13:08 -0000 1.15
+++ KWQRegExp.mm 2 Dec 2005 03:48:14 -0000 1.16
@@ -29,11 +29,12 @@
#import <sys/types.h>
#import <JavaScriptCore/pcre.h>
+#import "misc/shared.h"
#define MAX_SUBSTRINGS 10
#define MAX_OFFSETS (3 *MAX_SUBSTRINGS)
-class QRegExp::KWQRegExpPrivate
+class QRegExp::KWQRegExpPrivate : public khtml::Shared<QRegExp::KWQRegExpPrivate>
{
public:
KWQRegExpPrivate();
@@ -44,8 +45,6 @@
QString pattern;
pcre *regex;
-
- uint refCount;
QString lastMatchString;
int lastMatchOffsets[MAX_OFFSETS];
@@ -54,12 +53,12 @@
int lastMatchLength;
};
-QRegExp::KWQRegExpPrivate::KWQRegExpPrivate() : pattern(""), refCount(0)
+QRegExp::KWQRegExpPrivate::KWQRegExpPrivate() : pattern("")
{
compile(true, false);
}
-QRegExp::KWQRegExpPrivate::KWQRegExpPrivate(QString p, bool caseSensitive, bool glob) : pattern(p), refCount(0), lastMatchPos(-1), lastMatchLength(-1)
+QRegExp::KWQRegExpPrivate::KWQRegExpPrivate(QString p, bool caseSensitive, bool glob) : pattern(p), lastMatchPos(-1), lastMatchLength(-1)
{
compile(caseSensitive, glob);
}
@@ -140,7 +139,7 @@
QRegExp &QRegExp::operator=(const QRegExp &re)
{
QRegExp tmp(re);
- KWQRefPtr<QRegExp::KWQRegExpPrivate> tmpD = tmp.d;
+ RefPtr<QRegExp::KWQRegExpPrivate> tmpD = tmp.d;
tmp.d = d;
d = tmpD;
1.14 +2 -2 WebCore/kwq/KWQValueListImpl.h
Index: KWQValueListImpl.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQValueListImpl.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- KWQValueListImpl.h 3 Oct 2005 21:13:10 -0000 1.13
+++ KWQValueListImpl.h 2 Dec 2005 03:48:14 -0000 1.14
@@ -26,8 +26,8 @@
#ifndef KWQVALUELIST_H_
#define KWQVALUELIST_H_
-#include "KWQRefPtr.h"
#include "KWQDef.h"
+#include "kxmlcore/RefPtr.h"
class KWQValueListNodeImpl;
@@ -101,7 +101,7 @@
class KWQValueListPrivate;
- KWQRefPtr<KWQValueListPrivate> d;
+ RefPtr<KWQValueListPrivate> d;
friend class KWQValueListNodeImpl;
};
1.16 +8 -11 WebCore/kwq/KWQValueListImpl.mm
Index: KWQValueListImpl.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQValueListImpl.mm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- KWQValueListImpl.mm 3 Oct 2005 21:13:10 -0000 1.15
+++ KWQValueListImpl.mm 2 Dec 2005 03:48:14 -0000 1.16
@@ -25,10 +25,11 @@
#include "config.h"
#import "KWQValueListImpl.h"
+#import "misc/shared.h"
#import <stdlib.h>
-class KWQValueListImpl::KWQValueListPrivate
+class KWQValueListImpl::KWQValueListPrivate : public khtml::Shared<KWQValueListImpl::KWQValueListPrivate>
{
public:
KWQValueListPrivate(void (*deleteFunc)(KWQValueListNodeImpl *), KWQValueListNodeImpl *(*copyFunc)(KWQValueListNodeImpl *));
@@ -45,8 +46,6 @@
void (*deleteNode)(KWQValueListNodeImpl *);
KWQValueListNodeImpl *(*copyNode)(KWQValueListNodeImpl *);
uint count;
-
- uint refCount;
};
inline KWQValueListImpl::KWQValueListPrivate::KWQValueListPrivate(void (*deleteFunc)(KWQValueListNodeImpl *),
@@ -55,16 +54,15 @@
tail(NULL),
deleteNode(deleteFunc),
copyNode(copyFunc),
- count(0),
- refCount(0)
+ count(0)
{
}
inline KWQValueListImpl::KWQValueListPrivate::KWQValueListPrivate(const KWQValueListPrivate &other) :
+ khtml::Shared<KWQValueListImpl::KWQValueListPrivate>(),
deleteNode(other.deleteNode),
copyNode(other.copyNode),
- count(other.count),
- refCount(0)
+ count(other.count)
{
other.copyList(other.head, head, tail);
}
@@ -379,7 +377,7 @@
KWQValueListImpl& KWQValueListImpl::operator=(const KWQValueListImpl &other)
{
KWQValueListImpl tmp(other);
- KWQRefPtr<KWQValueListPrivate> tmpD = tmp.d;
+ RefPtr<KWQValueListPrivate> tmpD = tmp.d;
tmp.d = d;
d = tmpD;
@@ -389,9 +387,8 @@
void KWQValueListImpl::copyOnWrite()
{
- if (d->refCount > 1) {
- d = KWQRefPtr<KWQValueListPrivate>(new KWQValueListPrivate(*d));
- }
+ if (!d->hasOneRef())
+ d = new KWQValueListPrivate(*d);
}
bool KWQValueListImpl::isEqual(const KWQValueListImpl &other, bool (*equalFunc)(const KWQValueListNodeImpl *, const KWQValueListNodeImpl *)) const
1.16 +2 -2 WebCore/kwq/KWQVariant.h
Index: KWQVariant.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQVariant.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- KWQVariant.h 26 Jan 2003 05:04:57 -0000 1.15
+++ KWQVariant.h 2 Dec 2005 03:48:15 -0000 1.16
@@ -27,7 +27,7 @@
#define QVARIANT_H_
#include "KWQDef.h"
-#include "KWQRefPtr.h"
+#include "kxmlcore/RefPtr.h"
class QString;
@@ -65,7 +65,7 @@
private:
class QVariantPrivate;
- KWQRefPtr<QVariantPrivate> d;
+ RefPtr<QVariantPrivate> d;
};
1.16 +4 -5 WebCore/kwq/KWQVariant.mm
Index: KWQVariant.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQVariant.mm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- KWQVariant.mm 3 Oct 2005 21:13:10 -0000 1.15
+++ KWQVariant.mm 2 Dec 2005 03:48:15 -0000 1.16
@@ -25,10 +25,11 @@
#include "config.h"
#import "KWQVariant.h"
-
#import "KWQString.h"
+#import "misc/shared.h"
-class QVariant::QVariantPrivate {
+class QVariant::QVariantPrivate : public khtml::Shared<QVariant::QVariantPrivate>
+{
public:
QVariantPrivate(QVariant::Type type = QVariant::Invalid);
~QVariantPrivate();
@@ -42,12 +43,10 @@
void *p;
int i;
} value;
-
- int refCount;
};
QVariant::QVariantPrivate::QVariantPrivate(QVariant::Type type)
- : t(type), refCount(0)
+ : t(type)
{
}
More information about the webkit-changes
mailing list