version 0.3.0

[fms.git] / include / nntp / nntpconnection.h

diff --git a/include/nntp/nntpconnection.h b/include/nntp/nntpconnection.h
index d116148..15c2080 100644 (file)
--- a/include/nntp/nntpconnection.h
+++ b/include/nntp/nntpconnection.h
@@ -1,6 +1,7 @@
 #ifndef _nntpconnection_\r
 #define _nntpconnection_\r
 \r
+#include "../threadwrapper/cancelablerunnable.h"\r
 #include "../socketdefines.h"\r
 #include "../ilogger.h"\r
 #include "../message.h"\r
@@ -8,8 +9,6 @@
 \r
 #include <string>\r
 #include <vector>\r
-//#include <zthread/Runnable.h>\r
-#include "../pthreadwrapper/runnable.h"\r
 \r
 #ifdef _WIN32\r
 \r
@@ -22,7 +21,7 @@
        #include <arpa/inet.h>\r
 #endif\r
 \r
-class NNTPConnection:public PThread::Runnable,public ILogger\r
+class NNTPConnection:public CancelableRunnable,public ILogger\r
 {\r
 public:\r
        NNTPConnection(SOCKET sock);\r
@@ -31,7 +30,7 @@ public:
        void Disconnect();\r
        const bool Disconnected()               { return m_socket==INVALID_SOCKET; }\r
 \r
-       void Run();\r
+       void run();\r
 \r
 private:\r
 \r