[webkit-changes] cvs commit: WebCore/kwq KWQKStaticDeleter.h
KWQKStringHandler.h KWQKStringHandler.mm
Darin
darin at opensource.apple.com
Thu Dec 22 08:53:57 PST 2005
darin 05/12/22 08:53:57
Modified: . ChangeLog
WebCore.xcodeproj project.pbxproj
kcanvas KCanvasCreator.cpp
khtml khtmlpart_p.h
khtml/html html_canvasimpl.cpp html_imageimpl.cpp
khtml/xml dom_docimpl.cpp
ksvg2/svg SVGDOMImplementationImpl.cpp
Removed: ForwardingHeaders kstaticdeleter.h kstringhandler.h
kwq KWQKStaticDeleter.h KWQKStringHandler.h
KWQKStringHandler.mm
Log:
Reviewed by Eric.
- fix http://bugzilla.opendarwin.org/show_bug.cgi?id=6193
remove some unused KWQ code
* kcanvas/KCanvasCreator.cpp: (KCanvasCreator::self): Don't use static deleter for
two reasons: (1) We don't want any globals with constructors in any of our frameworks
because they slow down framework load time. (2) There's no need to destroy this object at
process termination time -- it's extra work with no benefit. Because of both these
reasons, our KStaticDeleter implementation was basically a no-op.
* ksvg2/svg/SVGDOMImplementationImpl.cpp: (SVGDOMImplementationImpl::self): Ditto.
* khtml/xml/dom_docimpl.cpp: (DocumentImpl::setDocumentChanged): Ditto.
* khtml/html/html_canvasimpl.cpp: Removed include of kstringhandler.h.
* khtml/html/html_imageimpl.cpp: Ditto.
* khtml/khtmlpart_p.h: Removed something that was in an "APPLE_CANGES" ifdef.
* ForwardingHeaders/kstaticdeleter.h: Removed.
* ForwardingHeaders/kstringhandler.h: Removed.
* kwq/KWQKStaticDeleter.h: Removed.
* kwq/KWQKStringHandler.h: Removed.
* kwq/KWQKStringHandler.mm: Removed.
* WebCore.xcodeproj/project.pbxproj: Removed files.
Revision Changes Path
1.26 +28 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ChangeLog 22 Dec 2005 16:50:07 -0000 1.25
+++ ChangeLog 22 Dec 2005 16:53:52 -0000 1.26
@@ -2,6 +2,34 @@
Reviewed by Eric.
+ - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=6193
+ remove some unused KWQ code
+
+ * kcanvas/KCanvasCreator.cpp: (KCanvasCreator::self): Don't use static deleter for
+ two reasons: (1) We don't want any globals with constructors in any of our frameworks
+ because they slow down framework load time. (2) There's no need to destroy this object at
+ process termination time -- it's extra work with no benefit. Because of both these
+ reasons, our KStaticDeleter implementation was basically a no-op.
+ * ksvg2/svg/SVGDOMImplementationImpl.cpp: (SVGDOMImplementationImpl::self): Ditto.
+ * khtml/xml/dom_docimpl.cpp: (DocumentImpl::setDocumentChanged): Ditto.
+
+ * khtml/html/html_canvasimpl.cpp: Removed include of kstringhandler.h.
+ * khtml/html/html_imageimpl.cpp: Ditto.
+
+ * khtml/khtmlpart_p.h: Removed something that was in an "APPLE_CANGES" ifdef.
+
+ * ForwardingHeaders/kstaticdeleter.h: Removed.
+ * ForwardingHeaders/kstringhandler.h: Removed.
+ * kwq/KWQKStaticDeleter.h: Removed.
+ * kwq/KWQKStringHandler.h: Removed.
+ * kwq/KWQKStringHandler.mm: Removed.
+
+ * WebCore.xcodeproj/project.pbxproj: Removed files.
+
+2005-12-22 Darin Adler <darin at apple.com>
+
+ Reviewed by Eric.
+
- fix http://bugzilla.opendarwin.org/show_bug.cgi?id=6192
add support for non-standard ⊅ entity (implemented in other browsers)
1.61 +0 -18 WebCore/WebCore.xcodeproj/project.pbxproj
Index: project.pbxproj
===================================================================
RCS file: /cvs/root/WebCore/WebCore.xcodeproj/project.pbxproj,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- project.pbxproj 22 Dec 2005 01:40:51 -0000 1.60
+++ project.pbxproj 22 Dec 2005 16:53:53 -0000 1.61
@@ -215,8 +215,6 @@
93F1996108245E59001E9ABC /* KWQKPartsPart.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866C02DE3B3201EA4122 /* KWQKPartsPart.h */; };
93F1996308245E59001E9ABC /* KWQKSSLKeyGen.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866202DE3B1101EA4122 /* KWQKSSLKeyGen.h */; };
93F1996408245E59001E9ABC /* KWQKStandardDirs.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785FF02DE382001EA4122 /* KWQKStandardDirs.h */; };
- 93F1996508245E59001E9ABC /* KWQKStaticDeleter.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785FE02DE382001EA4122 /* KWQKStaticDeleter.h */; };
- 93F1996608245E59001E9ABC /* KWQKStringHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = F587860002DE382001EA4122 /* KWQKStringHandler.h */; };
93F1996708245E59001E9ABC /* KWQKURL.h in Headers */ = {isa = PBXBuildFile; fileRef = F587860202DE382001EA4122 /* KWQKURL.h */; };
93F1996808245E59001E9ABC /* KWQKWin.h in Headers */ = {isa = PBXBuildFile; fileRef = F587860402DE382001EA4122 /* KWQKWin.h */; };
93F1996908245E59001E9ABC /* KWQKWinModule.h in Headers */ = {isa = PBXBuildFile; fileRef = F587860502DE382001EA4122 /* KWQKWinModule.h */; };
@@ -405,7 +403,6 @@
93F19A3208245E59001E9ABC /* KWQKLocale.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587850402DE375901EA4122 /* KWQKLocale.mm */; };
93F19A3308245E59001E9ABC /* KWQKPartsEvent.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587850802DE375901EA4122 /* KWQKPartsEvent.mm */; };
93F19A3408245E59001E9ABC /* KWQKStandardDirs.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587850C02DE375901EA4122 /* KWQKStandardDirs.mm */; };
- 93F19A3508245E59001E9ABC /* KWQKStringHandler.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587850D02DE375901EA4122 /* KWQKStringHandler.mm */; };
93F19A3608245E59001E9ABC /* KWQKURL.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587850E02DE375901EA4122 /* KWQKURL.mm */; };
93F19A3708245E59001E9ABC /* KWQKWin.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587850F02DE375901EA4122 /* KWQKWin.mm */; };
93F19A3808245E59001E9ABC /* KWQKWinModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851002DE375901EA4122 /* KWQKWinModule.mm */; };
@@ -740,8 +737,6 @@
A88AD1A40952480A001DD196 /* KWQKPartsPart.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866C02DE3B3201EA4122 /* KWQKPartsPart.h */; };
A88AD1A50952480A001DD196 /* KWQKSSLKeyGen.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866202DE3B1101EA4122 /* KWQKSSLKeyGen.h */; };
A88AD1A60952480A001DD196 /* KWQKStandardDirs.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785FF02DE382001EA4122 /* KWQKStandardDirs.h */; };
- A88AD1A70952480A001DD196 /* KWQKStaticDeleter.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785FE02DE382001EA4122 /* KWQKStaticDeleter.h */; };
- A88AD1A80952480A001DD196 /* KWQKStringHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = F587860002DE382001EA4122 /* KWQKStringHandler.h */; };
A88AD1A90952480A001DD196 /* KWQKURL.h in Headers */ = {isa = PBXBuildFile; fileRef = F587860202DE382001EA4122 /* KWQKURL.h */; };
A88AD1AA0952480A001DD196 /* KWQKWin.h in Headers */ = {isa = PBXBuildFile; fileRef = F587860402DE382001EA4122 /* KWQKWin.h */; };
A88AD1AB0952480A001DD196 /* KWQKWinModule.h in Headers */ = {isa = PBXBuildFile; fileRef = F587860502DE382001EA4122 /* KWQKWinModule.h */; };
@@ -972,7 +967,6 @@
A88AD28F0952480A001DD196 /* KWQKLocale.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587850402DE375901EA4122 /* KWQKLocale.mm */; };
A88AD2900952480A001DD196 /* KWQKPartsEvent.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587850802DE375901EA4122 /* KWQKPartsEvent.mm */; };
A88AD2910952480A001DD196 /* KWQKStandardDirs.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587850C02DE375901EA4122 /* KWQKStandardDirs.mm */; };
- A88AD2920952480A001DD196 /* KWQKStringHandler.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587850D02DE375901EA4122 /* KWQKStringHandler.mm */; };
A88AD2930952480A001DD196 /* KWQKURL.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587850E02DE375901EA4122 /* KWQKURL.mm */; };
A88AD2940952480A001DD196 /* KWQKWin.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587850F02DE375901EA4122 /* KWQKWin.mm */; };
A88AD2950952480A001DD196 /* KWQKWinModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851002DE375901EA4122 /* KWQKWinModule.mm */; };
@@ -2567,7 +2561,6 @@
F587850402DE375901EA4122 /* KWQKLocale.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKLocale.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587850802DE375901EA4122 /* KWQKPartsEvent.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKPartsEvent.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587850C02DE375901EA4122 /* KWQKStandardDirs.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKStandardDirs.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- F587850D02DE375901EA4122 /* KWQKStringHandler.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKStringHandler.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587850E02DE375901EA4122 /* KWQKURL.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKURL.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587850F02DE375901EA4122 /* KWQKWin.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKWin.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587851002DE375901EA4122 /* KWQKWinModule.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQKWinModule.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
@@ -2637,9 +2630,7 @@
F58785F802DE382001EA4122 /* KWQKInstance.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKInstance.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F58785FA02DE382001EA4122 /* KWQKLocale.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKLocale.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F58785FD02DE382001EA4122 /* KWQKStandardDirs.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKStandardDirs.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- F58785FE02DE382001EA4122 /* KWQKStaticDeleter.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKStaticDeleter.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F58785FF02DE382001EA4122 /* KWQKStandardDirs.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKStandardDirs.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- F587860002DE382001EA4122 /* KWQKStringHandler.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKStringHandler.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587860202DE382001EA4122 /* KWQKURL.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKURL.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587860402DE382001EA4122 /* KWQKWin.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKWin.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F587860502DE382001EA4122 /* KWQKWinModule.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWQKWinModule.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
@@ -4020,12 +4011,9 @@
F58785F802DE382001EA4122 /* KWQKInstance.h */,
F58785FA02DE382001EA4122 /* KWQKLocale.h */,
F587850402DE375901EA4122 /* KWQKLocale.mm */,
- F58785FE02DE382001EA4122 /* KWQKStaticDeleter.h */,
F58785FD02DE382001EA4122 /* KWQKStandardDirs.h */,
F58785FF02DE382001EA4122 /* KWQKStandardDirs.h */,
F587850C02DE375901EA4122 /* KWQKStandardDirs.mm */,
- F587860002DE382001EA4122 /* KWQKStringHandler.h */,
- F587850D02DE375901EA4122 /* KWQKStringHandler.mm */,
F587860202DE382001EA4122 /* KWQKURL.h */,
F587850E02DE375901EA4122 /* KWQKURL.mm */,
F587860402DE382001EA4122 /* KWQKWin.h */,
@@ -4375,8 +4363,6 @@
93F1996108245E59001E9ABC /* KWQKPartsPart.h in Headers */,
93F1996308245E59001E9ABC /* KWQKSSLKeyGen.h in Headers */,
93F1996408245E59001E9ABC /* KWQKStandardDirs.h in Headers */,
- 93F1996508245E59001E9ABC /* KWQKStaticDeleter.h in Headers */,
- 93F1996608245E59001E9ABC /* KWQKStringHandler.h in Headers */,
93F1996708245E59001E9ABC /* KWQKURL.h in Headers */,
93F1996808245E59001E9ABC /* KWQKWin.h in Headers */,
93F1996908245E59001E9ABC /* KWQKWinModule.h in Headers */,
@@ -4879,8 +4865,6 @@
A88AD1A40952480A001DD196 /* KWQKPartsPart.h in Headers */,
A88AD1A50952480A001DD196 /* KWQKSSLKeyGen.h in Headers */,
A88AD1A60952480A001DD196 /* KWQKStandardDirs.h in Headers */,
- A88AD1A70952480A001DD196 /* KWQKStaticDeleter.h in Headers */,
- A88AD1A80952480A001DD196 /* KWQKStringHandler.h in Headers */,
A88AD1A90952480A001DD196 /* KWQKURL.h in Headers */,
A88AD1AA0952480A001DD196 /* KWQKWin.h in Headers */,
A88AD1AB0952480A001DD196 /* KWQKWinModule.h in Headers */,
@@ -6188,7 +6172,6 @@
93F19A3208245E59001E9ABC /* KWQKLocale.mm in Sources */,
93F19A3308245E59001E9ABC /* KWQKPartsEvent.mm in Sources */,
93F19A3408245E59001E9ABC /* KWQKStandardDirs.mm in Sources */,
- 93F19A3508245E59001E9ABC /* KWQKStringHandler.mm in Sources */,
93F19A3608245E59001E9ABC /* KWQKURL.mm in Sources */,
93F19A3708245E59001E9ABC /* KWQKWin.mm in Sources */,
93F19A3808245E59001E9ABC /* KWQKWinModule.mm in Sources */,
@@ -6620,7 +6603,6 @@
A88AD28F0952480A001DD196 /* KWQKLocale.mm in Sources */,
A88AD2900952480A001DD196 /* KWQKPartsEvent.mm in Sources */,
A88AD2910952480A001DD196 /* KWQKStandardDirs.mm in Sources */,
- A88AD2920952480A001DD196 /* KWQKStringHandler.mm in Sources */,
A88AD2930952480A001DD196 /* KWQKURL.mm in Sources */,
A88AD2940952480A001DD196 /* KWQKWin.mm in Sources */,
A88AD2950952480A001DD196 /* KWQKWinModule.mm in Sources */,
1.9 +1 -3 WebCore/kcanvas/KCanvasCreator.cpp
Index: KCanvasCreator.cpp
===================================================================
RCS file: /cvs/root/WebCore/kcanvas/KCanvasCreator.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- KCanvasCreator.cpp 6 Dec 2005 01:23:18 -0000 1.8
+++ KCanvasCreator.cpp 22 Dec 2005 16:53:54 -0000 1.9
@@ -24,7 +24,6 @@
#include <math.h>
#include <kdebug.h>
-#include <kstaticdeleter.h>
#include "kcanvas/KCanvas.h"
#include "KCanvasPath.h"
@@ -32,7 +31,6 @@
#include "KRenderingDevice.h"
#include "KCanvasContainer.h"
-static KStaticDeleter<KCanvasCreator> canvasCreatorDeleter;
KCanvasCreator *KCanvasCreator::s_creator = 0;
KCanvasCreator::KCanvasCreator()
@@ -46,7 +44,7 @@
KCanvasCreator *KCanvasCreator::self()
{
if(!s_creator)
- s_creator = canvasCreatorDeleter.setObject(s_creator, new KCanvasCreator());
+ s_creator = new KCanvasCreator();
return s_creator;
}
1.66 +0 -3 WebCore/khtml/khtmlpart_p.h
Index: khtmlpart_p.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/khtmlpart_p.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- khtmlpart_p.h 20 Dec 2005 08:49:46 -0000 1.65
+++ khtmlpart_p.h 22 Dec 2005 16:53:54 -0000 1.66
@@ -199,9 +199,6 @@
RefPtr<khtml::Decoder> m_decoder;
QString m_encoding;
QString m_sheetUsed;
-#if !APPLE_CANGES
- long m_cacheId;
-#endif
QString scheduledScript;
RefPtr<DOM::NodeImpl> scheduledScriptNode;
1.11 +0 -1 WebCore/khtml/html/html_canvasimpl.cpp
Index: html_canvasimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_canvasimpl.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- html_canvasimpl.cpp 14 Dec 2005 23:31:50 -0000 1.10
+++ html_canvasimpl.cpp 22 Dec 2005 16:53:55 -0000 1.11
@@ -30,7 +30,6 @@
#include "khtmlview.h"
#include "khtml_part.h"
-#include <kstringhandler.h>
#include <kdebug.h>
#include "rendering/render_canvasimage.h"
1.62 +0 -1 WebCore/khtml/html/html_imageimpl.cpp
Index: html_imageimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_imageimpl.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- html_imageimpl.cpp 16 Dec 2005 08:08:18 -0000 1.61
+++ html_imageimpl.cpp 22 Dec 2005 16:53:55 -0000 1.62
@@ -30,7 +30,6 @@
#include "khtmlview.h"
#include "khtml_part.h"
-#include <kstringhandler.h>
#include <kdebug.h>
#include "rendering/render_image.h"
1.290 +1 -4 WebCore/khtml/xml/dom_docimpl.cpp
Index: dom_docimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_docimpl.cpp,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- dom_docimpl.cpp 21 Dec 2005 16:51:02 -0000 1.289
+++ dom_docimpl.cpp 22 Dec 2005 16:53:56 -0000 1.290
@@ -48,7 +48,6 @@
#include <qpaintdevicemetrics.h>
#include <qregexp.h>
#include <kdebug.h>
-#include <kstaticdeleter.h>
#include "rendering/render_canvas.h"
#include "rendering/render_frames.h"
@@ -60,7 +59,6 @@
#include "khtml_part.h"
#include <kglobalsettings.h>
-#include <kstringhandler.h>
#include "khtml_settings.h"
#include "khtmlpart_p.h"
@@ -369,7 +367,6 @@
// ------------------------------------------------------------------------
-KStaticDeleter< QPtrList<DocumentImpl> > s_changedDocumentsDeleter;
QPtrList<DocumentImpl> * DocumentImpl::changedDocuments = 0;
// KHTMLView might be 0
@@ -1007,7 +1004,7 @@
void DocumentImpl::setDocumentChanged(bool b)
{
if (!changedDocuments)
- changedDocuments = s_changedDocumentsDeleter.setObject(changedDocuments, new QPtrList<DocumentImpl>());
+ changedDocuments = new QPtrList<DocumentImpl>;
if (b && !m_docChanged)
changedDocuments->append(this);
1.10 +1 -3 WebCore/ksvg2/svg/SVGDOMImplementationImpl.cpp
Index: SVGDOMImplementationImpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/ksvg2/svg/SVGDOMImplementationImpl.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SVGDOMImplementationImpl.cpp 6 Dec 2005 01:53:16 -0000 1.9
+++ SVGDOMImplementationImpl.cpp 22 Dec 2005 16:53:56 -0000 1.10
@@ -21,7 +21,6 @@
*/
#include "config.h"
-#include <kstaticdeleter.h>
#include <kdom/kdom.h>
#include <kdom/Helper.h>
@@ -42,7 +41,6 @@
using namespace KSVG;
-static KStaticDeleter<SVGDOMImplementationImpl> instanceDeleter;
SVGDOMImplementationImpl *SVGDOMImplementationImpl::s_instance = 0;
QStringList SVGDOMImplementationImpl::s_features;
@@ -61,7 +59,7 @@
{
if(!s_instance)
{
- s_instance = instanceDeleter.setObject(s_instance, new SVGDOMImplementationImpl());
+ s_instance = new SVGDOMImplementationImpl();
// 1.1 features
s_features.append(QString::fromLatin1("SVG"));
More information about the webkit-changes
mailing list