summaryrefslogtreecommitdiff
path: root/graphics/kdegraphics4
diff options
context:
space:
mode:
authorMichael Nottebrock <lofi@FreeBSD.org>2004-08-03 11:09:56 +0000
committerMichael Nottebrock <lofi@FreeBSD.org>2004-08-03 11:09:56 +0000
commit80bf36c87a22c016a1a4f00ecdcdd7656252ba9d (patch)
tree20b7752ed8b6f4caecdfd0cb46cf87c5ab0b1569 /graphics/kdegraphics4
parent Update to latest snapshot. (diff)
GCC 3.4 fixes.
Obtained from: KDE CVS
Notes
Notes: svn path=/head/; revision=115338
Diffstat (limited to 'graphics/kdegraphics4')
-rw-r--r--graphics/kdegraphics4/files/patch-ksvg_ecma_ksvg_bridge.h27
-rw-r--r--graphics/kdegraphics4/files/patch-ksvg_ecma_ksvg_lookup.h17
-rw-r--r--graphics/kdegraphics4/files/patch-ksvg_ecma_ksvg_scriptinterpreter.h16
-rw-r--r--graphics/kdegraphics4/files/patch-ksvg_impl_SVGHelperImpl.h25
-rw-r--r--graphics/kdegraphics4/files/patch-ksvg_impl_SVGList.h16
5 files changed, 101 insertions, 0 deletions
diff --git a/graphics/kdegraphics4/files/patch-ksvg_ecma_ksvg_bridge.h b/graphics/kdegraphics4/files/patch-ksvg_ecma_ksvg_bridge.h
new file mode 100644
index 000000000000..90221dc92173
--- /dev/null
+++ b/graphics/kdegraphics4/files/patch-ksvg_ecma_ksvg_bridge.h
@@ -0,0 +1,27 @@
+===================================================================
+RCS file: /usr/repos/kde/kdegraphics/ksvg/ecma/ksvg_bridge.h,v
+retrieving revision 1.69
+retrieving revision 1.69.2.2
+diff -u -p -r1.69 -r1.69.2.2
+--- ksvg/ecma/ksvg_bridge.h 2003/10/13 20:24:12 1.69
++++ ksvg/ecma/ksvg_bridge.h 2004/06/12 18:10:53 1.69.2.2
+@@ -23,7 +23,9 @@
+
+ #include <kdebug.h>
+
+-#include "ksvg_lookup.h"
++#include <kjs/object.h>
++#include <kjs/lookup.h>
++#include <kjs/interpreter.h> // for ExecState
+
+ namespace KJS
+ {
+@@ -90,7 +92,7 @@ public:
+ // kdDebug(26004) << "KSVGBridge::put(), " << propertyName.qstring() << " Name: " << classInfo()->className << " Object: " << m_impl << endl;
+
+ // Try to see if we know this property (and need to take special action)
+- if(m_impl->put(exec, propertyName, value, attr))
++ if(this->m_impl->put(exec, propertyName, value, attr))
+ return;
+
+ // We don't -> set property in ObjectImp.
diff --git a/graphics/kdegraphics4/files/patch-ksvg_ecma_ksvg_lookup.h b/graphics/kdegraphics4/files/patch-ksvg_ecma_ksvg_lookup.h
new file mode 100644
index 000000000000..159031e38f6e
--- /dev/null
+++ b/graphics/kdegraphics4/files/patch-ksvg_ecma_ksvg_lookup.h
@@ -0,0 +1,17 @@
+===================================================================
+RCS file: /usr/repos/kde/kdegraphics/ksvg/ecma/ksvg_lookup.h,v
+retrieving revision 1.41
+retrieving revision 1.41.2.2
+diff -u -p -r1.41 -r1.41.2.2
+--- ksvg/ecma/ksvg_lookup.h 2003/08/17 11:49:23 1.41
++++ ksvg/ecma/ksvg_lookup.h 2004/06/07 07:45:09 1.41.2.2
+@@ -24,8 +24,7 @@
+ #include <kjs/object.h>
+ #include <kjs/lookup.h>
+ #include <kjs/interpreter.h> // for ExecState
+-
+-class KSVGScriptInterpreter;
++#include "ksvg_scriptinterpreter.h"
+
+ #define KSVG_GET_COMMON \
+ public: \
diff --git a/graphics/kdegraphics4/files/patch-ksvg_ecma_ksvg_scriptinterpreter.h b/graphics/kdegraphics4/files/patch-ksvg_ecma_ksvg_scriptinterpreter.h
new file mode 100644
index 000000000000..cfd83ad98bee
--- /dev/null
+++ b/graphics/kdegraphics4/files/patch-ksvg_ecma_ksvg_scriptinterpreter.h
@@ -0,0 +1,16 @@
+===================================================================
+RCS file: /usr/repos/kde/kdegraphics/ksvg/ecma/ksvg_scriptinterpreter.h,v
+retrieving revision 1.12
+retrieving revision 1.12.2.1
+diff -u -p -r1.12 -r1.12.2.1
+--- ksvg/ecma/ksvg_scriptinterpreter.h 2003/05/10 09:32:50 1.12
++++ ksvg/ecma/ksvg_scriptinterpreter.h 2004/06/04 16:53:16 1.12.2.1
+@@ -100,7 +100,7 @@ inline KJS::Object cacheGlobalBridge(KJS
+ {
+ ClassCtor* ctor = new ClassCtor(exec); // create the ClassCtor instance
+ KJS::Object newObject(new KSVGBridge<ClassCtor>(exec, ctor)); // create the bridge around it
+- exec->interpreter()->globalObject().put(exec, propertyName, newObject, Internal);
++ exec->interpreter()->globalObject().put(exec, propertyName, newObject, KJS::Internal);
+ return newObject;
+ }
+ }
diff --git a/graphics/kdegraphics4/files/patch-ksvg_impl_SVGHelperImpl.h b/graphics/kdegraphics4/files/patch-ksvg_impl_SVGHelperImpl.h
new file mode 100644
index 000000000000..bb15e57b90ca
--- /dev/null
+++ b/graphics/kdegraphics4/files/patch-ksvg_impl_SVGHelperImpl.h
@@ -0,0 +1,25 @@
+===================================================================
+RCS file: /usr/repos/kde/kdegraphics/ksvg/impl/SVGHelperImpl.h,v
+retrieving revision 1.22
+retrieving revision 1.22.2.1
+diff -u -p -r1.22 -r1.22.2.1
+--- ksvg/impl/SVGHelperImpl.h 2003/08/27 20:08:25 1.22
++++ ksvg/impl/SVGHelperImpl.h 2004/06/12 10:32:59 1.22.2.1
+@@ -26,7 +26,7 @@
+ #include "SVGLengthImpl.h"
+
+ #include "ksvg_lookup.h"
+-
++#include "SVGElementImpl.h"
+ class QRect;
+ class QString;
+
+@@ -56,7 +56,7 @@ public:
+ {
+ T *cast = dynamic_cast<T *>(element->ownerDoc()->getElementFromHandle(node.handle()));
+ if(cast)
+- cast->putValueProperty(element->ownerDoc()->ecmaEngine()->globalExec(), token, KJS::String(value), Internal);
++ cast->putValueProperty(element->ownerDoc()->ecmaEngine()->globalExec(), token, KJS::String(value), KJS::Internal);
+ }
+ }
+
diff --git a/graphics/kdegraphics4/files/patch-ksvg_impl_SVGList.h b/graphics/kdegraphics4/files/patch-ksvg_impl_SVGList.h
new file mode 100644
index 000000000000..684f8ce2e792
--- /dev/null
+++ b/graphics/kdegraphics4/files/patch-ksvg_impl_SVGList.h
@@ -0,0 +1,16 @@
+===================================================================
+RCS file: /usr/repos/kde/kdegraphics/ksvg/impl/SVGList.h,v
+retrieving revision 1.22
+retrieving revision 1.22.2.1
+diff -u -p -r1.22 -r1.22.2.1
+--- ksvg/impl/SVGList.h 2003/12/09 13:42:26 1.22
++++ ksvg/impl/SVGList.h 2004/06/04 16:46:27 1.22.2.1
+@@ -48,7 +48,7 @@ class SVGList : public DOM::DomShared
+ {
+ public:
+ SVGList() { m_impl.setAutoDelete(false); }
+- SVGList(const SVGList &) { *this = other; }
++ SVGList(const SVGList &other) { *this = other; }
+ ~SVGList() { clear(); }
+
+ SVGList<T> &operator=(const SVGList<T> &other)