X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d63d2c3c6cbbd574dda4f8b00ebe6c661735edd5..e7e5b70162a6e74d7ee293495635c79660e0f7a8:/lib/network/socket.h

diff --git a/lib/network/socket.h b/lib/network/socket.h
index edf9b904..9ffc7a78 100644
--- a/lib/network/socket.h
+++ b/lib/network/socket.h
@@ -10,7 +10,7 @@
 
 #include <lib/base/ebase.h>
 #include <lib/base/eerror.h>
-#include <lib/base/estring.h>
+#include <string>
 #include <libsig_comp.h>
 #include <lib/base/buffer.h>
 
@@ -26,13 +26,13 @@ private:
 	int writebusy;
 	sockaddr_in  serv_addr;
 protected:
-	eSocketNotifier	*rsn;
+	ePtr<eSocketNotifier> rsn;
 	virtual void notifier(int);
 public:
 	eSocket(eMainloop *ml);
 	eSocket(int socket, int issocket, eMainloop *ml);
 	~eSocket();
-	int connectToHost(eString hostname, int port);
+	int connectToHost(std::string hostname, int port);
 	int getDescriptor();
 	int writeBlock(const char *data, unsigned int len);
 	int setSocket(int socketfd, int issocket, eMainloop *ml);
@@ -40,7 +40,7 @@ public:
 	int readBlock(char *data, unsigned int maxlen);
 	int bytesAvailable();
 	bool canReadLine();
-	eString readLine();
+	std::string readLine();
 	void close();
 			// flow control: start/stop data delivery into read buffer.
 	void enableRead();