Rename a number of old tq methods that are no longer tq specific

25 files changed, 480 insertions, 480 deletions

diff --git a/src/kmplayer_atom.cpp b/src/kmplayer_atom.cpp
index a35c649..3b5915f 100644
--- a/src/kmplayer_atom.cpp
+++ b/src/kmplayer_atom.cpp
@@ -75,7 +75,7 @@ void ATOM::Link::closed () {
         else if (a->name () == "rel")
             rel = a->value ();
     }
-    if (!href.isEmpty () && rel == TQString::tqfromLatin1 ("enclosure"))
+    if (!href.isEmpty () && rel == TQString::fromLatin1 ("enclosure"))
         src = href;
     else if (pretty_name.isEmpty ())
         pretty_name = href;
@@ -87,12 +87,12 @@ void ATOM::Content::closed () {
             src = a->value ();
         else if (a->name () == StringPool::attr_type) {
             TQString v = a->value ().lower ();
-            if (v == TQString::tqfromLatin1 ("text"))
-                mimetype = TQString::tqfromLatin1 ("text/plain");
-            else if (v == TQString::tqfromLatin1 ("html"))
-                mimetype = TQString::tqfromLatin1 ("text/html");
-            else if (v == TQString::tqfromLatin1 ("xhtml"))
-                mimetype = TQString::tqfromLatin1 ("application/xhtml+xml");
+            if (v == TQString::fromLatin1 ("text"))
+                mimetype = TQString::fromLatin1 ("text/plain");
+            else if (v == TQString::fromLatin1 ("html"))
+                mimetype = TQString::fromLatin1 ("text/html");
+            else if (v == TQString::fromLatin1 ("xhtml"))
+                mimetype = TQString::fromLatin1 ("application/xhtml+xml");
             else
                 mimetype = v;
         }
diff --git a/src/kmplayer_koffice_part.cpp b/src/kmplayer_koffice_part.cpp
index c32e829..9e10ae7 100644
--- a/src/kmplayer_koffice_part.cpp
+++ b/src/kmplayer_koffice_part.cpp
@@ -50,7 +50,7 @@
 
 #include <tqdom.h>
 //#include <tqmetaobject.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqptrlist.h>
 #include <tqpainter.h>
 #include <koFrame.h>
diff --git a/src/kmplayer_part.cpp b/src/kmplayer_part.cpp
index d897c73..4fb7800 100644
--- a/src/kmplayer_part.cpp
+++ b/src/kmplayer_part.cpp
@@ -81,8 +81,8 @@ struct KMPLAYER_NO_EXPORT GroupPredicate {
                     !part->master () && !part->url ().isEmpty ()) ||
                 (m_part->allowRedir (part->m_docbase) &&
                  (part->m_group == m_group ||
-                  part->m_group == TQString::tqfromLatin1("_master") ||
-                  m_group == TQString::tqfromLatin1("_master")) &&
+                  part->m_group == TQString::fromLatin1("_master") ||
+                  m_group == TQString::fromLatin1("_master")) &&
                  (part->m_features & KMPlayerPart::Feat_Viewer) !=
                  (m_part->m_features & KMPlayerPart::Feat_Viewer)));
     }
@@ -128,9 +128,9 @@ KDE_NO_EXPORT KParts::Part *KMPlayerFactory::createPartObject
 //-----------------------------------------------------------------------------
 
 static bool getBoolValue (const TQString & value) {
-    return (value.lower() != TQString::tqfromLatin1("false") &&
-            value.lower() != TQString::tqfromLatin1("off") &&
-            value.lower() != TQString::tqfromLatin1("0"));
+    return (value.lower() != TQString::fromLatin1("false") &&
+            value.lower() != TQString::fromLatin1("off") &&
+            value.lower() != TQString::fromLatin1("0"));
 }
 
 #define SET_FEAT_ON(f) { m_features |= f; turned_off_features &= ~f; }
