173 files changed, 142 insertions, 1094 deletions

diff --git a/ksvg/impl/CMakeLists.txt b/ksvg/impl/CMakeLists.txt
index 64599da1..82980a01 100644
--- a/ksvg/impl/CMakeLists.txt
+++ b/ksvg/impl/CMakeLists.txt
@@ -30,64 +30,64 @@ include_directories(
 
 tde_add_library( ksvgdomimpl STATIC_PIC AUTOMOC
   SOURCES
-    SVGLengthImpl.cc SVGNumberImpl.cc SVGPointImpl.cc SVGTransformImpl.cc
-    SVGMatrixImpl.cc SVGRectImpl.cc SVGAngleImpl.cc SVGAnimatedLengthImpl.cc
-    SVGAnimatedNumberImpl.cc SVGAnimatedIntegerImpl.cc SVGAnimatedBooleanImpl.cc
-    SVGAnimatedEnumerationImpl.cc SVGAnimatedPreserveAspectRatioImpl.cc
-    SVGAnimatedRectImpl.cc SVGAnimatedAngleImpl.cc SVGAnimatedPathDataImpl.cc
-    SVGAnimatedStringImpl.cc SVGLengthListImpl.cc SVGNumberListImpl.cc
-    SVGPointListImpl.cc SVGTransformListImpl.cc SVGStringListImpl.cc
-    SVGPathSegListImpl.cc SVGElementInstanceListImpl.cc
-    SVGAnimatedLengthListImpl.cc SVGAnimatedNumberListImpl.cc
-    SVGAnimatedPointsImpl.cc SVGAnimatedTransformListImpl.cc
-    SVGShapeImpl.cc SVGContainerImpl.cc SVGBBoxTarget.cc SVGHelperImpl.cc
-    SVGStylableImpl.cc SVGTransformableImpl.cc SVGTestsImpl.cc SVGLangSpaceImpl.cc
-    SVGExternalResourcesRequiredImpl.cc SVGLocatableImpl.cc SVGFitToViewBoxImpl.cc
-    SVGPreserveAspectRatioImpl.cc SVGZoomAndPanImpl.cc SVGViewSpecImpl.cc
-    SVGElementImpl.cc SVGElementInstanceImpl.cc SVGDocumentImpl.cc
-    SVGSVGElementImpl.cc SVGWindowImpl.cc SVGDefsElementImpl.cc
-    SVGUseElementImpl.cc SVGDescElementImpl.cc SVGTitleElementImpl.cc
-    SVGGElementImpl.cc SVGSwitchElementImpl.cc SVGSymbolElementImpl.cc
-    SVGImageElementImpl.cc SVGURIReferenceImpl.cc SVGStyleElementImpl.cc
-    SVGCSSRuleImpl.cc SVGPathElementImpl.cc SVGPathSegImpl.cc
-    SVGPathSegClosePathImpl.cc SVGPathSegArcImpl.cc SVGPathSegMovetoImpl.cc
-    SVGPathSegCurvetoQuadraticImpl.cc SVGPathSegCurvetoQuadraticSmoothImpl.cc
-    SVGPathSegCurvetoCubicImpl.cc SVGPathSegCurvetoCubicSmoothImpl.cc
-    SVGPathSegLinetoImpl.cc SVGPathSegLinetoHorizontalImpl.cc
-    SVGPathSegLinetoVerticalImpl.cc SVGRectElementImpl.cc SVGCircleElementImpl.cc
-    SVGEllipseElementImpl.cc SVGLineElementImpl.cc SVGPolyElementImpl.cc
-    SVGPolylineElementImpl.cc SVGPolygonElementImpl.cc SVGTextElementImpl.cc
-    SVGTSpanElementImpl.cc SVGTRefElementImpl.cc SVGTextPositioningElementImpl.cc
-    SVGTextContentElementImpl.cc SVGTextPathElementImpl.cc SVGPaintImpl.cc
-    SVGMarkerElementImpl.cc SVGColorImpl.cc SVGICCColorImpl.cc
-    SVGColorProfileElementImpl.cc SVGColorProfileRuleImpl.cc SVGPaintServerImpl.cc
-    SVGGradientElementImpl.cc SVGStopElementImpl.cc SVGLinearGradientElementImpl.cc
-    SVGRadialGradientElementImpl.cc SVGPatternElementImpl.cc
-    SVGClipPathElementImpl.cc SVGMaskElementImpl.cc SVGFilterElementImpl.cc
-    SVGFilterPrimitiveStandardAttributesImpl.cc SVGFEBlendElementImpl.cc
-    SVGFEColorMatrixElementImpl.cc SVGFEComponentTransferElementImpl.cc
-    SVGComponentTransferFunctionElementImpl.cc SVGFEFuncAElementImpl.cc
-    SVGFEFuncBElementImpl.cc SVGFEFuncGElementImpl.cc SVGFEFuncRElementImpl.cc
-    SVGFECompositeElementImpl.cc SVGFEConvolveMatrixElementImpl.cc
-    SVGFEFloodElementImpl.cc SVGFEGaussianBlurElementImpl.cc
-    SVGFEDiffuseLightingElementImpl.cc SVGFEDistantLightElementImpl.cc
-    SVGFEPointLightElementImpl.cc SVGFESpotLightElementImpl.cc
-    SVGFEDisplacementMapElementImpl.cc SVGFEMergeElementImpl.cc
-    SVGFEMergeNodeElementImpl.cc SVGFEImageElementImpl.cc
-    SVGFEMorphologyElementImpl.cc SVGFEOffsetElementImpl.cc
-    SVGFESpecularLightingElementImpl.cc SVGFETileElementImpl.cc
-    SVGFETurbulenceElementImpl.cc SVGCursorElementImpl.cc
-    SVGAElementImpl.cc SVGViewElementImpl.cc SVGScriptElementImpl.cc
-    SVGEventImpl.cc SVGZoomEventImpl.cc SVGEcma.cc generateddata.cpp
-    SVGAnimationElementImpl.cc SVGAnimateElementImpl.cc SVGSetElementImpl.cc
-    SVGAnimateMotionElementImpl.cc SVGAnimateColorElementImpl.cc
-    SVGAnimateTransformElementImpl.cc SVGMPathElementImpl.cc SVGTimeScheduler.cc
-    SVGFontElementImpl.cc SVGAltGlyphElementImpl.cc SVGAltGlyphDefElementImpl.cc
-    SVGGlyphRefElementImpl.cc SVGGlyphElementImpl.cc SVGMissingGlyphElementImpl.cc
-    SVGFontFaceElementImpl.cc SVGFontFaceFormatElementImpl.cc
-    SVGFontFaceNameElementImpl.cc SVGFontFaceSrcElementImpl.cc
-    SVGFontFaceUriElementImpl.cc SVGDefinitionSrcElementImpl.cc
-    SVGHKernElementImpl.cc SVGVKernElementImpl.cc SVGMetadataElementImpl.cc
-    SVGForeignObjectElementImpl.cc svgpathparser.cc
+    SVGLengthImpl.cpp SVGNumberImpl.cpp SVGPointImpl.cpp SVGTransformImpl.cpp
+    SVGMatrixImpl.cpp SVGRectImpl.cpp SVGAngleImpl.cpp SVGAnimatedLengthImpl.cpp
+    SVGAnimatedNumberImpl.cpp SVGAnimatedIntegerImpl.cpp SVGAnimatedBooleanImpl.cpp
+    SVGAnimatedEnumerationImpl.cpp SVGAnimatedPreserveAspectRatioImpl.cpp
+    SVGAnimatedRectImpl.cpp SVGAnimatedAngleImpl.cpp SVGAnimatedPathDataImpl.cpp
+    SVGAnimatedStringImpl.cpp SVGLengthListImpl.cpp SVGNumberListImpl.cpp
+    SVGPointListImpl.cpp SVGTransformListImpl.cpp SVGStringListImpl.cpp
+    SVGPathSegListImpl.cpp SVGElementInstanceListImpl.cpp
+    SVGAnimatedLengthListImpl.cpp SVGAnimatedNumberListImpl.cpp
+    SVGAnimatedPointsImpl.cpp SVGAnimatedTransformListImpl.cpp
+    SVGShapeImpl.cpp SVGContainerImpl.cpp SVGBBoxTarget.cpp SVGHelperImpl.cpp
+    SVGStylableImpl.cpp SVGTransformableImpl.cpp SVGTestsImpl.cpp SVGLangSpaceImpl.cpp
+    SVGExternalResourcesRequiredImpl.cpp SVGLocatableImpl.cpp SVGFitToViewBoxImpl.cpp
+    SVGPreserveAspectRatioImpl.cpp SVGZoomAndPanImpl.cpp SVGViewSpecImpl.cpp
+    SVGElementImpl.cpp SVGElementInstanceImpl.cpp SVGDocumentImpl.cpp
+    SVGSVGElementImpl.cpp SVGWindowImpl.cpp SVGDefsElementImpl.cpp
+    SVGUseElementImpl.cpp SVGDescElementImpl.cpp SVGTitleElementImpl.cpp
+    SVGGElementImpl.cpp SVGSwitchElementImpl.cpp SVGSymbolElementImpl.cpp
+    SVGImageElementImpl.cpp SVGURIReferenceImpl.cpp SVGStyleElementImpl.cpp
+    SVGCSSRuleImpl.cpp SVGPathElementImpl.cpp SVGPathSegImpl.cpp
+    SVGPathSegClosePathImpl.cpp SVGPathSegArcImpl.cpp SVGPathSegMovetoImpl.cpp
+    SVGPathSegCurvetoQuadraticImpl.cpp SVGPathSegCurvetoQuadraticSmoothImpl.cpp
+    SVGPathSegCurvetoCubicImpl.cpp SVGPathSegCurvetoCubicSmoothImpl.cpp
+    SVGPathSegLinetoImpl.cpp SVGPathSegLinetoHorizontalImpl.cpp
+    SVGPathSegLinetoVerticalImpl.cpp SVGRectElementImpl.cpp SVGCircleElementImpl.cpp
+    SVGEllipseElementImpl.cpp SVGLineElementImpl.cpp SVGPolyElementImpl.cpp
+    SVGPolylineElementImpl.cpp SVGPolygonElementImpl.cpp SVGTextElementImpl.cpp
+    SVGTSpanElementImpl.cpp SVGTRefElementImpl.cpp SVGTextPositioningElementImpl.cpp
+    SVGTextContentElementImpl.cpp SVGTextPathElementImpl.cpp SVGPaintImpl.cpp
+    SVGMarkerElementImpl.cpp SVGColorImpl.cpp SVGICCColorImpl.cpp
+    SVGColorProfileElementImpl.cpp SVGColorProfileRuleImpl.cpp SVGPaintServerImpl.cpp
+    SVGGradientElementImpl.cpp SVGStopElementImpl.cpp SVGLinearGradientElementImpl.cpp
+    SVGRadialGradientElementImpl.cpp SVGPatternElementImpl.cpp
+    SVGClipPathElementImpl.cpp SVGMaskElementImpl.cpp SVGFilterElementImpl.cpp
+    SVGFilterPrimitiveStandardAttributesImpl.cpp SVGFEBlendElementImpl.cpp
+    SVGFEColorMatrixElementImpl.cpp SVGFEComponentTransferElementImpl.cpp
+    SVGComponentTransferFunctionElementImpl.cpp SVGFEFuncAElementImpl.cpp
+    SVGFEFuncBElementImpl.cpp SVGFEFuncGElementImpl.cpp SVGFEFuncRElementImpl.cpp
+    SVGFECompositeElementImpl.cpp SVGFEConvolveMatrixElementImpl.cpp
+    SVGFEFloodElementImpl.cpp SVGFEGaussianBlurElementImpl.cpp
+    SVGFEDiffuseLightingElementImpl.cpp SVGFEDistantLightElementImpl.cpp
+    SVGFEPointLightElementImpl.cpp SVGFESpotLightElementImpl.cpp
+    SVGFEDisplacementMapElementImpl.cpp SVGFEMergeElementImpl.cpp
+    SVGFEMergeNodeElementImpl.cpp SVGFEImageElementImpl.cpp
+    SVGFEMorphologyElementImpl.cpp SVGFEOffsetElementImpl.cpp
+    SVGFESpecularLightingElementImpl.cpp SVGFETileElementImpl.cpp
+    SVGFETurbulenceElementImpl.cpp SVGCursorElementImpl.cpp
+    SVGAElementImpl.cpp SVGViewElementImpl.cpp SVGScriptElementImpl.cpp
+    SVGEventImpl.cpp SVGZoomEventImpl.cpp SVGEcma.cpp generateddata.cpp
+    SVGAnimationElementImpl.cpp SVGAnimateElementImpl.cpp SVGSetElementImpl.cpp
+    SVGAnimateMotionElementImpl.cpp SVGAnimateColorElementImpl.cpp
+    SVGAnimateTransformElementImpl.cpp SVGMPathElementImpl.cpp SVGTimeScheduler.cpp
+    SVGFontElementImpl.cpp SVGAltGlyphElementImpl.cpp SVGAltGlyphDefElementImpl.cpp
+    SVGGlyphRefElementImpl.cpp SVGGlyphElementImpl.cpp SVGMissingGlyphElementImpl.cpp
+    SVGFontFaceElementImpl.cpp SVGFontFaceFormatElementImpl.cpp
+    SVGFontFaceNameElementImpl.cpp SVGFontFaceSrcElementImpl.cpp
+    SVGFontFaceUriElementImpl.cpp SVGDefinitionSrcElementImpl.cpp
+    SVGHKernElementImpl.cpp SVGVKernElementImpl.cpp SVGMetadataElementImpl.cpp
+    SVGForeignObjectElementImpl.cpp svgpathparser.cpp
   LINK kjs-shared
 )
diff --git a/ksvg/impl/Makefile.am b/ksvg/impl/Makefile.am
index 24e40d67..8509022f 100644
--- a/ksvg/impl/Makefile.am
+++ b/ksvg/impl/Makefile.am
@@ -29,87 +29,87 @@ KDE_OPTIONS = nofinal
 
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 libksvgdomimpl_la_SOURCES = \
-SVGLengthImpl.cc SVGNumberImpl.cc SVGPointImpl.cc SVGTransformImpl.cc \
-SVGMatrixImpl.cc SVGRectImpl.cc SVGAngleImpl.cc \
+SVGLengthImpl.cpp SVGNumberImpl.cpp SVGPointImpl.cpp SVGTransformImpl.cpp \
+SVGMatrixImpl.cpp SVGRectImpl.cpp SVGAngleImpl.cpp \
 \
-SVGAnimatedLengthImpl.cc SVGAnimatedNumberImpl.cc SVGAnimatedIntegerImpl.cc \
-SVGAnimatedBooleanImpl.cc SVGAnimatedEnumerationImpl.cc SVGAnimatedPreserveAspectRatioImpl.cc \
-SVGAnimatedRectImpl.cc SVGAnimatedAngleImpl.cc SVGAnimatedPathDataImpl.cc SVGAnimatedStringImpl.cc \
+SVGAnimatedLengthImpl.cpp SVGAnimatedNumberImpl.cpp SVGAnimatedIntegerImpl.cpp \
+SVGAnimatedBooleanImpl.cpp SVGAnimatedEnumerationImpl.cpp SVGAnimatedPreserveAspectRatioImpl.cpp \
+SVGAnimatedRectImpl.cpp SVGAnimatedAngleImpl.cpp SVGAnimatedPathDataImpl.cpp SVGAnimatedStringImpl.cpp \
 \
-SVGLengthListImpl.cc SVGNumberListImpl.cc SVGPointListImpl.cc SVGTransformListImpl.cc \
-SVGStringListImpl.cc SVGPathSegListImpl.cc SVGElementInstanceListImpl.cc \
+SVGLengthListImpl.cpp SVGNumberListImpl.cpp SVGPointListImpl.cpp SVGTransformListImpl.cpp \
+SVGStringListImpl.cpp SVGPathSegListImpl.cpp SVGElementInstanceListImpl.cpp \
 \
-SVGAnimatedLengthListImpl.cc SVGAnimatedNumberListImpl.cc \
-SVGAnimatedPointsImpl.cc SVGAnimatedTransformListImpl.cc \
+SVGAnimatedLengthListImpl.cpp SVGAnimatedNumberListImpl.cpp \
+SVGAnimatedPointsImpl.cpp SVGAnimatedTransformListImpl.cpp \
 \
-SVGShapeImpl.cc SVGContainerImpl.cc SVGBBoxTarget.cc SVGHelperImpl.cc \
-SVGStylableImpl.cc SVGTransformableImpl.cc SVGTestsImpl.cc SVGLangSpaceImpl.cc \
-SVGExternalResourcesRequiredImpl.cc SVGLocatableImpl.cc SVGFitToViewBoxImpl.cc \
-SVGPreserveAspectRatioImpl.cc SVGZoomAndPanImpl.cc SVGViewSpecImpl.cc \
+SVGShapeImpl.cpp SVGContainerImpl.cpp SVGBBoxTarget.cpp SVGHelperImpl.cpp \
+SVGStylableImpl.cpp SVGTransformableImpl.cpp SVGTestsImpl.cpp SVGLangSpaceImpl.cpp \
+SVGExternalResourcesRequiredImpl.cpp SVGLocatableImpl.cpp SVGFitToViewBoxImpl.cpp \
+SVGPreserveAspectRatioImpl.cpp SVGZoomAndPanImpl.cpp SVGViewSpecImpl.cpp \
 \
-SVGElementImpl.cc SVGElementInstanceImpl.cc \
-SVGDocumentImpl.cc SVGSVGElementImpl.cc SVGWindowImpl.cc \
-SVGDefsElementImpl.cc SVGUseElementImpl.cc \
-SVGDescElementImpl.cc SVGTitleElementImpl.cc \
-SVGGElementImpl.cc SVGSwitchElementImpl.cc \
-SVGSymbolElementImpl.cc SVGImageElementImpl.cc \
-SVGURIReferenceImpl.cc \
+SVGElementImpl.cpp SVGElementInstanceImpl.cpp \
+SVGDocumentImpl.cpp SVGSVGElementImpl.cpp SVGWindowImpl.cpp \
+SVGDefsElementImpl.cpp SVGUseElementImpl.cpp \
+SVGDescElementImpl.cpp SVGTitleElementImpl.cpp \
+SVGGElementImpl.cpp SVGSwitchElementImpl.cpp \
+SVGSymbolElementImpl.cpp SVGImageElementImpl.cpp \
+SVGURIReferenceImpl.cpp \
 \
-SVGStyleElementImpl.cc SVGCSSRuleImpl.cc \
+SVGStyleElementImpl.cpp SVGCSSRuleImpl.cpp \
 \
-SVGPathElementImpl.cc SVGPathSegImpl.cc SVGPathSegClosePathImpl.cc SVGPathSegArcImpl.cc \
-SVGPathSegMovetoImpl.cc SVGPathSegCurvetoQuadraticImpl.cc SVGPathSegCurvetoQuadraticSmoothImpl.cc \
-SVGPathSegCurvetoCubicImpl.cc SVGPathSegCurvetoCubicSmoothImpl.cc SVGPathSegLinetoImpl.cc \
-SVGPathSegLinetoHorizontalImpl.cc SVGPathSegLinetoVerticalImpl.cc \
+SVGPathElementImpl.cpp SVGPathSegImpl.cpp SVGPathSegClosePathImpl.cpp SVGPathSegArcImpl.cpp \
+SVGPathSegMovetoImpl.cpp SVGPathSegCurvetoQuadraticImpl.cpp SVGPathSegCurvetoQuadraticSmoothImpl.cpp \
+SVGPathSegCurvetoCubicImpl.cpp SVGPathSegCurvetoCubicSmoothImpl.cpp SVGPathSegLinetoImpl.cpp \
+SVGPathSegLinetoHorizontalImpl.cpp SVGPathSegLinetoVerticalImpl.cpp \
 \
-SVGRectElementImpl.cc SVGCircleElementImpl.cc SVGEllipseElementImpl.cc SVGLineElementImpl.cc \
-SVGPolyElementImpl.cc SVGPolylineElementImpl.cc SVGPolygonElementImpl.cc \
+SVGRectElementImpl.cpp SVGCircleElementImpl.cpp SVGEllipseElementImpl.cpp SVGLineElementImpl.cpp \
+SVGPolyElementImpl.cpp SVGPolylineElementImpl.cpp SVGPolygonElementImpl.cpp \
 \
-SVGTextElementImpl.cc SVGTSpanElementImpl.cc SVGTRefElementImpl.cc \
-SVGTextPositioningElementImpl.cc SVGTextContentElementImpl.cc SVGTextPathElementImpl.cc \
+SVGTextElementImpl.cpp SVGTSpanElementImpl.cpp SVGTRefElementImpl.cpp \
+SVGTextPositioningElementImpl.cpp SVGTextContentElementImpl.cpp SVGTextPathElementImpl.cpp \
 \
-SVGPaintImpl.cc SVGMarkerElementImpl.cc \
+SVGPaintImpl.cpp SVGMarkerElementImpl.cpp \
 \
-SVGColorImpl.cc SVGICCColorImpl.cc SVGColorProfileElementImpl.cc SVGColorProfileRuleImpl.cc \
+SVGColorImpl.cpp SVGICCColorImpl.cpp SVGColorProfileElementImpl.cpp SVGColorProfileRuleImpl.cpp \
 \
-SVGPaintServerImpl.cc SVGGradientElementImpl.cc SVGStopElementImpl.cc \
-SVGLinearGradientElementImpl.cc SVGRadialGradientElementImpl.cc SVGPatternElementImpl.cc \
+SVGPaintServerImpl.cpp SVGGradientElementImpl.cpp SVGStopElementImpl.cpp \
+SVGLinearGradientElementImpl.cpp SVGRadialGradientElementImpl.cpp SVGPatternElementImpl.cpp \
 \
-SVGClipPathElementImpl.cc SVGMaskElementImpl.cc \
+SVGClipPathElementImpl.cpp SVGMaskElementImpl.cpp \
 \
-SVGFilterElementImpl.cc SVGFilterPrimitiveStandardAttributesImpl.cc \
-SVGFEBlendElementImpl.cc SVGFEColorMatrixElementImpl.cc \
-SVGFEComponentTransferElementImpl.cc SVGComponentTransferFunctionElementImpl.cc \
-SVGFEFuncAElementImpl.cc SVGFEFuncBElementImpl.cc SVGFEFuncGElementImpl.cc \
-SVGFEFuncRElementImpl.cc SVGFECompositeElementImpl.cc SVGFEConvolveMatrixElementImpl.cc \
-SVGFEFloodElementImpl.cc SVGFEGaussianBlurElementImpl.cc SVGFEDiffuseLightingElementImpl.cc \
-SVGFEDistantLightElementImpl.cc SVGFEPointLightElementImpl.cc SVGFESpotLightElementImpl.cc \
-SVGFEDisplacementMapElementImpl.cc SVGFEMergeElementImpl.cc SVGFEMergeNodeElementImpl.cc \
-SVGFEImageElementImpl.cc SVGFEMorphologyElementImpl.cc SVGFEOffsetElementImpl.cc \
-SVGFESpecularLightingElementImpl.cc SVGFETileElementImpl.cc SVGFETurbulenceElementImpl.cc \
+SVGFilterElementImpl.cpp SVGFilterPrimitiveStandardAttributesImpl.cpp \
+SVGFEBlendElementImpl.cpp SVGFEColorMatrixElementImpl.cpp \
+SVGFEComponentTransferElementImpl.cpp SVGComponentTransferFunctionElementImpl.cpp \
+SVGFEFuncAElementImpl.cpp SVGFEFuncBElementImpl.cpp SVGFEFuncGElementImpl.cpp \
+SVGFEFuncRElementImpl.cpp SVGFECompositeElementImpl.cpp SVGFEConvolveMatrixElementImpl.cpp \
+SVGFEFloodElementImpl.cpp SVGFEGaussianBlurElementImpl.cpp SVGFEDiffuseLightingElementImpl.cpp \
+SVGFEDistantLightElementImpl.cpp SVGFEPointLightElementImpl.cpp SVGFESpotLightElementImpl.cpp \
+SVGFEDisplacementMapElementImpl.cpp SVGFEMergeElementImpl.cpp SVGFEMergeNodeElementImpl.cpp \
+SVGFEImageElementImpl.cpp SVGFEMorphologyElementImpl.cpp SVGFEOffsetElementImpl.cpp \
+SVGFESpecularLightingElementImpl.cpp SVGFETileElementImpl.cpp SVGFETurbulenceElementImpl.cpp \
 \
-SVGCursorElementImpl.cc \
+SVGCursorElementImpl.cpp \
 \
-SVGAElementImpl.cc SVGViewElementImpl.cc \
+SVGAElementImpl.cpp SVGViewElementImpl.cpp \
 \
-SVGScriptElementImpl.cc SVGEventImpl.cc SVGZoomEventImpl.cc \
-SVGEcma.cc generateddata.cpp \
+SVGScriptElementImpl.cpp SVGEventImpl.cpp SVGZoomEventImpl.cpp \
+SVGEcma.cpp generateddata.cpp \
 \
-SVGAnimationElementImpl.cc SVGAnimateElementImpl.cc SVGSetElementImpl.cc \
-SVGAnimateMotionElementImpl.cc SVGAnimateColorElementImpl.cc \
-SVGAnimateTransformElementImpl.cc SVGMPathElementImpl.cc SVGTimeScheduler.cc \
+SVGAnimationElementImpl.cpp SVGAnimateElementImpl.cpp SVGSetElementImpl.cpp \
+SVGAnimateMotionElementImpl.cpp SVGAnimateColorElementImpl.cpp \
+SVGAnimateTransformElementImpl.cpp SVGMPathElementImpl.cpp SVGTimeScheduler.cpp \
 \
-SVGFontElementImpl.cc SVGAltGlyphElementImpl.cc SVGAltGlyphDefElementImpl.cc \
-SVGGlyphRefElementImpl.cc SVGGlyphElementImpl.cc SVGMissingGlyphElementImpl.cc \
-SVGFontFaceElementImpl.cc SVGFontFaceFormatElementImpl.cc SVGFontFaceNameElementImpl.cc \
-SVGFontFaceSrcElementImpl.cc SVGFontFaceUriElementImpl.cc SVGDefinitionSrcElementImpl.cc \
-SVGHKernElementImpl.cc SVGVKernElementImpl.cc \
+SVGFontElementImpl.cpp SVGAltGlyphElementImpl.cpp SVGAltGlyphDefElementImpl.cpp \
+SVGGlyphRefElementImpl.cpp SVGGlyphElementImpl.cpp SVGMissingGlyphElementImpl.cpp \
+SVGFontFaceElementImpl.cpp SVGFontFaceFormatElementImpl.cpp SVGFontFaceNameElementImpl.cpp \
+SVGFontFaceSrcElementImpl.cpp SVGFontFaceUriElementImpl.cpp SVGDefinitionSrcElementImpl.cpp \
+SVGHKernElementImpl.cpp SVGVKernElementImpl.cpp \
 \
-SVGMetadataElementImpl.cc \
+SVGMetadataElementImpl.cpp \
 \
-SVGForeignObjectElementImpl.cc \
+SVGForeignObjectElementImpl.cpp \
 \
-svgpathparser.cc
+svgpathparser.cpp
 
 libksvgdomimpl_la_METASOURCES = AUTO
 
diff --git a/ksvg/impl/SVGAElementImpl.cc b/ksvg/impl/SVGAElementImpl.cpp
index 0885f254..0885f254 100644
--- a/ksvg/impl/SVGAElementImpl.cc
+++ b/ksvg/impl/SVGAElementImpl.cpp
diff --git a/ksvg/impl/SVGAltGlyphDefElementImpl.cc b/ksvg/impl/SVGAltGlyphDefElementImpl.cpp
index 6c60d72c..6c60d72c 100644
--- a/ksvg/impl/SVGAltGlyphDefElementImpl.cc
+++ b/ksvg/impl/SVGAltGlyphDefElementImpl.cpp
diff --git a/ksvg/impl/SVGAltGlyphElementImpl.cc b/ksvg/impl/SVGAltGlyphElementImpl.cpp
index 724fa50c..724fa50c 100644
--- a/ksvg/impl/SVGAltGlyphElementImpl.cc
+++ b/ksvg/impl/SVGAltGlyphElementImpl.cpp
diff --git a/ksvg/impl/SVGAngleImpl.cc b/ksvg/impl/SVGAngleImpl.cpp
index b69d95e8..b69d95e8 100644
--- a/ksvg/impl/SVGAngleImpl.cc
+++ b/ksvg/impl/SVGAngleImpl.cpp
diff --git a/ksvg/impl/SVGAnimateColorElementImpl.cc b/ksvg/impl/SVGAnimateColorElementImpl.cpp
index 0d2f0ff7..0d2f0ff7 100644
--- a/ksvg/impl/SVGAnimateColorElementImpl.cc
+++ b/ksvg/impl/SVGAnimateColorElementImpl.cpp
diff --git a/ksvg/impl/SVGAnimateElementImpl.cc b/ksvg/impl/SVGAnimateElementImpl.cpp
index a67a9837..a67a9837 100644
--- a/ksvg/impl/SVGAnimateElementImpl.cc
+++ b/ksvg/impl/SVGAnimateElementImpl.cpp
diff --git a/ksvg/impl/SVGAnimateMotionElementImpl.cc b/ksvg/impl/SVGAnimateMotionElementImpl.cpp
index 3de6bab2..3de6bab2 100644
--- a/ksvg/impl/SVGAnimateMotionElementImpl.cc
+++ b/ksvg/impl/SVGAnimateMotionElementImpl.cpp
diff --git a/ksvg/impl/SVGAnimateTransformElementImpl.cc b/ksvg/impl/SVGAnimateTransformElementImpl.cpp
index 3eae35dd..3eae35dd 100644
--- a/ksvg/impl/SVGAnimateTransformElementImpl.cc
+++ b/ksvg/impl/SVGAnimateTransformElementImpl.cpp
diff --git a/ksvg/impl/SVGAnimatedAngleImpl.cc b/ksvg/impl/SVGAnimatedAngleImpl.cpp
index 41429847..41429847 100644
--- a/ksvg/impl/SVGAnimatedAngleImpl.cc
+++ b/ksvg/impl/SVGAnimatedAngleImpl.cpp
diff --git a/ksvg/impl/SVGAnimatedBooleanImpl.cc b/ksvg/impl/SVGAnimatedBooleanImpl.cpp
index f60b6a04..f60b6a04 100644
--- a/ksvg/impl/SVGAnimatedBooleanImpl.cc
+++ b/ksvg/impl/SVGAnimatedBooleanImpl.cpp
diff --git a/ksvg/impl/SVGAnimatedEnumerationImpl.cc b/ksvg/impl/SVGAnimatedEnumerationImpl.cpp
index 11e769ba..11e769ba 100644
--- a/ksvg/impl/SVGAnimatedEnumerationImpl.cc
+++ b/ksvg/impl/SVGAnimatedEnumerationImpl.cpp
diff --git a/ksvg/impl/SVGAnimatedIntegerImpl.cc b/ksvg/impl/SVGAnimatedIntegerImpl.cpp
index 00999e0e..00999e0e 100644
--- a/ksvg/impl/SVGAnimatedIntegerImpl.cc
+++ b/ksvg/impl/SVGAnimatedIntegerImpl.cpp
diff --git a/ksvg/impl/SVGAnimatedLengthImpl.cc b/ksvg/impl/SVGAnimatedLengthImpl.cpp
index 1dead454..1dead454 100644
--- a/ksvg/impl/SVGAnimatedLengthImpl.cc
+++ b/ksvg/impl/SVGAnimatedLengthImpl.cpp
diff --git a/ksvg/impl/SVGAnimatedLengthListImpl.cc b/ksvg/impl/SVGAnimatedLengthListImpl.cpp
index cd603f27..cd603f27 100644
--- a/ksvg/impl/SVGAnimatedLengthListImpl.cc
+++ b/ksvg/impl/SVGAnimatedLengthListImpl.cpp
diff --git a/ksvg/impl/SVGAnimatedNumberImpl.cc b/ksvg/impl/SVGAnimatedNumberImpl.cpp
index 890d1895..890d1895 100644
--- a/ksvg/impl/SVGAnimatedNumberImpl.cc
+++ b/ksvg/impl/SVGAnimatedNumberImpl.cpp
diff --git a/ksvg/impl/SVGAnimatedNumberListImpl.cc b/ksvg/impl/SVGAnimatedNumberListImpl.cpp
index b04b31c0..b04b31c0 100644
--- a/ksvg/impl/SVGAnimatedNumberListImpl.cc
+++ b/ksvg/impl/SVGAnimatedNumberListImpl.cpp
diff --git a/ksvg/impl/SVGAnimatedPathDataImpl.cc b/ksvg/impl/SVGAnimatedPathDataImpl.cpp
index d0d7faae..d0d7faae 100644
--- a/ksvg/impl/SVGAnimatedPathDataImpl.cc
+++ b/ksvg/impl/SVGAnimatedPathDataImpl.cpp
diff --git a/ksvg/impl/SVGAnimatedPointsImpl.cc b/ksvg/impl/SVGAnimatedPointsImpl.cpp
index 22246286..22246286 100644
--- a/ksvg/impl/SVGAnimatedPointsImpl.cc
+++ b/ksvg/impl/SVGAnimatedPointsImpl.cpp
diff --git a/ksvg/impl/SVGAnimatedPreserveAspectRatioImpl.cc b/ksvg/impl/SVGAnimatedPreserveAspectRatioImpl.cpp
index 24ab74a5..24ab74a5 100644
--- a/ksvg/impl/SVGAnimatedPreserveAspectRatioImpl.cc
+++ b/ksvg/impl/SVGAnimatedPreserveAspectRatioImpl.cpp
diff --git a/ksvg/impl/SVGAnimatedRectImpl.cc b/ksvg/impl/SVGAnimatedRectImpl.cpp
index 62a35e1e..62a35e1e 100644
--- a/ksvg/impl/SVGAnimatedRectImpl.cc
+++ b/ksvg/impl/SVGAnimatedRectImpl.cpp
diff --git a/ksvg/impl/SVGAnimatedStringImpl.cc b/ksvg/impl/SVGAnimatedStringImpl.cpp
index 90b58d83..90b58d83 100644
--- a/ksvg/impl/SVGAnimatedStringImpl.cc
+++ b/ksvg/impl/SVGAnimatedStringImpl.cpp
diff --git a/ksvg/impl/SVGAnimatedTransformListImpl.cc b/ksvg/impl/SVGAnimatedTransformListImpl.cpp
index 6c191c06..6c191c06 100644
--- a/ksvg/impl/SVGAnimatedTransformListImpl.cc
+++ b/ksvg/impl/SVGAnimatedTransformListImpl.cpp
diff --git a/ksvg/impl/SVGAnimationElementImpl.cc b/ksvg/impl/SVGAnimationElementImpl.cpp
index b87a9829..b87a9829 100644
--- a/ksvg/impl/SVGAnimationElementImpl.cc
+++ b/ksvg/impl/SVGAnimationElementImpl.cpp
diff --git a/ksvg/impl/SVGBBoxTarget.cc b/ksvg/impl/SVGBBoxTarget.cpp
index 7d690373..7d690373 100644
--- a/ksvg/impl/SVGBBoxTarget.cc
+++ b/ksvg/impl/SVGBBoxTarget.cpp
diff --git a/ksvg/impl/SVGCSSRuleImpl.cc b/ksvg/impl/SVGCSSRuleImpl.cpp
index 250ed687..250ed687 100644
--- a/ksvg/impl/SVGCSSRuleImpl.cc
+++ b/ksvg/impl/SVGCSSRuleImpl.cpp
diff --git a/ksvg/impl/SVGCircleElementImpl.cc b/ksvg/impl/SVGCircleElementImpl.cpp
index b50f2661..b50f2661 100644
--- a/ksvg/impl/SVGCircleElementImpl.cc
+++ b/ksvg/impl/SVGCircleElementImpl.cpp
diff --git a/ksvg/impl/SVGClipPathElementImpl.cc b/ksvg/impl/SVGClipPathElementImpl.cpp
index 03512a41..03512a41 100644
--- a/ksvg/impl/SVGClipPathElementImpl.cc
+++ b/ksvg/impl/SVGClipPathElementImpl.cpp
diff --git a/ksvg/impl/SVGColorImpl.cc b/ksvg/impl/SVGColorImpl.cpp
index c5c44bcc..c5c44bcc 100644
--- a/ksvg/impl/SVGColorImpl.cc
+++ b/ksvg/impl/SVGColorImpl.cpp
diff --git a/ksvg/impl/SVGColorProfileElementImpl.cc b/ksvg/impl/SVGColorProfileElementImpl.cpp
index 89770494..89770494 100644
--- a/ksvg/impl/SVGColorProfileElementImpl.cc
+++ b/ksvg/impl/SVGColorProfileElementImpl.cpp
diff --git a/ksvg/impl/SVGColorProfileRuleImpl.cc b/ksvg/impl/SVGColorProfileRuleImpl.cpp
index 74fffb47..74fffb47 100644
--- a/ksvg/impl/SVGColorProfileRuleImpl.cc
+++ b/ksvg/impl/SVGColorProfileRuleImpl.cpp
diff --git a/ksvg/impl/SVGComponentTransferFunctionElementImpl.cc b/ksvg/impl/SVGComponentTransferFunctionElementImpl.cpp
index 9407b2a6..9407b2a6 100644
--- a/ksvg/impl/SVGComponentTransferFunctionElementImpl.cc
+++ b/ksvg/impl/SVGComponentTransferFunctionElementImpl.cpp
diff --git a/ksvg/impl/SVGContainerImpl.cc b/ksvg/impl/SVGContainerImpl.cpp
index efaf62e8..efaf62e8 100644
--- a/ksvg/impl/SVGContainerImpl.cc
+++ b/ksvg/impl/SVGContainerImpl.cpp
diff --git a/ksvg/impl/SVGCursorElementImpl.cc b/ksvg/impl/SVGCursorElementImpl.cpp
index a83afd73..a83afd73 100644
--- a/ksvg/impl/SVGCursorElementImpl.cc
+++ b/ksvg/impl/SVGCursorElementImpl.cpp
diff --git a/ksvg/impl/SVGDefinitionSrcElementImpl.cc b/ksvg/impl/SVGDefinitionSrcElementImpl.cpp
index fdd5b159..fdd5b159 100644
--- a/ksvg/impl/SVGDefinitionSrcElementImpl.cc
+++ b/ksvg/impl/SVGDefinitionSrcElementImpl.cpp
diff --git a/ksvg/impl/SVGDefsElementImpl.cc b/ksvg/impl/SVGDefsElementImpl.cpp
index f388e482..f388e482 100644
--- a/ksvg/impl/SVGDefsElementImpl.cc
+++ b/ksvg/impl/SVGDefsElementImpl.cpp
diff --git a/ksvg/impl/SVGDescElementImpl.cc b/ksvg/impl/SVGDescElementImpl.cpp
index 9d8ceef2..9d8ceef2 100644
--- a/ksvg/impl/SVGDescElementImpl.cc
+++ b/ksvg/impl/SVGDescElementImpl.cpp
diff --git a/ksvg/impl/SVGDocumentImpl.cc b/ksvg/impl/SVGDocumentImpl.cpp
index ce6de16e..ce3c1341 100644
--- a/ksvg/impl/SVGDocumentImpl.cc
+++ b/ksvg/impl/SVGDocumentImpl.cpp
@@ -231,7 +231,7 @@ bool SVGDocumentImpl::open(const ::KURL &url)
 		if(!m_loader)
 			m_loader = new KSVGLoader();
 
-		connect(m_loader, TQT_SIGNAL(gotResult(TQIODevice *)), this, TQT_SLOT(slotSVGContent(TQIODevice *)));
+		connect(m_loader, TQ_SIGNAL(gotResult(TQIODevice *)), this, TQ_SLOT(slotSVGContent(TQIODevice *)));
 		m_loader->getSVGContent(url);
 	}
 	else
