X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=include%2Fnntp%2Fnntplistener.h;h=0bcca8f3970f8c15b3b6e4e1570995b6ee62ba7d;hb=d5c9f7e6c1dd263dfc85a3cb5941a378a5ddd923;hp=4e4d1ca4a8d8ea41169aec656894050c2503cc23;hpb=b9c3763a932cebaa015a27fe111017f6f34dfbaa;p=fms.git

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