diff options
| author | Timothy Pearson <[email protected]> | 2011-12-18 18:10:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-12-18 18:10:16 -0600 |
| commit | 81ad3b51a1f061b0934426aaf339917f76c0cfc5 (patch) | |
| tree | d58f2500c1bfa5abeb84264cbaee55a7dd161bac /src/kmplayerapp.cpp | |
| parent | ee4b31b7bd3e899cad30866bf083c3ff6a4a9fc8 (diff) | |
| download | kmplayer-81ad3b51a1f061b0934426aaf339917f76c0cfc5.tar.gz kmplayer-81ad3b51a1f061b0934426aaf339917f76c0cfc5.zip | |
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'src/kmplayerapp.cpp')
| -rw-r--r-- | src/kmplayerapp.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/kmplayerapp.cpp b/src/kmplayerapp.cpp index 3996635..3354f04 100644 --- a/src/kmplayerapp.cpp +++ b/src/kmplayerapp.cpp @@ -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::tqfromLatin1 (nodeName ())) + if (tag == TQString::fromLatin1 (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::tqfromLatin1 ("item")) + if (tag == TQString::fromLatin1 ("item")) return new Recent (m_doc, app); - else if (tag == TQString::tqfromLatin1 ("group")) + else if (tag == TQString::fromLatin1 ("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::tqfromLatin1 ("item")) + if (tag == TQString::fromLatin1 ("item")) return new Recent (m_doc, app); - else if (tag == TQString::tqfromLatin1 ("group")) + else if (tag == TQString::fromLatin1 ("group")) return new Group (m_doc, app); return 0L; } @@ -862,7 +862,7 @@ KDE_NO_EXPORT void IntroSource::activate () { TQTextStream ts (&file); KMPlayer::readXML (m_document, ts, TQString (), false); } else { - TQString smil = TQString::tqfromLatin1 ( + TQString smil = TQString::fromLatin1 ( "<smil><head><tqlayout>" "<root-tqlayout width='320' height='240' background-color='black'/>" "<region id='image1' left='31.25%' top='25%' width='37.5%' height='50%' z-order='1'/>" @@ -882,7 +882,7 @@ KDE_NO_EXPORT void IntroSource::activate () { "<seq begin='reg1.activateEvent'/>" "</excl>" "</body></smil>" - ).arg (locate ("data", "kmplayer/noise.gif")).arg (KGlobal::iconLoader()->iconPath (TQString::tqfromLatin1 ("kmplayer"), -64)); + ).arg (locate ("data", "kmplayer/noise.gif")).arg (KGlobal::iconLoader()->iconPath (TQString::fromLatin1 ("kmplayer"), -64)); TQTextStream ts (smil.utf8 (), IO_ReadOnly); KMPlayer::readXML (m_document, ts, TQString (), false); } @@ -1165,7 +1165,7 @@ KDE_NO_EXPORT void KMPlayerApp::readOptions() { #include <netwm.h> #undef Always #undef Never -#undef tqStatus +#undef Status #undef Unsorted #undef Bool @@ -1227,7 +1227,7 @@ KDE_NO_EXPORT void ExitSource::activate () { TQTextStream ts (&file); KMPlayer::readXML (m_document, ts, TQString (), false); } else { - TQString smil = TQString::tqfromLatin1 ("<smil><head><tqlayout>" + TQString smil = TQString::fromLatin1 ("<smil><head><tqlayout>" "<root-tqlayout 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'/>" @@ -1238,7 +1238,7 @@ KDE_NO_EXPORT void ExitSource::activate () { //"<animate target='reg1' attribute='background-color' calcMode='discrete' values='#FFFFFF;#E4E4E4;#CCCCCC;#B4B4B4;#9E9E9E;#8A8A8A;#777777;#656565;#555555;#464646;#393939;#2D2D2D;#222222;#191919;#111111;#0B0B0B;#060606;#020202;#000000;#000000' dur='0.6'/>" "<img src='%2' id='img1' region='image' dur='0.4' fit='hidden' transOut='pw'/>" "</par>" - "</body></smil>").arg (KGlobal::iconLoader()->iconPath (TQString::tqfromLatin1 ("kmplayer"), -64)); + "</body></smil>").arg (KGlobal::iconLoader()->iconPath (TQString::fromLatin1 ("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 ()->tqtopLevelWidget ()->close (); + m_player->view ()->topLevelWidget ()->close (); } #endif @@ -1452,7 +1452,7 @@ KDE_NO_EXPORT void KMPlayerApp::slotStatusMsg (const TQString &text) { } KDE_NO_EXPORT void KMPlayerApp::fullScreen () { -// if (TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender ()))->tqmetaObject ()->inherits ("KAction")) +// if (TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender ()))->metaObject ()->inherits ("KAction")) if (TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender ()))->inherits ("KAction")) m_view->fullScreen(); #if KDE_IS_VERSION(3,1,90) |