Rename obsolete tq methods to standard names

(cherry picked from commit 119c7d143c661c438bcd3ab82113ada44e9725fa)

13 files changed, 244 insertions, 244 deletions

diff --git a/src/kmplayer_rp.h b/src/kmplayer_rp.h
index 9121739..a158a7d 100644
--- a/src/kmplayer_rp.h
+++ b/src/kmplayer_rp.h
@@ -67,7 +67,7 @@ public:
     virtual void accept (Visitor *);
     Surface *surface ();
     void repaint (); // called whenever something changes on image
-    Fit fit;        // how to tqlayout images
+    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 fddf355..1b2d914 100644
--- a/src/kmplayer_smil.cpp
+++ b/src/kmplayer_smil.cpp
@@ -1611,11 +1611,11 @@ KDE_NO_EXPORT void SMIL::Smil::activate () {
     //kdDebug () << "Smil::activate" << endl;
     current_av_media_type = NodePtr ();
     resolved = true;
-    SMIL::Layout * tqlayout = convertNode <SMIL::Layout> (layout_node);
-    if (tqlayout && tqlayout->region_surface) {
+    SMIL::Layout * layout = convertNode <SMIL::Layout> (layout_node);
+    if (layout && layout->region_surface) {
         kdError() << "Layout already has a surface" << endl;
     }
-    if (tqlayout)
+    if (layout)
         Element::activate ();
     else
         Element::deactivate(); // some unfortunate reset in parent doc
@@ -1664,7 +1664,7 @@ KDE_NO_EXPORT void SMIL::Smil::closed () {
         }
     }
     if (!layout_node) {
-        kdError () << "no <root-tqlayout>" << endl;
+        kdError () << "no <root-layout>" << endl;
         return;
     }
 }
