fixed refcount of eListboxPythonStringContent

[enigma2.git] / lib / dvb / db.cpp

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index f8233a64bfe4b96604cdbd81ab3524ec4cbfeb7d..1a2cd7df711893f9879333d4a9c71f02d42c7e4b 100644 (file)
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -9,7 +9,7 @@
 
 DEFINE_REF(eDVBService);
 
-eDVBService::eDVBService(): ref(0)
+eDVBService::eDVBService()
 {
 }
 
@@ -126,7 +126,7 @@ eDVBDB::eDVBDB()
                if (strlen(line))
                        line[strlen(line)-1]=0;
 
-               eString str=line;
+               std::string str=line;
 
                if (str[1]!=':')        // old ... (only service_provider)
                {
@@ -136,15 +136,15 @@ eDVBDB::eDVBDB()
                        {
                                unsigned int c=str.find(',');
                                char p=str[0];
-                               eString v;
-                               if (c == eString::npos)
+                               std::string v;
+                               if (c == std::string::npos)
                                {
-                                       v=str.mid(2);
+                                       v=str.substr(2);
                                        str="";
                                } else
                                {
-                                       v=str.mid(2, c-2);
-                                       str=str.mid(c+1);
+                                       v=str.substr(2, c-2);
+                                       str=str.substr(c+1);
                                }
 //                             eDebug("%c ... %s", p, v.c_str());
                                if (p == 'p')