Merged a bunch of small changes from trunk to 0.0 and set svn:eol-style

to native for some files that were still missing this property. This is 
a feeble attempt to reduce the amount of conflicts for future merges.

1 files changed, 11 insertions, 0 deletions

diff --git a/src/log.h b/src/log.h
index 4876a9aa..36328527 100644
--- a/src/log.h
+++ b/src/log.h
@@ -32,6 +32,11 @@ class Logger
 {
     public:
         /**
+         * Constructor.
+         */
+        Logger();
+
+        /**
          * Destructor, closes log file.
          */
         ~Logger();
@@ -42,6 +47,11 @@ class Logger
         void setLogFile(const std::string &logFilename);
 
         /**
+         * Sets whether the log should be written to standard output.
+         */
+        void setLogToStandardOut(bool value) { mLogToStandardOut = value; }
+
+        /**
          * Enters a message in the log. The message will be timestamped.
          */
         void log(const char *log_text, ...);
@@ -54,6 +64,7 @@ class Logger
 
     private:
         std::ofstream mLogFile;
+        bool mLogToStandardOut;
 };
 
 extern Logger *logger;