Merge branch 'master' into notifications

Conflicts:
	daemon/daemon.cpp
	daemon/manager.cpp
	daemon/manager.h
	ext/Log4Qt

1 files changed, 0 insertions, 66 deletions

diff --git a/ext/Log4Qt/src/logstream.cpp b/ext/Log4Qt/src/logstream.cpp
deleted file mode 100644
index ed62660..0000000
--- a/ext/Log4Qt/src/logstream.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/******************************************************************************
- *
- * package:     Log4Qt
- * file:        logstream.h
- * created:     March, 2011
- * author:      Tim Besard
- *
- *
- * Copyright 2011 Tim Besard
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ******************************************************************************/
-
-/******************************************************************************
- * Dependencies
- ******************************************************************************/
-
-#include "logstream.h"
-#include "logger.h"
-
-
-namespace Log4Qt {
-
-  /**************************************************************************
-   * Class implementation: Logger
-   **************************************************************************/
-
-    LogStream::~LogStream()
-    {
-        if (!--stream->ref) {
-            switch (mLevel.toInt())
-            {
-            case Level::TRACE_INT:
-                mLogger.trace(stream->buffer);
-                break;
-            case  Level::DEBUG_INT:
-                mLogger.debug(stream->buffer);
-                break;
-            case  Level::INFO_INT:
-                mLogger.info(stream->buffer);
-                break;
-            case Level::WARN_INT:
-                mLogger.warn(stream->buffer);
-                break;
-            case  Level::ERROR_INT:
-                mLogger.error(stream->buffer);
-                break;
-            case  Level::FATAL_INT:
-                mLogger.fatal(stream->buffer);
-                break;
-            }
-            delete stream;
-        }
-    }
-} // namespace Log4Qt