diff options
| author | Timothy Pearson <[email protected]> | 2011-12-21 14:04:46 -0600 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2012-06-18 23:49:44 +0200 |
| commit | bd8cc27bb451d668c6460c3c883dc7dd1054dd11 (patch) | |
| tree | a43e2c6a3efff84e629e5189a6966b3991404e1b /src/kmplayerapp.cpp | |
| parent | 06d3cc396b46988b67349ac9043243e989eed4fd (diff) | |
| download | kmplayer-bd8cc27bb451d668c6460c3c883dc7dd1054dd11.tar.gz kmplayer-bd8cc27bb451d668c6460c3c883dc7dd1054dd11.zip | |
Rename obsolete tq methods to standard names
(cherry picked from commit 119c7d143c661c438bcd3ab82113ada44e9725fa)
Diffstat (limited to 'src/kmplayerapp.cpp')
| -rw-r--r-- | src/kmplayerapp.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
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)); } //----------------------------------------------------------------------------- |