diff options
Diffstat (limited to 'ksvg/ecma')
-rw-r--r-- | ksvg/ecma/ksvg_ecma.cpp | 10 | ||||
-rw-r--r-- | ksvg/ecma/ksvg_helper.cpp | 4 | ||||
-rw-r--r-- | ksvg/ecma/ksvg_window.cpp | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/ksvg/ecma/ksvg_ecma.cpp b/ksvg/ecma/ksvg_ecma.cpp index 7fb9c6c1..aa2af84b 100644 --- a/ksvg/ecma/ksvg_ecma.cpp +++ b/ksvg/ecma/ksvg_ecma.cpp @@ -38,16 +38,16 @@ using namespace KSVG; using namespace KJS; -class AsynctqStatus : public ObjectImp +class AsyncStatus : public ObjectImp { public: - AsynctqStatus() : ObjectImp() { } + AsyncStatus() : ObjectImp() { } virtual bool implementsCall() const { return true; } virtual Value call(ExecState *exec, Object &thisObj, const List &args); }; -Value AsynctqStatus::call(ExecState *exec, Object &, const List &args) +Value AsyncStatus::call(ExecState *exec, Object &, const List &args) { kdDebug(26004) << "[AsyncStatus] " << args[0].toString(exec).ascii() << endl; @@ -194,7 +194,7 @@ void KSVGEcma::finishedWithEvent(SVGEventImpl *event) Value KSVGEcma::getUrl(ExecState *exec, ::KURL url) { - Object *status = new Object(new AsynctqStatus()); + Object *status = new Object(new AsyncStatus()); // FIXME: Security issue, allows local testing of getURL(), REMOVE BEFORE RELEASE! (Niko) TQString svgDocument = KSVGLoader::getUrl(url, true); @@ -214,7 +214,7 @@ Value KSVGEcma::getUrl(ExecState *exec, ::KURL url) void KSVGEcma::postUrl(ExecState *exec, ::KURL url, const TQString &data, const TQString &mimeType, const TQString &contentEncoding, Object &callBackFunction) { - Object *status = new Object(new AsynctqStatus()); + Object *status = new Object(new AsyncStatus()); status->put(exec, Identifier("content"), String("")); status->put(exec, Identifier("success"), Boolean(false)); diff --git a/ksvg/ecma/ksvg_helper.cpp b/ksvg/ecma/ksvg_helper.cpp index 1d41733e..24f05101 100644 --- a/ksvg/ecma/ksvg_helper.cpp +++ b/ksvg/ecma/ksvg_helper.cpp @@ -33,7 +33,7 @@ KJS::UString::UString(const DOM::DOMString &d) unsigned int len = d.length(); KJS::UChar *dat = new UChar[len]; - memcpy(dat, d.tqunicode(), len * sizeof(UChar)); + memcpy(dat, d.unicode(), len * sizeof(UChar)); rep = KJS::UString::Rep::create(dat, len); } @@ -41,7 +41,7 @@ KJS::UString::UString(const TQString &d) { unsigned int len = d.length(); KJS::UChar *dat = new UChar[len]; - memcpy(dat, d.tqunicode(), len * sizeof(UChar)); + memcpy(dat, d.unicode(), len * sizeof(UChar)); rep = KJS::UString::Rep::create(dat, len); } diff --git a/ksvg/ecma/ksvg_window.cpp b/ksvg/ecma/ksvg_window.cpp index 90194781..5574cd5a 100644 --- a/ksvg/ecma/ksvg_window.cpp +++ b/ksvg/ecma/ksvg_window.cpp @@ -42,7 +42,7 @@ #include <kparts/part.h> #include <assert.h> #include <kdebug.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include <kmessagebox.h> #include <klocale.h> #include <kinputdialog.h> @@ -330,11 +330,11 @@ Value WindowFunc::call(ExecState *exec, Object &thisObj, const List &args) case KSVG::Window::_GetURL: { KURL url((const_cast<Window *>(window))->doc()->baseUrl(), args[0].toString(exec).qstring()); - Value asynctqStatus = (const_cast<Window *>(window))->doc()->ecmaEngine()->getUrl(exec, url); + Value asyncStatus = (const_cast<Window *>(window))->doc()->ecmaEngine()->getUrl(exec, url); Object callBackFunction = Object::dynamicCast(args[1]); List callBackArgs; - callBackArgs.append(asynctqStatus); + callBackArgs.append(asyncStatus); callBackFunction.call(exec, callBackFunction, callBackArgs); return Undefined(); |