summaryrefslogtreecommitdiffstats
path: root/src/kmplayer_smil.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/kmplayer_smil.cpp')
-rw-r--r--src/kmplayer_smil.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/kmplayer_smil.cpp b/src/kmplayer_smil.cpp
index 5c5c5bd..a48640b 100644
--- a/src/kmplayer_smil.cpp
+++ b/src/kmplayer_smil.cpp
@@ -1618,7 +1618,7 @@ KDE_NO_EXPORT void SMIL::Smil::activate () {
if (tqlayout)
Element::activate ();
else
- Element::deactivate(); // some unfortunate reset in tqparent doc
+ Element::deactivate(); // some unfortunate reset in parent doc
}
KDE_NO_EXPORT void SMIL::Smil::deactivate () {
@@ -2052,7 +2052,7 @@ KDE_NO_EXPORT NodePtr SMIL::Region::childFromTag (const TQString & tag) {
/**
* calculates dimensions of this regions with _w and _h as width and height
- * of tqparent Region (representing 100%)
+ * of parent Region (representing 100%)
*/
KDE_NO_EXPORT
void SMIL::Region::calculateBounds (Single pw, Single ph) {
@@ -2060,7 +2060,7 @@ void SMIL::Region::calculateBounds (Single pw, Single ph) {
sizes.calcSizes (this, pw, ph, x, y, w, h);
if (surface ())
region_surface->bounds = SRect (x, y, w, h);
- //kdDebug () << "Region::calculateBounds tqparent:" << pw << "x" << ph << " this:" << x << "," << y << " " << w << "x" << h << endl;
+ //kdDebug () << "Region::calculateBounds parent:" << pw << "x" << ph << " this:" << x << "," << y << " " << w << "x" << h << endl;
}
NodeRefListPtr SMIL::Region::listeners (unsigned int eid) {
@@ -2398,9 +2398,9 @@ KDE_NO_EXPORT bool SMIL::TimedMrl::keepContent (Node *n) {
if (tm->m_runtime && p && p->active ()) {
if (tm->runtime ()->timingstate == Runtime::timings_stopped)
switch (tm->fill_active) {
- case fill_hold: // keep while tqparent active
+ case fill_hold: // keep while parent active
return true;
- case fill_freeze: // keep in tqparent duration
+ case fill_freeze: // keep in parent duration
if (p->unfinished() &&
(p->id == SMIL::id_node_par ||
p->id == SMIL::id_node_excl ||
@@ -2409,7 +2409,7 @@ KDE_NO_EXPORT bool SMIL::TimedMrl::keepContent (Node *n) {
return true;
// else fall through
case fill_default: // as freeze when no duration is set
- case fill_auto: // or when tqparent finished w/o duration
+ case fill_auto: // or when parent finished w/o duration
return keepContent (p) &&
(p->id == SMIL::id_node_par ||
p->id == SMIL::id_node_excl ||
@@ -2433,7 +2433,7 @@ KDE_NO_EXPORT SMIL::TimedMrl::Fill SMIL::TimedMrl::getDefaultFill (NodePtr n) {
if (tm->fill_def != fill_inherit)
return tm->fill_def;
else if (tm->fill == fill_default)
- return tm->fill_active; // assume tqparent figured out this
+ return tm->fill_active; // assume parent figured out this
} else if (p->id == SMIL::id_node_smil)
break;
return fill_auto;
@@ -3282,9 +3282,9 @@ KDE_NO_EXPORT bool SMIL::AnimateMotion::handleEvent (EventPtr event) {
KDE_NO_EXPORT void SMIL::Param::activate () {
setState (state_activated);
TQString name = getAttribute (StringPool::attr_name);
- Node * tqparent = parentNode ().ptr ();
- if (!name.isEmpty () && tqparent && tqparent->isElementNode ())
- static_cast<Element*>(tqparent)->setParam (name,
+ Node * parent = parentNode ().ptr ();
+ if (!name.isEmpty () && parent && parent->isElementNode ())
+ static_cast<Element*>(parent)->setParam (name,
getAttribute (StringPool::attr_value));
Element::activate (); //finish (); // no livetime of itself, will deactivate
}