@@ -257,7 +257,7 @@ void SVGDocumentImpl::slotSVGContent(TQIODevice *dev)
 		args.SVGFragmentId = url.mid(pos + 1);
 		
 	m_reader = new KSVGReader(this, m_canvas, args);
-	connect(m_reader, TQT_SIGNAL(finished(bool, const TQString &)), this, TQT_SLOT(slotFinishedParsing(bool, const TQString &)));
+	connect(m_reader, TQ_SIGNAL(finished(bool, const TQString &)), this, TQ_SLOT(slotFinishedParsing(bool, const TQString &)));
 	m_t.start();
 	
 #if USE_VALGRIND
@@ -277,7 +277,7 @@ void SVGDocumentImpl::parseSVG(TQXmlInputSource *inputSource, bool getURLMode)
 	args.fit = m_fit;
 	args.getURLMode = getURLMode;
 	m_reader = new KSVGReader(this, 0, args);
-	connect(m_reader, TQT_SIGNAL(finished(bool, const TQString &)), this, TQT_SLOT(slotFinishedParsing(bool, const TQString &)));
+	connect(m_reader, TQ_SIGNAL(finished(bool, const TQString &)), this, TQ_SLOT(slotFinishedParsing(bool, const TQString &)));
 	
 #if USE_VALGRIND
 	CALLTREE_ZERO_STATS();