@@ -1738,7 +1738,7 @@ static void headChildDone (NodePtr node, NodePtr child) {
 
 KDE_NO_EXPORT NodePtr SMIL::Head::childFromTag (const TQString & tag) {
     const char * ctag = tag.ascii ();
-    if (!strcmp (ctag, "tqlayout"))
+    if (!strcmp (ctag, "layout"))
         return new SMIL::Layout (m_doc);
     else if (!strcmp (ctag, "title"))
         return new DarkNode (m_doc, tag, id_node_title);
@@ -1757,10 +1757,10 @@ KDE_NO_EXPORT void SMIL::Head::closed () {
     for (NodePtr e = firstChild (); e; e = e->nextSibling ())
         if (e->id == id_node_layout)
             return;
-    SMIL::Layout * tqlayout = new SMIL::Layout (m_doc);
-    appendChild (tqlayout);
-    tqlayout->setAuxiliaryNode (true);
-    tqlayout->closed (); // add root-tqlayout and a region
+    SMIL::Layout * layout = new SMIL::Layout (m_doc);
+    appendChild (layout);
+    layout->setAuxiliaryNode (true);
+    layout->closed (); // add root-layout and a region
 }
 
 KDE_NO_EXPORT void SMIL::Head::childDone (NodePtr child) {
@@ -1774,7 +1774,7 @@ KDE_NO_CDTOR_EXPORT SMIL::Layout::Layout (NodePtr & d)
 
 KDE_NO_EXPORT NodePtr SMIL::Layout::childFromTag (const TQString & tag) {
     const char * ctag = tag.ascii ();
-    if (!strcmp (ctag, "root-tqlayout")) {
+    if (!strcmp (ctag, "root-layout")) {
         NodePtr e = new SMIL::RootLayout (m_doc);
         rootLayout = e;
         return e;
@@ -1816,7 +1816,7 @@ KDE_NO_EXPORT void SMIL::Layout::closed () {
         rl->setAttribute(StringPool::attr_height,TQString::number(h_root));
         insertBefore (sr, firstChild ());
     } else {
-        if (childNodes ()->length () < 2) { // only a root-tqlayout
+        if (childNodes ()->length () < 2) { // only a root-layout
             SMIL::Region * r = new SMIL::Region (m_doc);
             appendChild (r);
             r->setAuxiliaryNode (true);
diff --git a/src/kmplayer_smil.h b/src/kmplayer_smil.h
index ab34703..0629c60 100644
--- a/src/kmplayer_smil.h
+++ b/src/kmplayer_smil.h
@@ -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,7 +517,7 @@ 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"; }
 };
 
 /**
diff --git a/src/kmplayerapp.cpp b/src/kmplayerapp.cpp
index 35f89a9..fc8aba5 100644
--- a/src/kmplayerapp.cpp
+++ b/src/kmplayerapp.cpp
@@ -863,13 +863,13 @@ KDE_NO_EXPORT void IntroSource::activate () {
         KMPlayer::readXML (m_document, ts, TQString (), false);
     } else {
         TQString smil = TQString::fromLatin1 (
-          "<smil><head><tqlayout>"
-          "<root-tqlayout width='320' height='240' background-color='black'/>"
+          "<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>"
@@ -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 ();
     }
 }
 
@@ -1227,11 +1227,11 @@ KDE_NO_EXPORT void ExitSource::activate () {
         TQTextStream ts (&file);
         KMPlayer::readXML (m_document, ts, TQString (), false);
     } else {
-        TQString smil = TQString::fromLatin1 ("<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>"
@@ -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 d79428c..4723c26 100644
--- a/src/kmplayerbroadcast.cpp
+++ b/src/kmplayerbroadcast.cpp
@@ -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->setAlignment (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/kmplayerpartbase.cpp b/src/kmplayerpartbase.cpp
index 4591359..6a6f84c 100644
--- a/src/kmplayerpartbase.cpp
+++ b/src/kmplayerpartbase.cpp
@@ -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);
diff --git a/src/kmplayerprocess.cpp b/src/kmplayerprocess.cpp
index b4c5303..13b3309 100644
--- a/src/kmplayerprocess.cpp
+++ b/src/kmplayerprocess.cpp
@@ -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)
diff --git a/src/kmplayertvsource.cpp b/src/kmplayertvsource.cpp
index 93b4f27..770bf9b 100644
--- a/src/kmplayertvsource.cpp
+++ b/src/kmplayertvsource.cpp
@@ -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"));
 }
 
diff --git a/src/kmplayervdr.cpp b/src/kmplayervdr.cpp
index 28ea43f..2e95252 100644
--- a/src/kmplayervdr.cpp
+++ b/src/kmplayervdr.cpp
@@ -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 () {}
diff --git a/src/kmplayerview.cpp b/src/kmplayerview.cpp
index 5ea3e1e..512a62d 100644
--- a/src/kmplayerview.cpp
+++ b/src/kmplayerview.cpp
@@ -266,7 +266,7 @@ void View::toggleShowPlaylist () {
             m_dock_playlist->dockBack ();
         else {
             bool horz = true;
-            TQStyle & style = m_playlist->tqstyle ();
+            TQStyle & style = m_playlist->style ();
             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);
diff --git a/src/playlistview.cpp b/src/playlistview.cpp
index 7a5cfc9..bc7368a 100644
--- a/src/playlistview.cpp
+++ b/src/playlistview.cpp
@@ -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 3ea1b9f..9ed1425 100644
--- a/src/pref.cpp
+++ b/src/pref.cpp
@@ -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);
@@ -351,36 +351,36 @@ KDE_NO_CDTOR_EXPORT PrefSourcePageURL::PrefSourcePageURL (TQWidget *parent)
     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)));
@@ -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)
@@ -686,8 +686,8 @@ KDE_NO_CDTOR_EXPORT PrefOPPagePostProc::PrefOPPagePostProc(TQWidget *parent) : T
     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);
@@ -706,7 +706,7 @@ KDE_NO_CDTOR_EXPORT PrefOPPagePostProc::PrefOPPagePostProc(TQWidget *parent) : T
     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);
@@ -726,7 +726,7 @@ KDE_NO_CDTOR_EXPORT PrefOPPagePostProc::PrefOPPagePostProc(TQWidget *parent) : T
     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
diff --git a/src/viewarea.cpp b/src/viewarea.cpp
index 5752070..f814718 100644
--- a/src/viewarea.cpp
+++ b/src/viewarea.cpp
@@ -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 ())