Changeset 124 for smplayer/trunk/src/urlhistory.cpp

Timestamp:

Mar 16, 2012, 4:02:47 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: 0.7.1 trunk update

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/urlhistory.cpp (modified) (6 diffs)

smplayer/trunk/src/urlhistory.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -18 +18 @@
 
 #include "urlhistory.h"
-#include "constants.h"
 
 URLHistory::URLHistory() : Recents() 
@@ -28 +27 @@
 }
 
-void URLHistory::addUrl(QString url, bool is_playlist) {
+void URLHistory::addUrl(QString url) {
         qDebug("Recents::addItem: '%s'", url.toUtf8().data());
 
@@ -35 +34 @@
         while (iterator != l.end()) {
                 QString s = (*iterator);
-                if (isPlaylist(s)) {
-                        s = s.remove( QRegExp(IS_PLAYLIST_TAG_RX) );
-                }
                 if (s == url) 
                         iterator = l.erase(iterator);
@@ -45 +41 @@
 
         // Add new item to list
-        if (is_playlist) url = url + IS_PLAYLIST_TAG;
         l.prepend(url);
 
@@ -51 +46 @@
 }
 
-void URLHistory::addUrl(QString url) {
-        bool is_playlist = isPlaylist(url);
-        if (is_playlist) url = url.remove( QRegExp(IS_PLAYLIST_TAG_RX) );
-        addUrl(url, is_playlist);
-}
-
 QString URLHistory::url(int n) {
         QString s = l[n];
-        if (isPlaylist(n)) s = s.remove( QRegExp(IS_PLAYLIST_TAG_RX) );
         return s;
 }
 
-bool URLHistory::isPlaylist(int n) {
-        return isPlaylist(l[n]);
-}
-
-bool URLHistory::isPlaylist(QString url) {
-        return url.endsWith(IS_PLAYLIST_TAG);
-}
-