From 03217c86e35262518df4898b52e275690baff531 Mon Sep 17 00:00:00 2001 From: Pixel Date: Tue, 22 Jan 2013 09:27:06 -0800 Subject: Another pass of cruft cleaning. --- includes/Task.h | 10 +++++++--- includes/TaskMan.h | 5 ++++- includes/ZHandle.h | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) (limited to 'includes') diff --git a/includes/Task.h b/includes/Task.h index 6b9eff0..3e1b9cf 100644 --- a/includes/Task.h +++ b/includes/Task.h @@ -37,6 +37,8 @@ class Callback { protected: virtual void gotEvent(BaseEvent *) = 0; friend class BaseEvent; + Callback(const Callback &) = delete; + Callback & operator=(const Callback &) = delete; }; class BaseEvent { @@ -62,9 +64,11 @@ class BaseEvent { protected: virtual void gotOwner(Task * task) { } private: - Callback * m_cb; - bool m_signal; - Task * m_task; + Callback * m_cb = NULL; + bool m_signal = false; + Task * m_task = NULL; + BaseEvent(const BaseEvent &) = delete; + BaseEvent & operator=(const BaseEvent &) = delete; }; class Timeout : public BaseEvent { diff --git a/includes/TaskMan.h b/includes/TaskMan.h index 2b2742d..e388123 100644 --- a/includes/TaskMan.h +++ b/includes/TaskMan.h @@ -32,7 +32,7 @@ class TaskMan { virtual void * proc(); void stopMe(int code = 0) { m_taskMan->stopMe(code); } private: - TaskMan * m_taskMan; + TaskMan * m_taskMan = NULL; }; TaskMan(); @@ -92,6 +92,9 @@ class TaskMan { int m_stopCode = 0; bool m_stopped = false; bool m_allowedToSignal = false; + + TaskMan(const TaskMan &) = delete; + TaskMan & operator=(const TaskMan &) = delete; }; template diff --git a/includes/ZHandle.h b/includes/ZHandle.h index f30da83..dfb73fb 100644 --- a/includes/ZHandle.h +++ b/includes/ZHandle.h @@ -49,7 +49,7 @@ class ZStream : public Handle { } m_phase = IDLE; size_t m_total, m_count, m_compressed; AsyncOperation * m_op = NULL; - ssize_t m_status; + ssize_t m_status = IDLE; bool m_detached = false, m_closed = false, m_eof = false, m_useAsyncOp = true; }; -- cgit v1.2.3