@@ -454,7 +454,7 @@ void SVGDocumentImpl::executeScripts()
 	bool test = executeScriptsRecursiveCheck(*rootElement());
 	
 	if(!test)
-		TQTimer::singleShot(50, this, TQT_SLOT(executeScripts()));
+		TQTimer::singleShot(50, this, TQ_SLOT(executeScripts()));
 	else
 	{
 		executeScriptsRecursive(*rootElement());
diff --git a/ksvg/impl/SVGDocumentImpl.h b/ksvg/impl/SVGDocumentImpl.h
index e9d12a0d..58babf96 100644
--- a/ksvg/impl/SVGDocumentImpl.h
+++ b/ksvg/impl/SVGDocumentImpl.h
@@ -71,7 +71,7 @@ class SVGDocumentImpl : public TQObject,
 						public DOM::Document,
 						public SVGDOMNodeBridge
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	SVGDocumentImpl(bool anim = true, bool bFit = false, SVGImageElementImpl *parentImage = 0);
diff --git a/ksvg/impl/SVGEcma.cc b/ksvg/impl/SVGEcma.cpp
index 5036f591..5036f591 100644
--- a/ksvg/impl/SVGEcma.cc
+++ b/ksvg/impl/SVGEcma.cpp
diff --git a/ksvg/impl/SVGElementImpl.cc b/ksvg/impl/SVGElementImpl.cpp
index 523c5807..523c5807 100644
--- a/ksvg/impl/SVGElementImpl.cc
+++ b/ksvg/impl/SVGElementImpl.cpp
diff --git a/ksvg/impl/SVGElementInstanceImpl.cc b/ksvg/impl/SVGElementInstanceImpl.cpp
index bd1fc58d..bd1fc58d 100644
--- a/ksvg/impl/SVGElementInstanceImpl.cc
+++ b/ksvg/impl/SVGElementInstanceImpl.cpp
diff --git a/ksvg/impl/SVGElementInstanceListImpl.cc b/ksvg/impl/SVGElementInstanceListImpl.cpp
index c0748008..c0748008 100644
--- a/ksvg/impl/SVGElementInstanceListImpl.cc
+++ b/ksvg/impl/SVGElementInstanceListImpl.cpp
diff --git a/ksvg/impl/SVGEllipseElementImpl.cc b/ksvg/impl/SVGEllipseElementImpl.cpp
index 1487d79b..1487d79b 100644
--- a/ksvg/impl/SVGEllipseElementImpl.cc
+++ b/ksvg/impl/SVGEllipseElementImpl.cpp
diff --git a/ksvg/impl/SVGEventImpl.cc b/ksvg/impl/SVGEventImpl.cpp
index 9ff61abc..9ff61abc 100644
--- a/ksvg/impl/SVGEventImpl.cc
+++ b/ksvg/impl/SVGEventImpl.cpp
diff --git a/ksvg/impl/SVGExternalResourcesRequiredImpl.cc b/ksvg/impl/SVGExternalResourcesRequiredImpl.cpp
index 0303a75b..0303a75b 100644
--- a/ksvg/impl/SVGExternalResourcesRequiredImpl.cc
+++ b/ksvg/impl/SVGExternalResourcesRequiredImpl.cpp
diff --git a/ksvg/impl/SVGFEBlendElementImpl.cc b/ksvg/impl/SVGFEBlendElementImpl.cpp
index cec9cb88..cec9cb88 100644
--- a/ksvg/impl/SVGFEBlendElementImpl.cc
+++ b/ksvg/impl/SVGFEBlendElementImpl.cpp
diff --git a/ksvg/impl/SVGFEColorMatrixElementImpl.cc b/ksvg/impl/SVGFEColorMatrixElementImpl.cpp
index 0bd0c542..0bd0c542 100644
--- a/ksvg/impl/SVGFEColorMatrixElementImpl.cc
+++ b/ksvg/impl/SVGFEColorMatrixElementImpl.cpp
diff --git a/ksvg/impl/SVGFEComponentTransferElementImpl.cc b/ksvg/impl/SVGFEComponentTransferElementImpl.cpp
index cdc4a053..cdc4a053 100644
--- a/ksvg/impl/SVGFEComponentTransferElementImpl.cc
+++ b/ksvg/impl/SVGFEComponentTransferElementImpl.cpp
diff --git a/ksvg/impl/SVGFECompositeElementImpl.cc b/ksvg/impl/SVGFECompositeElementImpl.cpp
index 0ddaed6e..0ddaed6e 100644
--- a/ksvg/impl/SVGFECompositeElementImpl.cc
+++ b/ksvg/impl/SVGFECompositeElementImpl.cpp
diff --git a/ksvg/impl/SVGFEConvolveMatrixElementImpl.cc b/ksvg/impl/SVGFEConvolveMatrixElementImpl.cpp
index 4888eed7..4888eed7 100644
--- a/ksvg/impl/SVGFEConvolveMatrixElementImpl.cc
+++ b/ksvg/impl/SVGFEConvolveMatrixElementImpl.cpp
diff --git a/ksvg/impl/SVGFEDiffuseLightingElementImpl.cc b/ksvg/impl/SVGFEDiffuseLightingElementImpl.cpp
index 151b02bf..151b02bf 100644
--- a/ksvg/impl/SVGFEDiffuseLightingElementImpl.cc
+++ b/ksvg/impl/SVGFEDiffuseLightingElementImpl.cpp
diff --git a/ksvg/impl/SVGFEDisplacementMapElementImpl.cc b/ksvg/impl/SVGFEDisplacementMapElementImpl.cpp
index 6bdd9aea..6bdd9aea 100644
--- a/ksvg/impl/SVGFEDisplacementMapElementImpl.cc
+++ b/ksvg/impl/SVGFEDisplacementMapElementImpl.cpp
diff --git a/ksvg/impl/SVGFEDistantLightElementImpl.cc b/ksvg/impl/SVGFEDistantLightElementImpl.cpp
index f9556ab1..f9556ab1 100644
--- a/ksvg/impl/SVGFEDistantLightElementImpl.cc
+++ b/ksvg/impl/SVGFEDistantLightElementImpl.cpp
diff --git a/ksvg/impl/SVGFEFloodElementImpl.cc b/ksvg/impl/SVGFEFloodElementImpl.cpp
index 15d74945..15d74945 100644
--- a/ksvg/impl/SVGFEFloodElementImpl.cc
+++ b/ksvg/impl/SVGFEFloodElementImpl.cpp
diff --git a/ksvg/impl/SVGFEFuncAElementImpl.cc b/ksvg/impl/SVGFEFuncAElementImpl.cpp
index 7afec020..7afec020 100644
--- a/ksvg/impl/SVGFEFuncAElementImpl.cc
+++ b/ksvg/impl/SVGFEFuncAElementImpl.cpp
diff --git a/ksvg/impl/SVGFEFuncBElementImpl.cc b/ksvg/impl/SVGFEFuncBElementImpl.cpp
index 4c38afb6..4c38afb6 100644
--- a/ksvg/impl/SVGFEFuncBElementImpl.cc
+++ b/ksvg/impl/SVGFEFuncBElementImpl.cpp
diff --git a/ksvg/impl/SVGFEFuncGElementImpl.cc b/ksvg/impl/SVGFEFuncGElementImpl.cpp
index 67712b9b..67712b9b 100644
--- a/ksvg/impl/SVGFEFuncGElementImpl.cc
+++ b/ksvg/impl/SVGFEFuncGElementImpl.cpp
diff --git a/ksvg/impl/SVGFEFuncRElementImpl.cc b/ksvg/impl/SVGFEFuncRElementImpl.cpp
index 703eae13..703eae13 100644
--- a/ksvg/impl/SVGFEFuncRElementImpl.cc
+++ b/ksvg/impl/SVGFEFuncRElementImpl.cpp
diff --git a/ksvg/impl/SVGFEGaussianBlurElementImpl.cc b/ksvg/impl/SVGFEGaussianBlurElementImpl.cpp
index 1c10d564..1c10d564 100644
--- a/ksvg/impl/SVGFEGaussianBlurElementImpl.cc
+++ b/ksvg/impl/SVGFEGaussianBlurElementImpl.cpp
diff --git a/ksvg/impl/SVGFEImageElementImpl.cc b/ksvg/impl/SVGFEImageElementImpl.cpp
index 4bcd64ed..4bcd64ed 100644
--- a/ksvg/impl/SVGFEImageElementImpl.cc
+++ b/ksvg/impl/SVGFEImageElementImpl.cpp
diff --git a/ksvg/impl/SVGFEMergeElementImpl.cc b/ksvg/impl/SVGFEMergeElementImpl.cpp
index fb188bae..fb188bae 100644
--- a/ksvg/impl/SVGFEMergeElementImpl.cc
+++ b/ksvg/impl/SVGFEMergeElementImpl.cpp
diff --git a/ksvg/impl/SVGFEMergeNodeElementImpl.cc b/ksvg/impl/SVGFEMergeNodeElementImpl.cpp
index 13f6eefe..13f6eefe 100644
--- a/ksvg/impl/SVGFEMergeNodeElementImpl.cc
+++ b/ksvg/impl/SVGFEMergeNodeElementImpl.cpp
diff --git a/ksvg/impl/SVGFEMorphologyElementImpl.cc b/ksvg/impl/SVGFEMorphologyElementImpl.cpp
index 373d0b08..373d0b08 100644
--- a/ksvg/impl/SVGFEMorphologyElementImpl.cc
+++ b/ksvg/impl/SVGFEMorphologyElementImpl.cpp
diff --git a/ksvg/impl/SVGFEOffsetElementImpl.cc b/ksvg/impl/SVGFEOffsetElementImpl.cpp
index b402fbc0..b402fbc0 100644
--- a/ksvg/impl/SVGFEOffsetElementImpl.cc
+++ b/ksvg/impl/SVGFEOffsetElementImpl.cpp
diff --git a/ksvg/impl/SVGFEPointLightElementImpl.cc b/ksvg/impl/SVGFEPointLightElementImpl.cpp
index 1a705f43..1a705f43 100644
--- a/ksvg/impl/SVGFEPointLightElementImpl.cc
+++ b/ksvg/impl/SVGFEPointLightElementImpl.cpp
diff --git a/ksvg/impl/SVGFESpecularLightingElementImpl.cc b/ksvg/impl/SVGFESpecularLightingElementImpl.cpp
index 188dc0bd..188dc0bd 100644
--- a/ksvg/impl/SVGFESpecularLightingElementImpl.cc
+++ b/ksvg/impl/SVGFESpecularLightingElementImpl.cpp
diff --git a/ksvg/impl/SVGFESpotLightElementImpl.cc b/ksvg/impl/SVGFESpotLightElementImpl.cpp
index f92b4ccd..f92b4ccd 100644
--- a/ksvg/impl/SVGFESpotLightElementImpl.cc
+++ b/ksvg/impl/SVGFESpotLightElementImpl.cpp
diff --git a/ksvg/impl/SVGFETileElementImpl.cc b/ksvg/impl/SVGFETileElementImpl.cpp
index 2ca931a2..2ca931a2 100644
--- a/ksvg/impl/SVGFETileElementImpl.cc
+++ b/ksvg/impl/SVGFETileElementImpl.cpp
diff --git a/ksvg/impl/SVGFETurbulenceElementImpl.cc b/ksvg/impl/SVGFETurbulenceElementImpl.cpp
index 7c6638ef..7c6638ef 100644
--- a/ksvg/impl/SVGFETurbulenceElementImpl.cc
+++ b/ksvg/impl/SVGFETurbulenceElementImpl.cpp
diff --git a/ksvg/impl/SVGFilterElementImpl.cc b/ksvg/impl/SVGFilterElementImpl.cpp
index 5ed2dd8c..5ed2dd8c 100644
--- a/ksvg/impl/SVGFilterElementImpl.cc
+++ b/ksvg/impl/SVGFilterElementImpl.cpp
diff --git a/ksvg/impl/SVGFilterPrimitiveStandardAttributesImpl.cc b/ksvg/impl/SVGFilterPrimitiveStandardAttributesImpl.cpp
index 07517afd..07517afd 100644
--- a/ksvg/impl/SVGFilterPrimitiveStandardAttributesImpl.cc
+++ b/ksvg/impl/SVGFilterPrimitiveStandardAttributesImpl.cpp
diff --git a/ksvg/impl/SVGFitToViewBoxImpl.cc b/ksvg/impl/SVGFitToViewBoxImpl.cpp
index a33bc0fc..a33bc0fc 100644
--- a/ksvg/impl/SVGFitToViewBoxImpl.cc
+++ b/ksvg/impl/SVGFitToViewBoxImpl.cpp
diff --git a/ksvg/impl/SVGFontElementImpl.cc b/ksvg/impl/SVGFontElementImpl.cpp
index 49ed035c..49ed035c 100644
--- a/ksvg/impl/SVGFontElementImpl.cc
+++ b/ksvg/impl/SVGFontElementImpl.cpp
diff --git a/ksvg/impl/SVGFontFaceElementImpl.cc b/ksvg/impl/SVGFontFaceElementImpl.cpp
index b8ee49e1..b8ee49e1 100644
--- a/ksvg/impl/SVGFontFaceElementImpl.cc
+++ b/ksvg/impl/SVGFontFaceElementImpl.cpp
diff --git a/ksvg/impl/SVGFontFaceFormatElementImpl.cc b/ksvg/impl/SVGFontFaceFormatElementImpl.cpp
index aecf957c..aecf957c 100644
--- a/ksvg/impl/SVGFontFaceFormatElementImpl.cc
+++ b/ksvg/impl/SVGFontFaceFormatElementImpl.cpp
diff --git a/ksvg/impl/SVGFontFaceNameElementImpl.cc b/ksvg/impl/SVGFontFaceNameElementImpl.cpp
index c4a295fc..c4a295fc 100644
--- a/ksvg/impl/SVGFontFaceNameElementImpl.cc
+++ b/ksvg/impl/SVGFontFaceNameElementImpl.cpp
diff --git a/ksvg/impl/SVGFontFaceSrcElementImpl.cc b/ksvg/impl/SVGFontFaceSrcElementImpl.cpp
index 9a2bd71e..9a2bd71e 100644
--- a/ksvg/impl/SVGFontFaceSrcElementImpl.cc
+++ b/ksvg/impl/SVGFontFaceSrcElementImpl.cpp
diff --git a/ksvg/impl/SVGFontFaceUriElementImpl.cc b/ksvg/impl/SVGFontFaceUriElementImpl.cpp
index 4a4153ae..4a4153ae 100644
--- a/ksvg/impl/SVGFontFaceUriElementImpl.cc
+++ b/ksvg/impl/SVGFontFaceUriElementImpl.cpp
diff --git a/ksvg/impl/SVGForeignObjectElementImpl.cc b/ksvg/impl/SVGForeignObjectElementImpl.cpp
index bf6b3c7a..bf6b3c7a 100644
--- a/ksvg/impl/SVGForeignObjectElementImpl.cc
+++ b/ksvg/impl/SVGForeignObjectElementImpl.cpp
diff --git a/ksvg/impl/SVGGElementImpl.cc b/ksvg/impl/SVGGElementImpl.cpp
index 5cba29a3..5cba29a3 100644
--- a/ksvg/impl/SVGGElementImpl.cc
+++ b/ksvg/impl/SVGGElementImpl.cpp
diff --git a/ksvg/impl/SVGGlyphElementImpl.cc b/ksvg/impl/SVGGlyphElementImpl.cpp
index 9b909960..b267fe18 100644
--- a/ksvg/impl/SVGGlyphElementImpl.cc
+++ b/ksvg/impl/SVGGlyphElementImpl.cpp
@@ -46,7 +46,7 @@ TQString SVGGlyphElementImpl::d() const
  unicode		SVGGlyphElementImpl::Unicode		DontDelete|ReadOnly
  glyph-name		SVGGlyphElementImpl::GlyphName		DontDelete|ReadOnly
  d				SVGGlyphElementImpl::D				DontDelete|ReadOnly
- orientation	SVGGlyphElementImpl::Qt::Orientation	DontDelete|ReadOnly
+ orientation	SVGGlyphElementImpl::Orientation	DontDelete|ReadOnly
  arabic-form	SVGGlyphElementImpl::ArabicForm		DontDelete|ReadOnly
  lang			SVGGlyphElementImpl::Lang			DontDelete|ReadOnly
  horiz-adv-x	SVGGlyphElementImpl::HorizAdvX		DontDelete|ReadOnly
diff --git a/ksvg/impl/SVGGlyphRefElementImpl.cc b/ksvg/impl/SVGGlyphRefElementImpl.cpp
index 10366dd9..10366dd9 100644
--- a/ksvg/impl/SVGGlyphRefElementImpl.cc
+++ b/ksvg/impl/SVGGlyphRefElementImpl.cpp
diff --git a/ksvg/impl/SVGGradientElementImpl.cc b/ksvg/impl/SVGGradientElementImpl.cpp
index b59679e2..b59679e2 100644
--- a/ksvg/impl/SVGGradientElementImpl.cc
+++ b/ksvg/impl/SVGGradientElementImpl.cpp
diff --git a/ksvg/impl/SVGHKernElementImpl.cc b/ksvg/impl/SVGHKernElementImpl.cpp
index 64efce26..64efce26 100644
--- a/ksvg/impl/SVGHKernElementImpl.cc
+++ b/ksvg/impl/SVGHKernElementImpl.cpp
diff --git a/ksvg/impl/SVGHelperImpl.cc b/ksvg/impl/SVGHelperImpl.cpp
index fb546fbe..fb546fbe 100644
--- a/ksvg/impl/SVGHelperImpl.cc
+++ b/ksvg/impl/SVGHelperImpl.cpp
diff --git a/ksvg/impl/SVGICCColorImpl.cc b/ksvg/impl/SVGICCColorImpl.cpp
index 50af51c9..50af51c9 100644
--- a/ksvg/impl/SVGICCColorImpl.cc
+++ b/ksvg/impl/SVGICCColorImpl.cpp
diff --git a/ksvg/impl/SVGImageElementImpl.cc b/ksvg/impl/SVGImageElementImpl.cpp
index 65c678d2..c33d3737 100644
--- a/ksvg/impl/SVGImageElementImpl.cc
+++ b/ksvg/impl/SVGImageElementImpl.cpp
@@ -273,8 +273,8 @@ void SVGImageElementImpl::createItem(KSVGCanvas *c)
 				m_doc->ref();
 				m_doc->attach(c);
 
-				connect(m_doc, TQT_SIGNAL(finishedParsing(bool, const TQString &)), this, TQT_SLOT(slotParsingFinished(bool, const TQString &)));
-				connect(m_doc, TQT_SIGNAL(finishedLoading()), this, TQT_SLOT(slotLoadingFinished()));
+				connect(m_doc, TQ_SIGNAL(finishedParsing(bool, const TQString &)), this, TQ_SLOT(slotParsingFinished(bool, const TQString &)));
+				connect(m_doc, TQ_SIGNAL(finishedLoading()), this, TQ_SLOT(slotLoadingFinished()));
 
 				KURL file;
 
diff --git a/ksvg/impl/SVGImageElementImpl.h b/ksvg/impl/SVGImageElementImpl.h
index 96985440..c0858ba8 100644
--- a/ksvg/impl/SVGImageElementImpl.h
+++ b/ksvg/impl/SVGImageElementImpl.h
@@ -51,7 +51,7 @@ class SVGImageElementImpl : public TQObject,
 							public SVGStylableImpl,
 							public SVGTransformableImpl
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	SVGImageElementImpl(DOM::ElementImpl *);
diff --git a/ksvg/impl/SVGLangSpaceImpl.cc b/ksvg/impl/SVGLangSpaceImpl.cpp
index f6081401..f6081401 100644
--- a/ksvg/impl/SVGLangSpaceImpl.cc
+++ b/ksvg/impl/SVGLangSpaceImpl.cpp
diff --git a/ksvg/impl/SVGLengthImpl.cc b/ksvg/impl/SVGLengthImpl.cpp
index 36789ffe..36789ffe 100644
--- a/ksvg/impl/SVGLengthImpl.cc
+++ b/ksvg/impl/SVGLengthImpl.cpp
diff --git a/ksvg/impl/SVGLengthListImpl.cc b/ksvg/impl/SVGLengthListImpl.cpp
index 2966dec8..2966dec8 100644
--- a/ksvg/impl/SVGLengthListImpl.cc
+++ b/ksvg/impl/SVGLengthListImpl.cpp
diff --git a/ksvg/impl/SVGLineElementImpl.cc b/ksvg/impl/SVGLineElementImpl.cpp
index eee19d06..eee19d06 100644
--- a/ksvg/impl/SVGLineElementImpl.cc
+++ b/ksvg/impl/SVGLineElementImpl.cpp
diff --git a/ksvg/impl/SVGLinearGradientElementImpl.cc b/ksvg/impl/SVGLinearGradientElementImpl.cpp
index 0a01a748..0a01a748 100644
--- a/ksvg/impl/SVGLinearGradientElementImpl.cc
+++ b/ksvg/impl/SVGLinearGradientElementImpl.cpp
diff --git a/ksvg/impl/SVGLocatableImpl.cc b/ksvg/impl/SVGLocatableImpl.cpp
index 1bf17fb6..1bf17fb6 100644
--- a/ksvg/impl/SVGLocatableImpl.cc
+++ b/ksvg/impl/SVGLocatableImpl.cpp
diff --git a/ksvg/impl/SVGMPathElementImpl.cc b/ksvg/impl/SVGMPathElementImpl.cpp
index 8348e07a..8348e07a 100644
--- a/ksvg/impl/SVGMPathElementImpl.cc
+++ b/ksvg/impl/SVGMPathElementImpl.cpp
diff --git a/ksvg/impl/SVGMarkerElementImpl.cc b/ksvg/impl/SVGMarkerElementImpl.cpp
index 554f56b7..554f56b7 100644
--- a/ksvg/impl/SVGMarkerElementImpl.cc
+++ b/ksvg/impl/SVGMarkerElementImpl.cpp
diff --git a/ksvg/impl/SVGMaskElementImpl.cc b/ksvg/impl/SVGMaskElementImpl.cpp
index d3947ff4..d3947ff4 100644
--- a/ksvg/impl/SVGMaskElementImpl.cc
+++ b/ksvg/impl/SVGMaskElementImpl.cpp
diff --git a/ksvg/impl/SVGMatrixImpl.cc b/ksvg/impl/SVGMatrixImpl.cpp
index 1f48848d..1f48848d 100644
--- a/ksvg/impl/SVGMatrixImpl.cc
+++ b/ksvg/impl/SVGMatrixImpl.cpp
diff --git a/ksvg/impl/SVGMetadataElementImpl.cc b/ksvg/impl/SVGMetadataElementImpl.cpp
index 9fa245bf..9fa245bf 100644
--- a/ksvg/impl/SVGMetadataElementImpl.cc
+++ b/ksvg/impl/SVGMetadataElementImpl.cpp
diff --git a/ksvg/impl/SVGMissingGlyphElementImpl.cc b/ksvg/impl/SVGMissingGlyphElementImpl.cpp
index f522dff6..f522dff6 100644
--- a/ksvg/impl/SVGMissingGlyphElementImpl.cc
+++ b/ksvg/impl/SVGMissingGlyphElementImpl.cpp
diff --git a/ksvg/impl/SVGNumberImpl.cc b/ksvg/impl/SVGNumberImpl.cpp
index b1ec38b6..b1ec38b6 100644
--- a/ksvg/impl/SVGNumberImpl.cc
+++ b/ksvg/impl/SVGNumberImpl.cpp
diff --git a/ksvg/impl/SVGNumberListImpl.cc b/ksvg/impl/SVGNumberListImpl.cpp
index a528b474..a528b474 100644
--- a/ksvg/impl/SVGNumberListImpl.cc
+++ b/ksvg/impl/SVGNumberListImpl.cpp
diff --git a/ksvg/impl/SVGPaintImpl.cc b/ksvg/impl/SVGPaintImpl.cpp
index 8e56baae..8e56baae 100644
--- a/ksvg/impl/SVGPaintImpl.cc
+++ b/ksvg/impl/SVGPaintImpl.cpp
diff --git a/ksvg/impl/SVGPaintServerImpl.cc b/ksvg/impl/SVGPaintServerImpl.cpp
index 006ba853..006ba853 100644
--- a/ksvg/impl/SVGPaintServerImpl.cc
+++ b/ksvg/impl/SVGPaintServerImpl.cpp
diff --git a/ksvg/impl/SVGPathElementImpl.cc b/ksvg/impl/SVGPathElementImpl.cpp
index d64aede3..d64aede3 100644
--- a/ksvg/impl/SVGPathElementImpl.cc
+++ b/ksvg/impl/SVGPathElementImpl.cpp
diff --git a/ksvg/impl/SVGPathSegArcImpl.cc b/ksvg/impl/SVGPathSegArcImpl.cpp
index 9d5cc76a..9d5cc76a 100644
--- a/ksvg/impl/SVGPathSegArcImpl.cc
+++ b/ksvg/impl/SVGPathSegArcImpl.cpp
diff --git a/ksvg/impl/SVGPathSegClosePathImpl.cc b/ksvg/impl/SVGPathSegClosePathImpl.cpp
index f5e15f88..f5e15f88 100644
--- a/ksvg/impl/SVGPathSegClosePathImpl.cc
+++ b/ksvg/impl/SVGPathSegClosePathImpl.cpp
diff --git a/ksvg/impl/SVGPathSegCurvetoCubicImpl.cc b/ksvg/impl/SVGPathSegCurvetoCubicImpl.cpp
index 597b5bdc..597b5bdc 100644
--- a/ksvg/impl/SVGPathSegCurvetoCubicImpl.cc
+++ b/ksvg/impl/SVGPathSegCurvetoCubicImpl.cpp
diff --git a/ksvg/impl/SVGPathSegCurvetoCubicSmoothImpl.cc b/ksvg/impl/SVGPathSegCurvetoCubicSmoothImpl.cpp
index 8bc5460e..8bc5460e 100644
--- a/ksvg/impl/SVGPathSegCurvetoCubicSmoothImpl.cc
+++ b/ksvg/impl/SVGPathSegCurvetoCubicSmoothImpl.cpp
diff --git a/ksvg/impl/SVGPathSegCurvetoQuadraticImpl.cc b/ksvg/impl/SVGPathSegCurvetoQuadraticImpl.cpp
index fa78804f..fa78804f 100644
--- a/ksvg/impl/SVGPathSegCurvetoQuadraticImpl.cc
+++ b/ksvg/impl/SVGPathSegCurvetoQuadraticImpl.cpp
diff --git a/ksvg/impl/SVGPathSegCurvetoQuadraticSmoothImpl.cc b/ksvg/impl/SVGPathSegCurvetoQuadraticSmoothImpl.cpp
index a6cb362f..a6cb362f 100644
--- a/ksvg/impl/SVGPathSegCurvetoQuadraticSmoothImpl.cc
+++ b/ksvg/impl/SVGPathSegCurvetoQuadraticSmoothImpl.cpp
diff --git a/ksvg/impl/SVGPathSegImpl.cc b/ksvg/impl/SVGPathSegImpl.cpp
index 3ad83d35..3ad83d35 100644
--- a/ksvg/impl/SVGPathSegImpl.cc
+++ b/ksvg/impl/SVGPathSegImpl.cpp
diff --git a/ksvg/impl/SVGPathSegLinetoHorizontalImpl.cc b/ksvg/impl/SVGPathSegLinetoHorizontalImpl.cpp
index a0f11829..a0f11829 100644
--- a/ksvg/impl/SVGPathSegLinetoHorizontalImpl.cc
+++ b/ksvg/impl/SVGPathSegLinetoHorizontalImpl.cpp
diff --git a/ksvg/impl/SVGPathSegLinetoImpl.cc b/ksvg/impl/SVGPathSegLinetoImpl.cpp
index c47b6fcc..c47b6fcc 100644
--- a/ksvg/impl/SVGPathSegLinetoImpl.cc
+++ b/ksvg/impl/SVGPathSegLinetoImpl.cpp
diff --git a/ksvg/impl/SVGPathSegLinetoVerticalImpl.cc b/ksvg/impl/SVGPathSegLinetoVerticalImpl.cpp
index 47ced875..47ced875 100644
--- a/ksvg/impl/SVGPathSegLinetoVerticalImpl.cc
+++ b/ksvg/impl/SVGPathSegLinetoVerticalImpl.cpp
diff --git a/ksvg/impl/SVGPathSegListImpl.cc b/ksvg/impl/SVGPathSegListImpl.cpp
index 7e3ff83e..7e3ff83e 100644
--- a/ksvg/impl/SVGPathSegListImpl.cc
+++ b/ksvg/impl/SVGPathSegListImpl.cpp
diff --git a/ksvg/impl/SVGPathSegMovetoImpl.cc b/ksvg/impl/SVGPathSegMovetoImpl.cpp
index 0cafbc25..0cafbc25 100644
--- a/ksvg/impl/SVGPathSegMovetoImpl.cc
+++ b/ksvg/impl/SVGPathSegMovetoImpl.cpp
diff --git a/ksvg/impl/SVGPatternElementImpl.cc b/ksvg/impl/SVGPatternElementImpl.cpp
index 37825869..37825869 100644
--- a/ksvg/impl/SVGPatternElementImpl.cc
+++ b/ksvg/impl/SVGPatternElementImpl.cpp
diff --git a/ksvg/impl/SVGPointImpl.cc b/ksvg/impl/SVGPointImpl.cpp
index ebce509a..ebce509a 100644
--- a/ksvg/impl/SVGPointImpl.cc
+++ b/ksvg/impl/SVGPointImpl.cpp
diff --git a/ksvg/impl/SVGPointListImpl.cc b/ksvg/impl/SVGPointListImpl.cpp
index ba492c32..ba492c32 100644
--- a/ksvg/impl/SVGPointListImpl.cc
+++ b/ksvg/impl/SVGPointListImpl.cpp
diff --git a/ksvg/impl/SVGPolyElementImpl.cc b/ksvg/impl/SVGPolyElementImpl.cpp
index b1557aa3..b1557aa3 100644
--- a/ksvg/impl/SVGPolyElementImpl.cc
+++ b/ksvg/impl/SVGPolyElementImpl.cpp
diff --git a/ksvg/impl/SVGPolygonElementImpl.cc b/ksvg/impl/SVGPolygonElementImpl.cpp
index 0187ce43..0187ce43 100644
--- a/ksvg/impl/SVGPolygonElementImpl.cc
+++ b/ksvg/impl/SVGPolygonElementImpl.cpp
diff --git a/ksvg/impl/SVGPolylineElementImpl.cc b/ksvg/impl/SVGPolylineElementImpl.cpp
index 487f2630..487f2630 100644
--- a/ksvg/impl/SVGPolylineElementImpl.cc
+++ b/ksvg/impl/SVGPolylineElementImpl.cpp
diff --git a/ksvg/impl/SVGPreserveAspectRatioImpl.cc b/ksvg/impl/SVGPreserveAspectRatioImpl.cpp
index bce71948..bce71948 100644
--- a/ksvg/impl/SVGPreserveAspectRatioImpl.cc
+++ b/ksvg/impl/SVGPreserveAspectRatioImpl.cpp
diff --git a/ksvg/impl/SVGRadialGradientElementImpl.cc b/ksvg/impl/SVGRadialGradientElementImpl.cpp
index 6a52ab68..6a52ab68 100644
--- a/ksvg/impl/SVGRadialGradientElementImpl.cc
+++ b/ksvg/impl/SVGRadialGradientElementImpl.cpp
diff --git a/ksvg/impl/SVGRectElementImpl.cc b/ksvg/impl/SVGRectElementImpl.cpp
index 30a527ca..30a527ca 100644
--- a/ksvg/impl/SVGRectElementImpl.cc
+++ b/ksvg/impl/SVGRectElementImpl.cpp
diff --git a/ksvg/impl/SVGRectImpl.cc b/ksvg/impl/SVGRectImpl.cpp
index f02b5a4d..f02b5a4d 100644
--- a/ksvg/impl/SVGRectImpl.cc
+++ b/ksvg/impl/SVGRectImpl.cpp
diff --git a/ksvg/impl/SVGSVGElementImpl.cc b/ksvg/impl/SVGSVGElementImpl.cpp
index 98106d7c..98106d7c 100644
--- a/ksvg/impl/SVGSVGElementImpl.cc
+++ b/ksvg/impl/SVGSVGElementImpl.cpp
diff --git a/ksvg/impl/SVGScriptElementImpl.cc b/ksvg/impl/SVGScriptElementImpl.cpp
index f97ebf89..ce1aede9 100644
--- a/ksvg/impl/SVGScriptElementImpl.cc
+++ b/ksvg/impl/SVGScriptElementImpl.cpp
@@ -75,8 +75,8 @@ void SVGScriptElementImpl::setAttributes()
 		if(m_job == 0)
 			m_job = TDEIO::get(url, false, false);
 
-		connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
-		connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotResult(TDEIO::Job *)));
+		connect(m_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+		connect(m_job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotResult(TDEIO::Job *)));
 	}
 }
 
