Rename obsolete tq methods to standard names

1 files changed, 11 insertions, 11 deletions

diff --git a/src/kmplayer_smil.cpp b/src/kmplayer_smil.cpp
index fddf355..1b2d914 100644
--- a/src/kmplayer_smil.cpp
+++ b/src/kmplayer_smil.cpp
@@ -1611,11 +1611,11 @@ KDE_NO_EXPORT void SMIL::Smil::activate () {
     //kdDebug () << "Smil::activate" << endl;
     current_av_media_type = NodePtr ();
     resolved = true;
-    SMIL::Layout * tqlayout = convertNode <SMIL::Layout> (layout_node);
-    if (tqlayout && tqlayout->region_surface) {
+    SMIL::Layout * layout = convertNode <SMIL::Layout> (layout_node);
+    if (layout && layout->region_surface) {
         kdError() << "Layout already has a surface" << endl;
     }
-    if (tqlayout)
+    if (layout)
         Element::activate ();
     else
         Element::deactivate(); // some unfortunate reset in parent doc
@@ -1664,7 +1664,7 @@ KDE_NO_EXPORT void SMIL::Smil::closed () {
         }
     }
     if (!layout_node) {
-        kdError () << "no <root-tqlayout>" << endl;
+        kdError () << "no <root-layout>" << endl;
         return;
     }
 }
@@ -1738,7 +1738,7 @@ static void headChildDone (NodePtr node, NodePtr child) {
 
 KDE_NO_EXPORT NodePtr SMIL::Head::childFromTag (const TQString & tag) {
     const char * ctag = tag.ascii ();
-    if (!strcmp (ctag, "tqlayout"))
+    if (!strcmp (ctag, "layout"))
         return new SMIL::Layout (m_doc);
     else if (!strcmp (ctag, "title"))
         return new DarkNode (m_doc, tag, id_node_title);
@@ -1757,10 +1757,10 @@ KDE_NO_EXPORT void SMIL::Head::closed () {
     for (NodePtr e = firstChild (); e; e = e->nextSibling ())
         if (e->id == id_node_layout)
             return;
-    SMIL::Layout * tqlayout = new SMIL::Layout (m_doc);
-    appendChild (tqlayout);
-    tqlayout->setAuxiliaryNode (true);
-    tqlayout->closed (); // add root-tqlayout and a region
+    SMIL::Layout * layout = new SMIL::Layout (m_doc);
+    appendChild (layout);
+    layout->setAuxiliaryNode (true);
+    layout->closed (); // add root-layout and a region
 }
 
 KDE_NO_EXPORT void SMIL::Head::childDone (NodePtr child) {
@@ -1774,7 +1774,7 @@ KDE_NO_CDTOR_EXPORT SMIL::Layout::Layout (NodePtr & d)
 
 KDE_NO_EXPORT NodePtr SMIL::Layout::childFromTag (const TQString & tag) {
     const char * ctag = tag.ascii ();
-    if (!strcmp (ctag, "root-tqlayout")) {
+    if (!strcmp (ctag, "root-layout")) {
         NodePtr e = new SMIL::RootLayout (m_doc);
         rootLayout = e;
         return e;
@@ -1816,7 +1816,7 @@ KDE_NO_EXPORT void SMIL::Layout::closed () {
         rl->setAttribute(StringPool::attr_height,TQString::number(h_root));
         insertBefore (sr, firstChild ());
     } else {
-        if (childNodes ()->length () < 2) { // only a root-tqlayout
+        if (childNodes ()->length () < 2) { // only a root-layout
             SMIL::Region * r = new SMIL::Region (m_doc);
             appendChild (r);
             r->setAuxiliaryNode (true);