From ee4b31b7bd3e899cad30866bf083c3ff6a4a9fc8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:56:14 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit f97c8a56e217f04e08776ccf8021721b7d919b7d. --- src/kmplayerapp.cpp | 64 ++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'src/kmplayerapp.cpp') diff --git a/src/kmplayerapp.cpp b/src/kmplayerapp.cpp index 13a54ab..3996635 100644 --- a/src/kmplayerapp.cpp +++ b/src/kmplayerapp.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -202,7 +202,7 @@ KDE_NO_CDTOR_EXPORT FileDocument::FileDocument (short i, const TQString &s, KMPl } KDE_NO_EXPORT KMPlayer::NodePtr FileDocument::childFromTag(const TQString &tag) { - if (tag == TQString::fromLatin1 (nodeName ())) + if (tag == TQString::tqfromLatin1 (nodeName ())) return this; return 0L; } @@ -246,9 +246,9 @@ KDE_NO_EXPORT void Recents::defer () { KDE_NO_EXPORT KMPlayer::NodePtr Recents::childFromTag (const TQString & tag) { // kdDebug () << nodeName () << " childFromTag " << tag << endl; - if (tag == TQString::fromLatin1 ("item")) + if (tag == TQString::tqfromLatin1 ("item")) return new Recent (m_doc, app); - else if (tag == TQString::fromLatin1 ("group")) + else if (tag == TQString::tqfromLatin1 ("group")) return new Group (m_doc, app); return FileDocument::childFromTag (tag); } @@ -282,9 +282,9 @@ Group::Group (KMPlayer::NodePtr & doc, KMPlayerApp * a, const TQString & pn) } KDE_NO_EXPORT KMPlayer::NodePtr Group::childFromTag (const TQString & tag) { - if (tag == TQString::fromLatin1 ("item")) + if (tag == TQString::tqfromLatin1 ("item")) return new Recent (m_doc, app); - else if (tag == TQString::fromLatin1 ("group")) + else if (tag == TQString::tqfromLatin1 ("group")) return new Group (m_doc, app); return 0L; } @@ -862,14 +862,14 @@ KDE_NO_EXPORT void IntroSource::activate () { TQTextStream ts (&file); KMPlayer::readXML (m_document, ts, TQString (), false); } else { - TQString smil = TQString::fromLatin1 ( - "" - "" + TQString smil = TQString::tqfromLatin1 ( + "" + "" "" "" "" "" - "" + "" "" "" "" @@ -882,7 +882,7 @@ KDE_NO_EXPORT void IntroSource::activate () { "" "" "" - ).arg (locate ("data", "kmplayer/noise.gif")).arg (KGlobal::iconLoader()->iconPath (TQString::fromLatin1 ("kmplayer"), -64)); + ).arg (locate ("data", "kmplayer/noise.gif")).arg (KGlobal::iconLoader()->iconPath (TQString::tqfromLatin1 ("kmplayer"), -64)); TQTextStream ts (smil.utf8 (), IO_ReadOnly); KMPlayer::readXML (m_document, ts, TQString (), false); } @@ -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->layout ()->activate (); + m_view->tqlayout ()->activate (); } } @@ -1165,7 +1165,7 @@ KDE_NO_EXPORT void KMPlayerApp::readOptions() { #include #undef Always #undef Never -#undef Status +#undef tqStatus #undef Unsorted #undef Bool @@ -1227,18 +1227,18 @@ KDE_NO_EXPORT void ExitSource::activate () { TQTextStream ts (&file); KMPlayer::readXML (m_document, ts, TQString (), false); } else { - TQString smil = TQString::fromLatin1 ("" - "" + TQString smil = TQString::tqfromLatin1 ("" + "" "" "" - "" + "" "" "" "" //"" "

" "" - "").arg (KGlobal::iconLoader()->iconPath (TQString::fromLatin1 ("kmplayer"), -64)); + "").arg (KGlobal::iconLoader()->iconPath (TQString::tqfromLatin1 ("kmplayer"), -64)); TQTextStream ts (smil.utf8 (), IO_ReadOnly); KMPlayer::readXML (m_document, ts, TQString (), false); } @@ -1261,7 +1261,7 @@ KDE_NO_EXPORT void ExitSource::stateElementChanged (KMPlayer::Node * node, KMPla if (new_state == KMPlayer::Node::state_deactivated && m_document == node && m_player->view ()) - m_player->view ()->topLevelWidget ()->close (); + m_player->view ()->tqtopLevelWidget ()->close (); } #endif @@ -1437,7 +1437,7 @@ KDE_NO_EXPORT void KMPlayerApp::slotViewMenuBar() { slotStatusMsg(i18n("Ready")); } else { menuBar()->hide(); - slotStatusMsg (i18n ("Show Menubar with %1").arg(viewMenuBar->shortcutText())); + slotStatusMsg (i18n ("Show Menubar with %1").tqarg(viewMenuBar->shortcutText())); if (!m_showStatusbar) { statusBar()->show(); TQTimer::singleShot (3000, statusBar(), TQT_SLOT (hide ())); @@ -1452,7 +1452,7 @@ KDE_NO_EXPORT void KMPlayerApp::slotStatusMsg (const TQString &text) { } KDE_NO_EXPORT void KMPlayerApp::fullScreen () { -// if (TQT_TQOBJECT(const_cast(sender ()))->metaObject ()->inherits ("KAction")) +// if (TQT_TQOBJECT(const_cast(sender ()))->tqmetaObject ()->inherits ("KAction")) if (TQT_TQOBJECT(const_cast(sender ()))->inherits ("KAction")) m_view->fullScreen(); #if KDE_IS_VERSION(3,1,90) @@ -1704,17 +1704,17 @@ KDE_NO_EXPORT void KMPlayerMenuSource::menuItemClicked (TQPopupMenu * menu, int KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageDVD::KMPlayerPrefSourcePageDVD (TQWidget * parent) : TQFrame(parent) { - TQVBoxLayout *layout = new TQVBoxLayout (this, 5, 2); + TQVBoxLayout *tqlayout = 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")); - 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)); + 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)); } //----------------------------------------------------------------------------- @@ -2065,17 +2065,17 @@ KDE_NO_EXPORT TQString KMPlayerDVDNavSource::prettyName () { KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageVCD::KMPlayerPrefSourcePageVCD (TQWidget * parent) : TQFrame (parent) { - TQVBoxLayout *layout = new TQVBoxLayout (this, 5, 2); + TQVBoxLayout *tqlayout = 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")); - 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)); + 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)); } //----------------------------------------------------------------------------- -- cgit v1.2.1