@@ -95,7 +95,7 @@ void SVGScriptElementImpl::slotResult(TDEIO::Job *)
 	m_data[m_data.size() - 1] = '\0';
 
 	TQBuffer buf(m_data);
-	TQIODevice *dev = KFilterDev::device(TQT_TQIODEVICE(&buf), "application/x-gzip", false);
+	TQIODevice *dev = KFilterDev::device(&buf, "application/x-gzip", false);
 	TQByteArray contents;
 	if(dev->open(IO_ReadOnly))
 		contents = dev->readAll();
diff --git a/ksvg/impl/SVGScriptElementImpl.h b/ksvg/impl/SVGScriptElementImpl.h
index 2850af9d..d6c03cf9 100644
--- a/ksvg/impl/SVGScriptElementImpl.h
+++ b/ksvg/impl/SVGScriptElementImpl.h
@@ -41,7 +41,7 @@ class SVGScriptElementImpl : public TQObject,
 							 public SVGURIReferenceImpl,
 							 public SVGExternalResourcesRequiredImpl
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	SVGScriptElementImpl(DOM::ElementImpl *);
diff --git a/ksvg/impl/SVGSetElementImpl.cc b/ksvg/impl/SVGSetElementImpl.cpp
index 9e506eac..9e506eac 100644
--- a/ksvg/impl/SVGSetElementImpl.cc
+++ b/ksvg/impl/SVGSetElementImpl.cpp
diff --git a/ksvg/impl/SVGShapeImpl.cc b/ksvg/impl/SVGShapeImpl.cpp
index dc9b728f..dc9b728f 100644
--- a/ksvg/impl/SVGShapeImpl.cc
+++ b/ksvg/impl/SVGShapeImpl.cpp
diff --git a/ksvg/impl/SVGStopElementImpl.cc b/ksvg/impl/SVGStopElementImpl.cpp
index f15fb0a6..f15fb0a6 100644
--- a/ksvg/impl/SVGStopElementImpl.cc
+++ b/ksvg/impl/SVGStopElementImpl.cpp
diff --git a/ksvg/impl/SVGStringListImpl.cc b/ksvg/impl/SVGStringListImpl.cpp
index 331b4393..331b4393 100644
--- a/ksvg/impl/SVGStringListImpl.cc
+++ b/ksvg/impl/SVGStringListImpl.cpp
diff --git a/ksvg/impl/SVGStylableImpl.cc b/ksvg/impl/SVGStylableImpl.cpp
index 4400b236..4400b236 100644
--- a/ksvg/impl/SVGStylableImpl.cc
+++ b/ksvg/impl/SVGStylableImpl.cpp
diff --git a/ksvg/impl/SVGStyleElementImpl.cc b/ksvg/impl/SVGStyleElementImpl.cpp
index c376cb30..c376cb30 100644
--- a/ksvg/impl/SVGStyleElementImpl.cc
+++ b/ksvg/impl/SVGStyleElementImpl.cpp
diff --git a/ksvg/impl/SVGSwitchElementImpl.cc b/ksvg/impl/SVGSwitchElementImpl.cpp
index d69483f7..d69483f7 100644
--- a/ksvg/impl/SVGSwitchElementImpl.cc
+++ b/ksvg/impl/SVGSwitchElementImpl.cpp
diff --git a/ksvg/impl/SVGSymbolElementImpl.cc b/ksvg/impl/SVGSymbolElementImpl.cpp
index bbbef0b8..bbbef0b8 100644
--- a/ksvg/impl/SVGSymbolElementImpl.cc
+++ b/ksvg/impl/SVGSymbolElementImpl.cpp
diff --git a/ksvg/impl/SVGTRefElementImpl.cc b/ksvg/impl/SVGTRefElementImpl.cpp
index 1f352f9b..1f352f9b 100644
--- a/ksvg/impl/SVGTRefElementImpl.cc
+++ b/ksvg/impl/SVGTRefElementImpl.cpp
diff --git a/ksvg/impl/SVGTSpanElementImpl.cc b/ksvg/impl/SVGTSpanElementImpl.cpp
index 2cc35d05..2cc35d05 100644
--- a/ksvg/impl/SVGTSpanElementImpl.cc
+++ b/ksvg/impl/SVGTSpanElementImpl.cpp
diff --git a/ksvg/impl/SVGTestsImpl.cc b/ksvg/impl/SVGTestsImpl.cpp
index 15f8bcc6..15f8bcc6 100644
--- a/ksvg/impl/SVGTestsImpl.cc
+++ b/ksvg/impl/SVGTestsImpl.cpp
diff --git a/ksvg/impl/SVGTextContentElementImpl.cc b/ksvg/impl/SVGTextContentElementImpl.cpp
index a772672b..a772672b 100644
--- a/ksvg/impl/SVGTextContentElementImpl.cc
+++ b/ksvg/impl/SVGTextContentElementImpl.cpp
diff --git a/ksvg/impl/SVGTextElementImpl.cc b/ksvg/impl/SVGTextElementImpl.cpp
index 7617f7de..7617f7de 100644
--- a/ksvg/impl/SVGTextElementImpl.cc
+++ b/ksvg/impl/SVGTextElementImpl.cpp
diff --git a/ksvg/impl/SVGTextPathElementImpl.cc b/ksvg/impl/SVGTextPathElementImpl.cpp
index 4a116715..4a116715 100644
--- a/ksvg/impl/SVGTextPathElementImpl.cc
+++ b/ksvg/impl/SVGTextPathElementImpl.cpp
diff --git a/ksvg/impl/SVGTextPositioningElementImpl.cc b/ksvg/impl/SVGTextPositioningElementImpl.cpp
index e6b02745..e6b02745 100644
--- a/ksvg/impl/SVGTextPositioningElementImpl.cc
+++ b/ksvg/impl/SVGTextPositioningElementImpl.cpp
diff --git a/ksvg/impl/SVGTimeScheduler.cc b/ksvg/impl/SVGTimeScheduler.cpp
index b38eceaa..cf8bc75d 100644
--- a/ksvg/impl/SVGTimeScheduler.cc
+++ b/ksvg/impl/SVGTimeScheduler.cpp
@@ -50,7 +50,7 @@ const TQTimer *SVGTimer::qtimer() const
 
 void SVGTimer::start(TQObject *receiver, const char *member)
 {
-	TQObject::connect(m_timer, TQT_SIGNAL(timeout()), receiver, member);
+	TQObject::connect(m_timer, TQ_SIGNAL(timeout()), receiver, member);
 	m_timer->start(m_ms, m_singleShot);
 }
 
