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

This reverts commit f97c8a56e217f04e08776ccf8021721b7d919b7d.

1 files changed, 102 insertions, 102 deletions

diff --git a/src/pref.cpp b/src/pref.cpp
index 70ac4a5..423102e 100644
--- a/src/pref.cpp
+++ b/src/pref.cpp
@@ -23,7 +23,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <layout.h>
+#include <tqlayout.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 *layout = new TQVBoxLayout(this, 5, 2);
+    TQVBoxLayout *tqlayout = 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 * gridlayout = new TQGridLayout (bbox, 2, 2);
+    TQGridLayout * gridtqlayout = 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"));
-    gridlayout->addWidget (keepSizeRatio, 0, 0);
-    gridlayout->addWidget (dockSysTray, 1, 0);
-    gridlayout->addWidget (autoResize, 0, 1);
+    gridtqlayout->addWidget (keepSizeRatio, 0, 0);
+    gridtqlayout->addWidget (dockSysTray, 1, 0);
+    gridtqlayout->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;
-    gridlayout = new TQGridLayout (bbox, 3, 2);
+    gridtqlayout = 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"));
-    gridlayout->addWidget (showConfigButton, 0, 0);
-    gridlayout->addWidget (showPlaylistButton, 0, 1);
-    gridlayout->addWidget (showRecordButton, 1, 0);
-    gridlayout->addWidget (showBroadcastButton, 1, 1);
+    gridtqlayout->addWidget (showConfigButton, 0, 0);
+    gridtqlayout->addWidget (showPlaylistButton, 0, 1);
+    gridtqlayout->addWidget (showRecordButton, 1, 0);
+    gridtqlayout->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));
-    gridlayout->addMultiCellLayout (seekLayout, 2, 2, 0, 1);
+    gridtqlayout->addMultiCellLayout (seekLayout, 2, 2, 0, 1);
 
-    layout->addWidget (windowbox);
-    layout->addWidget (playbox);
-    layout->addWidget (gbox);
-    //layout->addWidget(autoHideSlider);
-    layout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+    tqlayout->addWidget (windowbox);
+    tqlayout->addWidget (playbox);
+    tqlayout->addWidget (gbox);
+    //tqlayout->addWidget(autoHideSlider);
+    tqlayout->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 *layout = new TQVBoxLayout(this, 5, 2);
+    TQVBoxLayout *tqlayout = 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 ()));
 
-    layout->addWidget (colorbox);
-    layout->addWidget (fontbox);
-    layout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+    tqlayout->addWidget (colorbox);
+    tqlayout->addWidget (fontbox);
+    tqlayout->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 *layout = new TQVBoxLayout (this, 5, 5);
-    TQHBoxLayout * urllayout = new TQHBoxLayout ();
-    TQHBoxLayout * sub_urllayout = new TQHBoxLayout ();
+    TQVBoxLayout *tqlayout = new TQVBoxLayout (this, 5, 5);
+    TQHBoxLayout * urltqlayout = new TQHBoxLayout ();
+    TQHBoxLayout * sub_urltqlayout = 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->setSizePolicy (TQSizePolicy (TQSizePolicy::Expanding, TQSizePolicy::Preferred));
+    url->tqsetSizePolicy (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->setSizePolicy (TQSizePolicy (TQSizePolicy::Expanding, TQSizePolicy::Preferred));
+    sub_url->tqsetSizePolicy (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"));
-    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);
+    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);
     TQLabel *backendLabel = new TQLabel (i18n ("Use movie player:"), this, 0);
     //TQWhatsThis::add (allowhref, i18n ("Explain this in a few lines"));
-    gridlayout->addWidget (backendLabel, 0, 0);
-    gridlayout->addWidget (backend, 1, 0);
-    gridlayout->addMultiCell (new TQSpacerItem (0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum), 0, 1, 1, 1);
+    gridtqlayout->addWidget (backendLabel, 0, 0);
+    gridtqlayout->addWidget (backend, 1, 0);
+    gridtqlayout->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 * bitratelayout = new TQGridLayout (wbox, 2, 3, 5);
+    TQGridLayout * bitratetqlayout = 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."));
-    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));
+    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));
     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 *layout = new TQVBoxLayout (this, 5, 5);
-    TQHBoxLayout * urllayout = new TQHBoxLayout ();
+    TQVBoxLayout *tqlayout = new TQVBoxLayout (this, 5, 5);
+    TQHBoxLayout * urltqlayout = new TQHBoxLayout ();
     TQLabel *urlLabel = new TQLabel (i18n ("Output file:"), this);
     url = new KURLRequester ("", this);
     url->setShowLocalProtocol (true);
-    urllayout->addWidget (urlLabel);
-    urllayout->addWidget (url);
+    urltqlayout->addWidget (urlLabel);
+    urltqlayout->addWidget (url);
     recordButton = new TQPushButton (i18n ("Start &Recording"), this);
     connect (recordButton, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotRecord ()));
-    TQHBoxLayout *buttonlayout = new TQHBoxLayout;
-    buttonlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum));
-    buttonlayout->addWidget (recordButton);
+    TQHBoxLayout *buttontqlayout = new TQHBoxLayout;
+    buttontqlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+    buttontqlayout->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 *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));
+    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));
     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);
