libdeng2: Fixed build and removed redundant functionality in LogSinks

skyjake · Jan 26, 2013 · cc43694 · cc43694
1 parent f93a6d9
commit cc43694
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 38 deletions.
diff --git a/doomsday/libdeng2/include/de/core/debuglogsink.h b/doomsday/libdeng2/include/de/core/debuglogsink.h
@@ -32,10 +32,8 @@ class DebugLogSink : public LogSink
 {
 public:
     DebugLogSink(QtMsgType msgType);
-
     ~DebugLogSink();
 
-    LogSink &operator << (LogEntry const &entry);
     LogSink &operator << (String const &plainText);
 
 private:

diff --git a/doomsday/libdeng2/include/de/core/filelogsink.h b/doomsday/libdeng2/include/de/core/filelogsink.h
@@ -34,8 +34,6 @@ class FileLogSink : public LogSink
 public:
     FileLogSink(File &outputFile);
 
-    LogSink &operator << (LogEntry const &entry);
-
     LogSink &operator << (String const &plainText);
 
     void flush();

diff --git a/doomsday/libdeng2/include/de/core/logsink.h b/doomsday/libdeng2/include/de/core/logsink.h
@@ -79,9 +79,12 @@ class DENG2_PUBLIC LogSink
      * isAccepted() whether this is an acceptable entry according to the mode
      * of the sink.
      *
-     * @param entry
+     * The default implementation uses the formatter to convert the entry
+     * to one or more lines of text.
+     *
+     * @param entry  Log entry to output.
      */
-    virtual LogSink &operator << (LogEntry const &entry) = 0;
+    virtual LogSink &operator << (LogEntry const &entry);
 
     virtual LogSink &operator << (String const &plainText) = 0;
 

diff --git a/doomsday/libdeng2/include/de/core/textstreamlogsink.h b/doomsday/libdeng2/include/de/core/textstreamlogsink.h
@@ -40,8 +40,6 @@ class TextStreamLogSink : public LogSink
 
     ~TextStreamLogSink();
 
-    LogSink &operator << (LogEntry const &entry);
-
     LogSink &operator << (String const &plainText);
 
     void flush();

diff --git a/doomsday/libdeng2/include/de/widgets/animation.h b/doomsday/libdeng2/include/de/widgets/animation.h
@@ -130,7 +130,7 @@ class Animation : public ISerializable
      * @param value  New value for the Animation, set without a transition.
      */
     inline Animation &operator = (float value) {
-        setValue(v);
+        setValue(value);
         return *this;
     }
 

diff --git a/doomsday/libdeng2/src/core/debuglogsink.cpp b/doomsday/libdeng2/src/core/debuglogsink.cpp
@@ -31,15 +31,6 @@ DebugLogSink::~DebugLogSink()
     delete _qs;
 }
 
-LogSink &DebugLogSink::operator << (LogEntry const &entry)
-{
-    foreach(String line, _format.logEntryToTextLines(entry))
-    {
-        *_qs << line;
-    }
-    return *this;
-}
-
 LogSink &DebugLogSink::operator << (String const &plainText)
 {
     *_qs << plainText.toUtf8().constData();

diff --git a/doomsday/libdeng2/src/core/filelogsink.cpp b/doomsday/libdeng2/src/core/filelogsink.cpp
@@ -25,15 +25,6 @@ FileLogSink::FileLogSink(File &outputFile)
     : LogSink(_format), _file(outputFile)
 {}
 
-LogSink &FileLogSink::operator << (LogEntry const &entry)
-{
-    foreach(String line, _format.logEntryToTextLines(entry))
-    {
-        *this << line;
-    }
-    return *this;
-}
-
 LogSink &FileLogSink::operator << (String const &plainText)
 {
     _file << Block((plainText + "\n").toUtf8());

diff --git a/doomsday/libdeng2/src/core/logsink.cpp b/doomsday/libdeng2/src/core/logsink.cpp
@@ -61,4 +61,15 @@ LogSink::IFormatter *LogSink::formatter()
     return _formatter;
 }
 
+LogSink &LogSink::operator << (LogEntry const &entry)
+{
+    DENG2_ASSERT(formatter());
+
+    foreach(String line, formatter()->logEntryToTextLines(entry))
+    {
+        *this << line;
+    }
+    return *this;
+}
+
 } // namespace de
diff --git a/doomsday/libdeng2/src/core/textstreamlogsink.cpp b/doomsday/libdeng2/src/core/textstreamlogsink.cpp
@@ -32,15 +32,6 @@ TextStreamLogSink::~TextStreamLogSink()
     delete _ts;
 }
 
-LogSink &TextStreamLogSink::operator << (LogEntry const &entry)
-{
-    foreach(String line, _format.logEntryToTextLines(entry))
-    {
-        *this << line;
-    }
-    return *this;
-}
-
 LogSink &TextStreamLogSink::operator << (String const &plainText)
 {
     *_ts << plainText + "\n";

diff --git a/doomsday/libdeng2/src/widgets/animation.cpp b/doomsday/libdeng2/src/widgets/animation.cpp
@@ -260,7 +260,7 @@ Clock const &Animation::clock()
     DENG2_ASSERT(_clock != 0);
     if(!_clock)
     {
-        throw ClockMissing("Animation::clock", "Animation has no clock");
+        throw ClockMissingError("Animation::clock", "Animation has no clock");
     }
     return *_clock;
 }
@@ -308,7 +308,7 @@ Time Animation::currentTime()
     DENG2_ASSERT(_clock != 0);
     if(!_clock)
     {
-        throw ClockMissing("Animation::clock", "Animation has no clock");
+        throw ClockMissingError("Animation::clock", "Animation has no clock");
     }
     return _clock->time();
 }