From 11a83c466cf96c7b6ac8de1673ae4a8402b38324 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sun, 19 Jun 2011 20:14:09 +0000
Subject: Fix kdegraphics FTBFS

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237560 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 ksvg/ecma/ksvg_window.cpp | 24 ++++++++++++------------
 ksvg/ecma/ksvg_window.h   | 12 ++++++------
 2 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'ksvg')

diff --git a/ksvg/ecma/ksvg_window.cpp b/ksvg/ecma/ksvg_window.cpp
index 7137bfbd..3a6c7469 100644
--- a/ksvg/ecma/ksvg_window.cpp
+++ b/ksvg/ecma/ksvg_window.cpp
@@ -108,7 +108,7 @@ const ClassInfo KSVG::Window::s_classInfo = { "Window", 0, &s_hashTable, 0 };
 
 KSVG::Window::Window(KSVG::SVGDocumentImpl *p) : ObjectImp(), m_doc(p)
 {
-	winq = new WindowTQObject(this);
+	winq = new WindowQObject(this);
 }
 
 KSVG::Window::~Window()
@@ -278,7 +278,7 @@ void KSVG::Window::clear(ExecState *exec)
 {
 	kdDebug(26004) << "KSVG::Window::clear " << this << endl;
 	delete winq;
-	winq = new WindowTQObject(this);;
+	winq = new WindowQObject(this);;
 	
 	// Get rid of everything, those user vars could hold references to DOM nodes
 	deleteAllProperties(exec);
@@ -488,18 +488,18 @@ void ScheduledAction::execute(Window *window)
 	}
 }
 
-////////////////////// WindowTQObject ////////////////////////
+////////////////////// WindowQObject ////////////////////////
 
-WindowTQObject::WindowTQObject(Window *w) : tqparent(w)
+WindowQObject::WindowQObject(Window *w) : tqparent(w)
 {
 }
 
-WindowTQObject::~WindowTQObject()
+WindowQObject::~WindowQObject()
 {
 	tqparentDestroyed(); // reuse same code
 }
 
-void WindowTQObject::tqparentDestroyed()
+void WindowQObject::tqparentDestroyed()
 {
 	killTimers();
 	
@@ -513,7 +513,7 @@ void WindowTQObject::tqparentDestroyed()
 	scheduledActions.clear();
 }
 
-int WindowTQObject::installTimeout(const UString &handler, int t, bool singleShot)
+int WindowQObject::installTimeout(const UString &handler, int t, bool singleShot)
 {
 	int id = startTimer(t);
 	ScheduledAction *action = new ScheduledAction(handler.qstring(), singleShot);
@@ -521,7 +521,7 @@ int WindowTQObject::installTimeout(const UString &handler, int t, bool singleSho
 	return id;
 }
 
-int WindowTQObject::installTimeout(const Value &func, List args, int t, bool singleShot)
+int WindowQObject::installTimeout(const Value &func, List args, int t, bool singleShot)
 {
 	Object objFunc = Object::dynamicCast(func);
 	int id = startTimer(t);
@@ -529,7 +529,7 @@ int WindowTQObject::installTimeout(const Value &func, List args, int t, bool sin
 	return id;
 }
 
-void WindowTQObject::clearTimeout(int timerId, bool delAction)
+void WindowQObject::clearTimeout(int timerId, bool delAction)
 {
 	killTimer(timerId);
 	
@@ -545,7 +545,7 @@ void WindowTQObject::clearTimeout(int timerId, bool delAction)
 	}
 }
 
-void WindowTQObject::timerEvent(TQTimerEvent *e)
+void WindowQObject::timerEvent(TQTimerEvent *e)
 {
 	TQMapIterator<int, ScheduledAction *> it = scheduledActions.tqfind(e->timerId());
 	if(it != scheduledActions.end())
@@ -570,9 +570,9 @@ void WindowTQObject::timerEvent(TQTimerEvent *e)
 			delete action;
 	}
 	else
-		kdWarning(6070) << "WindowTQObject::timerEvent this=" << this << " timer " << e->timerId() << " not found (" << scheduledActions.count() << " actions in map)" << endl;
+		kdWarning(6070) << "WindowQObject::timerEvent this=" << this << " timer " << e->timerId() << " not found (" << scheduledActions.count() << " actions in map)" << endl;
 }
 
-void WindowTQObject::timeoutClose()
+void WindowQObject::timeoutClose()
 {
 }
diff --git a/ksvg/ecma/ksvg_window.h b/ksvg/ecma/ksvg_window.h
index 6f1e511a..035dbb59 100644
--- a/ksvg/ecma/ksvg_window.h
+++ b/ksvg/ecma/ksvg_window.h
@@ -25,14 +25,14 @@
 namespace KSVG {
 
 class SVGDocumentImpl;
-class WindowTQObject;
+class WindowQObject;
 
 // This is currently a fork of khtml's Window object, simplified.
 // However in the long run it could become a base class for it.
 // Author: David Faure <faure@kde.org>
 class Window : public KJS::ObjectImp {
     friend class WindowFunc;
-    friend class WindowTQObject;
+    friend class WindowQObject;
     friend class ScheduledAction;
 public:
     Window(KSVG::SVGDocumentImpl *p);
@@ -81,7 +81,7 @@ public:
     static const struct KJS::HashTable s_hashTable;
 
 private:
-	WindowTQObject *winq;
+	WindowQObject *winq;
     TQGuardedPtr<KSVG::SVGDocumentImpl> m_doc;
 };
 
@@ -98,12 +98,12 @@ public:
 	bool singleShot;
 };
 
-class WindowTQObject : public TQObject {
+class WindowQObject : public TQObject {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	WindowTQObject(Window *w);
-	~WindowTQObject();
+	WindowQObject(Window *w);
+	~WindowQObject();
 	int installTimeout(const KJS::UString &handler, int t, bool singleShot);
 	int installTimeout(const KJS::Value &func, KJS::List args, int t, bool singleShot);
 	void clearTimeout(int timerId, bool delAction = true);
-- 
cgit v1.2.1