-    topLevelWidget ()->hide ();
+    tqtopLevelWidget ()->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::fromLatin1("Xine")) > -1;
+    bool b = recorder->find(id)->text().find (TQString::tqfromLatin1("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 *layout = new TQVBoxLayout (this, 5, 5);
+    TQVBoxLayout *tqlayout = 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 *gridlayout = new TQGridLayout (customopts, 1, 2, 2);
+    TQGridLayout *gridtqlayout = new TQGridLayout (customopts, 1, 2, 2);
     TQLabel *argLabel = new TQLabel (i18n("Mencoder arguments:"), customopts, 0);
     arguments = new TQLineEdit ("", customopts);
-    gridlayout->addWidget (argLabel, 0, 0);
-    gridlayout->addWidget (arguments, 0, 1);
-    layout->addWidget (format);
-    layout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+    gridtqlayout->addWidget (argLabel, 0, 0);
+    gridtqlayout->addWidget (arguments, 0, 1);
+    tqlayout->addWidget (format);
+    tqlayout->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 *layout = new TQVBoxLayout (this, 5, 5);
-    TQGridLayout *gridlayout = new TQGridLayout (1, 2, 2);
+    TQVBoxLayout *tqlayout = new TQVBoxLayout (this, 5, 5);
+    TQGridLayout *gridtqlayout = new TQGridLayout (1, 2, 2);
     TQLabel *argLabel = new TQLabel (i18n("FFMpeg arguments:"), this);
     arguments = new TQLineEdit ("", this);
-    gridlayout->addWidget (argLabel, 0, 0);
-    gridlayout->addWidget (arguments, 0, 1);
-    layout->addLayout (gridlayout);
-    layout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+    gridtqlayout->addWidget (argLabel, 0, 0);
+    gridtqlayout->addWidget (arguments, 0, 1);
+    tqlayout->addLayout (gridtqlayout);
+    tqlayout->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 *layout = new TQGridLayout (this, 2, 2, 5);
+    TQGridLayout *tqlayout = 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."));
-    layout->addWidget (new TQLabel (i18n ("Video driver:"), this), 0, 0);
-    layout->addWidget (videoDriver, 1, 0);
+    tqlayout->addWidget (new TQLabel (i18n ("Video driver:"), this), 0, 0);
+    tqlayout->addWidget (videoDriver, 1, 0);
 
     audioDriver = new TQListBox (this);
     for (int i = 0; ad[i].driver; i++)
         audioDriver->insertItem (ad[i].description, i);
-    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));
+    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));
 }
 
 KDE_NO_CDTOR_EXPORT PrefOPPageGeneral::PrefOPPageGeneral(TQWidget *parent)
 : TQFrame(parent)
 {
-    TQVBoxLayout *layout = new TQVBoxLayout (this, 5);
-    layout->setAutoAdd (true);
+    TQVBoxLayout *tqlayout = new TQVBoxLayout (this, 5);
+    tqlayout->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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, PostprocessingOptions->sizePolicy().hasHeightForWidth() ) );
+    PostprocessingOptions->tqsetSizePolicy( 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->setSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)2));
+    customFilters->tqsetSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)2));
     customFilters->setFlat(false);
     customFilters->setEnabled( false );
     customFilters->setInsideSpacing(7);
 
-    TQLayout *customFiltersLayout = customFilters->layout();
-    TQHBoxLayout *customFiltersLayout1 = new TQHBoxLayout ( customFilters->layout() );
+    TQLayout *customFiltersLayout = customFilters->tqlayout();
+    TQHBoxLayout *customFiltersLayout1 = new TQHBoxLayout ( customFilters->tqlayout() );
 
     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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)2 ) );
+    line1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)2 ) );
     line1->setFrameShape( TQFrame::HLine );
     line1->setFrameShadow( TQFrame::Sunken );
     customFiltersLayout->add(line1);
 
-    TQHBoxLayout *customFiltersLayout2 = new TQHBoxLayout ( customFilters->layout() );
+    TQHBoxLayout *customFiltersLayout2 = new TQHBoxLayout ( customFilters->tqlayout() );
 
     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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)2 ) );
+    line2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)2 ) );
     line2->setFrameShape( TQFrame::HLine );
     line2->setFrameShadow( TQFrame::Sunken );
     customFiltersLayout->add(line2);
 
-    TQHBoxLayout *customFiltersLayout3  = new TQHBoxLayout ( customFilters->layout() );
+    TQHBoxLayout *customFiltersLayout3  = new TQHBoxLayout ( customFilters->tqlayout() );
 
     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->layout());
+    TQHBoxLayout *customFiltersLayout4 =new TQHBoxLayout(customFilters->tqlayout());
 
     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->layout());
+    TQHBoxLayout *customFiltersLayout5 = new TQHBoxLayout (customFilters->tqlayout());
 
     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->setSizePolicy(TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1));*/
+        TmpNoiseSlider->tqsetSizePolicy(TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1));*/
 
     /*customFiltersLayout->addWidget(TmpNoiseFilter,7,0);
       customFiltersLayout->addWidget(TmpNoiseSlider,7,2);*/