diff options
Diffstat (limited to 'amarok/src/playlistbrowseritem.cpp')
-rw-r--r-- | amarok/src/playlistbrowseritem.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/amarok/src/playlistbrowseritem.cpp b/amarok/src/playlistbrowseritem.cpp index 2c800ad0..96a00f5a 100644 --- a/amarok/src/playlistbrowseritem.cpp +++ b/amarok/src/playlistbrowseritem.cpp @@ -249,8 +249,8 @@ void PlaylistCategory::okRename( int col ) if( m_id < 0 ) return; // update the database entry to have the correct name - const int tqparentId = tqparent() ? static_cast<PlaylistCategory*>(tqparent())->id() : 0; - CollectionDB::instance()->updatePodcastFolder( m_id, text(0), tqparentId, isOpen() ); + const int parentId = tqparent() ? static_cast<PlaylistCategory*>(tqparent())->id() : 0; + CollectionDB::instance()->updatePodcastFolder( m_id, text(0), parentId, isOpen() ); } void PlaylistCategory::setXml( const TQDomElement &xml ) @@ -399,10 +399,10 @@ PlaylistCategory::showContextMenu( const TQPoint &position ) enum Actions { RENAME, REMOVE, CREATE, PLAYLIST, PLAYLIST_IMPORT, SMART, STREAM, DYNAMIC, LASTFM, LASTFMCUSTOM, PODCAST, REFRESH, CONFIG, INTERVAL }; - TQListViewItem *tqparentCat = this; + TQListViewItem *parentCat = this; - while( tqparentCat->tqparent() ) - tqparentCat = tqparentCat->tqparent(); + while( parentCat->tqparent() ) + parentCat = parentCat->tqparent(); bool isPodcastFolder = false; @@ -412,37 +412,37 @@ PlaylistCategory::showContextMenu( const TQPoint &position ) menu.insertSeparator(); } - if( tqparentCat == static_cast<TQListViewItem*>( PlaylistBrowser::instance()->m_playlistCategory) ) + if( parentCat == static_cast<TQListViewItem*>( PlaylistBrowser::instance()->m_playlistCategory) ) { menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("Create Playlist..."), PLAYLIST ); menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("Import Playlist..."), PLAYLIST_IMPORT ); } - else if( tqparentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_smartCategory) ) + else if( parentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_smartCategory) ) menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("New Smart Playlist..."), SMART ); - else if( tqparentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_dynamicCategory) ) + else if( parentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_dynamicCategory) ) menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("New Dynamic Playlist..."), DYNAMIC ); - else if( tqparentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_streamsCategory) ) + else if( parentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_streamsCategory) ) menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("Add Radio Stream..."), STREAM ); - else if( tqparentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_lastfmCategory) ) + else if( parentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_lastfmCategory) ) { menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("Add Last.fm Radio..."), LASTFM ); menu.insertItem( SmallIconSet(Amarok::icon( "add_playlist" )), i18n("Add Custom Last.fm Radio..."), LASTFMCUSTOM ); } - else if( tqparentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_podcastCategory) ) + else if( parentCat == static_cast<TQListViewItem*>(PlaylistBrowser::instance()->m_podcastCategory) ) { isPodcastFolder = true; menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n("Add Podcast..."), PODCAST ); menu.insertItem( SmallIconSet( Amarok::icon( "refresh" ) ), i18n("Refresh All Podcasts"), REFRESH ); menu.insertSeparator(); menu.insertItem( SmallIconSet( Amarok::icon( "configure" ) ), i18n( "&Configure Podcasts..." ), CONFIG ); - if( tqparentCat->childCount() == 0 ) + if( parentCat->childCount() == 0 ) menu.setItemEnabled( CONFIG, false ); - if( tqparentCat == this ) + if( parentCat == this ) menu.insertItem( SmallIconSet( Amarok::icon( "configure" ) ), i18n("Scan Interval..."), INTERVAL ); } @@ -2428,10 +2428,10 @@ PodcastEpisode::PodcastEpisode( TQListViewItem *tqparent, TQListViewItem *after, if( title.isEmpty() ) title = link.fileName(); - KURL tqparentUrl = static_cast<PodcastChannel*>(tqparent)->url(); + KURL parentUrl = static_cast<PodcastChannel*>(tqparent)->url(); m_bundle.setDBId( -1 ); m_bundle.setURL( link ); - m_bundle.setParent( tqparentUrl ); + m_bundle.setParent( parentUrl ); m_bundle.setTitle( title ); m_bundle.setSubtitle( subtitle ); m_bundle.setAuthor( author ); @@ -2587,8 +2587,8 @@ void PodcastEpisode::createLocalDir( const KURL &localDir ) TQString localDirString = localDir.path(); if( !TQFile::exists( localDirString ) ) { - TQString tqparentDirString = localDir.directory( true, true ); - createLocalDir( tqparentDirString ); + TQString parentDirString = localDir.directory( true, true ); + createLocalDir( parentDirString ); TQDir dir( localDirString ); dir.mkdir( localDirString ); } |