summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorPixel <pixel@nobis-crew.org>2013-01-22 09:27:06 -0800
committerPixel <pixel@nobis-crew.org>2013-01-22 09:27:06 -0800
commit03217c86e35262518df4898b52e275690baff531 (patch)
tree3e4b95da4e8a408c33eb1361dfeaa0aafa2567fc /includes
parentf40de21e5666be6fa456fedc60584bd672d12c44 (diff)
Another pass of cruft cleaning.
Diffstat (limited to 'includes')
-rw-r--r--includes/Task.h10
-rw-r--r--includes/TaskMan.h5
-rw-r--r--includes/ZHandle.h2
3 files changed, 12 insertions, 5 deletions
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<class T>
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;
};