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

This reverts commit f97c8a56e217f04e08776ccf8021721b7d919b7d.

1 files changed, 57 insertions, 57 deletions

diff --git a/src/kmplayerbroadcast.cpp b/src/kmplayerbroadcast.cpp
index bb28f03..41a4dca 100644
--- a/src/kmplayerbroadcast.cpp
+++ b/src/kmplayerbroadcast.cpp
@@ -18,7 +18,7 @@
 */
 #include <algorithm>
 
-#include <layout.h>
+#include <tqlayout.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 *layout = new TQVBoxLayout (this, 5);
-    TQGridLayout *gridlayout = new TQGridLayout (layout, 6, 2, 2);
+    TQVBoxLayout *tqlayout = new TQVBoxLayout (this, 5);
+    TQGridLayout *gridtqlayout = new TQGridLayout (tqlayout, 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"));
-    gridlayout->addWidget (label, 0, 0);
-    gridlayout->addWidget (bindaddress, 0, 1);
+    gridtqlayout->addWidget (label, 0, 0);
+    gridtqlayout->addWidget (bindaddress, 0, 1);
     label = new TQLabel (i18n ("Listen port:"), this);
     port = new TQLineEdit ("", this);
-    gridlayout->addWidget (label, 1, 0);
-    gridlayout->addWidget (port, 1, 1);
+    gridtqlayout->addWidget (label, 1, 0);
+    gridtqlayout->addWidget (port, 1, 1);
     label = new TQLabel (i18n ("Maximum connections:"), this);
     maxclients = new TQLineEdit ("", this);
-    gridlayout->addWidget (label, 2, 0);
-    gridlayout->addWidget (maxclients, 2, 1);
+    gridtqlayout->addWidget (label, 2, 0);
+    gridtqlayout->addWidget (maxclients, 2, 1);
     label = new TQLabel (i18n ("Maximum bandwidth (kbit):"), this);
     maxbandwidth = new TQLineEdit ("", this);
-    gridlayout->addWidget (label, 3, 0);
-    gridlayout->addWidget (maxbandwidth, 3, 1);
+    gridtqlayout->addWidget (label, 3, 0);
+    gridtqlayout->addWidget (maxbandwidth, 3, 1);
     label = new TQLabel (i18n ("Temporary feed file:"), this);
     feedfile = new TQLineEdit ("", this);
-    gridlayout->addWidget (label, 4, 0);
-    gridlayout->addWidget (feedfile, 4, 1);
+    gridtqlayout->addWidget (label, 4, 0);
+    gridtqlayout->addWidget (feedfile, 4, 1);
     label = new TQLabel (i18n ("Feed file size (kB):"), this);
     feedfilesize = new TQLineEdit ("", this);
-    gridlayout->addWidget (label, 5, 0);
-    gridlayout->addWidget (feedfilesize, 5, 1);
-    layout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+    gridtqlayout->addWidget (label, 5, 0);
+    gridtqlayout->addWidget (feedfilesize, 5, 1);
+    tqlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
 }
 
 //-----------------------------------------------------------------------------
 
 #undef ADDPROPERTY
-#define ADDPROPERTY(label,qedit,gridlayout,row,parent)                  \
+#define ADDPROPERTY(label,qedit,gridtqlayout,row,parent)                  \
     qedit = new TQLineEdit ("", parent);                                 \
-    gridlayout->addWidget (new TQLabel (qedit, label, parent), row, 0);  \
-    gridlayout->addWidget (qedit, row, 1);
+    gridtqlayout->addWidget (new TQLabel (qedit, label, parent), row, 0);  \
+    gridtqlayout->addWidget (qedit, row, 1);
 
 KDE_NO_CDTOR_EXPORT KMPlayerPrefBroadcastFormatPage::KMPlayerPrefBroadcastFormatPage (TQWidget *parent, FFServerSettingList & ffs) : TQFrame (parent, "BroadcastPage"), profiles (ffs)
 {
-    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);
+    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);
     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"));
-    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);
+    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);
     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 *profileslayout = new TQGridLayout (profileframe, 5, 2, 2);
+    TQGridLayout *profilestqlayout = 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 ()));
-    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);
+    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);
     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);
-    ledlayout->addWidget (startbutton);
-    ledlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
-    ledlayout->addWidget (serverled);
-    ledlayout->addWidget (feedled);
-    leftlayout->addLayout (ledlayout);
+    ledtqlayout->addWidget (startbutton);
+    ledtqlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
+    ledtqlayout->addWidget (serverled);
+    ledtqlayout->addWidget (feedled);
+    lefttqlayout->addLayout (ledtqlayout);
     TQFrame * line = new TQFrame (this);
     line->setFrameShape (TQFrame::HLine);
-    leftlayout->addWidget (line);
-    leftlayout->addWidget (label);
-    leftlayout->addWidget (accesslist);
-    leftlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
-    layout->addLayout (leftlayout);
+    lefttqlayout->addWidget (line);
+    lefttqlayout->addWidget (label);
+    lefttqlayout->addWidget (accesslist);
+    lefttqlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+    tqlayout->addLayout (lefttqlayout);
     line = new TQFrame (this);
     line->setFrameShape (TQFrame::VLine);
-    layout->addWidget (line);
-    layout->addLayout (formatlayout);
-    layout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+    tqlayout->addWidget (line);
+    tqlayout->addLayout (formattqlayout);
+    tqlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
 }
 
 #undef ADDPROPERTY