[webkit-changes] cvs commit: WebCore/kwq KWQPtrDict.h
Eric
eseidel at opensource.apple.com
Fri Sep 2 04:15:47 PDT 2005
eseidel 05/09/02 04:15:46
Modified: . ChangeLog
kdom/cache KDOMCacheHelper.h KDOMCachedDocument.cpp
KDOMCachedImage.cpp KDOMCachedObject.h
KDOMCachedScript.cpp KDOMCachedStyleSheet.cpp
KDOMLoader.cpp KDOMLoader.h
kdom/ecma Ecma.cpp ScriptInterpreter.cpp
kwq KWQPtrDict.h
Added: ForwardingHeaders q3ptrdict.h
Log:
Bug #: 4799
Submitted by: eseidel
Reviewed by: mjs
* ForwardingHeaders/q3ptrdict.h: Added.
* kdom/cache/KDOMCacheHelper.h:
* kdom/cache/KDOMCachedDocument.cpp:
(CachedDocument::checkNotify):
(CachedDocument::error):
* kdom/cache/KDOMCachedImage.cpp:
(CachedImage::do_notify):
(CachedImage::movieStatus):
(CachedImage::data):
(CachedImage::error):
* kdom/cache/KDOMCachedObject.h:
* kdom/cache/KDOMCachedScript.cpp:
(CachedScript::checkNotify):
* kdom/cache/KDOMCachedStyleSheet.cpp:
(CachedStyleSheet::checkNotify):
(CachedStyleSheet::error):
* kdom/cache/KDOMLoader.cpp:
(DocumentLoader::setAutoloadImages):
(DocumentLoader::setShowAnimations):
(Loader::numRequests):
(Loader::cancelRequests):
(Loader::jobForRequest):
* kdom/cache/KDOMLoader.h:
* kdom/ecma/Ecma.cpp:
(Ecma::createEventListener):
* kdom/ecma/ScriptInterpreter.cpp:
(ScriptInterpreter::mark):
* kwq/KWQPtrDict.h:
Re-ran scripts from previous commit, now including QPtrDict.
http://bugzilla.opendarwin.org/show_bug.cgi?id=4799
Revision Changes Path
1.76 +35 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- ChangeLog 2 Sep 2005 10:02:52 -0000 1.75
+++ ChangeLog 2 Sep 2005 11:15:41 -0000 1.76
@@ -1,5 +1,40 @@
2005-09-02 Eric Seidel <eseidel at apple.com>
+ Reviewed by mjs (continuation of previous commit).
+
+ * ForwardingHeaders/q3ptrdict.h: Added.
+ * kdom/cache/KDOMCacheHelper.h:
+ * kdom/cache/KDOMCachedDocument.cpp:
+ (CachedDocument::checkNotify):
+ (CachedDocument::error):
+ * kdom/cache/KDOMCachedImage.cpp:
+ (CachedImage::do_notify):
+ (CachedImage::movieStatus):
+ (CachedImage::data):
+ (CachedImage::error):
+ * kdom/cache/KDOMCachedObject.h:
+ * kdom/cache/KDOMCachedScript.cpp:
+ (CachedScript::checkNotify):
+ * kdom/cache/KDOMCachedStyleSheet.cpp:
+ (CachedStyleSheet::checkNotify):
+ (CachedStyleSheet::error):
+ * kdom/cache/KDOMLoader.cpp:
+ (DocumentLoader::setAutoloadImages):
+ (DocumentLoader::setShowAnimations):
+ (Loader::numRequests):
+ (Loader::cancelRequests):
+ (Loader::jobForRequest):
+ * kdom/cache/KDOMLoader.h:
+ * kdom/ecma/Ecma.cpp:
+ (Ecma::createEventListener):
+ * kdom/ecma/ScriptInterpreter.cpp:
+ (ScriptInterpreter::mark):
+ * kwq/KWQPtrDict.h:
+ Re-ran scripts from previous commit, now including QPtrDict.
+ http://bugzilla.opendarwin.org/show_bug.cgi?id=4799
+
+2005-09-02 Eric Seidel <eseidel at apple.com>
+
Reviewed by mjs.
* ForwardingHeaders/q3cstring.h: Added.
1.1 WebCore/ForwardingHeaders/q3ptrdict.h
Index: q3ptrdict.h
===================================================================
#import "KWQPtrDict.h"
1.5 +1 -1 SVGSupport/kdom/cache/KDOMCacheHelper.h
Index: KDOMCacheHelper.h
===================================================================
RCS file: /cvs/root/SVGSupport/kdom/cache/KDOMCacheHelper.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- KDOMCacheHelper.h 2 Sep 2005 10:03:00 -0000 1.4
+++ KDOMCacheHelper.h 2 Sep 2005 11:15:42 -0000 1.5
@@ -28,7 +28,7 @@
#ifndef KDOM_CacheHelper_H
#define KDOM_CacheHelper_H
-#include <qptrdict.h>
+#include <q3ptrdict.h>
#include <q3ptrlist.h>
#include <kdom/cache/KDOMCachedObject.h>
1.4 +2 -2 SVGSupport/kdom/cache/KDOMCachedDocument.cpp
Index: KDOMCachedDocument.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/kdom/cache/KDOMCachedDocument.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- KDOMCachedDocument.cpp 1 Sep 2005 07:33:00 -0000 1.3
+++ KDOMCachedDocument.cpp 2 Sep 2005 11:15:42 -0000 1.4
@@ -105,7 +105,7 @@
if(m_loading)
return;
- for(QPtrDictIterator<CachedObjectClient> it(m_clients); it.current();)
+ for(Q3PtrDictIterator<CachedObjectClient> it(m_clients); it.current();)
it()->notifyFinished(this);
}
@@ -116,7 +116,7 @@
d->errorDescription = text;
m_loading = false;
- for(QPtrDictIterator<CachedObjectClient> it( m_clients ); it.current();)
+ for(Q3PtrDictIterator<CachedObjectClient> it( m_clients ); it.current();)
it()->error(d->errorCode, d->errorDescription);
}
1.5 +4 -4 SVGSupport/kdom/cache/KDOMCachedImage.cpp
Index: KDOMCachedImage.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/kdom/cache/KDOMCachedImage.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- KDOMCachedImage.cpp 1 Sep 2005 07:33:01 -0000 1.4
+++ KDOMCachedImage.cpp 2 Sep 2005 11:15:43 -0000 1.5
@@ -283,7 +283,7 @@
void CachedImage::do_notify(const QPixmap &p, const QRect &r)
{
- for(QPtrDictIterator<CachedObjectClient> it(m_clients); it.current(); )
+ for(Q3PtrDictIterator<CachedObjectClient> it(m_clients); it.current(); )
it()->setPixmap(p, r, this);
}
@@ -376,7 +376,7 @@
}
}
- for(QPtrDictIterator<CachedObjectClient> it(m_clients); it.current();)
+ for(Q3PtrDictIterator<CachedObjectClient> it(m_clients); it.current();)
it()->notifyFinished(this);
}
}
@@ -519,7 +519,7 @@
else
do_notify(*m_pixmap, m_pixmap->rect());
- for(QPtrDictIterator<CachedObjectClient> it(m_clients); it.current();)
+ for(Q3PtrDictIterator<CachedObjectClient> it(m_clients); it.current();)
it()->notifyFinished(this);
}
#else // APPLE_COMPILE_HACK
@@ -580,7 +580,7 @@
do_notify(pixmap(), QRect(0, 0, 16, 16));
- for(QPtrDictIterator<CachedObjectClient> it( m_clients ); it.current();)
+ for(Q3PtrDictIterator<CachedObjectClient> it( m_clients ); it.current();)
it()->notifyFinished(this);
}
1.5 +2 -2 SVGSupport/kdom/cache/KDOMCachedObject.h
Index: KDOMCachedObject.h
===================================================================
RCS file: /cvs/root/SVGSupport/kdom/cache/KDOMCachedObject.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- KDOMCachedObject.h 1 Sep 2005 07:33:01 -0000 1.4
+++ KDOMCachedObject.h 2 Sep 2005 11:15:43 -0000 1.5
@@ -29,7 +29,7 @@
#define KDOM_CachedObject_H
#include <qbuffer.h>
-#include <qptrdict.h>
+#include <q3ptrdict.h>
#include <qtextcodec.h>
#include <kio/global.h>
@@ -132,7 +132,7 @@
protected:
void setSize(int size);
- QPtrDict<CachedObjectClient> m_clients;
+ Q3PtrDict<CachedObjectClient> m_clients;
int m_size;
Type m_type;
1.4 +1 -1 SVGSupport/kdom/cache/KDOMCachedScript.cpp
Index: KDOMCachedScript.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/kdom/cache/KDOMCachedScript.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- KDOMCachedScript.cpp 1 Sep 2005 07:33:01 -0000 1.3
+++ KDOMCachedScript.cpp 2 Sep 2005 11:15:43 -0000 1.4
@@ -73,7 +73,7 @@
if(m_loading)
return;
- for(QPtrDictIterator<CachedObjectClient> it(m_clients); it.current();)
+ for(Q3PtrDictIterator<CachedObjectClient> it(m_clients); it.current();)
it()->notifyFinished(this);
}
1.5 +2 -2 SVGSupport/kdom/cache/KDOMCachedStyleSheet.cpp
Index: KDOMCachedStyleSheet.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/kdom/cache/KDOMCachedStyleSheet.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- KDOMCachedStyleSheet.cpp 1 Sep 2005 07:33:01 -0000 1.4
+++ KDOMCachedStyleSheet.cpp 2 Sep 2005 11:15:43 -0000 1.5
@@ -103,7 +103,7 @@
// it() first increments, then returnes the current item.
// this avoids skipping an item when setStyleSheet deletes the "current" one.
- for(QPtrDictIterator<CachedObjectClient> it( m_clients ); it.current();)
+ for(Q3PtrDictIterator<CachedObjectClient> it( m_clients ); it.current();)
it()->setStyleSheet(m_url, m_sheet);
}
@@ -116,7 +116,7 @@
// it() first increments, then returnes the current item.
// this avoids skipping an item when setStyleSheet deletes the "current" one.
- for(QPtrDictIterator<CachedObjectClient> it( m_clients ); it.current();)
+ for(Q3PtrDictIterator<CachedObjectClient> it( m_clients ); it.current();)
it()->error(m_err, m_errText);
}
1.7 +5 -5 SVGSupport/kdom/cache/KDOMLoader.cpp
Index: KDOMLoader.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/kdom/cache/KDOMLoader.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- KDOMLoader.cpp 2 Sep 2005 10:03:00 -0000 1.6
+++ KDOMLoader.cpp 2 Sep 2005 11:15:43 -0000 1.7
@@ -139,7 +139,7 @@
if(!m_autoloadImages)
return;
- for(QPtrDictIterator<CachedObject> it(m_docObjects); it.current(); ++it)
+ for(Q3PtrDictIterator<CachedObject> it(m_docObjects); it.current(); ++it)
{
if(it.current()->type() == CachedObject::Image)
{
@@ -162,7 +162,7 @@
m_showAnimations = showAnimations;
#ifndef APPLE_COMPILE_HACK
- for(QPtrDictIterator<CachedObject> it(m_docObjects); it.current(); ++it)
+ for(Q3PtrDictIterator<CachedObject> it(m_docObjects); it.current(); ++it)
{
if(it.current()->type() == CachedObject::Image)
{
@@ -273,7 +273,7 @@
res++;
}
- QPtrDictIterator<Request> lIt(m_requestsLoading);
+ Q3PtrDictIterator<Request> lIt(m_requestsLoading);
for (; lIt.current(); ++lIt)
{
if(lIt.current()->docLoader == docLoader)
@@ -299,7 +299,7 @@
++pIt;
}
- QPtrDictIterator<Request> lIt( m_requestsLoading );
+ Q3PtrDictIterator<Request> lIt( m_requestsLoading );
while(lIt.current())
{
if(lIt.current()->docLoader == docLoader)
@@ -320,7 +320,7 @@
KIO::Job *Loader::jobForRequest(const DOMString &url) const
{
- QPtrDictIterator<Request> it(m_requestsLoading);
+ Q3PtrDictIterator<Request> it(m_requestsLoading);
for (; it.current(); ++it)
{
CachedObject *obj = it.current()->object;
1.6 +3 -3 SVGSupport/kdom/cache/KDOMLoader.h
Index: KDOMLoader.h
===================================================================
RCS file: /cvs/root/SVGSupport/kdom/cache/KDOMLoader.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- KDOMLoader.h 2 Sep 2005 10:03:00 -0000 1.5
+++ KDOMLoader.h 2 Sep 2005 11:15:43 -0000 1.6
@@ -30,7 +30,7 @@
#include <qtimer.h>
#include <qobject.h>
-#include <qptrdict.h>
+#include <q3ptrdict.h>
#include <qstringlist.h>
#include <kio/job.h>
@@ -114,7 +114,7 @@
QStringList m_reloadedURLs;
KIO::CacheControl m_cachePolicy;
- mutable QPtrDict<CachedObject> m_docObjects;
+ mutable Q3PtrDict<CachedObject> m_docObjects;
};
class Loader : public QObject
@@ -149,7 +149,7 @@
protected:
Q3PtrList<Request> m_requestsPending;
- QPtrDict<Request> m_requestsLoading;
+ Q3PtrDict<Request> m_requestsLoading;
QTimer m_timer;
};
1.7 +3 -3 SVGSupport/kdom/ecma/Ecma.cpp
Index: Ecma.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/kdom/ecma/Ecma.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Ecma.cpp 1 Sep 2005 07:33:23 -0000 1.6
+++ Ecma.cpp 2 Sep 2005 11:15:44 -0000 1.7
@@ -22,7 +22,7 @@
#include <kdebug.h>
#include <qvariant.h>
-#include <qptrdict.h>
+#include <q3ptrdict.h>
#include "kdom.h"
#include "Ecma.h"
@@ -112,7 +112,7 @@
GlobalObject *globalObject;
ScriptInterpreter *interpreter;
- QPtrDict<EventListenerImpl> eventListeners;
+ Q3PtrDict<EventListenerImpl> eventListeners;
};
Ecma::Ecma(DocumentImpl *doc) : d(new Private(doc))
@@ -257,7 +257,7 @@
// We probably deal with sth. like onload="alert('hi');' ...
DOMString internalType = DOMString("[KDOM] - ") + jsCode;
- QPtrDictIterator<EventListenerImpl> it(d->eventListeners);
+ Q3PtrDictIterator<EventListenerImpl> it(d->eventListeners);
for( ; it.current(); ++it)
{
EventListenerImpl *current = it.current();
1.7 +3 -3 SVGSupport/kdom/ecma/ScriptInterpreter.cpp
Index: ScriptInterpreter.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/kdom/ecma/ScriptInterpreter.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ScriptInterpreter.cpp 2 Sep 2005 10:03:09 -0000 1.6
+++ ScriptInterpreter.cpp 2 Sep 2005 11:15:45 -0000 1.7
@@ -25,7 +25,7 @@
#include <kdebug.h>
#include <kjs/object.h>
-#include <qptrdict.h>
+#include <q3ptrdict.h>
#include <q3ptrlist.h>
#include "EventImpl.h"
@@ -46,7 +46,7 @@
DocumentImpl *document;
EventImpl *currentEvent;
- QPtrDict<KJS::ObjectImp> domObjects;
+ Q3PtrDict<KJS::ObjectImp> domObjects;
};
ScriptInterpreter::ScriptInterpreter(KJS::ObjectImp *global, DocumentImpl *doc) : KJS::Interpreter(global), d(new Private(doc))
@@ -143,7 +143,7 @@
return;
kdDebug() << "!!!!!!!!!! ScriptInterpreter::mark " << this << " marking " << d->domObjects.count() << " DOM objects" << endl;
- QPtrDictIterator<KJS::ObjectImp> it(d->domObjects);
+ Q3PtrDictIterator<KJS::ObjectImp> it(d->domObjects);
for(; it.current(); ++it)
it.current()->mark();
}
1.30 +3 -0 WebCore/kwq/KWQPtrDict.h
Index: KWQPtrDict.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQPtrDict.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- KWQPtrDict.h 7 Jul 2005 07:38:24 -0000 1.29
+++ KWQPtrDict.h 2 Sep 2005 11:15:46 -0000 1.30
@@ -82,4 +82,7 @@
QPtrDictIterator &operator=(const QPtrDictIterator &);
};
+#define Q3PtrDict QPtrDict
+#define Q3PtrDictIterator QPtrDictIterator
+
#endif
More information about the webkit-changes
mailing list