@@ -165,7 +165,7 @@ void SVGTimeScheduler::startAnimations()
 	{
 		SVGTimer *svgTimer = *it;
 		if(svgTimer && !svgTimer->isActive())
-			svgTimer->start(this, TQT_SLOT(slotTimerNotify()));
+			svgTimer->start(this, TQ_SLOT(slotTimerNotify()));
 	}
 }
 
@@ -174,7 +174,7 @@ void SVGTimeScheduler::toggleAnimations()
 	if(m_intervalTimer->isActive())
 		m_intervalTimer->stop();
 	else
-		m_intervalTimer->start(this, TQT_SLOT(slotTimerNotify()));
+		m_intervalTimer->start(this, TQ_SLOT(slotTimerNotify()));
 }
 
 bool SVGTimeScheduler::animationsPaused() const
@@ -223,7 +223,7 @@ void SVGTimeScheduler::slotTimerNotify()
 	// by the previous call, and now all connections to the interval timer
 	// are created and now we just need to fire that timer (Niko)
 	if(svgTimer != m_intervalTimer && !m_intervalTimer->isActive())
-		m_intervalTimer->start(this, TQT_SLOT(slotTimerNotify()));
+		m_intervalTimer->start(this, TQ_SLOT(slotTimerNotify()));
 }
 
 float SVGTimeScheduler::elapsed() const