@@ -184,13 +184,13 @@ KDE_NO_CDTOR_EXPORT KMPlayerPart::KMPlayerPart (TQWidget * wparent, const char *
                 urlsource->setURL (KURL (value));
                 urlsource->setIdentified (false);
                 m_havehref = true;
-            } else if (name == TQString::tqfromLatin1("width")) {
+            } else if (name == TQString::fromLatin1("width")) {
                 m_noresize = true;
-            } else if (name == TQString::tqfromLatin1("height")) {
+            } else if (name == TQString::fromLatin1("height")) {
                 m_noresize = true;
-            } else if (name == TQString::tqfromLatin1("type")) {
+            } else if (name == TQString::fromLatin1("type")) {
                 urlsource->document ()->mrl ()->mimetype = value;
-            } else if (name == TQString::tqfromLatin1("controls")) {
+            } else if (name == TQString::fromLatin1("controls")) {
                 //http://service.real.com/help/library/guides/production8/realpgd.htm?src=noref,rnhmpg_080301,rnhmtn,nosrc
                 //http://service.real.com/help/library/guides/production8/htmfiles/control.htm
                 TQStringList sl = TQStringList::split (TQChar (','), value);
@@ -198,107 +198,107 @@ KDE_NO_CDTOR_EXPORT KMPlayerPart::KMPlayerPart (TQWidget * wparent, const char *
                 const TQStringList::const_iterator e = sl.end ();
                 for (TQStringList::const_iterator i = sl.begin (); i != e; ++i) {
                     TQString val_lower ((*i).lower ());
-                    if (val_lower == TQString::tqfromLatin1("imagewindow")) {
+                    if (val_lower == TQString::fromLatin1("imagewindow")) {
                         SET_FEAT_ON (Feat_ImageWindow | Feat_Viewer)
-                    } else if (val_lower == TQString::tqfromLatin1("all")) {
+                    } else if (val_lower == TQString::fromLatin1("all")) {
                         m_features = (Feat_Controls | Feat_StatusBar);
-                    } else if (val_lower == TQString::tqfromLatin1("tacctrl")) {
+                    } else if (val_lower == TQString::fromLatin1("tacctrl")) {
                         SET_FEAT_ON (Feat_Label)
-                    } else if (val_lower == TQString::tqfromLatin1("controlpanel")) {
+                    } else if (val_lower == TQString::fromLatin1("controlpanel")) {
                         SET_FEAT_ON (Feat_Controls)
-                    } else if (val_lower == TQString::tqfromLatin1("infovolumepanel")){
+                    } else if (val_lower == TQString::fromLatin1("infovolumepanel")){
                         SET_FEAT_ON (Feat_Controls) // TODO
-                    } else if (val_lower == TQString::tqfromLatin1("positionfield") ||
-                            val_lower == TQString::tqfromLatin1("positionslider")) {
+                    } else if (val_lower == TQString::fromLatin1("positionfield") ||
+                            val_lower == TQString::fromLatin1("positionslider")) {
                         setAutoControls (false);
                         panel->positionSlider ()->show ();
                         SET_FEAT_ON (Feat_Controls)
-                    } else if ( val_lower == TQString::tqfromLatin1("homectrl")) {
+                    } else if ( val_lower == TQString::fromLatin1("homectrl")) {
                         setAutoControls (false);
                         panel->button (KMPlayer::ControlPanel::button_config)->show();
-                    } else if (val_lower == TQString::tqfromLatin1("mutectrl") ||
-                            val_lower == TQString::tqfromLatin1("mutevolume")) {
+                    } else if (val_lower == TQString::fromLatin1("mutectrl") ||
+                            val_lower == TQString::fromLatin1("mutevolume")) {
                         setAutoControls (false);
-                        panel->volumeBar()->setMinimumSize (TQSize (20, panel->volumeBar()->tqminimumSize ().height ()));
+                        panel->volumeBar()->setMinimumSize (TQSize (20, panel->volumeBar()->minimumSize ().height ()));
                         panel->volumeBar()->show ();
                         SET_FEAT_ON (Feat_Controls)
-                    } else if (val_lower == TQString::tqfromLatin1("rwctrl")) {
+                    } else if (val_lower == TQString::fromLatin1("rwctrl")) {
                         setAutoControls (false);
                         panel->button (KMPlayer::ControlPanel::button_back)->show (); // rewind ?
                         SET_FEAT_ON (Feat_Controls)
-                    } else if ( val_lower == TQString::tqfromLatin1("ffctrl")) {
+                    } else if ( val_lower == TQString::fromLatin1("ffctrl")) {
                         setAutoControls (false);
                         panel->button(KMPlayer::ControlPanel::button_forward)->show();
                         m_features = Feat_Controls;
-                    } else if ( val_lower ==TQString::tqfromLatin1("stopbutton")) {
+                    } else if ( val_lower ==TQString::fromLatin1("stopbutton")) {
                         setAutoControls (false);
                         panel->button (KMPlayer::ControlPanel::button_stop)->show ();
                         SET_FEAT_ON (Feat_Controls)
-                    } else if (val_lower == TQString::tqfromLatin1("playbutton") ||
-                            val_lower ==TQString::tqfromLatin1("playonlybutton")) {
+                    } else if (val_lower == TQString::fromLatin1("playbutton") ||
+                            val_lower ==TQString::fromLatin1("playonlybutton")) {
                         setAutoControls (false);
                         panel->button (KMPlayer::ControlPanel::button_play)->show ();
                         SET_FEAT_ON (Feat_Controls)
-                    } else if (val_lower ==TQString::tqfromLatin1("pausebutton")) {
+                    } else if (val_lower ==TQString::fromLatin1("pausebutton")) {
                         setAutoControls (false);
                         panel->button (KMPlayer::ControlPanel::button_pause)->show ();
                         SET_FEAT_ON (Feat_Controls)
-                    } else if (val_lower == TQString::tqfromLatin1("statusbar") ||
-                            val_lower == TQString::tqfromLatin1("statusfield")) {
+                    } else if (val_lower == TQString::fromLatin1("statusbar") ||
+                            val_lower == TQString::fromLatin1("statusfield")) {
                         SET_FEAT_ON (Feat_StatusBar)
-                    } else if (val_lower == TQString::tqfromLatin1("infopanel")) {
+                    } else if (val_lower == TQString::fromLatin1("infopanel")) {
                         SET_FEAT_ON (Feat_InfoPanel)
-                    } else if (val_lower == TQString::tqfromLatin1("playlist")) {
+                    } else if (val_lower == TQString::fromLatin1("playlist")) {
                         SET_FEAT_ON (Feat_PlayList)
-                    } else if (val_lower==TQString::tqfromLatin1("volumeslider")) {
+                    } else if (val_lower==TQString::fromLatin1("volumeslider")) {
                         SET_FEAT_ON (Feat_VolumeSlider)
                         setAutoControls (false);
                         panel->volumeBar()->show ();
-                        panel->volumeBar()->setMinimumSize (TQSize (20, panel->volumeBar()->tqminimumSize ().height ()));
+                        panel->volumeBar()->setMinimumSize (TQSize (20, panel->volumeBar()->minimumSize ().height ()));
                     }
                 }
-            } else if (name == TQString::tqfromLatin1("uimode")) {
+            } else if (name == TQString::fromLatin1("uimode")) {
                 TQString val_lower (value.lower ());
-                if (val_lower == TQString::tqfromLatin1("full"))
+                if (val_lower == TQString::fromLatin1("full"))
                     SET_FEAT_ON (Feat_All & ~(Feat_PlayList | Feat_ImageWindow))
                 // TODO: invisible, none, mini
-            } else if (name == TQString::tqfromLatin1("nolabels")) {
+            } else if (name == TQString::fromLatin1("nolabels")) {
                 SET_FEAT_OFF (Feat_Label)
-            } else if (name == TQString::tqfromLatin1("nocontrols")) {
+            } else if (name == TQString::fromLatin1("nocontrols")) {
                 SET_FEAT_OFF (Feat_Controls | Feat_VolumeSlider)
-            } else if (name == TQString::tqfromLatin1("showdisplay")) {
+            } else if (name == TQString::fromLatin1("showdisplay")) {
                 // the author name, the clip name, and the copyright information
                 if (getBoolValue (value))
                     SET_FEAT_ON (Feat_InfoPanel)
                 else
                     SET_FEAT_OFF (Feat_InfoPanel)
-            } else if (name == TQString::tqfromLatin1("showcontrols")) {
+            } else if (name == TQString::fromLatin1("showcontrols")) {
                 if (getBoolValue (value))
                     SET_FEAT_ON (Feat_Viewer | Feat_Controls)
                 else
                     SET_FEAT_OFF (Feat_Controls | Feat_VolumeSlider)
-            } else if (name == TQString::tqfromLatin1("showstatusbar")) {
+            } else if (name == TQString::fromLatin1("showstatusbar")) {
                 if (getBoolValue (value))
                     SET_FEAT_ON (Feat_Viewer | Feat_StatusBar)
                 else
                     SET_FEAT_OFF (Feat_StatusBar)
             // else showcaptioning/showgotobar/showpositioncontrols/showtracker
-            } else if (name == TQString::tqfromLatin1("console")) {
-                m_group = value.isEmpty() ? TQString::tqfromLatin1("_anonymous") : value;
-            } else if (name == TQString::tqfromLatin1("__khtml__pluginbaseurl")) {
+            } else if (name == TQString::fromLatin1("console")) {
+                m_group = value.isEmpty() ? TQString::fromLatin1("_anonymous") : value;
+            } else if (name == TQString::fromLatin1("__khtml__pluginbaseurl")) {
                 m_docbase = KURL (value);
-            } else if (name == TQString::tqfromLatin1("src")) {
+            } else if (name == TQString::fromLatin1("src")) {
                 m_src_url = value;
-            } else if (name == TQString::tqfromLatin1("filename")) {
+            } else if (name == TQString::fromLatin1("filename")) {
                 m_file_name = value;
-            } else if (name == TQString::tqfromLatin1 ("fullscreenmode")) {
+            } else if (name == TQString::fromLatin1 ("fullscreenmode")) {
                 show_fullscreen = getBoolValue (value);
-            } else if (name == TQString::tqfromLatin1 ("autostart")) {
+            } else if (name == TQString::fromLatin1 ("autostart")) {
                 urlsource->setAutoPlay (getBoolValue (value));
 	    }
             // volume/clicktoplay/transparentatstart/animationatstart
             // autorewind/displaysize/border
-            if (name.startsWith (TQString::tqfromLatin1 ("__khtml__")))
+            if (name.startsWith (TQString::fromLatin1 ("__khtml__")))
                 name = name.mid (9);
             convertNode <KMPlayer::Element> (urlsource->document ())->setAttribute (name, value);
         }
@@ -332,7 +332,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerPart::KMPlayerPart (TQWidget * wparent, const char *
         else
             m_view->setControlPanelMode (KMPlayer::View::CP_AutoHide);
     }
-    bool group_member = !m_group.isEmpty () && m_group != TQString::tqfromLatin1("_unique") && m_features != Feat_Unknown;
+    bool group_member = !m_group.isEmpty () && m_group != TQString::fromLatin1("_unique") && m_features != Feat_Unknown;
     if (!group_member || m_features & Feat_Viewer) {
         // not part of a group or we're the viewer
         setProcess ("mplayer");
@@ -1017,8 +1017,8 @@ KDE_NO_EXPORT bool KMPlayerLiveConnectExtension::call
             break;
         case showcontrolpanel:
             if (args.size () &&
-                    (args.first () == TQString::tqfromLatin1 ("0") ||
-                     args.first () == TQString::tqfromLatin1 ("false")))
+                    (args.first () == TQString::fromLatin1 ("0") ||
+                     args.first () == TQString::fromLatin1 ("false")))
                 static_cast <KMPlayer::View*> (player->view ())->setControlPanelMode (KMPlayer::View::CP_Hide);
             else
                 static_cast <KMPlayer::View*> (player->view ())->setControlPanelMode (KMPlayer::View::CP_Show);
diff --git a/src/kmplayer_rp.cpp b/src/kmplayer_rp.cpp
index 9ecdb62..36938b5 100644
--- a/src/kmplayer_rp.cpp
+++ b/src/kmplayer_rp.cpp
@@ -183,11 +183,11 @@ KDE_NO_EXPORT NodePtr RP::Imfl::childFromTag (const TQString & tag) {
     return 0L;
 }
 
-KDE_NO_EXPORT void RP::Imfl::tqrepaint () {
+KDE_NO_EXPORT void RP::Imfl::repaint () {
     if (!active ())
-        kdWarning () << "Spurious Imfl tqrepaint" << endl;
+        kdWarning () << "Spurious Imfl repaint" << endl;
     else if (surface () && width > 0 && height > 0)
-        rp_surface->tqrepaint (SRect (0, 0, width, height));
+        rp_surface->repaint (SRect (0, 0, width, height));
 }
 
 KDE_NO_CDTOR_EXPORT RP::Image::Image (NodePtr & doc)
@@ -353,7 +353,7 @@ KDE_NO_EXPORT void RP::TimingsBase::update (int percentage) {
     progress = percentage;
     Node * p = parentNode ().ptr ();
     if (p->id == RP::id_node_imfl)
-        static_cast <RP::Imfl *> (p)->tqrepaint ();
+        static_cast <RP::Imfl *> (p)->repaint ();
 }
 
 KDE_NO_EXPORT void RP::TimingsBase::finish () {
@@ -447,11 +447,11 @@ KDE_NO_EXPORT void RP::Wipe::activate () {
     //TODO implement 'type="push"'
     TQString dir = getAttribute ("direction").lower ();
     direction = dir_right;
-    if (dir == TQString::tqfromLatin1 ("left"))
+    if (dir == TQString::fromLatin1 ("left"))
         direction = dir_left;
-    else if (dir == TQString::tqfromLatin1 ("up"))
+    else if (dir == TQString::fromLatin1 ("up"))
         direction = dir_up;
-    else if (dir == TQString::tqfromLatin1 ("down"))
+    else if (dir == TQString::fromLatin1 ("down"))
         direction = dir_down;
     TimingsBase::activate ();
 }
diff --git a/src/kmplayer_rp.h b/src/kmplayer_rp.h
index 017086e..a158a7d 100644
--- a/src/kmplayer_rp.h
+++ b/src/kmplayer_rp.h
@@ -66,8 +66,8 @@ public:
     virtual bool handleEvent (EventPtr event);
     virtual void accept (Visitor *);
     Surface *surface ();
-    void tqrepaint (); // called whenever something changes on image
-    Fit fit;        // how to tqlayout images
+    void repaint (); // called whenever something changes on image
+    Fit fit;        // how to layout images
     unsigned int duration; // cached attributes of head
     TimerInfoPtrW duration_timer;
     SurfacePtrW rp_surface;
diff --git a/src/kmplayer_smil.cpp b/src/kmplayer_smil.cpp
index a48640b..c3dd483 100644
--- a/src/kmplayer_smil.cpp
+++ b/src/kmplayer_smil.cpp
@@ -20,12 +20,12 @@
 
 #include <stdlib.h>
 
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqcolor.h>
 #include <tqpixmap.h>
 #include <tqmovie.h>
 #include <tqimage.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqfont.h>
 #include <tqapplication.h>
 #include <tqregexp.h>
@@ -635,7 +635,7 @@ KDE_NO_EXPORT void CalculatedSizer::resetSizes () {
     right.reset ();
     bottom.reset ();
     reg_point.truncate (0);
-    reg_align = TQString::tqfromLatin1 ("topLeft");
+    reg_align = TQString::fromLatin1 ("topLeft");
 }
 
 static bool regPoints (const TQString & str, Single & x, Single & y) {
@@ -939,11 +939,11 @@ bool AnimateData::parseParam (const TrieString & name, const TQString & val) {
     } else if (name == "values") {
         change_values = TQStringList::split (TQString (";"), val);
     } else if (name == "calcMode") {
-        if (val == TQString::tqfromLatin1 ("discrete"))
+        if (val == TQString::fromLatin1 ("discrete"))
             calcMode = calc_discrete;
-        else if (val == TQString::tqfromLatin1 ("linear"))
+        else if (val == TQString::fromLatin1 ("linear"))
             calcMode = calc_linear;
-        else if (val == TQString::tqfromLatin1 ("paced"))
+        else if (val == TQString::fromLatin1 ("paced"))
             calcMode = calc_paced;
     } else
         return AnimateGroupData::parseParam (name, val);
@@ -1052,8 +1052,8 @@ KDE_NO_EXPORT void AnimateData::stopped () {
 KDE_NO_EXPORT void AnimateData::applyStep () {
     Element * target = convertNode <Element> (target_element);
     if (target && calcMode == calc_linear)
-        target->setParam (changed_attribute, TQString ("%1%2").tqarg (
-                    change_from_val).tqarg(change_from_unit),
+        target->setParam (changed_attribute, TQString ("%1%2").arg (
+                    change_from_val).arg(change_from_unit),
                 &modification_id);
     else if (target && calcMode == calc_discrete)
         target->setParam (changed_attribute,
@@ -1156,13 +1156,13 @@ bool AnimateMotionData::parseParam (const TrieString & name, const TQString & va
     } else if (name == "keySplines") {
         splines = TQStringList::split (TQString (";"), val);
     } else if (name == "calcMode") {
-        if (val == TQString::tqfromLatin1 ("discrete"))
+        if (val == TQString::fromLatin1 ("discrete"))
             calcMode = calc_discrete;
-        else if (val == TQString::tqfromLatin1 ("linear"))
+        else if (val == TQString::fromLatin1 ("linear"))
             calcMode = calc_linear;
-        else if (val == TQString::tqfromLatin1 ("paced"))
+        else if (val == TQString::fromLatin1 ("paced"))
             calcMode = calc_paced;
-        else if (val == TQString::tqfromLatin1 ("spline"))
+        else if (val == TQString::fromLatin1 ("spline"))
             calcMode = calc_spline;
     } else
         return AnimateGroupData::parseParam (name, val);
@@ -1403,7 +1403,7 @@ KDE_NO_EXPORT void KMPlayer::MediaTypeRuntime::reset () {
 }
 
 /**
- * will request a tqrepaint of attached region
+ * will request a repaint of attached region
  */
 KDE_NO_EXPORT void MediaTypeRuntime::stopped () {
     clipStop ();
@@ -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
@@ -1623,7 +1623,7 @@ KDE_NO_EXPORT void SMIL::Smil::activate () {
 
 KDE_NO_EXPORT void SMIL::Smil::deactivate () {
     if (layout_node)
-        convertNode <SMIL::Layout> (layout_node)->tqrepaint ();
+        convertNode <SMIL::Layout> (layout_node)->repaint ();
     if (layout_node)
         convertNode <SMIL::Layout> (layout_node)->region_surface = NULL;
     Mrl::getSurface(0L);
@@ -1657,14 +1657,14 @@ KDE_NO_EXPORT void SMIL::Smil::closed () {
         } else if (e->id == id_node_meta) {
             Element * elm = convertNode <Element> (e);
             const TQString name = elm->getAttribute (StringPool::attr_name);
-            if (name == TQString::tqfromLatin1 ("title"))
+            if (name == TQString::fromLatin1 ("title"))
                 pretty_name = elm->getAttribute ("content");
-            else if (name == TQString::tqfromLatin1 ("base"))
+            else if (name == TQString::fromLatin1 ("base"))
                 src = elm->getAttribute ("content");
         }
     }
     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);
@@ -1834,7 +1834,7 @@ KDE_NO_EXPORT void SMIL::Layout::activate () {
     RegionBase::activate ();
     if (surface ()) {
         updateDimensions ();
-        tqrepaint ();
+        repaint ();
     }
     finish (); // proceed and allow 'head' to finish
 }
@@ -1928,14 +1928,14 @@ KDE_NO_EXPORT void SMIL::RegionBase::remoteReady (TQByteArray & data) {
     postpone_lock = 0L;
 }
 
-KDE_NO_EXPORT void SMIL::RegionBase::tqrepaint () {
+KDE_NO_EXPORT void SMIL::RegionBase::repaint () {
     if (surface ())
-        region_surface->tqrepaint (SRect (0, 0, w, h));
+        region_surface->repaint (SRect (0, 0, w, h));
 }
 
-KDE_NO_EXPORT void SMIL::RegionBase::tqrepaint (const SRect & rect) {
+KDE_NO_EXPORT void SMIL::RegionBase::repaint (const SRect & rect) {
     if (surface ())
-        region_surface->tqrepaint (SRect (0, 0, w, h).intersect (rect));
+        region_surface->repaint (SRect (0, 0, w, h).intersect (rect));
 }
 
 KDE_NO_EXPORT void SMIL::RegionBase::updateDimensions () {
@@ -1949,7 +1949,7 @@ KDE_NO_EXPORT void SMIL::RegionBase::updateDimensions () {
 }
 
 KDE_NO_EXPORT void SMIL::RegionBase::boundsUpdate () {
-    // if there is a region_surface and it's moved, do a limit tqrepaint
+    // if there is a region_surface and it's moved, do a limit repaint
     NodePtr p = parentNode ();
     if (p && (p->id==SMIL::id_node_region || p->id==SMIL::id_node_layout) &&
             region_surface) {
@@ -1958,7 +1958,7 @@ KDE_NO_EXPORT void SMIL::RegionBase::boundsUpdate () {
         w = 0; h = 0;
         sizes.calcSizes (this, pr->w, pr->h, x, y, w, h);
         region_surface->bounds = SRect (x, y, w, h);
-        pr->tqrepaint (region_surface->bounds.unite (old_bounds));
+        pr->repaint (region_surface->bounds.unite (old_bounds));
     }
 }
 
@@ -1981,7 +1981,7 @@ KDE_NO_EXPORT Surface *SMIL::RegionBase::surface () {
 KDE_NO_EXPORT
 void SMIL::RegionBase::parseParam (const TrieString & name, const TQString & val) {
     //kdDebug () << "RegionBase::parseParam " << getAttribute ("id") << " " << name << "=" << val << " active:" << active() << endl;
-    bool need_tqrepaint = false;
+    bool need_repaint = false;
     SRect rect = SRect (x, y, w, h);
     bool dim_changed;
     if (name == "background-color" || name == "backgroundColor") {
@@ -1991,10 +1991,10 @@ void SMIL::RegionBase::parseParam (const TrieString & name, const TQString & val
             background_color = 0xff000000 | TQColor (val).rgb ();
         if (region_surface || (active () && surface ()))
             region_surface->background_color = background_color;
-        need_tqrepaint = true;
+        need_repaint = true;
     } else if (name == "z-index") {
         z_order = val.toInt ();
-        need_tqrepaint = true;
+        need_repaint = true;
     } else if (sizes.setSizeParam (name, val, dim_changed)) {
         if (active ()) {
             if (region_surface) {
@@ -2009,20 +2009,20 @@ void SMIL::RegionBase::parseParam (const TrieString & name, const TQString & val
             if (p &&(p->id==SMIL::id_node_region ||p->id==SMIL::id_node_layout))
                 convertNode <SMIL::RegionBase> (p)->updateDimensions ();
             rect = rect.unite (SRect (x, y, w, h));
-            need_tqrepaint = true;
+            need_repaint = true;
         }
     } else if (name == "showBackground") {
         if (val == "whenActive")
             show_background = ShowWhenActive;
         else
             show_background = ShowAlways;
-        need_tqrepaint = true;
+        need_repaint = true;
     } else if (name == "backgroundImage") {
         background_image = val;
         Smil * s = SMIL::Smil::findSmilNode (this);
         if (s) {
             killWGet ();
-            need_tqrepaint = !cached_img.isEmpty ();
+            need_repaint = !cached_img.isEmpty ();
             Mrl *mrl = s->parentNode () ? s->parentNode ()->mrl () : NULL;
             TQString url = mrl ? KURL (mrl->absolutePath (), val).url () : val;
             cached_img.setUrl (url);
@@ -2030,12 +2030,12 @@ void SMIL::RegionBase::parseParam (const TrieString & name, const TQString & val
                 postpone_lock = document ()->postpone ();
                 wget (url);
             } else {
-                need_tqrepaint = true;
+                need_repaint = true;
             }
         }
     }
-    if (need_tqrepaint && active () && surface() && region_surface->parentNode ())
-        region_surface->parentNode ()->tqrepaint (rect);
+    if (need_repaint && active () && surface() && region_surface->parentNode ())
+        region_surface->parentNode ()->repaint (rect);
     Element::parseParam (name, val);
 }
 
@@ -2083,7 +2083,7 @@ KDE_NO_EXPORT void SMIL::Region::accept (Visitor * v) {
 KDE_NO_EXPORT
 void SMIL::RegPoint::parseParam (const TrieString & p, const TQString & v) {
     bool b;
-    sizes.setSizeParam (p, v, b); // TODO: if dynamic, make sure to tqrepaint
+    sizes.setSizeParam (p, v, b); // TODO: if dynamic, make sure to repaint
     Element::parseParam (p, v);
 }
 
@@ -2570,7 +2570,7 @@ KDE_NO_EXPORT void SMIL::Excl::begin () {
     for (NodePtr e = firstChild (); e; e = e->nextSibling ())
         if (isTimedMrl (e)) {
             SMIL::TimedMrl * tm = static_cast <SMIL::TimedMrl *> (e.ptr ());
-            if (tm) { // make aboutToStart connection with TimedMrl tqchildren
+            if (tm) { // make aboutToStart connection with TimedMrl children
                 ConnectionPtr c = tm->connectTo (this, event_to_be_started);
                 started_event_list.append (new ConnectionStoreItem (c));
             }
@@ -2857,10 +2857,10 @@ void SMIL::MediaType::parseParam (const TrieString &para, const TQString & val)
         TimedMrl::parseParam (para, val);
     }
     if (sub_surface)
-        sub_surface->tqrepaint ();
+        sub_surface->repaint ();
     resetSurface ();
     if (surface ())
-        sub_surface->tqrepaint ();
+        sub_surface->repaint ();
 }
 
 KDE_NO_EXPORT void SMIL::MediaType::boundsUpdate () {
@@ -2869,7 +2869,7 @@ KDE_NO_EXPORT void SMIL::MediaType::boundsUpdate () {
         SRect new_bounds = calculateBounds ();
         SRect repaint_rect = sub_surface->bounds.unite (new_bounds);
         sub_surface->bounds = new_bounds;
-        rb->tqrepaint (repaint_rect);
+        rb->repaint (repaint_rect);
     }
 }
 
@@ -2881,7 +2881,7 @@ KDE_NO_EXPORT void SMIL::MediaType::activate () {
     setState (state_activated);
     for (NodePtr c = firstChild (); c; c = c->nextSibling ())
         if (c != external_tree) {
-            // activate param/set/animate.. tqchildren
+            // activate param/set/animate.. children
             c->activate ();
             break; // childDone will handle next siblings
         }
@@ -2896,7 +2896,7 @@ KDE_NO_EXPORT void SMIL::MediaType::deactivate () {
     region_attach = 0L;
     trans_step = trans_steps = 0;
     if (region_node)
-        convertNode <SMIL::RegionBase> (region_node)->tqrepaint ();
+        convertNode <SMIL::RegionBase> (region_node)->repaint ();
     if (trans_timer)
         document ()->cancelTimer (trans_timer);
     if (trans_out_timer)
@@ -2918,7 +2918,7 @@ KDE_NO_EXPORT void SMIL::MediaType::begin () {
         region_mouse_leave = r->connectTo (this, event_outbounds);
         region_mouse_click = r->connectTo (this, event_activated);
         region_attach = r->connectTo (this, mediatype_attached);
-        r->tqrepaint ();
+        r->repaint ();
         tr->clipStart ();
         Transition * trans = convertNode <Transition> (trans_in);
         if (trans && trans->supported ()) {
@@ -2955,13 +2955,13 @@ KDE_NO_EXPORT void SMIL::MediaType::finish () {
         ASSERT(!trans_timer);
     }
     if (region_node)
-        convertNode <SMIL::RegionBase> (region_node)->tqrepaint ();
+        convertNode <SMIL::RegionBase> (region_node)->repaint ();
     TimedMrl::finish ();
     static_cast <MediaTypeRuntime *> (runtime ())->clipStop ();
 }
 
 /**
- * Re-implement from TimedMrl, because we may have tqchildren like
+ * Re-implement from TimedMrl, because we may have children like
  * param/set/animatie that should all be activate, but also other smil or imfl
  * documents, that should only be activated if the runtime has started
  */
@@ -2969,7 +2969,7 @@ KDE_NO_EXPORT void SMIL::MediaType::childDone (NodePtr child) {
     bool child_doc = child->mrl () && child->mrl ()->opener.ptr () == this;
     if (child_doc) {
         child->deactivate (); // should only if fill not is freeze or hold
-    } else if (active ()) { // traverse param or area tqchildren
+    } else if (active ()) { // traverse param or area children
         for (NodePtr c = child->nextSibling(); c; c = c->nextSibling ())
             if (!c->mrl () || c->mrl ()->opener.ptr () != this ) {
                 c->activate ();
@@ -3086,7 +3086,7 @@ bool SMIL::MediaType::handleEvent (EventPtr event) {
                     else
                         te->interval = trans_step++ < trans_steps;
                     if (s && s->parentNode())
-                        s->parentNode()->tqrepaint (s->bounds);
+                        s->parentNode()->repaint (s->bounds);
                     return true;
                 } else if (te->timer_info->event_id == trans_out_timer_id) {
                     active_trans = trans_out;
@@ -3104,7 +3104,7 @@ bool SMIL::MediaType::handleEvent (EventPtr event) {
                         }
                         trans_out_active = true;
                         if (s)
-                            s->tqrepaint ();
+                            s->repaint ();
                     }
                     return true;
                 }
@@ -3377,7 +3377,7 @@ bool ImageRuntime::parseParam (const TrieString & name, const TQString & val) {
 }
 
 /**
- * start_timer timer expired, tqrepaint if we have an image
+ * start_timer timer expired, repaint if we have an image
  */
 KDE_NO_EXPORT void ImageRuntime::started () {
     if (element && downloading ()) {
@@ -3409,7 +3409,7 @@ KDE_NO_EXPORT void ImageRuntime::remoteReady (TQByteArray & data) {
         mt->resetSurface ();
         TQString mime = mimetype ();
         kdDebug () << "ImageRuntime::remoteReady " << mime << " empty:" << cached_img.isEmpty () << " " << mt->src << endl;
-        if (mime.startsWith (TQString::tqfromLatin1 ("text/"))) {
+        if (mime.startsWith (TQString::fromLatin1 ("text/"))) {
             TQTextStream ts (data, IO_ReadOnly);
             readXML (element, ts, TQString ());
             Mrl *mrl = mt->external_tree ? mt->external_tree->mrl () : NULL;
@@ -3426,13 +3426,13 @@ KDE_NO_EXPORT void ImageRuntime::remoteReady (TQByteArray & data) {
                 cached_img.data->image = pix;
                 img_movie = new TQMovie (data, data.size ());
                 img_movie->connectUpdate(this,TQT_SLOT(movieUpdated(const TQRect&)));
-                img_movie->connectStatus (this, TQT_SLOT (movietqStatus (int)));
+                img_movie->connectStatus (this, TQT_SLOT (movieStatus (int)));
                 img_movie->connectResize(this,TQT_SLOT (movieResize(const TQSize&)));
                 frame_nr = 0;
                 mt->width = pix->width ();
                 mt->height = pix->height ();
                 if (mt->surface ())
-                    mt->sub_surface->tqrepaint ();
+                    mt->sub_surface->repaint ();
             } else
                 delete pix;
         }
@@ -3451,13 +3451,13 @@ KDE_NO_EXPORT void ImageRuntime::movieUpdated (const TQRect &) {
         cached_img.data->image = new TQImage;
         *cached_img.data->image = (img_movie->framePixmap ());
         if (mt->surface())
-            mt->sub_surface->tqrepaint ();
+            mt->sub_surface->repaint ();
     }
     if (timingstate != timings_started && img_movie)
         img_movie->pause ();
 }
 
-KDE_NO_EXPORT void ImageRuntime::movietqStatus (int s) {
+KDE_NO_EXPORT void ImageRuntime::movieStatus (int s) {
     if (element && element->state >= Node::state_began &&
             SMIL::TimedMrl::keepContent (element)) {
         if (s == TQMovie::EndOfMovie) {
@@ -3469,7 +3469,7 @@ KDE_NO_EXPORT void ImageRuntime::movietqStatus (int s) {
 KDE_NO_EXPORT void ImageRuntime::movieResize (const TQSize &) {
     SMIL::MediaType * mt = convertNode <SMIL::MediaType> (element);
     if (mt->surface ())
-        mt->sub_surface->tqrepaint ();
+        mt->sub_surface->repaint ();
         //kdDebug () << "movieResize" << endl;
 }
 
@@ -3564,12 +3564,12 @@ bool TextRuntime::parseParam (const TrieString & name, const TQString & val) {
         return MediaTypeRuntime::parseParam (name, val);
     mt->resetSurface ();
     if (mt->surface ())
-        mt->sub_surface->tqrepaint ();
+        mt->sub_surface->repaint ();
     return true;
 }
 
 /**
- * start_timer timer expired, tqrepaint if we have text
+ * start_timer timer expired, repaint if we have text
  */
 KDE_NO_EXPORT void TextRuntime::started () {
     if (element && downloading ()) {
@@ -3592,7 +3592,7 @@ KDE_NO_EXPORT void TextRuntime::remoteReady (TQByteArray & data) {
             ts.setCodec (d->codec);
         text  = ts.read ();
         if (mt->surface ())
-            mt->sub_surface->tqrepaint ();
+            mt->sub_surface->repaint ();
     }
     postpone_lock = 0L;
     if (timingstate == timings_started)
diff --git a/src/kmplayer_smil.h b/src/kmplayer_smil.h
index 5392101..0629c60 100644
--- a/src/kmplayer_smil.h
+++ b/src/kmplayer_smil.h
@@ -61,7 +61,7 @@ class TextRuntimePrivate;
 
 /*
  * Event signaled before the actual starting takes place. Use by SMIL::Excl
- * to stop possible other tqchildren
+ * to stop possible other children
  */
 class ToBeStartedEvent : public Event {
 public:
@@ -215,7 +215,7 @@ protected:
     virtual void remoteReady (TQByteArray &);
 private slots:
     void movieUpdated (const TQRect &);
-    void movietqStatus (int);
+    void movieStatus (int);
     void movieResize (const TQSize &);
 };
 
@@ -444,15 +444,15 @@ public:
     /**
      * repaints region, calls scheduleRepaint(x,y,w,h) on view
      */
-    void tqrepaint ();
-    void tqrepaint (const SRect & rect);
+    void repaint ();
+    void repaint (const SRect & rect);
     /**
      * calculate the relative x,y,w,h on the child region elements
      * given this element's w and h value
      * and child's left/top/right/width/height/bottom attributes
      */
     virtual void updateDimensions ();
-    void boundsUpdate (); // recalculates and tqrepaint old and new bounds
+    void boundsUpdate (); // recalculates and repaint old and new bounds
 
     virtual Surface *surface ();
     SurfacePtrW region_surface;
@@ -471,13 +471,13 @@ protected:
 };
 
 /**
- * Defines region tqlayout, should reside below 'head' element
+ * Defines region layout, should reside below 'head' element
  */
 class KMPLAYER_NO_EXPORT Layout : public RegionBase {
 public:
     Layout (NodePtr & d);
     NodePtr childFromTag (const TQString & tag);
-    KDE_NO_EXPORT const char * nodeName () const { return "tqlayout"; }
+    KDE_NO_EXPORT const char * nodeName () const { return "layout"; }
     void activate ();
     void closed ();
     virtual void accept (Visitor *);
@@ -517,11 +517,11 @@ class KMPLAYER_NO_EXPORT RootLayout : public RegionBase {
 public:
     KDE_NO_CDTOR_EXPORT RootLayout (NodePtr & d)
         : RegionBase (d, id_node_root_layout) {}
-    KDE_NO_EXPORT const char * nodeName () const { return "root-tqlayout"; }
+    KDE_NO_EXPORT const char * nodeName () const { return "root-layout"; }
 };
 
 /**
- * Represents a regPoint element for tqalignment inside regions
+ * Represents a regPoint element for alignment inside regions
  */
 class KMPLAYER_NO_EXPORT RegPoint : public Element {
 public:
@@ -656,7 +656,7 @@ protected:
 };
 
 /**
- * A Par represents parallel processing of all its tqchildren
+ * A Par represents parallel processing of all its children
  */
 class KMPLAYER_NO_EXPORT Par : public GroupBase {
 public:
@@ -668,7 +668,7 @@ public:
 };
 
 /**
- * A Seq represents sequential processing of all its tqchildren
+ * A Seq represents sequential processing of all its children
  */
 class KMPLAYER_NO_EXPORT Seq : public GroupBase {
 public:
@@ -691,7 +691,7 @@ public:
 };
 
 /**
- * An Excl represents exclusive processing of one of its tqchildren
+ * An Excl represents exclusive processing of one of its children
  */
 class KMPLAYER_NO_EXPORT Excl : public GroupBase {
 public:
@@ -780,7 +780,7 @@ public:
     Surface *surface ();
     void resetSurface ();
     SRect calculateBounds ();
-    void boundsUpdate (); // recalculates and tqrepaint old and new bounds
+    void boundsUpdate (); // recalculates and repaint old and new bounds
     virtual void parseParam (const TrieString & name, const TQString & value);
     virtual bool handleEvent (EventPtr event);
     NodeRefListPtr listeners (unsigned int event_id);
diff --git a/src/kmplayerapp.cpp b/src/kmplayerapp.cpp
index 3996635..13a54ab 100644
--- a/src/kmplayerapp.cpp
+++ b/src/kmplayerapp.cpp
@@ -29,7 +29,7 @@
 #include <tqkeysequence.h>
 #include <tqapplication.h>
 #include <tqslider.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 #include <tqtimer.h>
 #include <tqfile.h>
@@ -202,7 +202,7 @@ KDE_NO_CDTOR_EXPORT FileDocument::FileDocument (short i, const TQString &s, KMPl
 }
 
 KDE_NO_EXPORT KMPlayer::NodePtr FileDocument::childFromTag(const TQString &tag) {
-    if (tag == TQString::tqfromLatin1 (nodeName ()))
+    if (tag == TQString::fromLatin1 (nodeName ()))
         return this;
     return 0L;
 }
@@ -246,9 +246,9 @@ KDE_NO_EXPORT void Recents::defer () {
 
 KDE_NO_EXPORT KMPlayer::NodePtr Recents::childFromTag (const TQString & tag) {
     // kdDebug () << nodeName () << " childFromTag " << tag << endl;
-    if (tag == TQString::tqfromLatin1 ("item"))
+    if (tag == TQString::fromLatin1 ("item"))
         return new Recent (m_doc, app);
-    else if (tag == TQString::tqfromLatin1 ("group"))
+    else if (tag == TQString::fromLatin1 ("group"))
         return new Group (m_doc, app);
     return FileDocument::childFromTag (tag);
 }
@@ -282,9 +282,9 @@ Group::Group (KMPlayer::NodePtr & doc, KMPlayerApp * a, const TQString & pn)
 }
 
 KDE_NO_EXPORT KMPlayer::NodePtr Group::childFromTag (const TQString & tag) {
-    if (tag == TQString::tqfromLatin1 ("item"))
+    if (tag == TQString::fromLatin1 ("item"))
         return new Recent (m_doc, app);
-    else if (tag == TQString::tqfromLatin1 ("group"))
+    else if (tag == TQString::fromLatin1 ("group"))
         return new Group (m_doc, app);
     return 0L;
 }
@@ -862,14 +862,14 @@ KDE_NO_EXPORT void IntroSource::activate () {
         TQTextStream ts (&file);
         KMPlayer::readXML (m_document, ts, TQString (), false);
     } else {
-        TQString smil = TQString::tqfromLatin1 (
-          "<smil><head><tqlayout>"
-          "<root-tqlayout width='320' height='240' background-color='black'/>"
+        TQString smil = TQString::fromLatin1 (
+          "<smil><head><layout>"
+          "<root-layout width='320' height='240' background-color='black'/>"
           "<region id='image1' left='31.25%' top='25%' width='37.5%' height='50%' z-order='1'/>"
           "<region id='reg1' top='10%' height='80%' z-order='2'>"
           "<region id='image2' left='128' top='72' width='64' bottom='56'/>"
           "</region>"
-          "</tqlayout>"
+          "</layout>"
           "<transition id='fadein-1' dur='0.6' type='fade'/>"
           "<transition id='iris1' dur='0.3' type='irisWipe'/>"
           "</head>"
@@ -882,7 +882,7 @@ KDE_NO_EXPORT void IntroSource::activate () {
           "<seq begin='reg1.activateEvent'/>"
           "</excl>"
           "</body></smil>"
-          ).arg (locate ("data", "kmplayer/noise.gif")).arg (KGlobal::iconLoader()->iconPath (TQString::tqfromLatin1 ("kmplayer"), -64));
+          ).arg (locate ("data", "kmplayer/noise.gif")).arg (KGlobal::iconLoader()->iconPath (TQString::fromLatin1 ("kmplayer"), -64));
         TQTextStream ts (smil.utf8 (), IO_ReadOnly);
         KMPlayer::readXML (m_document, ts, TQString (), false);
     }
@@ -927,7 +927,7 @@ KDE_NO_EXPORT void KMPlayerApp::restoreFromConfig () {
         m_view->docArea ()->hide ();
         m_view->docArea ()->readDockConfig (m_player->config (), TQString ("Window Layout"));
         m_view->docArea ()->show ();
-        m_view->tqlayout ()->activate ();
+        m_view->layout ()->activate ();
     }
 }
 
@@ -1165,7 +1165,7 @@ KDE_NO_EXPORT void KMPlayerApp::readOptions() {
 #include <netwm.h>
 #undef Always
 #undef Never
-#undef tqStatus
+#undef Status
 #undef Unsorted
 #undef Bool
 
@@ -1227,18 +1227,18 @@ KDE_NO_EXPORT void ExitSource::activate () {
         TQTextStream ts (&file);
         KMPlayer::readXML (m_document, ts, TQString (), false);
     } else {
-        TQString smil = TQString::tqfromLatin1 ("<smil><head><tqlayout>"
-          "<root-tqlayout width='320' height='240' background-color='black'/>"
+        TQString smil = TQString::fromLatin1 ("<smil><head><layout>"
+          "<root-layout width='320' height='240' background-color='black'/>"
           "<region id='reg1' top='10%' height='80%' z-order='2'>"
           "<region id='image' left='128' top='72' width='64' bottom='56'/>"
-          "</region></tqlayout>"
+          "</region></layout>"
           "<transition id='pw' dur='0.3' type='pushWipe' subtype='fromBottom'/>"
           "</head><body>"
           "<par>"
           //"<animate target='reg1' attribute='background-color' calcMode='discrete' values='#FFFFFF;#E4E4E4;#CCCCCC;#B4B4B4;#9E9E9E;#8A8A8A;#777777;#656565;#555555;#464646;#393939;#2D2D2D;#222222;#191919;#111111;#0B0B0B;#060606;#020202;#000000;#000000' dur='0.6'/>"
           "<img src='%2' id='img1' region='image' dur='0.4' fit='hidden' transOut='pw'/>"
           "</par>"
-          "</body></smil>").arg (KGlobal::iconLoader()->iconPath (TQString::tqfromLatin1 ("kmplayer"), -64));
+          "</body></smil>").arg (KGlobal::iconLoader()->iconPath (TQString::fromLatin1 ("kmplayer"), -64));
         TQTextStream ts (smil.utf8 (), IO_ReadOnly);
         KMPlayer::readXML (m_document, ts, TQString (), false);
     }
@@ -1261,7 +1261,7 @@ KDE_NO_EXPORT void ExitSource::stateElementChanged (KMPlayer::Node * node, KMPla
     if (new_state == KMPlayer::Node::state_deactivated &&
             m_document == node &&
             m_player->view ())
-       m_player->view ()->tqtopLevelWidget ()->close ();
+       m_player->view ()->topLevelWidget ()->close ();
 }
 #endif
 
@@ -1437,7 +1437,7 @@ KDE_NO_EXPORT void KMPlayerApp::slotViewMenuBar() {
         slotStatusMsg(i18n("Ready"));
     } else {
         menuBar()->hide();
-        slotStatusMsg (i18n ("Show Menubar with %1").tqarg(viewMenuBar->shortcutText()));
+        slotStatusMsg (i18n ("Show Menubar with %1").arg(viewMenuBar->shortcutText()));
         if (!m_showStatusbar) {
             statusBar()->show();
             TQTimer::singleShot (3000, statusBar(), TQT_SLOT (hide ()));
@@ -1452,7 +1452,7 @@ KDE_NO_EXPORT void KMPlayerApp::slotStatusMsg (const TQString &text) {
 }
 
 KDE_NO_EXPORT void KMPlayerApp::fullScreen () {
-//    if (TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender ()))->tqmetaObject ()->inherits ("KAction"))
+//    if (TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender ()))->metaObject ()->inherits ("KAction"))
     if (TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender ()))->inherits ("KAction"))
         m_view->fullScreen();
 #if KDE_IS_VERSION(3,1,90)
@@ -1704,17 +1704,17 @@ KDE_NO_EXPORT void KMPlayerMenuSource::menuItemClicked (TQPopupMenu * menu, int
 
 KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageDVD::KMPlayerPrefSourcePageDVD (TQWidget * parent)
  : TQFrame(parent) {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout (this, 5, 2);
+    TQVBoxLayout *layout = new TQVBoxLayout (this, 5, 2);
     autoPlayDVD = new TQCheckBox (i18n ("Auto play after opening DVD"), this, 0);
     TQWhatsThis::add(autoPlayDVD, i18n ("Start playing DVD right after opening DVD"));
     TQLabel *dvdDevicePathLabel = new TQLabel (i18n("DVD device:"), this, 0);
     dvddevice = new KURLRequester ("/dev/dvd", this, 0);
     TQWhatsThis::add(dvddevice, i18n ("Path to your DVD device, you must have read rights to this device"));
-    tqlayout->addWidget (autoPlayDVD);
-    tqlayout->addItem (new TQSpacerItem (0, 10, TQSizePolicy::Minimum, TQSizePolicy::Minimum));
-    tqlayout->addWidget (dvdDevicePathLabel);
-    tqlayout->addWidget (dvddevice);
-    tqlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+    layout->addWidget (autoPlayDVD);
+    layout->addItem (new TQSpacerItem (0, 10, TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+    layout->addWidget (dvdDevicePathLabel);
+    layout->addWidget (dvddevice);
+    layout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
 }
 
 //-----------------------------------------------------------------------------
@@ -2065,17 +2065,17 @@ KDE_NO_EXPORT TQString KMPlayerDVDNavSource::prettyName () {
 
 KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageVCD::KMPlayerPrefSourcePageVCD (TQWidget * parent)
  : TQFrame (parent) {
-     TQVBoxLayout *tqlayout = new TQVBoxLayout (this, 5, 2);
+     TQVBoxLayout *layout = new TQVBoxLayout (this, 5, 2);
      autoPlayVCD = new TQCheckBox (i18n ("Auto play after opening a VCD"), this, 0);
      TQWhatsThis::add(autoPlayVCD, i18n ("Start playing VCD right after opening VCD"));
      TQLabel *vcdDevicePathLabel = new TQLabel (i18n ("VCD (CDROM) device:"), this, 0);
      vcddevice= new KURLRequester ("/dev/cdrom", this, 0);
      TQWhatsThis::add(vcddevice, i18n ("Path to your CDROM/DVD device, you must have read rights to this device"));
-     tqlayout->addWidget (autoPlayVCD);
-     tqlayout->addItem (new TQSpacerItem (0, 10, TQSizePolicy::Minimum, TQSizePolicy::Minimum));
-     tqlayout->addWidget (vcdDevicePathLabel);
-     tqlayout->addWidget (vcddevice);
-     tqlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+     layout->addWidget (autoPlayVCD);
+     layout->addItem (new TQSpacerItem (0, 10, TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+     layout->addWidget (vcdDevicePathLabel);
+     layout->addWidget (vcddevice);
+     layout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
 }
 
 //-----------------------------------------------------------------------------
diff --git a/src/kmplayerbroadcast.cpp b/src/kmplayerbroadcast.cpp
index 41a4dca..bb28f03 100644
--- a/src/kmplayerbroadcast.cpp
+++ b/src/kmplayerbroadcast.cpp
@@ -18,7 +18,7 @@
 */
 #include <algorithm>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqtable.h>
@@ -155,51 +155,51 @@ KDE_NO_EXPORT const TQStringList FFServerSetting::list () {
 //-----------------------------------------------------------------------------
 
 KDE_NO_CDTOR_EXPORT KMPlayerPrefBroadcastPage::KMPlayerPrefBroadcastPage (TQWidget *parent) : TQFrame (parent) {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout (this, 5);
-    TQGridLayout *gridtqlayout = new TQGridLayout (tqlayout, 6, 2, 2);
+    TQVBoxLayout *layout = new TQVBoxLayout (this, 5);
+    TQGridLayout *gridlayout = new TQGridLayout (layout, 6, 2, 2);
     TQLabel *label = new TQLabel (i18n ("Bind address:"), this);
     bindaddress = new TQLineEdit ("", this);
     TQWhatsThis::add (bindaddress, i18n ("If you have multiple network devices, you can limit access"));
-    gridtqlayout->addWidget (label, 0, 0);
-    gridtqlayout->addWidget (bindaddress, 0, 1);
+    gridlayout->addWidget (label, 0, 0);
+    gridlayout->addWidget (bindaddress, 0, 1);
     label = new TQLabel (i18n ("Listen port:"), this);
     port = new TQLineEdit ("", this);
-    gridtqlayout->addWidget (label, 1, 0);
-    gridtqlayout->addWidget (port, 1, 1);
+    gridlayout->addWidget (label, 1, 0);
+    gridlayout->addWidget (port, 1, 1);
     label = new TQLabel (i18n ("Maximum connections:"), this);
     maxclients = new TQLineEdit ("", this);
-    gridtqlayout->addWidget (label, 2, 0);
-    gridtqlayout->addWidget (maxclients, 2, 1);
+    gridlayout->addWidget (label, 2, 0);
+    gridlayout->addWidget (maxclients, 2, 1);
     label = new TQLabel (i18n ("Maximum bandwidth (kbit):"), this);
     maxbandwidth = new TQLineEdit ("", this);
-    gridtqlayout->addWidget (label, 3, 0);
-    gridtqlayout->addWidget (maxbandwidth, 3, 1);
+    gridlayout->addWidget (label, 3, 0);
+    gridlayout->addWidget (maxbandwidth, 3, 1);
     label = new TQLabel (i18n ("Temporary feed file:"), this);
     feedfile = new TQLineEdit ("", this);
-    gridtqlayout->addWidget (label, 4, 0);
-    gridtqlayout->addWidget (feedfile, 4, 1);
+    gridlayout->addWidget (label, 4, 0);
+    gridlayout->addWidget (feedfile, 4, 1);
     label = new TQLabel (i18n ("Feed file size (kB):"), this);
     feedfilesize = new TQLineEdit ("", this);
-    gridtqlayout->addWidget (label, 5, 0);
-    gridtqlayout->addWidget (feedfilesize, 5, 1);
-    tqlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+    gridlayout->addWidget (label, 5, 0);
+    gridlayout->addWidget (feedfilesize, 5, 1);
+    layout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
 }
 
 //-----------------------------------------------------------------------------
 
 #undef ADDPROPERTY
-#define ADDPROPERTY(label,qedit,gridtqlayout,row,parent)                  \
+#define ADDPROPERTY(label,qedit,gridlayout,row,parent)                  \
     qedit = new TQLineEdit ("", parent);                                 \
-    gridtqlayout->addWidget (new TQLabel (qedit, label, parent), row, 0);  \
-    gridtqlayout->addWidget (qedit, row, 1);
+    gridlayout->addWidget (new TQLabel (qedit, label, parent), row, 0);  \
+    gridlayout->addWidget (qedit, row, 1);
 
 KDE_NO_CDTOR_EXPORT KMPlayerPrefBroadcastFormatPage::KMPlayerPrefBroadcastFormatPage (TQWidget *parent, FFServerSettingList & ffs) : TQFrame (parent, "BroadcastPage"), profiles (ffs)
 {
-    TQHBoxLayout *tqlayout = new TQHBoxLayout (this, 5);
-    TQGridLayout *formattqlayout = new TQGridLayout (11, 2, 2);
-    formattqlayout->tqsetAlignment (TQt::AlignTop);
-    TQVBoxLayout *lefttqlayout = new TQVBoxLayout (15);
-    TQHBoxLayout *ledtqlayout = new TQHBoxLayout (5);
+    TQHBoxLayout *layout = new TQHBoxLayout (this, 5);
+    TQGridLayout *formatlayout = new TQGridLayout (11, 2, 2);
+    formatlayout->setAlignment (TQt::AlignTop);
+    TQVBoxLayout *leftlayout = new TQVBoxLayout (15);
+    TQHBoxLayout *ledlayout = new TQHBoxLayout (5);
     format = new TQComboBox (this);
     TQLabel * label = new TQLabel (format, i18n ("Format:"), this);
     format->clear ();
@@ -210,18 +210,18 @@ KDE_NO_CDTOR_EXPORT KMPlayerPrefBroadcastFormatPage::KMPlayerPrefBroadcastFormat
     format->insertItem (TQString ("rm"));
     format->insertItem (TQString ("swf"));
     TQWhatsThis::add (format, i18n ("Only avi, mpeg and rm work for mplayer playback"));
-    formattqlayout->addWidget (label, 0, 0);
-    formattqlayout->addWidget (format, 0, 1);
-    ADDPROPERTY (i18n ("Audio codec:"), audiocodec, formattqlayout, 1, this);
-    ADDPROPERTY (i18n ("Audio bit rate (kbit):"), audiobitrate, formattqlayout, 2, this);
-    ADDPROPERTY (i18n ("Audio sample rate (Hz):"), audiosamplerate, formattqlayout, 3, this);
-    ADDPROPERTY (i18n ("Video codec:"), videocodec, formattqlayout, 4, this);
-    ADDPROPERTY (i18n ("Video bit rate (kbit):"), videobitrate, formattqlayout, 5, this);
-    ADDPROPERTY (i18n ("Quality (1-31):"), quality, formattqlayout, 6, this);
-    ADDPROPERTY (i18n ("Frame rate (Hz):"), framerate, formattqlayout, 7, this);
-    ADDPROPERTY (i18n ("Gop size:"), gopsize, formattqlayout, 8, this);
-    ADDPROPERTY (i18n ("Width (pixels):"), moviewidth, formattqlayout, 9, this);
-    ADDPROPERTY (i18n ("Height (pixels):"), movieheight, formattqlayout, 10, this);
+    formatlayout->addWidget (label, 0, 0);
+    formatlayout->addWidget (format, 0, 1);
+    ADDPROPERTY (i18n ("Audio codec:"), audiocodec, formatlayout, 1, this);
+    ADDPROPERTY (i18n ("Audio bit rate (kbit):"), audiobitrate, formatlayout, 2, this);
+    ADDPROPERTY (i18n ("Audio sample rate (Hz):"), audiosamplerate, formatlayout, 3, this);
+    ADDPROPERTY (i18n ("Video codec:"), videocodec, formatlayout, 4, this);
+    ADDPROPERTY (i18n ("Video bit rate (kbit):"), videobitrate, formatlayout, 5, this);
+    ADDPROPERTY (i18n ("Quality (1-31):"), quality, formatlayout, 6, this);
+    ADDPROPERTY (i18n ("Frame rate (Hz):"), framerate, formatlayout, 7, this);
+    ADDPROPERTY (i18n ("Gop size:"), gopsize, formatlayout, 8, this);
+    ADDPROPERTY (i18n ("Width (pixels):"), moviewidth, formatlayout, 9, this);
+    ADDPROPERTY (i18n ("Height (pixels):"), movieheight, formatlayout, 10, this);
     label = new TQLabel (i18n ("Allow access from:"), this);
     accesslist = new TQTable (40, 1, this);
     accesslist->verticalHeader ()->hide ();
@@ -231,7 +231,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerPrefBroadcastFormatPage::KMPlayerPrefBroadcastFormat
     TQHeader *header = accesslist->horizontalHeader ();
     header->setLabel (0, i18n ("Host/IP or IP Range"));
     TQFrame *profileframe = new TQFrame (this);
-    TQGridLayout *profilestqlayout = new TQGridLayout (profileframe, 5, 2, 2);
+    TQGridLayout *profileslayout = new TQGridLayout (profileframe, 5, 2, 2);
     profile = new TQLineEdit ("", profileframe);
     connect (profile, TQT_SIGNAL(textChanged (const TQString &)),
              this, TQT_SLOT (slotTextChanged (const TQString &)));
@@ -251,33 +251,33 @@ KDE_NO_CDTOR_EXPORT KMPlayerPrefBroadcastFormatPage::KMPlayerPrefBroadcastFormat
     connect (load, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotLoad ()));
     connect (save, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotSave ()));
     connect (del, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotDelete ()));
-    profilestqlayout->addWidget (profile, 0, 0);
-    profilestqlayout->setRowSpacing (4, 60);
-    profilestqlayout->addMultiCellWidget (profilelist, 1, 4, 0, 0);
-    profilestqlayout->addWidget (load, 1, 1);
-    profilestqlayout->addWidget (save, 2, 1);
-    profilestqlayout->addWidget (del, 3, 1);
-    lefttqlayout->addWidget (profileframe);
+    profileslayout->addWidget (profile, 0, 0);
+    profileslayout->setRowSpacing (4, 60);
+    profileslayout->addMultiCellWidget (profilelist, 1, 4, 0, 0);
+    profileslayout->addWidget (load, 1, 1);
+    profileslayout->addWidget (save, 2, 1);
+    profileslayout->addWidget (del, 3, 1);
+    leftlayout->addWidget (profileframe);
     startbutton = new TQPushButton (i18n ("Start"), this);
     serverled = new KLed (TQt::green, KLed::Off, KLed::Raised, KLed::Circular, this);
     feedled = new KLed (TQt::green, KLed::Off, KLed::Raised, KLed::Circular, this);
-    ledtqlayout->addWidget (startbutton);
-    ledtqlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
-    ledtqlayout->addWidget (serverled);
-    ledtqlayout->addWidget (feedled);
-    lefttqlayout->addLayout (ledtqlayout);
+    ledlayout->addWidget (startbutton);
+    ledlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
+    ledlayout->addWidget (serverled);
+    ledlayout->addWidget (feedled);
+    leftlayout->addLayout (ledlayout);
     TQFrame * line = new TQFrame (this);
     line->setFrameShape (TQFrame::HLine);
-    lefttqlayout->addWidget (line);
-    lefttqlayout->addWidget (label);
-    lefttqlayout->addWidget (accesslist);
-    lefttqlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
-    tqlayout->addLayout (lefttqlayout);
+    leftlayout->addWidget (line);
+    leftlayout->addWidget (label);
+    leftlayout->addWidget (accesslist);
+    leftlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+    layout->addLayout (leftlayout);
     line = new TQFrame (this);
     line->setFrameShape (TQFrame::VLine);
-    tqlayout->addWidget (line);
-    tqlayout->addLayout (formattqlayout);
-    tqlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+    layout->addWidget (line);
+    layout->addLayout (formatlayout);
+    layout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
 }
 
 #undef ADDPROPERTY
diff --git a/src/kmplayerconfig.cpp b/src/kmplayerconfig.cpp
index a5e975f..8b3c56a 100644
--- a/src/kmplayerconfig.cpp
+++ b/src/kmplayerconfig.cpp
@@ -20,7 +20,7 @@
 #include <functional>
 #include <config.h>
 #include <tqcheckbox.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 #include <tqtabwidget.h>
@@ -497,7 +497,7 @@ void Settings::show (const char * pagename) {
     if (pagename)
         configDialog ()->setPage (pagename);
     if (created)
-        configdialog->resize (configdialog->tqminimumSize ());
+        configdialog->resize (configdialog->minimumSize ());
     configdialog->show ();
 }
 
diff --git a/src/kmplayercontrolpanel.cpp b/src/kmplayercontrolpanel.cpp
index ce5be9d..cab529b 100644
--- a/src/kmplayercontrolpanel.cpp
+++ b/src/kmplayercontrolpanel.cpp
@@ -16,7 +16,7 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpixmap.h>
 #include <tqslider.h>
 #include <tqlabel.h>
@@ -292,7 +292,7 @@ KDE_NO_EXPORT void KMPlayerPopupMenu::leaveEvent (TQEvent *) {
 
 KDE_NO_CDTOR_EXPORT VolumeBar::VolumeBar (TQWidget * parent, View * view)
  : TQWidget (parent), m_view (view), m_value (100) {
-    tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
+    setSizePolicy( TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
     setMinimumSize (TQSize (51, button_height_only_buttons + 2));
     TQToolTip::add (this, i18n ("Volume is %1").arg (m_value));
 }
@@ -306,7 +306,7 @@ void VolumeBar::setValue (int v) {
     if (m_value > 100) m_value = 100;
     TQToolTip::remove (this);
     TQToolTip::add (this, i18n ("Volume is %1").arg (m_value));
-    tqrepaint (true);
+    repaint (true);
     emit volumeChanged (m_value);
 }
 
@@ -517,11 +517,11 @@ void ControlPanel::setAutoControls (bool b) {
 
 KDE_NO_EXPORT void ControlPanel::showPopupMenu () {
     m_view->updateVolume ();
-    m_popupMenu->exec (m_buttons [button_config]->mapToGlobal (TQPoint (0, tqmaximumSize ().height ())));
+    m_popupMenu->exec (m_buttons [button_config]->mapToGlobal (TQPoint (0, maximumSize ().height ())));
 }
 
 KDE_NO_EXPORT void ControlPanel::showLanguageMenu () {
-    m_languageMenu->exec (m_buttons [button_language]->mapToGlobal (TQPoint (0, tqmaximumSize ().height ())));
+    m_languageMenu->exec (m_buttons [button_language]->mapToGlobal (TQPoint (0, maximumSize ().height ())));
 }
 
 void ControlPanel::showPositionSlider (bool show) {
@@ -540,7 +540,7 @@ KDE_NO_EXPORT void ControlPanel::setupPositionSlider (bool show) {
         m_posSlider->show ();
         m_buttonbox->setMargin (4);
         m_buttonbox->setSpacing (4);
-        setEraseColor (m_view->tqtopLevelWidget ()->paletteBackgroundColor ());
+        setEraseColor (m_view->topLevelWidget ()->paletteBackgroundColor ());
     } else {
         m_posSlider->hide ();
         m_buttonbox->setMargin (1);
diff --git a/src/kmplayerpartbase.cpp b/src/kmplayerpartbase.cpp
index 00c83e8..c43596b 100644
--- a/src/kmplayerpartbase.cpp
+++ b/src/kmplayerpartbase.cpp
@@ -34,7 +34,7 @@
 #include <tqslider.h>
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <kmessagebox.h>
 #include <kaboutdata.h>
@@ -702,7 +702,7 @@ void PartBase::updateInfo (const TQString & msg) {
     emit infoUpdated (msg);
 }
 
-void PartBase::updatetqStatus (const TQString & msg) {
+void PartBase::updateStatus (const TQString & msg) {
     emit statusUpdated (msg);
 }
 
@@ -1376,7 +1376,7 @@ void Source::stateChange(Process *p, Process::State olds, Process::State news) {
     Recorder *rec = dynamic_cast <Recorder *> (p);
     if (rec && !rec->recordURL ().isEmpty ()) {
         kdDebug () << "recordState " << statemap[olds] << " -> " << statemap[news] << endl;
-        m_player->updatetqStatus (i18n ("Recorder %1 %2").arg (p->name ()).arg (statemap[news]));
+        m_player->updateStatus (i18n ("Recorder %1 %2").arg (p->name ()).arg (statemap[news]));
         p->viewer ()->view ()->controlPanel ()->setRecording (news > Process::Ready);
         if (news == Process::Ready) {
             if (olds > Process::Ready) {
@@ -1394,7 +1394,7 @@ void Source::stateChange(Process *p, Process::State olds, Process::State news) {
     } else {
         p->viewer()->view()->controlPanel()->setPlaying(news > Process::Ready);
         kdDebug () << "processState " << statemap[olds] << " -> " << statemap[news] << endl;
-        m_player->updatetqStatus (i18n ("Player %1 %2").arg (p->name ()).arg (statemap[news]));
+        m_player->updateStatus (i18n ("Player %1 %2").arg (p->name ()).arg (statemap[news]));
         if (!p->mrl () && news > Process::Ready) {
             p->stop (); // reschedule for Ready state
         } else if (news == Process::Playing) {
@@ -1437,7 +1437,7 @@ void Source::stateChange(Process *p, Process::State olds, Process::State news) {
 		}
                 if (m_player->view() &&
                         (!mrl || mrl->view_mode != Mrl::WindowMode))
-                    static_cast<View*>(m_player->view())->viewArea()->tqrepaint();
+                    static_cast<View*>(m_player->view())->viewArea()->repaint();
             } else
                 TQTimer::singleShot (0, this, TQT_SLOT (playCurrent ()));
         } else if (news == Process::Buffering) {
@@ -1502,7 +1502,7 @@ KDE_NO_EXPORT void URLSource::stopResolving () {
         for (SharedPtr <ResolveInfo> ri = m_resolve_info; ri; ri = ri->next)
             ri->job->kill ();
         m_resolve_info = 0L;
-        m_player->updatetqStatus (i18n ("Disconnected"));
+        m_player->updateStatus (i18n ("Disconnected"));
         m_player->setLoaded (100);
     }
 }
@@ -1650,7 +1650,7 @@ KDE_NO_EXPORT void URLSource::read (NodePtr root, TQTextStream & textstream) {
             readXML (cur_elm, textstream, line);
             //cur_elm->normalize ();
             if (m_document && m_document->firstChild ()) {
-                // SMIL documents have set its size of root-tqlayout
+                // SMIL documents have set its size of root-layout
                 Mrl * mrl = m_document->firstChild ()->mrl ();
                 if (mrl)
                     Source::setDimensions (m_document->firstChild (), mrl->width, mrl->height);
@@ -1724,7 +1724,7 @@ KDE_NO_EXPORT void URLSource::kioResult (KIO::Job * job) {
         kdWarning () << "Spurious kioData" << endl;
         return;
     }
-    m_player->updatetqStatus ("");
+    m_player->updateStatus ("");
     m_player->setLoaded (100);
     if (previnfo)
         previnfo->next = rinfo->next;
@@ -1836,8 +1836,8 @@ bool URLSource::resolveURL (NodePtr m) {
                 url.protocol ().compare (TQString ("rtp"))) ||
             (mimestr.isEmpty () &&
              (url.protocol ().startsWith (TQString ("http")) || 
-              url.protocol () == TQString::tqfromLatin1 ("media") ||
-              url.protocol () == TQString::tqfromLatin1 ("remote")))) {
+              url.protocol () == TQString::fromLatin1 ("media") ||
+              url.protocol () == TQString::fromLatin1 ("remote")))) {
         KIO::Job * job = KIO::get (url, false, false);
         job->addMetaData ("PropagateHttpHeader", "true");
         job->addMetaData ("errorPage", "false");
@@ -1851,7 +1851,7 @@ bool URLSource::resolveURL (NodePtr m) {
         connect (m_resolve_info->job, TQT_SIGNAL (result (KIO::Job *)),
                 this, TQT_SLOT (kioResult (KIO::Job *)));
         static_cast <View *> (m_player->view ())->controlPanel ()->setPlaying (true);
-        m_player->updatetqStatus (i18n ("Connecting"));
+        m_player->updateStatus (i18n ("Connecting"));
         m_player->setLoaded (0);
         return false; // wait for result ..
     }
diff --git a/src/kmplayerpartbase.h b/src/kmplayerpartbase.h
index 52b01e1..2ab8450 100644
--- a/src/kmplayerpartbase.h
+++ b/src/kmplayerpartbase.h
@@ -152,7 +152,7 @@ public:
     bool mayResize () const { return !m_noresize; }
     void updatePlayerMenu (ControlPanel *);
     void updateInfo (const TQString & msg);
-    void updatetqStatus (const TQString & msg);
+    void updateStatus (const TQString & msg);
 #ifdef HAVE_DBUS
     void setServiceName (const TQString & srv) { m_service = srv; }
     TQString serviceName () const { return m_service; }
diff --git a/src/kmplayerplaylist.cpp b/src/kmplayerplaylist.cpp
index 12ca61e..e99248f 100644
--- a/src/kmplayerplaylist.cpp
+++ b/src/kmplayerplaylist.cpp
@@ -19,7 +19,7 @@
 #include <config.h>
 #include <time.h>
 
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <kdebug.h>
 #include <kurl.h>
 #ifdef HAVE_EXPAT
@@ -296,7 +296,7 @@ void Node::clearChildren () {
     if (m_doc)
         document()->m_tree_version++;
     while (m_first_child != m_last_child) {
-        // avoid stack abuse with 10k tqchildren derefing each other
+        // avoid stack abuse with 10k children derefing each other
         m_last_child->m_parent = 0L;
         m_last_child = m_last_child->m_prev;
         m_last_child->m_next = 0L;
diff --git a/src/kmplayerplaylist.h b/src/kmplayerplaylist.h
index 8f3a519..3371e70 100644
--- a/src/kmplayerplaylist.h
+++ b/src/kmplayerplaylist.h
@@ -164,7 +164,7 @@ public:
 };
 
 /*
- * Base class for double linked tree nodes having parent/siblings/tqchildren.
+ * Base class for double linked tree nodes having parent/siblings/children.
  * The linkage is a shared firstChild and weak parentNode.
  */
 template <class T>
@@ -246,7 +246,7 @@ typedef Item<Node>::WeakType NodePtrW;
 typedef Item<Attribute>::SharedType AttributePtr;
 typedef Item<Attribute>::WeakType AttributePtrW;
 typedef Item<Event>::SharedType EventPtr;
-typedef List<Node> NodeList;                 // eg. for Node's tqchildren
+typedef List<Node> NodeList;                 // eg. for Node's children
 typedef Item<NodeList>::SharedType NodeListPtr;
 typedef Item<NodeList>::WeakType NodeListPtrW;
 ITEM_AS_POINTER(KMPlayer::NodeList)
@@ -402,7 +402,7 @@ public:
     virtual void finish ();
     /**
      * Stops element, sets state to state_deactivated. Calls deactivate() on 
-     * activated/deferred tqchildren. May call childDone() when active() and not
+     * activated/deferred children. May call childDone() when active() and not
      * finished yet.
      */
     virtual void deactivate ();
@@ -440,7 +440,7 @@ public:
      */
     virtual void opened ();
     /*
-     * Close tag is found by parser, tqchildren are appended
+     * Close tag is found by parser, children are appended
      */
     virtual void closed ();
 protected:
@@ -632,8 +632,8 @@ public:
     virtual SurfacePtr createSurface (NodePtr owner, const SRect & rect) = 0;
     virtual IRect toScreen (Single x, Single y, Single w, Single h) = 0;
     virtual void resize (const SRect & rect) = 0;
-    virtual void tqrepaint () = 0;
-    virtual void tqrepaint (const SRect &rect) = 0;
+    virtual void repaint () = 0;
+    virtual void repaint (const SRect &rect) = 0;
     virtual void video () = 0;
     void remove ();                // remove from parent, mark ancestors dirty
     void markDirty ();             // mark this and ancestors dirty
diff --git a/src/kmplayerprocess.cpp b/src/kmplayerprocess.cpp
index f36a410..79250fc 100644
--- a/src/kmplayerprocess.cpp
+++ b/src/kmplayerprocess.cpp
@@ -23,7 +23,7 @@
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqtimer.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtable.h>
 #include <tqlineedit.h>
 #include <tqslider.h>
@@ -101,7 +101,7 @@ void Process::initProcess (Viewer * viewer) {
     delete m_process;
     m_process = new KProcess;
     m_process->setUseShell (true);
-    m_process->setEnvironment (TQString::tqfromLatin1 ("SESSION_MANAGER"), TQString::tqfromLatin1 (""));
+    m_process->setEnvironment (TQString::fromLatin1 ("SESSION_MANAGER"), TQString::fromLatin1 (""));
     if (m_source) m_source->setPosition (0);
 }
 
@@ -548,7 +548,7 @@ bool MPlayer::run (const char * args, const char * pipe) {
         fprintf (stderr, " -vo %s", strVideoDriver.lower().ascii());
         *m_process << " -vo " << strVideoDriver.lower();
         if (viewer ()->view ()->keepSizeRatio () &&
-                strVideoDriver.lower() == TQString::tqfromLatin1 ("x11")) {
+                strVideoDriver.lower() == TQString::fromLatin1 ("x11")) {
             fprintf (stderr, " -zoom");
             *m_process << " -zoom";
         }
@@ -894,7 +894,7 @@ public:
 
 KDE_NO_CDTOR_EXPORT MPlayerPreferencesFrame::MPlayerPreferencesFrame (TQWidget * parent)
  : TQFrame (parent) {
-    TQVBoxLayout * tqlayout = new TQVBoxLayout (this);
+    TQVBoxLayout * layout = new TQVBoxLayout (this);
     table = new TQTable (int (MPlayerPreferencesPage::pat_last)+non_patterns, 2, this);
     table->verticalHeader ()->hide ();
     table->setLeftMargin (0);
@@ -919,7 +919,7 @@ KDE_NO_CDTOR_EXPORT MPlayerPreferencesFrame::MPlayerPreferencesFrame (TQWidget *
     }
     table->setColumnWidth (0, first_column_width);
     table->setColumnStretchable (1, true);
-    tqlayout->addWidget (table);
+    layout->addWidget (table);
 }
 
 KDE_NO_CDTOR_EXPORT MPlayerPreferencesPage::MPlayerPreferencesPage (MPlayer * p)
@@ -1572,9 +1572,9 @@ private:
 KDE_NO_CDTOR_EXPORT XMLPreferencesFrame::XMLPreferencesFrame
 (TQWidget * parent, CallbackProcess * p)
  : TQFrame (parent), m_process (p){
-    TQVBoxLayout * tqlayout = new TQVBoxLayout (this);
+    TQVBoxLayout * layout = new TQVBoxLayout (this);
     table = new TQTable (this);
-    tqlayout->addWidget (table);
+    layout->addWidget (table);
 }
 
 KDE_NO_CDTOR_EXPORT XMLPreferencesPage::XMLPreferencesPage (CallbackProcess * p)
@@ -2488,7 +2488,7 @@ KDE_NO_EXPORT void NpPlayer::processStreams () {
             char *mt = strdup (stream->mimetype.isEmpty ()
                     ? ""
                     : stream->mimetype.utf8 ().data ());
-            TQString objpath=TQString("/plugin/stream_%1").tqarg(stream->stream_id);
+            TQString objpath=TQString("/plugin/stream_%1").arg(stream->stream_id);
             DBusMessage *msg = dbus_message_new_method_call (
                     remote_service.ascii(),
                     objpath.ascii (),
diff --git a/src/kmplayertvsource.cpp b/src/kmplayertvsource.cpp
index 9596879..f1cd0cf 100644
--- a/src/kmplayertvsource.cpp
+++ b/src/kmplayertvsource.cpp
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqtimer.h>
 #include <tqpushbutton.h>
@@ -58,10 +58,10 @@ static const char * strTVDriver = "Driver";
 KDE_NO_CDTOR_EXPORT TVDevicePage::TVDevicePage (TQWidget *parent, KMPlayer::NodePtr dev)
 : TQFrame (parent, "PageTVDevice"), device_doc (dev) {
     TVDevice * device = KMPlayer::convertNode <TVDevice> (device_doc);
-    TQVBoxLayout *tqlayout = new TQVBoxLayout (this, 5, 2);
+    TQVBoxLayout *layout = new TQVBoxLayout (this, 5, 2);
     TQLabel * deviceLabel = new TQLabel (i18n ("Video device:") + device->src, this, 0);
-    tqlayout->addWidget (deviceLabel);
-    TQGridLayout *gridtqlayout = new TQGridLayout (tqlayout, 3, 4);
+    layout->addWidget (deviceLabel);
+    TQGridLayout *gridlayout = new TQGridLayout (layout, 3, 4);
     TQLabel * audioLabel = new TQLabel (i18n ("Audio device:"), this);
     audiodevice = new KURLRequester (device->getAttribute ("audio"), this);
     TQLabel * nameLabel = new TQLabel (i18n ("Name:"), this, 0);
@@ -79,19 +79,19 @@ KDE_NO_CDTOR_EXPORT TVDevicePage::TVDevicePage (TQWidget *parent, KMPlayer::Node
             continue;
         TVInput * input = KMPlayer::convertNode <TVInput> (ip);
         TQWidget * widget = new TQWidget (this);
-        TQHBoxLayout *tabtqlayout = new TQHBoxLayout (widget, 5, 2);
+        TQHBoxLayout *tablayout = new TQHBoxLayout (widget, 5, 2);
         if (!input->getAttribute ("tuner").isEmpty ()) {
-            TQHBoxLayout *horztqlayout = new TQHBoxLayout ();
-            TQVBoxLayout *verttqlayout = new TQVBoxLayout ();
-            horztqlayout->addWidget (new TQLabel (i18n ("Norm:"), widget));
+            TQHBoxLayout *horzlayout = new TQHBoxLayout ();
+            TQVBoxLayout *vertlayout = new TQVBoxLayout ();
+            horzlayout->addWidget (new TQLabel (i18n ("Norm:"), widget));
             TQComboBox * norms = new TQComboBox (widget, "PageTVNorm");
             norms->insertItem (TQString ("NTSC"), 0);
             norms->insertItem (TQString ("PAL"), 1);
             norms->insertItem (TQString ("SECAM"), 2);
             norms->setCurrentText (input->getAttribute ("norm"));
-            horztqlayout->addWidget (norms);
-            verttqlayout->addLayout (horztqlayout);
-            verttqlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+            horzlayout->addWidget (norms);
+            vertlayout->addLayout (horzlayout);
+            vertlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
             TQTable * table = new TQTable (90, 2, widget, "PageTVChannels");
             TQFontMetrics metrics (table->font ());
             TQHeader *header = table->horizontalHeader();
@@ -110,29 +110,29 @@ KDE_NO_CDTOR_EXPORT TVDevicePage::TVDevicePage (TQWidget *parent, KMPlayer::Node
             }
             table->setColumnWidth (0, first_column_width);
             table->setColumnStretchable (1, true);
-            tabtqlayout->addWidget (table);
-            tabtqlayout->addLayout (verttqlayout);
+            tablayout->addWidget (table);
+            tablayout->addLayout (vertlayout);
         }
         inputsTab->addTab (widget, input->mrl ()->pretty_name);
     }
     TQPushButton * delButton = new TQPushButton (i18n ("Delete"), this);
     connect (delButton, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotDelete ()));
-    gridtqlayout->addWidget (audioLabel, 0, 0);
-    gridtqlayout->addMultiCellWidget (audiodevice, 0, 0, 1, 3);
-    gridtqlayout->addWidget (nameLabel, 1, 0);
-    gridtqlayout->addMultiCellWidget (name, 1, 1, 1, 3);
-    gridtqlayout->addWidget (sizewidthLabel, 2, 0);
-    gridtqlayout->addWidget (sizewidth, 2, 1);
-    gridtqlayout->addWidget (sizeheightLabel, 2, 2);
-    gridtqlayout->addWidget (sizeheight, 2, 3);
-    tqlayout->addWidget (inputsTab);
-    tqlayout->addSpacing (5);
-    tqlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum));
-    TQHBoxLayout *buttontqlayout = new TQHBoxLayout ();
-    buttontqlayout->addWidget (noplayback);
-    buttontqlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
-    buttontqlayout->addWidget (delButton);
-    tqlayout->addLayout (buttontqlayout);
+    gridlayout->addWidget (audioLabel, 0, 0);
+    gridlayout->addMultiCellWidget (audiodevice, 0, 0, 1, 3);
+    gridlayout->addWidget (nameLabel, 1, 0);
+    gridlayout->addMultiCellWidget (name, 1, 1, 1, 3);
+    gridlayout->addWidget (sizewidthLabel, 2, 0);
+    gridlayout->addWidget (sizewidth, 2, 1);
+    gridlayout->addWidget (sizeheightLabel, 2, 2);
+    gridlayout->addWidget (sizeheight, 2, 3);
+    layout->addWidget (inputsTab);
+    layout->addSpacing (5);
+    layout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+    TQHBoxLayout *buttonlayout = new TQHBoxLayout ();
+    buttonlayout->addWidget (noplayback);
+    buttonlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
+    buttonlayout->addWidget (delButton);
+    layout->addLayout (buttonlayout);
 }
 
 KDE_NO_EXPORT void TVDevicePage::slotDelete () {
@@ -144,13 +144,13 @@ KDE_NO_EXPORT void TVDevicePage::slotDelete () {
 
 KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageTV::KMPlayerPrefSourcePageTV (TQWidget *parent, KMPlayerTVSource * tvsource)
 : TQFrame (parent), m_tvsource (tvsource) {
-    TQVBoxLayout * maintqlayout = new TQVBoxLayout (this, 5);
+    TQVBoxLayout * mainlayout = new TQVBoxLayout (this, 5);
     notebook = new TQTabWidget (this);
     notebook->setTabPosition (TQTabWidget::Bottom);
-    maintqlayout->addWidget (notebook);
+    mainlayout->addWidget (notebook);
     TQWidget * general = new TQWidget (notebook);
-    TQVBoxLayout *tqlayout = new TQVBoxLayout (general);
-    TQGridLayout *gridtqlayout = new TQGridLayout (tqlayout, 2, 2, 2);
+    TQVBoxLayout *layout = new TQVBoxLayout (general);
+    TQGridLayout *gridlayout = new TQGridLayout (layout, 2, 2, 2);
     TQLabel *driverLabel = new TQLabel (i18n ("Driver:"), general, 0);
     driver = new TQLineEdit ("", general, 0);
     TQWhatsThis::add (driver, i18n ("dummy, v4l or bsdbt848"));
@@ -158,15 +158,15 @@ KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageTV::KMPlayerPrefSourcePageTV (TQWidget
     device = new KURLRequester ("/dev/video", general);
     TQWhatsThis::add(device, i18n("Path to your video device, eg. /dev/video0"));
     scan = new TQPushButton (i18n ("Scan..."), general);
-    gridtqlayout->addWidget (driverLabel, 0, 0);
-    gridtqlayout->addWidget (driver, 0, 1);
-    gridtqlayout->addWidget (deviceLabel, 1, 0);
-    gridtqlayout->addWidget (device, 1, 1);
-    TQHBoxLayout *buttontqlayout = new TQHBoxLayout ();
-    buttontqlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum));
-    buttontqlayout->addWidget (scan);
-    tqlayout->addLayout (buttontqlayout);
-    tqlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+    gridlayout->addWidget (driverLabel, 0, 0);
+    gridlayout->addWidget (driver, 0, 1);
+    gridlayout->addWidget (deviceLabel, 1, 0);
+    gridlayout->addWidget (device, 1, 1);
+    TQHBoxLayout *buttonlayout = new TQHBoxLayout ();
+    buttonlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+    buttonlayout->addWidget (scan);
+    layout->addLayout (buttonlayout);
+    layout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
     notebook->insertTab (general, i18n ("General"));
 }
 
@@ -213,7 +213,7 @@ KDE_NO_CDTOR_EXPORT TVInput::TVInput (KMPlayer::NodePtr & d) : TVNode (d, TQStri
 
 KDE_NO_EXPORT KMPlayer::NodePtr TVInput::childFromTag (const TQString & tag) {
     // kdDebug () << nodeName () << " childFromTag " << tag << endl;
-    if (tag == TQString::tqfromLatin1 ("channel")) {
+    if (tag == TQString::fromLatin1 ("channel")) {
         return new TVChannel (m_doc);
     } else
         return 0L;
@@ -252,7 +252,7 @@ KDE_NO_CDTOR_EXPORT TVDevice::~TVDevice () {
 
 KDE_NO_EXPORT KMPlayer::NodePtr TVDevice::childFromTag (const TQString & tag) {
     // kdDebug () << nodeName () << " childFromTag " << tag << endl;
-    if (tag == TQString::tqfromLatin1 ("input"))
+    if (tag == TQString::fromLatin1 ("input"))
         return new TVInput (m_doc);
     return 0L;
 }
@@ -323,7 +323,7 @@ TVDocument::TVDocument (KMPlayerTVSource * source)
 
 KDE_NO_EXPORT KMPlayer::NodePtr TVDocument::childFromTag (const TQString & tag) {
     // kdDebug () << nodeName () << " childFromTag " << tag << endl;
-    if (tag == TQString::tqfromLatin1 ("device"))
+    if (tag == TQString::fromLatin1 ("device"))
         return new TVDevice (m_doc);
     return FileDocument::childFromTag (tag);
 }
@@ -377,7 +377,7 @@ KDE_NO_EXPORT void KMPlayerTVSource::activate () {
         KMPlayer::Source::reset ();
     buildArguments ();
     if (m_cur_tvdevice) {
-        TQString playback = static_cast <KMPlayer::Element *> (m_cur_tvdevice.ptr ())->getAttribute (TQString::tqfromLatin1 ("playback"));
+        TQString playback = static_cast <KMPlayer::Element *> (m_cur_tvdevice.ptr ())->getAttribute (TQString::fromLatin1 ("playback"));
         if (playback.isEmpty () || playback.toInt ())
             TQTimer::singleShot (0, m_player, TQT_SLOT (play ()));
     }
diff --git a/src/kmplayervdr.cpp b/src/kmplayervdr.cpp
index 702c8f4..9e603da 100644
--- a/src/kmplayervdr.cpp
+++ b/src/kmplayervdr.cpp
@@ -20,7 +20,7 @@
 #include <math.h>
 #include <unistd.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqmap.h>
 #include <tqtimer.h>
@@ -78,8 +78,8 @@ static const char * strXVScale = "XV Scale";
 KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageVDR::KMPlayerPrefSourcePageVDR (TQWidget * parent, KMPlayer::PartBase * player)
  : TQFrame (parent), m_player (player) {
     //KURLRequester * v4ldevice;
-    TQVBoxLayout *tqlayout = new TQVBoxLayout (this, 5, 2);
-    TQGridLayout *gridtqlayout = new TQGridLayout (1, 2);
+    TQVBoxLayout *layout = new TQVBoxLayout (this, 5, 2);
+    TQGridLayout *gridlayout = new TQGridLayout (1, 2);
     xv_port = new KListView (this);
     xv_port->addColumn (TQString());
     xv_port->header()->hide ();
@@ -90,19 +90,19 @@ KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageVDR::KMPlayerPrefSourcePageVDR (TQWidg
     vitem->setOpen (true);
     TQWhatsThis::add (xv_port, i18n ("Port base of the X Video extension.\nIf left to default (0), the first available port will be used. However if you have multiple XVideo instances, you might have to provide the port to use here.\nSee the output from 'xvinfo' for more information"));
     TQLabel * label = new TQLabel (i18n ("Communication port:"), this);
-    gridtqlayout->addWidget (label, 0, 0);
+    gridlayout->addWidget (label, 0, 0);
     tcp_port = new TQLineEdit ("", this);
     TQWhatsThis::add (tcp_port, i18n ("Communication port with VDR. Default is port 2001.\nIf you use another port, with the '-p' option of 'vdr', you must set it here too."));
-    gridtqlayout->addWidget (tcp_port, 0, 1);
-    tqlayout->addWidget (xv_port);
-    tqlayout->addLayout (gridtqlayout);
+    gridlayout->addWidget (tcp_port, 0, 1);
+    layout->addWidget (xv_port);
+    layout->addLayout (gridlayout);
     scale = new TQButtonGroup (2, Qt::Vertical, i18n ("Scale"), this);
     new TQRadioButton (i18n ("4:3"), scale);
     new TQRadioButton (i18n ("16:9"), scale);
     TQWhatsThis::add (scale, i18n ("Aspects to use when viewing VDR"));
     scale->setButton (0);
-    tqlayout->addWidget (scale);
-    tqlayout->addItem (new TQSpacerItem (5, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+    layout->addWidget (scale);
+    layout->addItem (new TQSpacerItem (5, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
 }
 
 KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageVDR::~KMPlayerPrefSourcePageVDR () {}
@@ -218,7 +218,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::playCurrent () {
 
 KDE_NO_EXPORT void KMPlayerVDRSource::processStopped () {
     if (m_socket->state () == TQSocket::Connected) {
-        queueCommand (TQString ("VOLU %1\n").tqarg (m_stored_volume).ascii ());
+        queueCommand (TQString ("VOLU %1\n").arg (m_stored_volume).ascii ());
         queueCommand ("QUIT\n");
     }
 }
@@ -309,7 +309,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::toggleConnected () {
 }
 
 KDE_NO_EXPORT void KMPlayerVDRSource::volumeChanged (int val) {
-    queueCommand (TQString ("VOLU %1\n").tqarg (int (sqrt (255 * 255 * val / 100))).ascii ());
+    queueCommand (TQString ("VOLU %1\n").arg (int (sqrt (255 * 255 * val / 100))).ascii ());
 }
 
 static struct ReadBuf {
@@ -380,7 +380,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::readyRead () {
                 if (p > 0)
                     line.truncate (p);
                 TQString channel_name = line.mid (4);
-                m_document->appendChild (new KMPlayer::GenericMrl (m_document, TQString ("kmplayer://vdrsource/%1").tqarg(channel_name), channel_name));
+                m_document->appendChild (new KMPlayer::GenericMrl (m_document, TQString ("kmplayer://vdrsource/%1").arg(channel_name), channel_name));
                 if (cmd_done) {
                     m_player->updateTree ();
                     if (!m_request_jump.isEmpty ()) {
diff --git a/src/kmplayerview.cpp b/src/kmplayerview.cpp
index dd1e1f4..5e1ede7 100644
--- a/src/kmplayerview.cpp
+++ b/src/kmplayerview.cpp
@@ -25,9 +25,9 @@
 #include <tqtimer.h>
 #include <tqpainter.h>
 #include <tqmetaobject.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpixmap.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqtooltip.h>
 #include <tqapplication.h>
 #include <tqiconset.h>
@@ -38,7 +38,7 @@
 #include <tqdatastream.h>
 #include <tqwidgetstack.h>
 #include <tqcursor.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 #include <kiconloader.h>
 #include <kstatusbar.h>
@@ -68,7 +68,7 @@ static const int XKeyPress = KeyPress;
 #undef KeyPress
 #undef Always
 #undef Never
-#undef tqStatus
+#undef Status
 #undef Unsorted
 #undef Bool
 
@@ -190,10 +190,10 @@ KDE_NO_EXPORT void View::init (KActionCollection * action_collection) {
     viewbox->addWidget (m_dockarea);
     m_widgetstack = new TQWidgetStack (m_view_area);
     m_control_panel = new ControlPanel (m_view_area, this);
-    m_control_panel->setMaximumSize (2500, controlPanel ()->tqmaximumSize ().height ());
+    m_control_panel->setMaximumSize (2500, controlPanel ()->maximumSize ().height ());
     m_status_bar = new StatusBar (m_view_area);
     m_status_bar->insertItem (TQString (""), 0);
-    TQSize sbsize = m_status_bar->tqsizeHint ();
+    TQSize sbsize = m_status_bar->sizeHint ();
     m_status_bar->hide ();
     m_status_bar->setMaximumSize (2500, sbsize.height ());
     m_viewer = new Viewer (m_widgetstack, this);
@@ -267,9 +267,9 @@ void View::toggleShowPlaylist () {
         else {
             bool horz = true;
             TQStyle & style = m_playlist->tqstyle ();
-            int h = style.tqpixelMetric (TQStyle::PM_ScrollBarExtent, m_playlist);
-            h += style.tqpixelMetric(TQStyle::PM_DockWindowFrameWidth, m_playlist);
-            h +=style.tqpixelMetric(TQStyle::PM_DockWindowHandleExtent,m_playlist);
+            int h = style.pixelMetric (TQStyle::PM_ScrollBarExtent, m_playlist);
+            h += style.pixelMetric(TQStyle::PM_DockWindowFrameWidth, m_playlist);
+            h +=style.pixelMetric(TQStyle::PM_DockWindowHandleExtent,m_playlist);
             for (TQListViewItem *i=m_playlist->firstChild();i;i=i->itemBelow()) {
                 h += i->height ();
                 if (h > int (0.25 * height ())) {
@@ -482,7 +482,7 @@ KDE_NO_EXPORT void View::timerEvent (TQTimerEvent * e) {
                 m_widgetstack->visibleWidget () == m_widgettypes[WT_Picture]) {
             int vert_buttons_pos = m_view_area->height()-statusBarHeight ();
             TQPoint mouse_pos = m_view_area->mapFromGlobal (TQCursor::pos ());
-            int cp_height = m_control_panel->tqmaximumSize ().height ();
+            int cp_height = m_control_panel->maximumSize ().height ();
             bool mouse_on_buttons = (//m_view_area->hasMouse () && 
                     mouse_pos.y () >= vert_buttons_pos-cp_height &&
                     mouse_pos.y ()<= vert_buttons_pos &&
@@ -632,7 +632,7 @@ KDE_NO_EXPORT int View::statusBarHeight () const {
         if (statusBarMode () == SB_Only)
             return height ();
         else 
-            return statusBar()->tqmaximumSize ().height ();
+            return statusBar()->maximumSize ().height ();
     }
     return 0;
 }
@@ -665,7 +665,7 @@ bool View::x11Event (XEvent * e) {
             if (e->xmotion.window == m_viewer->embeddedWinId ())
                 delayedShowButtons (e->xmotion.y > m_view_area->height () -
                         statusBarHeight () -
-                        m_control_panel->tqmaximumSize ().height ());
+                        m_control_panel->maximumSize ().height ());
             m_view_area->mouseMoved ();
             break;
         case MapNotify:
@@ -749,7 +749,7 @@ KDE_NO_EXPORT void Viewer::windowChanged (WId w) {
 
 KDE_NO_EXPORT void Viewer::mouseMoveEvent (TQMouseEvent * e) {
     if (e->state () == Qt::NoButton) {
-        int cp_height = m_view->controlPanel ()->tqmaximumSize ().height ();
+        int cp_height = m_view->controlPanel ()->maximumSize ().height ();
         m_view->delayedShowButtons (e->y () > height () - cp_height);
     }
     m_view->viewArea ()->mouseMoved ();
diff --git a/src/kmplayerview.h b/src/kmplayerview.h
index 696ad48..1b39193 100644
--- a/src/kmplayerview.h
+++ b/src/kmplayerview.h
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 #include <tqwidget.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 
 #include <kdockwidget.h>
 #include <kurl.h>
diff --git a/src/npplayer.c b/src/npplayer.c
index 8209bbf..e7f67bb 100644
--- a/src/npplayer.c
+++ b/src/npplayer.c
@@ -379,7 +379,7 @@ static NPError nsDestroyStream (NPP instance, NPStream *stream, NPError reason)
     return NPERR_NO_DATA;
 }
 
-static void nstqStatus (NPP instance, const char* message) {
+static void nsStatus (NPP instance, const char* message) {
     (void)instance;
     print ("NPN_Status %s\n", message ? message : "-");
 }
@@ -966,7 +966,7 @@ static int initPlugin (const char *plugin_lib) {
     ns_funcs.newstream = nsNewStream;
     ns_funcs.write = nsWrite;
     ns_funcs.destroystream = nsDestroyStream;
-    ns_funcs.status = nstqStatus;
+    ns_funcs.status = nsStatus;
     ns_funcs.uagent = nsUserAgent;
     ns_funcs.memalloc = nsAlloc;
     ns_funcs.memfree = nsMemFree;
diff --git a/src/playlistview.cpp b/src/playlistview.cpp
index 20a761e..106047b 100644
--- a/src/playlistview.cpp
+++ b/src/playlistview.cpp
@@ -21,7 +21,7 @@
 #include <config.h>
 // include files for TQt
 #include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqpopupmenu.h>
 #include <tqdrawutil.h>
 #include <tqpainter.h>
@@ -96,9 +96,9 @@ RootPlayListItem::RootPlayListItem (int _id, PlayListView *v, const NodePtr & e,
 
 KDE_NO_CDTOR_EXPORT void RootPlayListItem::paintCell (TQPainter * p, const TQColorGroup & cg, int column, int width, int align) {
     TQColorGroup mycg (cg);
-    mycg.setColor (TQColorGroup::Base, listview->tqtopLevelWidget()->paletteBackgroundColor());
+    mycg.setColor (TQColorGroup::Base, listview->topLevelWidget()->paletteBackgroundColor());
     mycg.setColor (TQColorGroup::Highlight, mycg.base ());
-    mycg.setColor (TQColorGroup::Text, listview->tqtopLevelWidget()->paletteForegroundColor());
+    mycg.setColor (TQColorGroup::Text, listview->topLevelWidget()->paletteForegroundColor());
     mycg.setColor (TQColorGroup::HighlightedText, mycg.text ());
     TQListViewItem::paintCell (p, mycg, column, width, align);
     qDrawShadeRect (p, 0, 0, width -1, height () -1, mycg, !isOpen ());
@@ -238,7 +238,7 @@ void PlayListView::updateTree (int id, NodePtr root, NodePtr active,
         bool select, bool open) {
     // TODO, if root is same as rootitems->node and treeversion is the same
     // and show all nodes is unchanged then only update the cells
-    TQWidget * w = tqfocusWidget ();
+    TQWidget * w = focusWidget ();
     if (w && w != this)
         w->clearFocus ();
     //setSelected (firstChild (), true);
@@ -410,7 +410,7 @@ void PlayListView::copyToClipboard () {
         if (mrl && !mrl->src.isEmpty ())
             text = mrl->src;
     }
-    TQApplication::tqclipboard()->setText (text);
+    TQApplication::clipboard()->setText (text);
 }
 
 void PlayListView::addBookMark () {
diff --git a/src/pref.cpp b/src/pref.cpp
index 423102e..70ac4a5 100644
--- a/src/pref.cpp
+++ b/src/pref.cpp
@@ -23,7 +23,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
@@ -202,21 +202,21 @@ KDE_NO_CDTOR_EXPORT Preferences::~Preferences() {
 KDE_NO_CDTOR_EXPORT PrefGeneralPageGeneral::PrefGeneralPageGeneral(TQWidget *parent, Settings *)
 : TQFrame (parent, "GeneralPage")
 {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 5, 2);
+    TQVBoxLayout *layout = new TQVBoxLayout(this, 5, 2);
 
     TQGroupBox *windowbox = new TQGroupBox(1, Qt::Vertical, i18n("Window"), this);
     TQWidget * wbox = new TQWidget (windowbox);
     TQWidget * bbox = new TQWidget (wbox);
-    TQGridLayout * gridtqlayout = new TQGridLayout (bbox, 2, 2);
+    TQGridLayout * gridlayout = new TQGridLayout (bbox, 2, 2);
     keepSizeRatio = new TQCheckBox (i18n ("Keep size ratio"), bbox, 0);
     TQWhatsThis::add(keepSizeRatio, i18n("When checked, movie will keep its aspect ratio\nwhen window is resized"));
     dockSysTray = new TQCheckBox (i18n ("Dock in system tray"), bbox, 0);
     TQWhatsThis::add (dockSysTray, i18n ("When checked, an icon of KMPlayer will be added to the system tray.\nWhen clicked it will hide KMPlayer's main window and removing KMPlayer's taskbar button."));
     autoResize = new TQCheckBox (i18n ("Auto resize to video sizes"), bbox);
     TQWhatsThis::add (autoResize, i18n("When checked, KMPlayer will resize to movie sizes\nwhen video starts"));
-    gridtqlayout->addWidget (keepSizeRatio, 0, 0);
-    gridtqlayout->addWidget (dockSysTray, 1, 0);
-    gridtqlayout->addWidget (autoResize, 0, 1);
+    gridlayout->addWidget (keepSizeRatio, 0, 0);
+    gridlayout->addWidget (dockSysTray, 1, 0);
+    gridlayout->addWidget (autoResize, 0, 1);
     sizesChoice = new TQButtonGroup (2, Qt::Vertical, wbox);
     new TQRadioButton (i18n("Remember window size on exit"), sizesChoice);
     new TQRadioButton (i18n("Always start with fixed size"), sizesChoice);
@@ -237,7 +237,7 @@ KDE_NO_CDTOR_EXPORT PrefGeneralPageGeneral::PrefGeneralPageGeneral(TQWidget *par
     TQGroupBox * gbox =new TQGroupBox (1, Qt::Vertical, i18n("Control Panel"), this);
     bbox =new TQWidget (gbox);
     //TQGroupBox * bbox = gbox;
-    gridtqlayout = new TQGridLayout (bbox, 3, 2);
+    gridlayout = new TQGridLayout (bbox, 3, 2);
     showConfigButton = new TQCheckBox(i18n("Show config button"), bbox);
     TQWhatsThis::add (showConfigButton, i18n ("Add a button that will popup a config menu"));
     showPlaylistButton = new TQCheckBox(i18n("Show playlist button"), bbox);
@@ -246,10 +246,10 @@ KDE_NO_CDTOR_EXPORT PrefGeneralPageGeneral::PrefGeneralPageGeneral(TQWidget *par
     TQWhatsThis::add (showRecordButton, i18n ("Add a record button to the control buttons"));
     showBroadcastButton = new TQCheckBox (i18n ("Show broadcast button"), bbox);
     TQWhatsThis::add (showBroadcastButton, i18n ("Add a broadcast button to the control buttons"));
-    gridtqlayout->addWidget (showConfigButton, 0, 0);
-    gridtqlayout->addWidget (showPlaylistButton, 0, 1);
-    gridtqlayout->addWidget (showRecordButton, 1, 0);
-    gridtqlayout->addWidget (showBroadcastButton, 1, 1);
+    gridlayout->addWidget (showConfigButton, 0, 0);
+    gridlayout->addWidget (showPlaylistButton, 0, 1);
+    gridlayout->addWidget (showRecordButton, 1, 0);
+    gridlayout->addWidget (showBroadcastButton, 1, 1);
     //TQWidget *seekingWidget = new TQWidget (bbox);
     TQHBoxLayout *seekLayout = new TQHBoxLayout (bbox);
     seekLayout->addWidget(new TQLabel(i18n("Forward/backward seek time:"),bbox));
@@ -257,20 +257,20 @@ KDE_NO_CDTOR_EXPORT PrefGeneralPageGeneral::PrefGeneralPageGeneral(TQWidget *par
     seekTime = new TQSpinBox(1, 600, 1, bbox);
     seekLayout->addWidget(seekTime);
     seekLayout->addItem(new TQSpacerItem(0,0,TQSizePolicy::Minimum, TQSizePolicy::Minimum));
-    gridtqlayout->addMultiCellLayout (seekLayout, 2, 2, 0, 1);
+    gridlayout->addMultiCellLayout (seekLayout, 2, 2, 0, 1);
 
-    tqlayout->addWidget (windowbox);
-    tqlayout->addWidget (playbox);
-    tqlayout->addWidget (gbox);
-    //tqlayout->addWidget(autoHideSlider);
-    tqlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+    layout->addWidget (windowbox);
+    layout->addWidget (playbox);
+    layout->addWidget (gbox);
+    //layout->addWidget(autoHideSlider);
+    layout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
 }
 
 KDE_NO_CDTOR_EXPORT PrefGeneralPageLooks::PrefGeneralPageLooks (TQWidget *parent, Settings * settings)
  : TQFrame (parent, "LooksPage"),
    colors (settings->colors),
    fonts (settings->fonts) {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 5, 2);
+    TQVBoxLayout *layout = new TQVBoxLayout(this, 5, 2);
 
     TQGroupBox *colorbox= new TQGroupBox(2, Qt::Horizontal, i18n("Colors"), this);
     colorscombo = new TQComboBox (colorbox);
@@ -296,9 +296,9 @@ KDE_NO_CDTOR_EXPORT PrefGeneralPageLooks::PrefGeneralPageLooks (TQWidget *parent
     fontbutton->setFont (fonts[0].font);
     connect (fontbutton, TQT_SIGNAL (clicked ()), this, TQT_SLOT (fontClicked ()));
 
-    tqlayout->addWidget (colorbox);
-    tqlayout->addWidget (fontbox);
-    tqlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+    layout->addWidget (colorbox);
+    layout->addWidget (fontbox);
+    layout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
 }
 
 KDE_NO_EXPORT void PrefGeneralPageLooks::colorItemChanged (int c) {
@@ -330,9 +330,9 @@ KDE_NO_EXPORT void PrefGeneralPageLooks::fontClicked () {
 KDE_NO_CDTOR_EXPORT PrefSourcePageURL::PrefSourcePageURL (TQWidget *parent)
 : TQFrame (parent, "URLPage")
 {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout (this, 5, 5);
-    TQHBoxLayout * urltqlayout = new TQHBoxLayout ();
-    TQHBoxLayout * sub_urltqlayout = new TQHBoxLayout ();
+    TQVBoxLayout *layout = new TQVBoxLayout (this, 5, 5);
+    TQHBoxLayout * urllayout = new TQHBoxLayout ();
+    TQHBoxLayout * sub_urllayout = new TQHBoxLayout ();
     TQLabel *urlLabel = new TQLabel (i18n ("Location:"), this, 0);
     urllist = new KComboBox (true, this);
     urllist->setMaxCount (20);
@@ -340,47 +340,47 @@ KDE_NO_CDTOR_EXPORT PrefSourcePageURL::PrefSourcePageURL (TQWidget *parent)
     url = new KURLRequester (urllist, this);
     TQWhatsThis::add (url, i18n ("Location of the playable item"));
     //url->setShowLocalProtocol (true);
-    url->tqsetSizePolicy (TQSizePolicy (TQSizePolicy::Expanding, TQSizePolicy::Preferred));
+    url->setSizePolicy (TQSizePolicy (TQSizePolicy::Expanding, TQSizePolicy::Preferred));
     TQLabel *sub_urlLabel = new TQLabel (i18n ("Sub title:"), this, 0);
     sub_urllist = new KComboBox (true, this);
     sub_urllist->setMaxCount (20);
     sub_urllist->setDuplicatesEnabled (false); // not that it helps much :(
     sub_url = new KURLRequester (sub_urllist, this);
     TQWhatsThis::add (sub_url, i18n ("Optional location of a file containing the subtitles of the URL above"));
-    sub_url->tqsetSizePolicy (TQSizePolicy (TQSizePolicy::Expanding, TQSizePolicy::Preferred));
+    sub_url->setSizePolicy (TQSizePolicy (TQSizePolicy::Expanding, TQSizePolicy::Preferred));
     backend = new TQListBox (this);
     allowhref = new TQCheckBox (i18n ("Enable 'Click to Play' support"), this);
     TQWhatsThis::add (allowhref, i18n ("Support for WEB pages having a start image"));
-    tqlayout->addWidget (allowhref);
-    urltqlayout->addWidget (urlLabel);
-    urltqlayout->addWidget (url);
-    tqlayout->addLayout (urltqlayout);
-    sub_urltqlayout->addWidget (sub_urlLabel);
-    sub_urltqlayout->addWidget (sub_url);
-    tqlayout->addLayout (sub_urltqlayout);
-    tqlayout->addItem (new TQSpacerItem (0, 10, TQSizePolicy::Minimum, TQSizePolicy::Minimum));
-    TQGridLayout * gridtqlayout = new TQGridLayout (2, 2);
+    layout->addWidget (allowhref);
+    urllayout->addWidget (urlLabel);
+    urllayout->addWidget (url);
+    layout->addLayout (urllayout);
+    sub_urllayout->addWidget (sub_urlLabel);
+    sub_urllayout->addWidget (sub_url);
+    layout->addLayout (sub_urllayout);
+    layout->addItem (new TQSpacerItem (0, 10, TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+    TQGridLayout * gridlayout = new TQGridLayout (2, 2);
     TQLabel *backendLabel = new TQLabel (i18n ("Use movie player:"), this, 0);
     //TQWhatsThis::add (allowhref, i18n ("Explain this in a few lines"));
-    gridtqlayout->addWidget (backendLabel, 0, 0);
-    gridtqlayout->addWidget (backend, 1, 0);
-    gridtqlayout->addMultiCell (new TQSpacerItem (0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum), 0, 1, 1, 1);
+    gridlayout->addWidget (backendLabel, 0, 0);
+    gridlayout->addWidget (backend, 1, 0);
+    gridlayout->addMultiCell (new TQSpacerItem (0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum), 0, 1, 1, 1);
     TQGroupBox *cbox = new TQGroupBox(1, Qt::Vertical, i18n("Network bandwidth"), this);
     TQWidget * wbox = new TQWidget (cbox);
-    TQGridLayout * bitratetqlayout = new TQGridLayout (wbox, 2, 3, 5);
+    TQGridLayout * bitratelayout = new TQGridLayout (wbox, 2, 3, 5);
     prefBitRate = new TQLineEdit (wbox);
     TQWhatsThis::add (prefBitRate, i18n("Sometimes it is possible to choose between various streams given a particular bitrate.\nThis option sets how much bandwidth you would prefer to allocate to video."));
     maxBitRate = new TQLineEdit (wbox);
     TQWhatsThis::add (maxBitRate, i18n("Sometimes it is possible to choose between various streams given a particular bitrate.\nThis option sets the maximum bandwidth you have available for video."));
-    bitratetqlayout->addWidget(new TQLabel(i18n("Preferred bitrate:"), wbox), 0, 0);
-    bitratetqlayout->addWidget (prefBitRate, 0, 1);
-    bitratetqlayout->addWidget (new TQLabel (i18n ("kbit/s"), wbox), 0, 2);
-    bitratetqlayout->addWidget (new TQLabel(i18n("Maximum bitrate:"), wbox), 1, 0);
-    bitratetqlayout->addWidget (maxBitRate, 1, 1);
-    bitratetqlayout->addWidget (new TQLabel (i18n ("kbit/s"), wbox), 1, 2);
-    tqlayout->addLayout (gridtqlayout);
-    tqlayout->addWidget (cbox);
-    tqlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+    bitratelayout->addWidget(new TQLabel(i18n("Preferred bitrate:"), wbox), 0, 0);
+    bitratelayout->addWidget (prefBitRate, 0, 1);
+    bitratelayout->addWidget (new TQLabel (i18n ("kbit/s"), wbox), 0, 2);
+    bitratelayout->addWidget (new TQLabel(i18n("Maximum bitrate:"), wbox), 1, 0);
+    bitratelayout->addWidget (maxBitRate, 1, 1);
+    bitratelayout->addWidget (new TQLabel (i18n ("kbit/s"), wbox), 1, 2);
+    layout->addLayout (gridlayout);
+    layout->addWidget (cbox);
+    layout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
     connect (urllist, TQT_SIGNAL(textChanged (const TQString &)),
              this, TQT_SLOT (slotTextChanged (const TQString &)));
     connect (sub_urllist, TQT_SIGNAL(textChanged (const TQString &)),
@@ -395,18 +395,18 @@ KDE_NO_EXPORT void PrefSourcePageURL::slotTextChanged (const TQString &) {
 }
 
 KDE_NO_CDTOR_EXPORT PrefRecordPage::PrefRecordPage (TQWidget *parent, PartBase * player, RecorderPage * rl, int rec_len) : TQFrame (parent, "RecordPage"), m_player (player), m_recorders (rl), m_recorders_length (rec_len) {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout (this, 5, 5);
-    TQHBoxLayout * urltqlayout = new TQHBoxLayout ();
+    TQVBoxLayout *layout = new TQVBoxLayout (this, 5, 5);
+    TQHBoxLayout * urllayout = new TQHBoxLayout ();
     TQLabel *urlLabel = new TQLabel (i18n ("Output file:"), this);
     url = new KURLRequester ("", this);
     url->setShowLocalProtocol (true);
-    urltqlayout->addWidget (urlLabel);
-    urltqlayout->addWidget (url);
+    urllayout->addWidget (urlLabel);
+    urllayout->addWidget (url);
     recordButton = new TQPushButton (i18n ("Start &Recording"), this);
     connect (recordButton, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotRecord ()));
-    TQHBoxLayout *buttontqlayout = new TQHBoxLayout;
-    buttontqlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum));
-    buttontqlayout->addWidget (recordButton);
+    TQHBoxLayout *buttonlayout = new TQHBoxLayout;
+    buttonlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+    buttonlayout->addWidget (recordButton);
     source = new TQLabel (i18n ("Current source: ") + m_player->source ()->prettyName (), this);
     recorder = new TQButtonGroup (m_recorders_length, Qt::Vertical, i18n ("Recorder"), this);
     for (RecorderPage * p = m_recorders; p; p = p->next)
@@ -420,20 +420,20 @@ KDE_NO_CDTOR_EXPORT PrefRecordPage::PrefRecordPage (TQWidget *parent, PartBase *
     new TQRadioButton (i18n ("A&fter"), replay);
     TQWidget * customreplay = new TQWidget (replay);
     replaytime = new TQLineEdit (customreplay);
-    TQHBoxLayout *replaytqlayout = new TQHBoxLayout (customreplay);
-    replaytqlayout->addWidget (new TQLabel (i18n("Time (seconds):"), customreplay));
-    replaytqlayout->addWidget (replaytime);
-    replaytqlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
-    tqlayout->addWidget (source);
-    tqlayout->addItem (new TQSpacerItem (5, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum));
-    tqlayout->addLayout (urltqlayout);
-    tqlayout->addItem (new TQSpacerItem (5, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum));
-    tqlayout->addWidget (recorder);
-    tqlayout->addItem (new TQSpacerItem (5, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum));
-    tqlayout->addWidget (replay);
-    tqlayout->addItem (new TQSpacerItem (5, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum));
-    tqlayout->addLayout (buttontqlayout);
-    tqlayout->addItem (new TQSpacerItem (5, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+    TQHBoxLayout *replaylayout = new TQHBoxLayout (customreplay);
+    replaylayout->addWidget (new TQLabel (i18n("Time (seconds):"), customreplay));
+    replaylayout->addWidget (replaytime);
+    replaylayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
+    layout->addWidget (source);
+    layout->addItem (new TQSpacerItem (5, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+    layout->addLayout (urllayout);
+    layout->addItem (new TQSpacerItem (5, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+    layout->addWidget (recorder);
+    layout->addItem (new TQSpacerItem (5, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+    layout->addWidget (replay);
+    layout->addItem (new TQSpacerItem (5, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+    layout->addLayout (buttonlayout);
+    layout->addItem (new TQSpacerItem (5, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
     connect (m_player, TQT_SIGNAL (sourceChanged(KMPlayer::Source*,KMPlayer::Source*)), this, TQT_SLOT (sourceChanged(KMPlayer::Source*,KMPlayer::Source*)));
 #ifdef HAVE_XINE
     connect (recorder, TQT_SIGNAL (clicked(int)), this, TQT_SLOT(recorderClicked(int)));
@@ -444,7 +444,7 @@ KDE_NO_CDTOR_EXPORT PrefRecordPage::PrefRecordPage (TQWidget *parent, PartBase *
 KDE_NO_EXPORT void PrefRecordPage::recordingStarted () {
     recordButton->setText (i18n ("Stop Recording"));
     url->setEnabled (false);
-    tqtopLevelWidget ()->hide ();
+    topLevelWidget ()->hide ();
 }
 
 KDE_NO_EXPORT void PrefRecordPage::recordingFinished () {
@@ -475,7 +475,7 @@ KDE_NO_EXPORT void PrefRecordPage::sourceChanged (Source * olds, Source * nws) {
 }
 
 KDE_NO_EXPORT void PrefRecordPage::recorderClicked (int id) {
-    bool b = recorder->find(id)->text().find (TQString::tqfromLatin1("Xine")) > -1;
+    bool b = recorder->find(id)->text().find (TQString::fromLatin1("Xine")) > -1;
     replay->setEnabled (!b);
     if (b)
         replay->setButton (Settings::ReplayNo);
@@ -538,18 +538,18 @@ KDE_NO_EXPORT void RecorderPage::record () {
 }
 
 KDE_NO_CDTOR_EXPORT PrefMEncoderPage::PrefMEncoderPage (TQWidget *parent, PartBase * player) : RecorderPage (parent, player) {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout (this, 5, 5);
+    TQVBoxLayout *layout = new TQVBoxLayout (this, 5, 5);
     format = new TQButtonGroup (3, Qt::Vertical, i18n ("Format"), this);
     new TQRadioButton (i18n ("Same as source"), format);
     new TQRadioButton (i18n ("Custom"), format);
     TQWidget * customopts = new TQWidget (format);
-    TQGridLayout *gridtqlayout = new TQGridLayout (customopts, 1, 2, 2);
+    TQGridLayout *gridlayout = new TQGridLayout (customopts, 1, 2, 2);
     TQLabel *argLabel = new TQLabel (i18n("Mencoder arguments:"), customopts, 0);
     arguments = new TQLineEdit ("", customopts);
-    gridtqlayout->addWidget (argLabel, 0, 0);
-    gridtqlayout->addWidget (arguments, 0, 1);
-    tqlayout->addWidget (format);
-    tqlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+    gridlayout->addWidget (argLabel, 0, 0);
+    gridlayout->addWidget (arguments, 0, 1);
+    layout->addWidget (format);
+    layout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
     connect (format, TQT_SIGNAL (clicked (int)), this, TQT_SLOT (formatClicked (int)));
 }
 
@@ -580,14 +580,14 @@ KDE_NO_EXPORT TQString PrefMPlayerDumpstreamPage::name () {
 }
 
 KDE_NO_CDTOR_EXPORT PrefFFMpegPage::PrefFFMpegPage (TQWidget *parent, PartBase * player) : RecorderPage (parent, player) {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout (this, 5, 5);
-    TQGridLayout *gridtqlayout = new TQGridLayout (1, 2, 2);
+    TQVBoxLayout *layout = new TQVBoxLayout (this, 5, 5);
+    TQGridLayout *gridlayout = new TQGridLayout (1, 2, 2);
     TQLabel *argLabel = new TQLabel (i18n("FFMpeg arguments:"), this);
     arguments = new TQLineEdit ("", this);
-    gridtqlayout->addWidget (argLabel, 0, 0);
-    gridtqlayout->addWidget (arguments, 0, 1);
-    tqlayout->addLayout (gridtqlayout);
-    tqlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+    gridlayout->addWidget (argLabel, 0, 0);
+    gridlayout->addWidget (arguments, 0, 1);
+    layout->addLayout (gridlayout);
+    layout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
 }
 
 KDE_NO_EXPORT void PrefFFMpegPage::record () {
@@ -611,28 +611,28 @@ KDE_NO_EXPORT TQString PrefXinePage::name () {
 
 KDE_NO_CDTOR_EXPORT PrefGeneralPageOutput::PrefGeneralPageOutput(TQWidget *parent, OutputDriver * ad, OutputDriver * vd)
  : TQFrame (parent) {
-    TQGridLayout *tqlayout = new TQGridLayout (this, 2, 2, 5);
+    TQGridLayout *layout = new TQGridLayout (this, 2, 2, 5);
 
     videoDriver = new TQListBox (this);
     for (int i = 0; vd[i].driver; i++)
         videoDriver->insertItem (vd[i].description, i);
     TQWhatsThis::add(videoDriver, i18n("Sets video driver. Recommended is XVideo, or, if it is not supported, X11, which is slower."));
-    tqlayout->addWidget (new TQLabel (i18n ("Video driver:"), this), 0, 0);
-    tqlayout->addWidget (videoDriver, 1, 0);
+    layout->addWidget (new TQLabel (i18n ("Video driver:"), this), 0, 0);
+    layout->addWidget (videoDriver, 1, 0);
 
     audioDriver = new TQListBox (this);
     for (int i = 0; ad[i].driver; i++)
         audioDriver->insertItem (ad[i].description, i);
-    tqlayout->addWidget (new TQLabel (i18n ("Audio driver:"), this), 0, 1);
-    tqlayout->addWidget (audioDriver, 1, 1);
-    tqlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+    layout->addWidget (new TQLabel (i18n ("Audio driver:"), this), 0, 1);
+    layout->addWidget (audioDriver, 1, 1);
+    layout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
 }
 
 KDE_NO_CDTOR_EXPORT PrefOPPageGeneral::PrefOPPageGeneral(TQWidget *parent)
 : TQFrame(parent)
 {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout (this, 5);
-    tqlayout->setAutoAdd (true);
+    TQVBoxLayout *layout = new TQVBoxLayout (this, 5);
+    layout->setAutoAdd (true);
 }
 
 KDE_NO_CDTOR_EXPORT PrefOPPagePostProc::PrefOPPagePostProc(TQWidget *parent) : TQFrame(parent)
@@ -651,7 +651,7 @@ KDE_NO_CDTOR_EXPORT PrefOPPagePostProc::PrefOPPagePostProc(TQWidget *parent) : T
     PostprocessingOptions->setAutoMask (false);
     PostprocessingOptions->setTabPosition( TQTabWidget::Top );
     PostprocessingOptions->setTabShape( TQTabWidget::Rounded );
-    PostprocessingOptions->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, PostprocessingOptions->sizePolicy().hasHeightForWidth() ) );
+    PostprocessingOptions->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, PostprocessingOptions->sizePolicy().hasHeightForWidth() ) );
 
     TQWidget *presetSelectionWidget = new TQWidget( PostprocessingOptions, "presetSelectionWidget" );
     TQGridLayout *presetSelectionWidgetLayout = new TQGridLayout( presetSelectionWidget, 1, 1, 1);
@@ -681,13 +681,13 @@ KDE_NO_CDTOR_EXPORT PrefOPPagePostProc::PrefOPPagePostProc(TQWidget *parent) : T
     TQVBoxLayout *customFiltersWidgetLayout = new TQVBoxLayout( customFiltersWidget );
 
     TQGroupBox *customFilters = new TQGroupBox(0, Qt::Vertical, customFiltersWidget, "customFilters" );
-    customFilters->tqsetSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)2));
+    customFilters->setSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)2));
     customFilters->setFlat(false);
     customFilters->setEnabled( false );
     customFilters->setInsideSpacing(7);
 
-    TQLayout *customFiltersLayout = customFilters->tqlayout();
-    TQHBoxLayout *customFiltersLayout1 = new TQHBoxLayout ( customFilters->tqlayout() );
+    TQLayout *customFiltersLayout = customFilters->layout();
+    TQHBoxLayout *customFiltersLayout1 = new TQHBoxLayout ( customFilters->layout() );
 
     HzDeblockFilter = new TQCheckBox (i18n ("Horizontal deblocking"), customFilters);
     HzDeblockAQuality = new TQCheckBox (i18n ("Auto quality"), customFilters);
@@ -701,12 +701,12 @@ KDE_NO_CDTOR_EXPORT PrefOPPagePostProc::PrefOPPagePostProc(TQWidget *parent) : T
     customFiltersLayout1->addWidget( HzDeblockCFiltering );
 
     TQFrame *line1 = new TQFrame( customFilters, "line1" );
-    line1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)2 ) );
+    line1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)2 ) );
     line1->setFrameShape( TQFrame::HLine );
     line1->setFrameShadow( TQFrame::Sunken );
     customFiltersLayout->add(line1);
 
-    TQHBoxLayout *customFiltersLayout2 = new TQHBoxLayout ( customFilters->tqlayout() );
+    TQHBoxLayout *customFiltersLayout2 = new TQHBoxLayout ( customFilters->layout() );
 
     VtDeblockFilter = new TQCheckBox(i18n("Vertical deblocking"), customFilters);
     VtDeblockAQuality = new TQCheckBox (i18n ("Auto quality"), customFilters);
@@ -721,12 +721,12 @@ KDE_NO_CDTOR_EXPORT PrefOPPagePostProc::PrefOPPagePostProc(TQWidget *parent) : T
 
     TQFrame *line2 = new TQFrame( customFilters, "line2" );
 
-    line2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)2 ) );
+    line2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)2 ) );
     line2->setFrameShape( TQFrame::HLine );
     line2->setFrameShadow( TQFrame::Sunken );
     customFiltersLayout->add(line2);
 
-    TQHBoxLayout *customFiltersLayout3  = new TQHBoxLayout ( customFilters->tqlayout() );
+    TQHBoxLayout *customFiltersLayout3  = new TQHBoxLayout ( customFilters->layout() );
 
     DeringFilter = new TQCheckBox (i18n ("Dering filter"), customFilters);
     DeringAQuality = new TQCheckBox (i18n ("Auto quality"), customFilters);
@@ -746,7 +746,7 @@ KDE_NO_CDTOR_EXPORT PrefOPPagePostProc::PrefOPPagePostProc(TQWidget *parent) : T
 
     customFiltersLayout->add(line3);
 
-    TQHBoxLayout *customFiltersLayout4 =new TQHBoxLayout(customFilters->tqlayout());
+    TQHBoxLayout *customFiltersLayout4 =new TQHBoxLayout(customFilters->layout());
 
     AutolevelsFilter = new TQCheckBox (i18n ("Auto brightness/contrast"), customFilters);
     AutolevelsFullrange = new TQCheckBox (i18n ("Stretch luminance to full range"), customFilters);
@@ -756,7 +756,7 @@ KDE_NO_CDTOR_EXPORT PrefOPPagePostProc::PrefOPPagePostProc(TQWidget *parent) : T
     customFiltersLayout4->addItem(new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum ));
     customFiltersLayout4->addWidget(AutolevelsFullrange);
 
-    TQHBoxLayout *customFiltersLayout5 = new TQHBoxLayout (customFilters->tqlayout());
+    TQHBoxLayout *customFiltersLayout5 = new TQHBoxLayout (customFilters->layout());
 
     TmpNoiseFilter =new TQCheckBox(i18n("Temporal noise reducer"),customFilters);
     /*	Note: Change TmpNoiseFilter text back to "Label:" if this slider gets reactivated
@@ -768,7 +768,7 @@ KDE_NO_CDTOR_EXPORT PrefOPPagePostProc::PrefOPPagePostProc(TQWidget *parent) : T
         TmpNoiseSlider->setOrientation( TQSlider::Horizontal );
         TmpNoiseSlider->setTickmarks( TQSlider::Left );
         TmpNoiseSlider->setTickInterval( 1 );
-        TmpNoiseSlider->tqsetSizePolicy(TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1));*/
+        TmpNoiseSlider->setSizePolicy(TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1));*/
 
     /*customFiltersLayout->addWidget(TmpNoiseFilter,7,0);
       customFiltersLayout->addWidget(TmpNoiseSlider,7,2);*/
diff --git a/src/viewarea.cpp b/src/viewarea.cpp
index daf5e5a..f814718 100644
--- a/src/viewarea.cpp
+++ b/src/viewarea.cpp
@@ -144,8 +144,8 @@ public:
     SurfacePtr createSurface (NodePtr owner, const SRect & rect);
     IRect toScreen (Single x, Single y, Single w, Single h);
     void resize (const SRect & rect);
-    void tqrepaint ();
-    void tqrepaint (const SRect &rect);
+    void repaint ();
+    void repaint (const SRect &rect);
     void video ();
 
     NodePtrW current_video;
@@ -181,7 +181,7 @@ KDE_NO_EXPORT void ViewSurface::resize (const SRect &r) {
 #endif
     /*if (rect == nrect)
         ;//return;
-    SRect pr = rect.unite (nrect); // for tqrepaint
+    SRect pr = rect.unite (nrect); // for repaint
     rect = nrect;*/
 }
 
@@ -197,14 +197,14 @@ KDE_NO_EXPORT IRect ViewSurface::toScreen (Single x, Single y, Single w, Single
 }
 
 KDE_NO_EXPORT
-void ViewSurface::tqrepaint (const SRect &r) {
+void ViewSurface::repaint (const SRect &r) {
     markDirty ();
     view_widget->scheduleRepaint (toScreen (r.x (), r.y (), r.width (), r.height ()));
-    //kdDebug() << "Surface::tqrepaint x:" << (int)x << " y:" << (int)y << " w:" << (int)w << " h:" << (int)h << endl;
+    //kdDebug() << "Surface::repaint x:" << (int)x << " y:" << (int)y << " w:" << (int)w << " h:" << (int)h << endl;
 }
 
 KDE_NO_EXPORT
-void ViewSurface::tqrepaint () {
+void ViewSurface::repaint () {
     markDirty ();
     view_widget->scheduleRepaint (toScreen (0, 0, bounds.width (), bounds.height ()));
 }
@@ -327,7 +327,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::traverseRegion (SMIL::RegionBase * reg) {
             if (c->data)
                 c->data->accept (this);
     }
-    // finally visit tqchildren, accounting for z-order FIXME optimize
+    // finally visit children, accounting for z-order FIXME optimize
     NodeRefList sorted;
     for (NodePtr n = reg->firstChild (); n; n = n->nextSibling ()) {
         if (n->id != SMIL::id_node_region)
@@ -1143,17 +1143,17 @@ KDE_NO_EXPORT void MouseVisitor::visit (Node * n) {
     kdDebug () << "Mouse event ignored for " << n->nodeName () << endl;
 }
 
-KDE_NO_EXPORT void MouseVisitor::visit (SMIL::Layout * tqlayout) {
-    if (tqlayout->surface ()) {
+KDE_NO_EXPORT void MouseVisitor::visit (SMIL::Layout * layout) {
+    if (layout->surface ()) {
         Matrix m = matrix;
-        SRect rect = tqlayout->region_surface->bounds;
+        SRect rect = layout->region_surface->bounds;
         matrix = Matrix (rect.x(), rect.y(),
-                tqlayout->region_surface->xscale, tqlayout->region_surface->yscale);
+                layout->region_surface->xscale, layout->region_surface->yscale);
         matrix.transform (m);
 
         NodePtr node_save = node;
-        node = tqlayout;
-        for (NodePtr r = tqlayout->firstChild (); r; r = r->nextSibling ()) {
+        node = layout;
+        for (NodePtr r = layout->firstChild (); r; r = r->nextSibling ()) {
             if (r->id == SMIL::id_node_region)
                 r->accept (this);
             if (!node->active ())
@@ -1378,7 +1378,7 @@ KDE_NO_EXPORT void ViewArea::fullScreen () {
         }
         m_view->controlPanel ()->button (ControlPanel::button_playlist)->setIconSet (TQIconSet (TQPixmap (playlist_xpm)));
     } else {
-        m_topwindow_rect = tqtopLevelWidget ()->tqgeometry ();
+        m_topwindow_rect = topLevelWidget ()->geometry ();
         reparent (0L, 0, tqApp->desktop()->screenGeometry(this).topLeft(), true);
         showFullScreen ();
         for (unsigned i = 0; i < m_collection->count (); ++i)
@@ -1425,7 +1425,7 @@ void ViewArea::minimalMode () {
         m_view->setNoInfoMessages (false);
         m_view->controlPanel ()->button (ControlPanel::button_playlist)->setIconSet (TQIconSet (TQPixmap (playlist_xpm)));
     }
-    m_topwindow_rect = tqtopLevelWidget ()->tqgeometry ();
+    m_topwindow_rect = topLevelWidget ()->geometry ();
 }
 
 KDE_NO_EXPORT void ViewArea::accelActivated () {
@@ -1447,7 +1447,7 @@ KDE_NO_EXPORT void ViewArea::mouseDoubleClickEvent (TQMouseEvent *) {
 KDE_NO_EXPORT void ViewArea::mouseMoveEvent (TQMouseEvent * e) {
     if (e->state () == Qt::NoButton) {
         int vert_buttons_pos = height () - m_view->statusBarHeight ();
-        int cp_height = m_view->controlPanel ()->tqmaximumSize ().height ();
+        int cp_height = m_view->controlPanel ()->maximumSize ().height ();
         m_view->delayedShowButtons (e->y() > vert_buttons_pos-cp_height &&
                                     e->y() < vert_buttons_pos);
     }
@@ -1481,7 +1481,7 @@ KDE_NO_EXPORT void ViewArea::syncVisual (const IRect & rect) {
     if (surface->node)
         surface->node->accept (&visitor);
 #else
-    tqrepaint (TQRect(rect.x, rect.y, rect.w, rect.h), false);
+    repaint (TQRect(rect.x, rect.y, rect.w, rect.h), false);
 #endif
     if (m_repaint_timer) {
         killTimer (m_repaint_timer);
@@ -1510,7 +1510,7 @@ KDE_NO_EXPORT void ViewArea::updateSurfaceBounds () {
     h -= m_view->controlPanel ()->isVisible ()
         ? (m_view->controlPanelMode () == View::CP_Only
                 ? h
-                : (Single) m_view->controlPanel()->tqmaximumSize ().height ())
+                : (Single) m_view->controlPanel()->maximumSize ().height ())
         : Single (0);
     surface->resize (SRect (x, y, w, h));
     Mrl *mrl = surface->node ? surface->node->mrl () : NULL;
@@ -1545,7 +1545,7 @@ KDE_NO_EXPORT void ViewArea::resizeEvent (TQResizeEvent *) {
     Single hcp = m_view->controlPanel ()->isVisible ()
         ? (m_view->controlPanelMode () == View::CP_Only
                 ? h-hsb
-                : (Single) m_view->controlPanel()->tqmaximumSize ().height ())
+                : (Single) m_view->controlPanel()->maximumSize ().height ())
         : Single (0);
     Single wws = w;
     // move controlpanel over video when autohiding and playing
@@ -1593,13 +1593,13 @@ void ViewArea::setAudioVideoGeometry (const IRect &rect, unsigned int * bg_color
                 h = hfw;
             }
     }
-    m_av_tqgeometry = TQRect (x, y, w, h);
-    TQRect wrect = m_view->widgetStack ()->tqgeometry ();
-    if (m_av_tqgeometry != wrect &&
-            !(m_av_tqgeometry.width() <= 0 &&
+    m_av_geometry = TQRect (x, y, w, h);
+    TQRect wrect = m_view->widgetStack ()->geometry ();
+    if (m_av_geometry != wrect &&
+            !(m_av_geometry.width() <= 0 &&
                 wrect.width() <= 1 && wrect.height() <= 1)) {
         m_view->widgetStack ()->setGeometry (x, y, w, h);
-        wrect.unite (m_av_tqgeometry);
+        wrect.unite (m_av_geometry);
         scheduleRepaint (IRect (wrect.x (), wrect.y (), wrect.width (), wrect.height ()));
     }
     if (bg_color)
@@ -1668,7 +1668,7 @@ KDE_NO_EXPORT void ViewArea::timerEvent (TQTimerEvent * e) {
     } else if (e->timerId () == m_repaint_timer) {
         killTimer (m_repaint_timer);
         m_repaint_timer = 0;
-        //tqrepaint (m_repaint_rect, false);
+        //repaint (m_repaint_rect, false);
         syncVisual (m_repaint_rect.intersect (IRect (0, 0, width (), height ())));
     } else {
         kdError () << "unknown timer " << e->timerId () << " " << m_repaint_timer << endl;
@@ -1680,8 +1680,8 @@ KDE_NO_EXPORT void ViewArea::closeEvent (TQCloseEvent * e) {
     //kdDebug () << "closeEvent" << endl;
     if (m_fullscreen) {
         fullScreen ();
-        if (!m_parent->tqtopLevelWidget ()->isVisible ())
-            m_parent->tqtopLevelWidget ()->show ();
+        if (!m_parent->topLevelWidget ()->isVisible ())
+            m_parent->topLevelWidget ()->show ();
         e->ignore ();
     } else
         TQWidget::closeEvent (e);
diff --git a/src/viewarea.h b/src/viewarea.h
index d68c11c..ee3930a 100644
--- a/src/viewarea.h
+++ b/src/viewarea.h
@@ -73,7 +73,7 @@ private:
     KActionCollection * m_collection;
     SurfacePtr surface;
     NodePtrW video_node;
-    TQRect m_av_tqgeometry;
+    TQRect m_av_geometry;
     IRect m_repaint_rect;
     TQRect m_topwindow_rect;
     int m_mouse_invisible_timer;