diff options
Diffstat (limited to 'src/kmplayerapp.cpp')
-rw-r--r-- | src/kmplayerapp.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/kmplayerapp.cpp b/src/kmplayerapp.cpp index 66d942f..21e8e44 100644 --- a/src/kmplayerapp.cpp +++ b/src/kmplayerapp.cpp @@ -349,9 +349,9 @@ KDE_NO_EXPORT void PlaylistItemBase::activate () { KMPlayer::NodePtr pl = new Playlist (app, source, true); TQString data; TQString pn; - if (tqparentNode ()->id == KMPlayer::id_node_group_node) { - data = tqparentNode ()->innerXML (); - pn = tqparentNode ()->mrl ()->pretty_name; + if (parentNode ()->id == KMPlayer::id_node_group_node) { + data = parentNode ()->innerXML (); + pn = parentNode ()->mrl ()->pretty_name; } else { data = outerXML (); pn = pretty_name.isEmpty () ? src : pretty_name; @@ -363,8 +363,8 @@ KDE_NO_EXPORT void PlaylistItemBase::activate () { pl->normalize (); KMPlayer::NodePtr cur = pl->firstChild (); pl->mrl ()->resolved = !!cur; - if (tqparentNode ()->id == KMPlayer::id_node_group_node && cur) { - KMPlayer::NodePtr sister = tqparentNode ()->firstChild (); + if (parentNode ()->id == KMPlayer::id_node_group_node && cur) { + KMPlayer::NodePtr sister = parentNode ()->firstChild (); while (sister && cur && sister.ptr () != this) { sister = sister->nextSibling (); cur = cur->nextSibling (); @@ -1522,16 +1522,16 @@ KDE_NO_EXPORT void KMPlayerApp::menuDropInList () { KMPlayer::NodePtr n = static_cast<KMPlayer::PlayListItem*>(m_drop_after)->node; KMPlayer::NodePtr pi; for (int i = m_drop_list.size (); n && (i > 0 || manip_node); i--) { - if (manip_node && manip_node->tqparentNode ()) { + if (manip_node && manip_node->parentNode ()) { pi = manip_node; manip_node = 0L; - pi->tqparentNode ()->removeChild (pi); + pi->parentNode ()->removeChild (pi); } else pi = new PlaylistItem(playlist, this,false, m_drop_list[i-1].url()); if (n == playlist || m_drop_after->isOpen ()) n->insertBefore (pi, n->firstChild ()); else - n->tqparentNode ()->insertBefore (pi, n->nextSibling ()); + n->parentNode ()->insertBefore (pi, n->nextSibling ()); } m_view->playList()->updateTree (playlist_id, playlist, pi, true, false); } @@ -1544,13 +1544,13 @@ KDE_NO_EXPORT void KMPlayerApp::menuDropInGroup () { if (n == playlist || m_drop_after->isOpen ()) n->insertBefore (g, n->firstChild ()); else - n->tqparentNode ()->insertBefore (g, n->nextSibling ()); + n->parentNode ()->insertBefore (g, n->nextSibling ()); KMPlayer::NodePtr pi; for (int i = 0; i < m_drop_list.size () || manip_node; ++i) { - if (manip_node && manip_node->tqparentNode ()) { + if (manip_node && manip_node->parentNode ()) { pi = manip_node; manip_node = 0L; - pi->tqparentNode ()->removeChild (pi); + pi->parentNode ()->removeChild (pi); } else pi = new PlaylistItem (playlist,this, false, m_drop_list[i].url ()); g->appendChild (pi); @@ -1565,36 +1565,36 @@ KDE_NO_EXPORT void KMPlayerApp::menuCopyDrop () { if (n == playlist || m_drop_after->isOpen ()) n->insertBefore (pi, n->firstChild ()); else - n->tqparentNode ()->insertBefore (pi, n->nextSibling ()); + n->parentNode ()->insertBefore (pi, n->nextSibling ()); m_view->playList()->updateTree (playlist_id, playlist, pi, true, false); } } KDE_NO_EXPORT void KMPlayerApp::menuDeleteNode () { KMPlayer::NodePtr n; - if (manip_node && manip_node->tqparentNode ()) { - n = manip_node->previousSibling() ? manip_node->previousSibling() : manip_node->tqparentNode (); - manip_node->tqparentNode ()->removeChild (manip_node); + if (manip_node && manip_node->parentNode ()) { + n = manip_node->previousSibling() ? manip_node->previousSibling() : manip_node->parentNode (); + manip_node->parentNode ()->removeChild (manip_node); } m_view->playList()->updateTree (manip_tree_id, 0L, n, true, false); } KDE_NO_EXPORT void KMPlayerApp::menuMoveUpNode () { KMPlayer::NodePtr n = manip_node; - if (n && n->tqparentNode () && n->previousSibling ()) { + if (n && n->parentNode () && n->previousSibling ()) { KMPlayer::NodePtr prev = n->previousSibling (); - n->tqparentNode ()->removeChild (n); - prev->tqparentNode ()->insertBefore (n, prev); + n->parentNode ()->removeChild (n); + prev->parentNode ()->insertBefore (n, prev); } m_view->playList()->updateTree (manip_tree_id, 0L, n, true, false); } KDE_NO_EXPORT void KMPlayerApp::menuMoveDownNode () { KMPlayer::NodePtr n = manip_node; - if (n && n->tqparentNode () && n->nextSibling ()) { + if (n && n->parentNode () && n->nextSibling ()) { KMPlayer::NodePtr next = n->nextSibling (); - n->tqparentNode ()->removeChild (n); - next->tqparentNode ()->insertBefore (n, next->nextSibling ()); + n->parentNode ()->removeChild (n); + next->parentNode ()->insertBefore (n, next->nextSibling ()); } m_view->playList()->updateTree (manip_tree_id, 0L, n, true, false); } @@ -1604,7 +1604,7 @@ KDE_NO_EXPORT void KMPlayerApp::playListItemMoved () { KMPlayer::RootPlayListItem * ri = m_view->playList ()->rootItem (si); kdDebug() << "playListItemMoved " << (ri->id == playlist_id) << !! si->node << endl; if (ri->id == playlist_id && si->node) { - KMPlayer::NodePtr p = si->node->tqparentNode (); + KMPlayer::NodePtr p = si->node->parentNode (); if (p) { p->removeChild (si->node); m_view->playList()->updateTree(playlist_id,playlist,0L,false,false); |