diff -Nur filebrowser-old/statebag.c filebrowser/statebag.c
--- filebrowser-old/statebag.c	2006-12-04 22:13:24.000000000 +0100
+++ filebrowser/statebag.c	2007-06-18 20:20:21.000000000 +0200
@@ -27,10 +27,10 @@
 #ifdef FILEBROWSER_PLUGIN_BUILD
   Threads=new cThreadList();
 #endif
-  SelectedFiles=new cStringList();
+  SelectedFiles=new cStringContainerList();
   Commands=new cFilebrowserCommands();
   BaseDir[0]='\0';
-  CurrentFiles=new cStringList();
+  CurrentFiles=new cStringContainerList();
 }
 
 cFilebrowserStatebag::~cFilebrowserStatebag()
diff -Nur filebrowser-old/statebag.h filebrowser/statebag.h
--- filebrowser-old/statebag.h	2006-12-04 22:13:24.000000000 +0100
+++ filebrowser/statebag.h	2007-06-18 20:21:46.000000000 +0200
@@ -22,7 +22,7 @@
 #include <vdr/plugin.h>
 
 //Forward declarations for used classes
-class cStringList;
+class cStringContainerList;
 #ifdef FILEBROWSER_PLUGIN_BUILD
 class cThreadList;
 #endif
@@ -31,7 +31,7 @@
 class cFilebrowserStatebag
 {
   protected:
-    cStringList* SelectedFiles;
+    cStringContainerList* SelectedFiles;
 #ifdef FILEBROWSER_PLUGIN_BUILD
     cThreadList* Threads;
 #endif
@@ -41,7 +41,7 @@
     cFilebrowserStatebag();
     ~cFilebrowserStatebag();
 
-    cStringList* GetSelectedFiles() { return SelectedFiles; };
+    cStringContainerList* GetSelectedFiles() { return SelectedFiles; };
 #ifdef FILEBROWSER_PLUGIN_BUILD
     cThreadList* GetThreads() { return Threads; };
 #endif
@@ -54,7 +54,7 @@
     cString Filter;
     cString CurrentDirectory;
     cString ConfigDirectory;
-    cStringList* CurrentFiles;
+    cStringContainerList* CurrentFiles;
 
 #ifdef FILEBROWSER_PLUGIN_BUILD
     /*
diff -Nur filebrowser-old/threads.c filebrowser/threads.c
--- filebrowser-old/threads.c	2006-12-07 20:19:48.000000000 +0100
+++ filebrowser/threads.c	2007-06-18 20:20:21.000000000 +0200
@@ -35,7 +35,7 @@
   this->CurrentFile=CurrentFile ? strdup(CurrentFile) : NULL;
   this->Statebag=Statebag;
   //deep copy of Selected files
-  SelectedFiles=new cStringList();
+  SelectedFiles=new cStringContainerList();
   for(int i=0; i<Statebag->GetSelectedFiles()->Count(); i++)
   {
     SelectedFiles->Add(new cStringContainer(strdup((char*)Statebag->GetSelectedFiles()->Get(i)->GetObject())));
@@ -317,7 +317,7 @@
 
 char* cConfigCommandThread::SelectedFilesHandler(const char* OrgString, const char* CurrentPos, const cCommandParser::cHandlerParameters* Params)
 {
-  cStringList* SelectedFiles=(cStringList*)Params->Data;
+  cStringContainerList* SelectedFiles=(cStringContainerList*)Params->Data;
   char* Text=NULL;
   int TextLength=0;
   
diff -Nur filebrowser-old/threads.h filebrowser/threads.h
--- filebrowser-old/threads.h	2006-12-04 22:13:24.000000000 +0100
+++ filebrowser/threads.h	2007-06-18 20:20:21.000000000 +0200
@@ -41,7 +41,7 @@
     char* DestinationFile;
     char* CurrentFile;
     char* Description;
-    cStringList* SelectedFiles;
+    cStringContainerList* SelectedFiles;
     ThreadState State;
     bool RemoveRequested;
   public:
diff -Nur filebrowser-old/tools.c filebrowser/tools.c
--- filebrowser-old/tools.c	2007-02-03 18:57:13.000000000 +0100
+++ filebrowser/tools.c	2007-06-18 20:20:21.000000000 +0200
@@ -20,10 +20,10 @@
 #include "tools.h"
 
 /*
-  Implementation cStringList
+  Implementation cStringContainerList
 */
 
-bool cStringList::Contains(const char* String)
+bool cStringContainerList::Contains(const char* String)
 {
   for(cStringContainer *i = First(); i; i=Next(i))
   {
@@ -35,7 +35,7 @@
   return false;
 }
 
-void cStringList::Remove(const char* String)
+void cStringContainerList::Remove(const char* String)
 {
   for(cStringContainer *i = First(); i!=NULL; i=Next(i))
   {
diff -Nur filebrowser-old/tools.h filebrowser/tools.h
--- filebrowser-old/tools.h	2007-02-03 18:57:13.000000000 +0100
+++ filebrowser/tools.h	2007-06-18 20:20:21.000000000 +0200
@@ -55,7 +55,7 @@
     ~cStringContainer() {};
 };
 
-class cStringList : public cList<cStringContainer>
+class cStringContainerList : public cList<cStringContainer>
 {
   public:
     bool Contains(const char* String);