summaryrefslogtreecommitdiffstats
path: root/ksvg/ecma
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commite7366c97c998679efa80cf61c88e64a11a3d3c33 (patch)
treea161d2940165f6cc47c05f0271ad8e5f64ffe6e8 /ksvg/ecma
parentda4be7880ff1de6415ab6256afd2514e64f5fa2e (diff)
downloadtdegraphics-e7366c97c998679efa80cf61c88e64a11a3d3c33.tar.gz
tdegraphics-e7366c97c998679efa80cf61c88e64a11a3d3c33.zip
rename the following methods:
tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'ksvg/ecma')
-rw-r--r--ksvg/ecma/ksvg_lookup.h12
-rw-r--r--ksvg/ecma/ksvg_window.cpp6
-rw-r--r--ksvg/ecma/ksvg_window.h2
3 files changed, 10 insertions, 10 deletions
diff --git a/ksvg/ecma/ksvg_lookup.h b/ksvg/ecma/ksvg_lookup.h
index ef22000a..11c41462 100644
--- a/ksvg/ecma/ksvg_lookup.h
+++ b/ksvg/ecma/ksvg_lookup.h
@@ -37,7 +37,7 @@ public: \
/* get() method, called by KSVGBridge::get */ \
KJS::Value get(KJS::ExecState *exec, const KJS::Identifier &propertyName, const KJS::ObjectImp* bridge) const; \
\
- /* Called by lookupGet(). Auto-generated. Forwards to the tqparent which has the given property. */ \
+ /* Called by lookupGet(). Auto-generated. Forwards to the parent which has the given property. */ \
KJS::Value getInParents(KJS::ExecState *exec, const KJS::Identifier &propertyName, const KJS::ObjectImp* bridge) const; \
\
KJS::Object prototype(KJS::ExecState *exec) const;\
@@ -59,7 +59,7 @@ public: \
KSVG_GET_COMMON \
virtual KJS::Value cache(KJS::ExecState *exec) const;
-// For classes without properties, but with a tqparent class to forward to
+// For classes without properties, but with a parent class to forward to
#define KSVG_FORWARDGET \
public: \
\
@@ -127,7 +127,7 @@ namespace KSVG
*
* This method does it all (looking in the hashtable, checking for function
* overrides, creating the function or retrieving from cache, calling
- * getValueProperty in case of a non-function property, forwarding to tqparent[s] if
+ * getValueProperty in case of a non-function property, forwarding to parent[s] if
* unknown property).
*
* Template arguments:
@@ -256,14 +256,14 @@ namespace KSVG
} \
const KJS::ClassInfo ClassProto::info = { ClassName, 0, &s_hashTable, 0 }; \
-// same as KSVG_IMPLEMENT_PROTOTYPE but with a tqparent class to forward calls to
+// same as KSVG_IMPLEMENT_PROTOTYPE but with a parent class to forward calls to
// Not used within KSVG up to now - each class does a self proto lookup in generateddata.cpp
#define KSVG_IMPLEMENT_PROTOTYPE_WITH_PARENT(ClassName,ClassProto,ClassFunc,ParentProto) \
KJS::Value KSVG::ClassProto::get(KJS::ExecState *exec, const KJS::Identifier &propertyName) const \
{ \
KJS::Value val = lookupGetFunction<ClassFunc,KJS::ObjectImp>(exec, propertyName, &s_hashTable, this ); \
if ( val.type() != UndefinedType ) return val; \
- /* Not found -> forward request to "tqparent" prototype */ \
+ /* Not found -> forward request to "parent" prototype */ \
return ParentProto::self(exec).get( exec, propertyName ); \
} \
bool KSVG::ClassProto::hasProperty(KJS::ExecState *exec, const KJS::Identifier &propertyName) const \
@@ -310,7 +310,7 @@ namespace KSVG
// To be used in all call() implementations!
// Can't use if (!thisObj.inherits(&ClassName::s_classInfo) since we don't
-// use the (single-tqparent) inheritance of ClassInfo...
+// use the (single-parent) inheritance of ClassInfo...
#define KSVG_CHECK_THIS(ClassName) KSVG_CHECK(ClassName, thisObj)
#endif
diff --git a/ksvg/ecma/ksvg_window.cpp b/ksvg/ecma/ksvg_window.cpp
index ae6024b3..90194781 100644
--- a/ksvg/ecma/ksvg_window.cpp
+++ b/ksvg/ecma/ksvg_window.cpp
@@ -490,7 +490,7 @@ void ScheduledAction::execute(Window *window)
////////////////////// WindowQObject ////////////////////////
-WindowQObject::WindowQObject(Window *w) : tqparent(w)
+WindowQObject::WindowQObject(Window *w) : parent(w)
{
}
@@ -560,8 +560,8 @@ void WindowQObject::timerEvent(TQTimerEvent *e)
scheduledActions.remove(it);
}
- if(tqparent->doc())
- action->execute(tqparent);
+ if(parent->doc())
+ action->execute(parent);
// It is important to test singleShot and not action->singleShot here - the
// action could have been deleted already if not single shot and if the
diff --git a/ksvg/ecma/ksvg_window.h b/ksvg/ecma/ksvg_window.h
index 091448a8..ea07856c 100644
--- a/ksvg/ecma/ksvg_window.h
+++ b/ksvg/ecma/ksvg_window.h
@@ -114,7 +114,7 @@ protected slots:
protected:
void timerEvent(TQTimerEvent *e);
private:
- Window *tqparent;
+ Window *parent;
//KHTMLPart *part; // not guarded, may be dangling
TQMap<int, ScheduledAction*> scheduledActions;
};