diff --git a/ksvg/impl/SVGTimeScheduler.h b/ksvg/impl/SVGTimeScheduler.h
index cc897a57..605a5173 100644
--- a/ksvg/impl/SVGTimeScheduler.h
+++ b/ksvg/impl/SVGTimeScheduler.h
@@ -66,7 +66,7 @@ typedef TQValueList<SVGTimer *> SVGTimerList;
 class SVGDocumentImpl;
 class SVGTimeScheduler : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	SVGTimeScheduler(SVGDocumentImpl *doc);
diff --git a/ksvg/impl/SVGTitleElementImpl.cc b/ksvg/impl/SVGTitleElementImpl.cpp
index 838f27fe..838f27fe 100644
--- a/ksvg/impl/SVGTitleElementImpl.cc
+++ b/ksvg/impl/SVGTitleElementImpl.cpp
diff --git a/ksvg/impl/SVGTransformImpl.cc b/ksvg/impl/SVGTransformImpl.cpp
index dba50b09..dba50b09 100644
--- a/ksvg/impl/SVGTransformImpl.cc
+++ b/ksvg/impl/SVGTransformImpl.cpp
diff --git a/ksvg/impl/SVGTransformListImpl.cc b/ksvg/impl/SVGTransformListImpl.cpp
index 18e737b5..18e737b5 100644
--- a/ksvg/impl/SVGTransformListImpl.cc
+++ b/ksvg/impl/SVGTransformListImpl.cpp
diff --git a/ksvg/impl/SVGTransformableImpl.cc b/ksvg/impl/SVGTransformableImpl.cpp
index 6d9e4055..6d9e4055 100644
--- a/ksvg/impl/SVGTransformableImpl.cc
+++ b/ksvg/impl/SVGTransformableImpl.cpp
diff --git a/ksvg/impl/SVGURIReferenceImpl.cc b/ksvg/impl/SVGURIReferenceImpl.cpp
index 0d634e13..0d634e13 100644
--- a/ksvg/impl/SVGURIReferenceImpl.cc
+++ b/ksvg/impl/SVGURIReferenceImpl.cpp
diff --git a/ksvg/impl/SVGUseElementImpl.cc b/ksvg/impl/SVGUseElementImpl.cpp
index b7f36be5..b7f36be5 100644
--- a/ksvg/impl/SVGUseElementImpl.cc
+++ b/ksvg/impl/SVGUseElementImpl.cpp
diff --git a/ksvg/impl/SVGVKernElementImpl.cc b/ksvg/impl/SVGVKernElementImpl.cpp
index 2f07baee..2f07baee 100644
--- a/ksvg/impl/SVGVKernElementImpl.cc
+++ b/ksvg/impl/SVGVKernElementImpl.cpp
diff --git a/ksvg/impl/SVGViewElementImpl.cc b/ksvg/impl/SVGViewElementImpl.cpp
index 19d56dc5..19d56dc5 100644
--- a/ksvg/impl/SVGViewElementImpl.cc
+++ b/ksvg/impl/SVGViewElementImpl.cpp
diff --git a/ksvg/impl/SVGViewSpecImpl.cc b/ksvg/impl/SVGViewSpecImpl.cpp
index ff42db43..ff42db43 100644
--- a/ksvg/impl/SVGViewSpecImpl.cc
+++ b/ksvg/impl/SVGViewSpecImpl.cpp
diff --git a/ksvg/impl/SVGWindowImpl.cc b/ksvg/impl/SVGWindowImpl.cpp
index 5edd4b4e..5edd4b4e 100644
--- a/ksvg/impl/SVGWindowImpl.cc
+++ b/ksvg/impl/SVGWindowImpl.cpp
diff --git a/ksvg/impl/SVGZoomAndPanImpl.cc b/ksvg/impl/SVGZoomAndPanImpl.cpp
index c632a4dc..c632a4dc 100644
--- a/ksvg/impl/SVGZoomAndPanImpl.cc
+++ b/ksvg/impl/SVGZoomAndPanImpl.cpp
diff --git a/ksvg/impl/SVGZoomEventImpl.cc b/ksvg/impl/SVGZoomEventImpl.cpp
index 0164779c..0164779c 100644
--- a/ksvg/impl/SVGZoomEventImpl.cc
+++ b/ksvg/impl/SVGZoomEventImpl.cpp
diff --git a/ksvg/impl/libs/libtext2path/src/CMakeLists.txt b/ksvg/impl/libs/libtext2path/src/CMakeLists.txt
index 098f836d..29ab129e 100644
--- a/ksvg/impl/libs/libtext2path/src/CMakeLists.txt
+++ b/ksvg/impl/libs/libtext2path/src/CMakeLists.txt
@@ -46,4 +46,4 @@ tde_add_library( text2path SHARED
   VERSION 0.0.0
   LINK ${FREETYPE_LIBRARIES} ${FRIBIDI_LIBRARIES} ${FONTCONFIG_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
-)
\ No newline at end of file
+)
diff --git a/ksvg/impl/libs/libtext2path/src/Cache.h b/ksvg/impl/libs/libtext2path/src/Cache.h
index 39536179..531135e0 100644
--- a/ksvg/impl/libs/libtext2path/src/Cache.h
+++ b/ksvg/impl/libs/libtext2path/src/Cache.h
@@ -25,8 +25,7 @@
 #include <string>
 #include <vector>
 #include <iostream>
