fixed a few warnings

yavdr · Apr 7, 2012 · 9119ec2 · 9119ec2
1 parent 676e875
commit 9119ec2
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/channels.h b/channels.h
@@ -47,8 +47,8 @@ class ChannelList : public BaseList
     StreamExtension *s;
     int total;
   public:
-    ChannelList(std::ostream* _out);
-    ~ChannelList();
+    explicit ChannelList(std::ostream* _out);
+    virtual ~ChannelList();
     virtual void init() { };
     virtual void addChannel(cChannel* channel, std::string group, bool image) { };
     virtual void finish() { };
@@ -58,7 +58,7 @@ class ChannelList : public BaseList
 class HtmlChannelList : ChannelList
 {
   public:
-    HtmlChannelList(std::ostream* _out) : ChannelList(_out) { };
+    explicit HtmlChannelList(std::ostream* _out) : ChannelList(_out) { };
     ~HtmlChannelList() { };
     virtual void init();
     virtual void addChannel(cChannel* channel, std::string group, bool image);
@@ -70,7 +70,7 @@ class JsonChannelList : ChannelList
   private:
     std::vector < struct SerChannel > serChannels;
   public:
-    JsonChannelList(std::ostream* _out) : ChannelList(_out) { };
+    explicit JsonChannelList(std::ostream* _out) : ChannelList(_out) { };
     ~JsonChannelList() { };
     virtual void addChannel(cChannel* channel, std::string group, bool image);
     virtual void finish();
@@ -79,7 +79,7 @@ class JsonChannelList : ChannelList
 class XmlChannelList : ChannelList
 {
   public:
-    XmlChannelList(std::ostream* _out) : ChannelList(_out) { };
+    explicit XmlChannelList(std::ostream* _out) : ChannelList(_out) { };
     ~XmlChannelList() { };
     virtual void init();
     virtual void addChannel(cChannel* channel, std::string group, bool image);
@@ -92,8 +92,8 @@ class ChannelGroupList : public BaseList
     StreamExtension *s;
     int total;
   public:
-    ChannelGroupList(std::ostream* _out);
-    ~ChannelGroupList();
+    explicit ChannelGroupList(std::ostream* _out);
+    virtual ~ChannelGroupList();
     virtual void init() { };
     virtual void addGroup(std::string group) { };
     virtual void finish() { };
@@ -103,7 +103,7 @@ class ChannelGroupList : public BaseList
 class HtmlChannelGroupList : ChannelGroupList
 {
   public:
-    HtmlChannelGroupList(std::ostream* _out) : ChannelGroupList(_out) { };
+    explicit HtmlChannelGroupList(std::ostream* _out) : ChannelGroupList(_out) { };
     ~HtmlChannelGroupList() { };
     virtual void init();
     virtual void addGroup(std::string group);
@@ -115,7 +115,7 @@ class JsonChannelGroupList : ChannelGroupList
   private:
     std::vector< cxxtools::String > groups;
   public:
-    JsonChannelGroupList(std::ostream* _out) : ChannelGroupList(_out) { };
+    explicit JsonChannelGroupList(std::ostream* _out) : ChannelGroupList(_out) { };
     ~JsonChannelGroupList() { };
     virtual void init() { };
     virtual void addGroup(std::string group);
@@ -125,7 +125,7 @@ class JsonChannelGroupList : ChannelGroupList
 class XmlChannelGroupList : ChannelGroupList
 {
   public:
-    XmlChannelGroupList(std::ostream* _out) : ChannelGroupList(_out) { };
+    explicit XmlChannelGroupList(std::ostream* _out) : ChannelGroupList(_out) { };
     ~XmlChannelGroupList() { };
     virtual void init();
     virtual void addGroup(std::string group);

diff --git a/events.h b/events.h
@@ -68,8 +68,8 @@ class EventList : public BaseList
     StreamExtension *s;
     int total;
   public:
-    EventList(std::ostream* _out);
-    ~EventList();
+    explicit EventList(std::ostream* _out);
+    virtual ~EventList();
     virtual void init() { };
     virtual void addEvent(cEvent* event) { };
     virtual void finish() { };
@@ -79,7 +79,7 @@ class EventList : public BaseList
 class HtmlEventList : EventList
 {
   public:
-    HtmlEventList(std::ostream* _out) : EventList(_out) { };
+    explicit HtmlEventList(std::ostream* _out) : EventList(_out) { };
     ~HtmlEventList() { };
     virtual void init();
     virtual void addEvent(cEvent* event);
@@ -91,7 +91,7 @@ class JsonEventList : EventList
   private:
     std::vector < struct SerEvent > serEvents;
   public:
-    JsonEventList(std::ostream* _out) : EventList(_out) { };
+    explicit JsonEventList(std::ostream* _out) : EventList(_out) { };
     ~JsonEventList() { };
     virtual void addEvent(cEvent* event);
     virtual void finish();
@@ -100,7 +100,7 @@ class JsonEventList : EventList
 class XmlEventList : EventList
 {
   public:
-    XmlEventList(std::ostream* _out) : EventList(_out) { };
+    explicit XmlEventList(std::ostream* _out) : EventList(_out) { };
     ~XmlEventList() { };
     virtual void init();
     virtual void addEvent(cEvent* event);

diff --git a/recordings.h b/recordings.h
@@ -66,7 +66,7 @@ class RecordingList : public BaseList
     StreamExtension *s;
   public:
     RecordingList(std::ostream* _out, bool _read_marks);
-    ~RecordingList();
+    virtual ~RecordingList();
     virtual void init() { };
     virtual void addRecording(cRecording* recording, int nr) { };
     virtual void finish() { };

diff --git a/timers.h b/timers.h
@@ -63,8 +63,8 @@ class TimerList : public BaseList
     StreamExtension *s;
     int total;
   public:
-    TimerList(std::ostream* _out);
-    ~TimerList();
+    explicit TimerList(std::ostream* _out);
+    virtual ~TimerList();
     virtual void init() { };
     virtual void addTimer(cTimer* timer) { };
     virtual void finish() { };
@@ -74,7 +74,7 @@ class TimerList : public BaseList
 class HtmlTimerList : TimerList
 {
   public:
-    HtmlTimerList(std::ostream* _out) : TimerList(_out) { };
+    explicit HtmlTimerList(std::ostream* _out) : TimerList(_out) { };
     ~HtmlTimerList() { };
     virtual void init();
     virtual void addTimer(cTimer* timer);
@@ -86,7 +86,7 @@ class JsonTimerList : TimerList
   private:
     std::vector < struct SerTimer > serTimers;
   public:
-    JsonTimerList(std::ostream* _out) : TimerList(_out) { };
+    explicit JsonTimerList(std::ostream* _out) : TimerList(_out) { };
     ~JsonTimerList() { };
     virtual void addTimer(cTimer* timer);
     virtual void finish();
@@ -95,7 +95,7 @@ class JsonTimerList : TimerList
 class XmlTimerList : TimerList
 {
   public:
-    XmlTimerList(std::ostream* _out) : TimerList(_out) { };
+    explicit XmlTimerList(std::ostream* _out) : TimerList(_out) { };
     ~XmlTimerList() { };
     virtual void init();
     virtual void addTimer(cTimer* timer);

diff --git a/tools.h b/tools.h
@@ -245,7 +245,7 @@ class BaseList
     int limit;
   public:
     BaseList();
-    ~BaseList() { };
+    virtual ~BaseList() { };
     virtual void activateLimit(int _start, int _limit);
     virtual bool filtered();
     virtual int Count() { return counter; }
@@ -291,7 +291,7 @@ class BasicOsd
 {
   public:
     BasicOsd() { };
-    ~BasicOsd() { };
+    virtual ~BasicOsd() { };
     virtual int Type() { return 0x00; };
 };
 
@@ -306,7 +306,7 @@ class BaseTask
     int created; //time in s
   public:
     BaseTask() { created = (int)time(NULL); };
-    ~BaseTask() { };
+    virtual ~BaseTask() { };
     int Created() { return created; };
 };