remove lib/content
[enigma2.git] / lib / network / http_dyn.h
index 6fb8b9b..6111640 100644 (file)
@@ -5,30 +5,36 @@
 
 class eHTTPDyn: public eHTTPDataSource
 {
-       eString result;
+       DECLARE_REF;
+private:
+       std::string result;
        int wptr, size;
 public:
-       eHTTPDyn(eHTTPConnection *c, eString result);
+       eHTTPDyn(eHTTPConnection *c, std::string result);
        ~eHTTPDyn();
        int doWrite(int);
 };
 
-class eHTTPDynPathResolver: public eHTTPPathResolver
+class eHTTPDynPathResolver: public iHTTPPathResolver
 {
+       DECLARE_REF;
+private:
        struct eHTTPDynEntry
        {
-               eString request, path;
-               eString (*function)(eString request, eString path, eString opt, eHTTPConnection *content);
+               DECLARE_REF;
+       public:
+               std::string request, path;
+               std::string (*function)(std::string request, std::string path, std::string opt, eHTTPConnection *content);
                
-               eHTTPDynEntry(eString request, eString path, eString (*function)(eString, eString, eString, eHTTPConnection *)): request(request), path(path), function(function)
+               eHTTPDynEntry(std::string request, std::string path, std::string (*function)(std::string, std::string, std::string, eHTTPConnection *)): request(request), path(path), function(function)
                {
                }
        };
-       ePtrList<eHTTPDynEntry> dyn;
+       eSmartPtrList<eHTTPDynEntry> dyn;
 public:
-       void addDyn(eString request, eString path, eString (*function)(eString, eString, eString, eHTTPConnection *conn));
+       void addDyn(std::string request, std::string path, std::string (*function)(std::string, std::string, std::string, eHTTPConnection *conn));
        eHTTPDynPathResolver();
-       eHTTPDataSource *getDataSource(eString request, eString path, eHTTPConnection *conn);
+       RESULT getDataSource(eHTTPDataSourcePtr &ptr, std::string request, std::string path, eHTTPConnection *conn);
 };
 
 #endif