-
-#include "myboost/shared_ptr.hpp"
+#include <memory>
 
 namespace T2P
 {
@@ -50,7 +49,7 @@ namespace T2P
 	class Cache
 	{
 	public:
-		typedef myboost::shared_ptr<T> SharedT;
+		typedef std::shared_ptr<T> SharedT;
 
 		Cache(int maxSize = 10) : m_size(0), m_maxSize(maxSize) { }
 		~Cache() { clear(); }
diff --git a/ksvg/impl/libs/libtext2path/src/Converter.cpp b/ksvg/impl/libs/libtext2path/src/Converter.cpp
index f8e3d20e..6434798e 100644
--- a/ksvg/impl/libs/libtext2path/src/Converter.cpp
+++ b/ksvg/impl/libs/libtext2path/src/Converter.cpp
@@ -22,7 +22,6 @@
 
 #include <math.h>
 
-#include "myboost/shared_ptr.hpp"
 #include <fontconfig/fontconfig.h>
 #include <fribidi/fribidi.h>
 
diff --git a/ksvg/impl/libs/libtext2path/src/Converter.h b/ksvg/impl/libs/libtext2path/src/Converter.h
index 864812be..7f76533f 100644
--- a/ksvg/impl/libs/libtext2path/src/Converter.h
+++ b/ksvg/impl/libs/libtext2path/src/Converter.h
@@ -44,8 +44,8 @@ namespace T2P
 	class GlyphLayoutParams;
 	class GlyphRenderParams;
 
-	typedef myboost::shared_ptr<Font> SharedFont;
-	typedef myboost::shared_ptr<Glyph> SharedGlyph;
+	typedef std::shared_ptr<Font> SharedFont;
+	typedef std::shared_ptr<Glyph> SharedGlyph;
 
 	class Converter
 	{
diff --git a/ksvg/impl/libs/libtext2path/src/myboost/assert.hpp b/ksvg/impl/libs/libtext2path/src/myboost/assert.hpp
deleted file mode 100644
index 3f3c61c2..00000000
--- a/ksvg/impl/libs/libtext2path/src/myboost/assert.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-//  boost/assert.hpp - BOOST_ASSERT(expr)
-//
-//  Copyright (c) 2001, 2002 Peter Dimov and Multi Media Ltd.
-//
-//  Permission to copy, use, modify, sell and distribute this software
-//  is granted provided this copyright notice appears in all copies.
-//  This software is provided "as is" without express or implied
-//  warranty, and with no claim as to its suitability for any purpose.
-//
-//  Note: There are no include guards. This is intentional.
-//
-//  See http://www.boost.org/libs/utility/assert.html for documentation.
-//
-
-#ifndef ASSERT_HPP
-#define ASSERT_HPP
-
-#undef BOOST_ASSERT
-
-# include <assert.h>
-# define BOOST_ASSERT(expr) assert(expr)
-
-#endif
diff --git a/ksvg/impl/libs/libtext2path/src/myboost/checked_delete.hpp b/ksvg/impl/libs/libtext2path/src/myboost/checked_delete.hpp
deleted file mode 100644
index 73afd5f5..00000000
--- a/ksvg/impl/libs/libtext2path/src/myboost/checked_delete.hpp
+++ /dev/null
@@ -1,61 +0,0 @@
-#ifndef BOOST_CHECKED_DELETE_HPP_INCLUDED
-#define BOOST_CHECKED_DELETE_HPP_INCLUDED
-
-//
-//  boost/checked_delete.hpp
-//
-//  Copyright (c) 1999, 2000, 2001, 2002 boost.org
-//  Copyright (c) 2002, 2003 Peter Dimov
-//
-//  Permission to copy, use, modify, sell and distribute this software
-//  is granted provided this copyright notice appears in all copies.
-//  This software is provided "as is" without express or implied
-//  warranty, and with no claim as to its suitability for any purpose.
-//
-//  See http://www.boost.org/libs/utility/checked_delete.html for documentation.
-//
-
-namespace myboost
-{
-
-// verify that types are complete for increased safety
-
-template<class T> inline void checked_delete(T * x)
-{
-    // Intel 7 accepts sizeof(incomplete) as 0 in system headers
-    typedef char type_must_be_complete[ sizeof(T)? 1: -1 ];
-    delete x;
-}
-
-template<class T> inline void checked_array_delete(T * x)
-{
-    typedef char type_must_be_complete[ sizeof(T)? 1: -1 ];
-    delete [] x;
-}
-
-template<class T> struct checked_deleter
-{
-    typedef void result_type;
-    typedef T * argument_type;
-
-    void operator()(T * x) const
-    {
-        // boost:: disables ADL
-        myboost::checked_delete(x);
-    }
-};
-
-template<class T> struct checked_array_deleter
-{
-    typedef void result_type;
-    typedef T * argument_type;
-
-    void operator()(T * x) const
-    {
-        myboost::checked_array_delete(x);
-    }
-};
-
-} // namespace myboost
-
-#endif  // #ifndef BOOST_CHECKED_DELETE_HPP_INCLUDED
diff --git a/ksvg/impl/libs/libtext2path/src/myboost/lightweight_mutex.hpp b/ksvg/impl/libs/libtext2path/src/myboost/lightweight_mutex.hpp
deleted file mode 100644
index 10db127c..00000000
--- a/ksvg/impl/libs/libtext2path/src/myboost/lightweight_mutex.hpp
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef BOOST_DETAIL_LWM_PTHREADS_HPP_INCLUDED
-#define BOOST_DETAIL_LWM_PTHREADS_HPP_INCLUDED
-
-//
-//  boost/detail/lwm_pthreads.hpp
-//
-//  Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
-//
-//  Permission to copy, use, modify, sell and distribute this software
-//  is granted provided this copyright notice appears in all copies.
-//  This software is provided "as is" without express or implied
-//  warranty, and with no claim as to its suitability for any purpose.
-//
-
-#include <pthread.h>
-
-namespace myboost
-{
-
-namespace detail
-{
-
-class lightweight_mutex
-{
-private:
-
-    pthread_mutex_t m_;
-
-    lightweight_mutex(lightweight_mutex const &);
-    lightweight_mutex & operator=(lightweight_mutex const &);
-
-public:
-
-    lightweight_mutex()
-    {
-        pthread_mutex_init(&m_, 0);
-    }
-
-    ~lightweight_mutex()
-    {
-        pthread_mutex_destroy(&m_);
-    }
-
-    class scoped_lock;
-    friend class scoped_lock;
-
-    class scoped_lock
-    {
-    private:
-
-        pthread_mutex_t & m_;
-
-        scoped_lock(scoped_lock const &);
-        scoped_lock & operator=(scoped_lock const &);
-
-    public:
-
-        scoped_lock(lightweight_mutex & m): m_(m.m_)
-        {
-            pthread_mutex_lock(&m_);
-        }
-
-        ~scoped_lock()
-        {
-            pthread_mutex_unlock(&m_);
-        }
-    };
-};
-
-} // namespace detail
-
-} // namespace myboost
-
-#endif // #ifndef BOOST_DETAIL_LWM_PTHREADS_HPP_INCLUDED
diff --git a/ksvg/impl/libs/libtext2path/src/myboost/shared_count.hpp b/ksvg/impl/libs/libtext2path/src/myboost/shared_count.hpp
deleted file mode 100644
index e8ec19a8..00000000
--- a/ksvg/impl/libs/libtext2path/src/myboost/shared_count.hpp
+++ /dev/null
@@ -1,367 +0,0 @@
-#ifndef BOOST_DETAIL_SHARED_COUNT_HPP_INCLUDED
-#define BOOST_DETAIL_SHARED_COUNT_HPP_INCLUDED
-
-//
-//  detail/shared_count.hpp
-//
-//  Copyright (c) 2001, 2002, 2003 Peter Dimov and Multi Media Ltd.
-//
-//  Permission to copy, use, modify, sell and distribute this software
-//  is granted provided this copyright notice appears in all copies.
-//  This software is provided "as is" without express or implied
-//  warranty, and with no claim as to its suitability for any purpose.
-//
-
-#include "myboost/checked_delete.hpp"
-#include "myboost/throw_exception.hpp"
-#include "myboost/lightweight_mutex.hpp"
-
-#include <memory>           // std::auto_ptr, std::allocator
-#include <functional>       // std::less
-#include <exception>        // std::exception
-#include <new>              // std::bad_alloc
-#include <typeinfo>         // std::type_info in get_deleter
-#include <cstddef>          // std::size_t
-
-namespace myboost
-{
-
-class bad_weak_ptr: public std::exception
-{
-public:
-
-    virtual char const * what() const throw()
-    {
-        return "myboost::bad_weak_ptr";
-    }
-};
-
-namespace detail
-{
-
-class sp_counted_base
-{
-private:
-
-    typedef detail::lightweight_mutex mutex_type;
-
-public:
-
-    sp_counted_base(): use_count_(1), weak_count_(1)
-    {
-    }
-
-    virtual ~sp_counted_base() // nothrow
-    {
-    }
-
-    // dispose() is called when use_count_ drops to zero, to release
-    // the resources managed by *this.
-
-    virtual void dispose() = 0; // nothrow
-
-    // destruct() is called when weak_count_ drops to zero.
-
-    virtual void destruct() // nothrow
-    {
-        delete this;
-    }
-
-    virtual void * get_deleter(std::type_info const & ti) = 0;
-
-    void add_ref_copy()
-    {
-        mutex_type::scoped_lock lock(mtx_);
-        ++use_count_;
-    }
-
-    void add_ref_lock()
-    {
-        mutex_type::scoped_lock lock(mtx_);
-        if(use_count_ == 0) myboost::throw_exception(myboost::bad_weak_ptr());
-        ++use_count_;
-    }
-
-    void release() // nothrow
-    {
-        {
-            mutex_type::scoped_lock lock(mtx_);
-            long new_use_count = --use_count_;
-
-            if(new_use_count != 0) return;
-        }
-
-        dispose();
-        weak_release();
-    }
-
-    void weak_add_ref() // nothrow
-    {
-        mutex_type::scoped_lock lock(mtx_);
-        ++weak_count_;
-    }
-
-    void weak_release() // nothrow
-    {
-        long new_weak_count;
-
-        {
-            mutex_type::scoped_lock lock(mtx_);
-            new_weak_count = --weak_count_;
-        }
-
-        if(new_weak_count == 0)
-        {
-            destruct();
-        }
-    }
-
-    long use_count() const // nothrow
-    {
-        mutex_type::scoped_lock lock(mtx_);
-        return use_count_;
-    }
-
-private:
-
-    sp_counted_base(sp_counted_base const &);
-    sp_counted_base & operator= (sp_counted_base const &);
-
-    long use_count_;        // #shared
-    long weak_count_;       // #weak + (#shared != 0)
-
-    mutable mutex_type mtx_;
-};
-
-template<class P, class D> class sp_counted_base_impl: public sp_counted_base
-{
-private:
-
-    P ptr; // copy constructor must not throw
-    D del; // copy constructor must not throw
-
-    sp_counted_base_impl(sp_counted_base_impl const &);
-    sp_counted_base_impl & operator= (sp_counted_base_impl const &);
-
-    typedef sp_counted_base_impl<P, D> this_type;
-
-public:
-
-    // pre: initial_use_count <= initial_weak_count, d(p) must not throw
-
-    sp_counted_base_impl(P p, D d): ptr(p), del(d)
-    {
-    }
-
-    virtual void dispose() // nothrow
-    {
-        del(ptr);
-    }
-
-    virtual void * get_deleter(std::type_info const & ti)
-    {
-        return ti == typeid(D)? &del: 0;
-    }
-
-    void * operator new(std::size_t)
-    {
-        return std::allocator<this_type>().allocate(1, static_cast<this_type *>(0));
-    }
-
-    void operator delete(void * p)
-    {
-        std::allocator<this_type>().deallocate(static_cast<this_type *>(p), 1);
-    }
-};
-
-class weak_count;
-
-class shared_count
-{
-private:
-
-    sp_counted_base * pi_;
-
-    friend class weak_count;
-
-public:
-
-    shared_count(): pi_(0) // nothrow
-    {
-    }
-
-    template<class P, class D> shared_count(P p, D d): pi_(0)
-    {
-
-        try
-        {
-            pi_ = new sp_counted_base_impl<P, D>(p, d);
-        }
-        catch(...)
-        {
-            d(p); // delete p
-            throw;
-        }
-
-
-        pi_ = new sp_counted_base_impl<P, D>(p, d);
-
-        if(pi_ == 0)
-        {
-            d(p); // delete p
-            myboost::throw_exception(std::bad_alloc());
-        }
-    }
-
-    // auto_ptr<Y> is special cased to provide the strong guarantee
-
-    template<class Y>
-    explicit shared_count(std::auto_ptr<Y> & r): pi_(new sp_counted_base_impl< Y *, checked_deleter<Y> >(r.get(), checked_deleter<Y>()))
-    {
-        r.release();
-    }
-
-    ~shared_count() // nothrow
-    {
-        if(pi_ != 0) pi_->release();
-    }
-
-    shared_count(shared_count const & r): pi_(r.pi_) // nothrow
-    {
-        if(pi_ != 0) pi_->add_ref_copy();
-    }
-
-    explicit shared_count(weak_count const & r); // throws bad_weak_ptr when r.use_count() == 0
-
-    shared_count & operator= (shared_count const & r) // nothrow
-    {
-        sp_counted_base * tmp = r.pi_;
-        if(tmp != 0) tmp->add_ref_copy();
-        if(pi_ != 0) pi_->release();
-        pi_ = tmp;
-
-        return *this;
-    }
-
-    void swap(shared_count & r) // nothrow
-    {
-        sp_counted_base * tmp = r.pi_;
-        r.pi_ = pi_;
-        pi_ = tmp;
-    }
-
-    long use_count() const // nothrow
-    {
-        return pi_ != 0? pi_->use_count(): 0;
-    }
-
-    bool unique() const // nothrow
-    {
-        return use_count() == 1;
-    }
-
-    friend inline bool operator==(shared_count const & a, shared_count const & b)
-    {
-        return a.pi_ == b.pi_;
-    }
-
-    friend inline bool operator<(shared_count const & a, shared_count const & b)
-    {
-        return std::less<sp_counted_base *>()(a.pi_, b.pi_);
-    }
-
-    void * get_deleter(std::type_info const & ti) const
-    {
-        return pi_? pi_->get_deleter(ti): 0;
-    }
-};
-
-class weak_count
-{
-private:
-
-    sp_counted_base * pi_;
-
-    friend class shared_count;
-
-public:
-
-    weak_count(): pi_(0) // nothrow
-    {
-    }
-
-    weak_count(shared_count const & r): pi_(r.pi_) // nothrow
-    {
-        if(pi_ != 0) pi_->weak_add_ref();
-    }
-
-    weak_count(weak_count const & r): pi_(r.pi_) // nothrow
-    {
-        if(pi_ != 0) pi_->weak_add_ref();
-    }
-
-    ~weak_count() // nothrow
-    {
-        if(pi_ != 0) pi_->weak_release();
-    }
-
-    weak_count & operator= (shared_count const & r) // nothrow
-    {
-        sp_counted_base * tmp = r.pi_;
-        if(tmp != 0) tmp->weak_add_ref();
-        if(pi_ != 0) pi_->weak_release();
-        pi_ = tmp;
-
-        return *this;
-    }
-
-    weak_count & operator= (weak_count const & r) // nothrow
-    {
-        sp_counted_base * tmp = r.pi_;
-        if(tmp != 0) tmp->weak_add_ref();
-        if(pi_ != 0) pi_->weak_release();
-        pi_ = tmp;
-
-        return *this;
-    }
-
-    void swap(weak_count & r) // nothrow
-    {
-        sp_counted_base * tmp = r.pi_;
-        r.pi_ = pi_;
-        pi_ = tmp;
-    }
-
-    long use_count() const // nothrow
-    {
-        return pi_ != 0? pi_->use_count(): 0;
-    }
-
-    friend inline bool operator==(weak_count const & a, weak_count const & b)
-    {
-        return a.pi_ == b.pi_;
-    }
-
-    friend inline bool operator<(weak_count const & a, weak_count const & b)
-    {
-        return std::less<sp_counted_base *>()(a.pi_, b.pi_);
-    }
-};
-
-inline shared_count::shared_count(weak_count const & r): pi_(r.pi_)
-{
-    if(pi_ != 0)
-    {
-        pi_->add_ref_lock();
-    }
-    else
-    {
-        myboost::throw_exception(myboost::bad_weak_ptr());
-    }
-}
-
-} // namespace detail
-
-} // namespace myboost
-
-#endif  // #ifndef BOOST_DETAIL_SHARED_COUNT_HPP_INCLUDED
diff --git a/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp b/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp
deleted file mode 100644
index 3f2fe30d..00000000
--- a/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp
+++ /dev/null
@@ -1,395 +0,0 @@
-#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
-#define BOOST_SHARED_PTR_HPP_INCLUDED
-
-//  shared_ptr.hpp
-//
-//  (C) Copyright Greg Colvin and Beman Dawes 1998, 1999.
-//  Copyright (c) 2001, 2002, 2003 Peter Dimov
-//
-//  Permission to copy, use, modify, sell and distribute this software
-//  is granted provided this copyright notice appears in all copies.
-//  This software is provided "as is" without express or implied
-//  warranty, and with no claim as to its suitability for any purpose.
-//
-//  See http://www.boost.org/libs/smart_ptr/shared_ptr.htm for documentation.
-//
-
-#include "myboost/assert.hpp"
-#include "myboost/checked_delete.hpp"
-#include "myboost/throw_exception.hpp"
-#include "myboost/shared_count.hpp"
-
-#include <memory>               // for std::auto_ptr
-#include <algorithm>            // for std::swap
-#include <functional>           // for std::less
-#include <typeinfo>             // for std::bad_cast
-#include <iosfwd>               // for std::basic_ostream
-
-namespace myboost
-{
-
-template<class T> class weak_ptr;
-template<class T> class enable_shared_from_this;
-
-namespace detail
-{
-
-struct static_cast_tag {};
-struct const_cast_tag {};
-struct dynamic_cast_tag {};
-struct polymorphic_cast_tag {};
-
-template<class T> struct shared_ptr_traits
-{
-    typedef T & reference;
-};
-
-template<> struct shared_ptr_traits<void>
-{
-    typedef void reference;
-};
-
-template<> struct shared_ptr_traits<void const>
-{
-    typedef void reference;
-};
-
-template<> struct shared_ptr_traits<void volatile>
-{
-    typedef void reference;
-};
-
-template<> struct shared_ptr_traits<void const volatile>
-{
-    typedef void reference;
-};
-
-// enable_shared_from_this support
-
-template<class T, class Y> void sp_enable_shared_from_this(myboost::enable_shared_from_this<T> * pe, Y * px, shared_count const & pn)
-{
-    if(pe != 0) pe->_internal_weak_this._internal_assign(px, pn);
-}
-
-inline void sp_enable_shared_from_this(void const *, void const *, shared_count const &)
-{
-}
-
-} // namespace detail
-
-
-//
-//  shared_ptr
-//
-//  An enhanced relative of scoped_ptr with reference counted copy semantics.
-//  The object pointed to is deleted when the last shared_ptr pointing to it
-//  is destroyed or reset.
-//
-
-template<class T> class shared_ptr
-{
-private:
-
-    // Borland 5.5.1 specific workaround
-    typedef shared_ptr<T> this_type;
-
-public:
-
-    typedef T element_type;
-    typedef T value_type;
-    typedef T * pointer;
-    typedef typename detail::shared_ptr_traits<T>::reference reference;
-
-    shared_ptr(): px(0), pn() // never throws in 1.30+
-    {
-    }
-
-    template<class Y>
-    explicit shared_ptr(Y * p): px(p), pn(p, checked_deleter<Y>()) // Y must be complete
-    {
-        detail::sp_enable_shared_from_this(p, p, pn);
-    }
-
-    //
-    // Requirements: D's copy constructor must not throw
-    //
-    // shared_ptr will release p by calling d(p)
-    //
-
-    template<class Y, class D> shared_ptr(Y * p, D d): px(p), pn(p, d)
-    {
-        detail::sp_enable_shared_from_this(p, p, pn);
-    }
-
-//  generated copy constructor, assignment, destructor are fine...
-//  except that Borland C++ has a bug, and g++ with -Wsynth warns
-    shared_ptr & operator=(shared_ptr const & r) // never throws
-    {
-        px = r.px;
-        pn = r.pn; // shared_count::op= doesn't throw
-        return *this;
-    }
-
-    template<class Y>
-    explicit shared_ptr(weak_ptr<Y> const & r): pn(r.pn) // may throw
-    {
-        // it is now safe to copy r.px, as pn(r.pn) did not throw
-        px = r.px;
-    }
-
-    template<class Y>
-    shared_ptr(shared_ptr<Y> const & r): px(r.px), pn(r.pn) // never throws
-    {
-    }
-
-    template<class Y>
-    shared_ptr(shared_ptr<Y> const & r, detail::static_cast_tag): px(static_cast<element_type *>(r.px)), pn(r.pn)
-    {
-    }
-
-    template<class Y>
-    shared_ptr(shared_ptr<Y> const & r, detail::const_cast_tag): px(const_cast<element_type *>(r.px)), pn(r.pn)
-    {
-    }
-
-    template<class Y>
-    shared_ptr(shared_ptr<Y> const & r, detail::dynamic_cast_tag): px(dynamic_cast<element_type *>(r.px)), pn(r.pn)
-    {
-        if(px == 0) // need to allocate new counter -- the cast failed
-        {
-            pn = detail::shared_count();
-        }
-    }
-
-    template<class Y>
-    shared_ptr(shared_ptr<Y> const & r, detail::polymorphic_cast_tag): px(dynamic_cast<element_type *>(r.px)), pn(r.pn)
-    {
-        if(px == 0)
-        {
-            myboost::throw_exception(std::bad_cast());
-        }
-    }
-
-    template<class Y>
-    explicit shared_ptr(std::auto_ptr<Y> & r): px(r.get()), pn()
-    {
-        Y * tmp = r.get();
-        pn = detail::shared_count(r);
-        detail::sp_enable_shared_from_this(tmp, tmp, pn);
-    }
-
-    template<class Y>
-    shared_ptr & operator=(shared_ptr<Y> const & r) // never throws
-    {
-        px = r.px;
-        pn = r.pn; // shared_count::op= doesn't throw
-        return *this;
-    }
-
-    template<class Y>
-    shared_ptr & operator=(std::auto_ptr<Y> & r)
-    {
-        this_type(r).swap(*this);
-        return *this;
-    }
-
-    void reset() // never throws in 1.30+
-    {
-        this_type().swap(*this);
-    }
-
-    template<class Y> void reset(Y * p) // Y must be complete
-    {
-        BOOST_ASSERT(p == 0 || p != px); // catch self-reset errors
-        this_type(p).swap(*this);
-    }
-
-    template<class Y, class D> void reset(Y * p, D d)
-    {
-        this_type(p, d).swap(*this);
-    }
-
-    reference operator* () const // never throws
-    {
-        BOOST_ASSERT(px != 0);
-        return *px;
-    }
-
-    T * operator-> () const // never throws
-    {
-        BOOST_ASSERT(px != 0);
-        return px;
-    }
-    
-    T * get() const // never throws
-    {
-        return px;
-    }
-
-    typedef T * (this_type::*unspecified_bool_type)() const;
-
-    operator unspecified_bool_type() const // never throws
-    {
-        return px == 0? 0: &this_type::get;
-    }
-
-    // operator! is redundant, but some compilers need it
-
-    bool operator! () const // never throws
-    {
-        return px == 0;
-    }
-
-    bool unique() const // never throws
-    {
-        return pn.unique();
-    }
-
-    long use_count() const // never throws
-    {
-        return pn.use_count();
-    }
-
-    void swap(shared_ptr<T> & other) // never throws
-    {
-        std::swap(px, other.px);
-        pn.swap(other.pn);
-    }
-
-    template<class Y> bool _internal_less(shared_ptr<Y> const & rhs) const
-    {
-        return pn < rhs.pn;
-    }
-
-    void * _internal_get_deleter(std::type_info const & ti) const
-    {
-        return pn.get_deleter(ti);
-    }
-
-// Tasteless as this may seem, making all members public allows member templates
-// to work in the absence of member template friends. (Matthew Langston)
-
-#   if __GNUC__ >= 2 && __GNUC_MINOR__ >= 97
-private:
-
-    template<class Y> friend class shared_ptr;
-    template<class Y> friend class weak_ptr;
-#endif
-
-    T * px;                     // contained pointer
-    detail::shared_count pn;    // reference counter
-
-};  // shared_ptr
-
-template<class T, class U> inline bool operator==(shared_ptr<T> const & a, shared_ptr<U> const & b)
-{
-    return a.get() == b.get();
-}
-
-template<class T, class U> inline bool operator!=(shared_ptr<T> const & a, shared_ptr<U> const & b)
-{
-    return a.get() != b.get();
-}
-
-#if __GNUC__ == 2 && __GNUC_MINOR__ <= 96
-
-// Resolve the ambiguity between our op!= and the one in rel_ops
-
-template<class T> inline bool operator!=(shared_ptr<T> const & a, shared_ptr<T> const & b)
-{
-    return a.get() != b.get();
-}
-
-#endif
-
-template<class T, class U> inline bool operator<(shared_ptr<T> const & a, shared_ptr<U> const & b)
-{
-    return a._internal_less(b);
-}
-
-template<class T> inline void swap(shared_ptr<T> & a, shared_ptr<T> & b)
-{
-    a.swap(b);
-}
-
-template<class T, class U> shared_ptr<T> static_pointer_cast(shared_ptr<U> const & r)
-{
-    return shared_ptr<T>(r, detail::static_cast_tag());
-}
-
-template<class T, class U> shared_ptr<T> const_pointer_cast(shared_ptr<U> const & r)
-{
-    return shared_ptr<T>(r, detail::const_cast_tag());
-}
-
-template<class T, class U> shared_ptr<T> dynamic_pointer_cast(shared_ptr<U> const & r)
-{
-    return shared_ptr<T>(r, detail::dynamic_cast_tag());
-}
-
-// shared_*_cast names are deprecated. Use *_pointer_cast instead.
-
-template<class T, class U> shared_ptr<T> shared_static_cast(shared_ptr<U> const & r)
-{
-    return shared_ptr<T>(r, detail::static_cast_tag());
-}
-
-template<class T, class U> shared_ptr<T> shared_dynamic_cast(shared_ptr<U> const & r)
-{
-    return shared_ptr<T>(r, detail::dynamic_cast_tag());
-}
-
-template<class T, class U> shared_ptr<T> shared_polymorphic_cast(shared_ptr<U> const & r)
-{
-    return shared_ptr<T>(r, detail::polymorphic_cast_tag());
-}
-
-template<class T, class U> shared_ptr<T> shared_polymorphic_downcast(shared_ptr<U> const & r)
-{
-    BOOST_ASSERT(dynamic_cast<T *>(r.get()) == r.get());
-    return shared_static_cast<T>(r);
-}
-
-// get_pointer() enables boost::mem_fn to recognize shared_ptr
-
-template<class T> inline T * get_pointer(shared_ptr<T> const & p)
-{
-    return p.get();
-}
-
-// operator<<
-
-
-template<class Y> std::ostream & operator<< (std::ostream & os, shared_ptr<Y> const & p)
-{
-    os << p.get();
-    return os;
-}
-
-
-// get_deleter (experimental)
-
-#if (defined(__GNUC__) &&  (__GNUC__ < 3)) || (defined(__EDG_VERSION__) && (__EDG_VERSION__ <= 238))
-
-// g++ 2.9x doesn't allow static_cast<X const *>(void *)
-// apparently EDG 2.38 also doesn't accept it
-
-template<class D, class T> D * get_deleter(shared_ptr<T> const & p)
-{
-    void const * q = p._internal_get_deleter(typeid(D));
-    return const_cast<D *>(static_cast<D const *>(q));
-}
-
-#else
-
-template<class D, class T> D * get_deleter(shared_ptr<T> const & p)
-{
-    return static_cast<D *>(p._internal_get_deleter(typeid(D)));
-}
-
-#endif
-
-} // namespace boost
-
-
-#endif  // #ifndef BOOST_SHARED_PTR_HPP_INCLUDED
diff --git a/ksvg/impl/libs/libtext2path/src/myboost/throw_exception.hpp b/ksvg/impl/libs/libtext2path/src/myboost/throw_exception.hpp
deleted file mode 100644
index dd32ec43..00000000
--- a/ksvg/impl/libs/libtext2path/src/myboost/throw_exception.hpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef BOOST_THROW_EXCEPTION_HPP_INCLUDED
-#define BOOST_THROW_EXCEPTION_HPP_INCLUDED
-
-
-//
-//  boost/throw_exception.hpp
-//
-//  Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
-//
-//  Permission to copy, use, modify, sell and distribute this software
-//  is granted provided this copyright notice appears in all copies.
-//  This software is provided "as is" without express or implied
-//  warranty, and with no claim as to its suitability for any purpose.
-//
-//  http://www.boost.org/libs/utility/throw_exception.html
-//
-
-# include <exception>
-
-namespace myboost
-{
-
-template<class E> void throw_exception(E const & e)
-{
-    throw e;
-}
-
-} // namespace myboost
-
-#endif // #ifndef BOOST_THROW_EXCEPTION_HPP_INCLUDED
diff --git a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.c b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.c
index 8383246b..99ff4fdf 100644
--- a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.c
+++ b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.c
@@ -22,6 +22,7 @@
 #include <X11/Xlib.h>
 /*#include <gdk-pixbuf/gdk-pixbuf-private.h>*/
 #include "gdk-pixbuf-xlib-private.h"
+#include "gdk-pixbuf-xlibrgb.h"
 
 Display *gdk_pixbuf_dpy = NULL;
 int gdk_pixbuf_screen = -1;
diff --git a/ksvg/impl/svgpathparser.cc b/ksvg/impl/svgpathparser.cpp
index 87a03aca..87a03aca 100644
--- a/ksvg/impl/svgpathparser.cc
+++ b/ksvg/impl/svgpathparser.cpp