From 119c7d143c661c438bcd3ab82113ada44e9725fa Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:04:46 -0600 Subject: Rename obsolete tq methods to standard names --- src/kmplayertvsource.cpp | 82 ++++++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 41 deletions(-) (limited to 'src/kmplayertvsource.cpp') 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 (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 (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")); } -- cgit v1.2.1