version 0.3.0

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

diff --git a/include/nntp/nntplistener.h b/include/nntp/nntplistener.h
index 4e4d1ca..0bcca8f 100644 (file)
--- a/include/nntp/nntplistener.h
+++ b/include/nntp/nntplistener.h
@@ -3,34 +3,28 @@
 \r
 #include <list>\r
 #include <vector>\r
-//#include <zthread/Thread.h>\r
-//#include <zthread/Task.h>\r
-//#include <zthread/ZThread.h>\r
-//#include <zthread/ThreadedExecutor.h>\r
-#include "../pthreadwrapper/runnable.h"\r
-#include "../pthreadwrapper/threadedexecutor.h"\r
-\r
+#include "../threadwrapper/threadedexecutor.h"\r
 #include "../socketdefines.h"\r
+#include "../ilogger.h"\r
 \r
 /**\r
        \brief Listens for NNTP connections\r
 */\r
-class NNTPListener:public PThread::Runnable\r
+class NNTPListener:public CancelableRunnable,public ILogger\r
 {\r
 public:\r
        NNTPListener();\r
        ~NNTPListener();\r
 \r
-       void Run();\r
+       void run();\r
        void StartListen();\r
 \r
 private:\r
 \r
        unsigned short m_listenport;\r
        std::vector<SOCKET> m_listensockets;\r
-       //ZThread::ThreadedExecutor m_connections;\r
-       //std::vector<PThread::Thread *> m_connectionthreads;\r
-       PThread::ThreadedExecutor m_connections;\r
+\r
+       ThreadedExecutor m_connections;\r
 \r
 };\r
 \r