Merge branch 'master' into notifications

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

1 files changed, 0 insertions, 242 deletions

diff --git a/ext/Log4Qt/src/level.cpp b/ext/Log4Qt/src/level.cpp
deleted file mode 100755
index f546740..0000000
--- a/ext/Log4Qt/src/level.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-/******************************************************************************
- *
- * package:     Log4Qt
- * file:        level.cpp
- * created:     September 2007
- * author:      Martin Heinrich
- *
- *
- * Copyright 2007 Martin Heinrich
- *
- * 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 "level.h"
-
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
-#include "logger.h"
-#include <QDataStream>
-
-namespace Log4Qt
-{
-
-
-	/**************************************************************************
-	 * Declarations
-	 **************************************************************************/
-
-
-
-	/**************************************************************************
-	 * C helper functions
-	 **************************************************************************/
-
-
-    LOG4QT_DECLARE_STATIC_LOGGER(logger, Log4Qt::Level)
-
-
-
-	/**************************************************************************
-	 * Class implementation: Level
-	 **************************************************************************/
-
-
-	int Level::syslogEquivalent() const
-	{
-        // QMutexLocker locker(&mObjectGuard); // Read/Write of int is safe
-
-	    switch (mValue)
-	    {
-	        case NULL_INT:
-	        case ALL_INT:
-	        case TRACE_INT:
-	        case DEBUG_INT:
-	            return 7;
-	        case INFO_INT:
-	            return 6;
-	        case WARN_INT:
-	            return 4;
-	        case ERROR_INT:
-	            return 3;
-	        case FATAL_INT:
-	        case OFF_INT:
-	            return 0;
-	        default:
-	            Q_ASSERT_X(false, "Level::syslogEquivalent()", "Unknown level value");
-	            return 7;
-	    }
-	}
-
-
-	QString Level::toString() const
-	{
-        // QMutexLocker locker(&mObjectGuard); // Read/Write of int is safe
-
-	    const char *p_context = "Level";
-
-	    switch (mValue)
-	    {
-	        case NULL_INT:
-	            return QCoreApplication::translate(p_context, "NULL");
-	        case ALL_INT:
-	            return QCoreApplication::translate(p_context, "ALL");
-	        case TRACE_INT:
-	            return QCoreApplication::translate(p_context, "TRACE");
-	        case DEBUG_INT:
-	            return QCoreApplication::translate(p_context, "DEBUG");
-	        case INFO_INT:
-	            return QCoreApplication::translate(p_context, "INFO");
-	        case WARN_INT:
-	            return QCoreApplication::translate(p_context, "WARN");
-	        case ERROR_INT:
-	            return QCoreApplication::translate(p_context, "ERROR");
-	        case FATAL_INT:
-	            return QCoreApplication::translate(p_context, "FATAL");
-	        case OFF_INT:
-	            return QCoreApplication::translate(p_context, "OFF");
-	        default:
-	            Q_ASSERT_X(false, "Level::toString()", "Unknown level value");
-	            return QCoreApplication::translate(p_context, "NULL");
-	    }
-	}
-
-
-	Level Level::fromString(const QString &rLevel, bool *pOk)
-	{
-	    const char *p_context = "Level";
-	    if (pOk)
-	        *pOk = true;
-
-	    if (rLevel == QLatin1String("OFF") ||
-	        rLevel == QCoreApplication::translate(p_context, "OFF"))
-	        return OFF_INT;
-	    if (rLevel == QLatin1String("FATAL") ||
-	        rLevel == QCoreApplication::translate(p_context, "FATAL"))
-	        return FATAL_INT;
-	    if (rLevel == QLatin1String("ERROR") ||
-	        rLevel == QCoreApplication::translate(p_context, "ERROR"))
-	        return ERROR_INT;
-	    if (rLevel == QLatin1String("WARN") ||
-	        rLevel == QCoreApplication::translate(p_context, "WARN"))
-	        return WARN_INT;
-	    if (rLevel == QLatin1String("INFO") ||
-	        rLevel == QCoreApplication::translate(p_context, "INFO"))
-	        return INFO_INT;
-	    if (rLevel == QLatin1String("DEBUG") ||
-	        rLevel == QCoreApplication::translate(p_context, "DEBUG"))
-	        return DEBUG_INT;
-	    if (rLevel == QLatin1String("TRACE") ||
-	        rLevel == QCoreApplication::translate(p_context, "TRACE"))
-	        return TRACE_INT;
-	    if (rLevel == QLatin1String("ALL") ||
-	        rLevel == QCoreApplication::translate(p_context, "ALL"))
-	        return ALL_INT;
-	    if (rLevel == QLatin1String("NULL") ||
-	        rLevel == QCoreApplication::translate(p_context, "NULL"))
-	        return NULL_INT;
-
-	    logger()->warn("Use of invalid level string '%1'. Using 'Level::NULL_INT' instead.", rLevel);
-	    if (pOk)
-	        *pOk = false;
-	    return NULL_INT;
-	}
-
-
-
-	/**************************************************************************
-	 * Implementation: Operators, Helper
-	 **************************************************************************/
-
-
-#ifndef QT_NO_DATASTREAM
-    QDataStream &operator<<(QDataStream &rStream,
-                            const Level &rLevel)
-    {
-        quint8 l = rLevel.mValue;
-        rStream << l;
-        return rStream;
-    }
-
-
-    QDataStream &operator>>(QDataStream &rStream,
-                            Level &rLevel)
-    {
-        quint8 l;
-        rStream >> l;
-        rLevel.mValue = static_cast<Level::Value>(l);
-        return rStream;
-    }
-#endif // QT_NO_DATASTREAM
-
-
-#ifndef QT_NO_DEBUG_STREAM
-	QDebug operator<<(QDebug debug,
-	                  const Level &rLevel)
-	{
-	    debug.nospace() << "Level("
-	        << rLevel.toString()
-	        << ")";
-	    return debug.space();
-	}
-#endif // QT_NO_DEBUG_STREAM
-
-Level::Level(Value value)
-    : mValue(value)
-{
-}
-
-int Level::toInt() const
-{   // QMutexLocker locker(&mObjectGuard); // Read/Write of int is safe
-    return mValue;
-}
-
-bool Level::operator==(const Level &rOther) const
-{   // QMutexLocker locker(&mObjectGuard); // Read/Write of int is safe
-    return mValue == rOther.mValue;
-}
-
-bool Level::operator!=(const Level &rOther) const
-{   // QMutexLocker locker(&mObjectGuard); // Read/Write of int is safe
-    return mValue != rOther.mValue;
-}
-
-bool Level::operator<(const Level &rOther) const
-{   // QMutexLocker locker(&mObjectGuard); // Read/Write of int is safe
-    return mValue < rOther.mValue;
-}
-
-bool Level::operator<=(const Level &rOther) const
-{   // QMutexLocker locker(&mObjectGuard); // Read/Write of int is safe
-    return mValue <= rOther.mValue;
-}
-
-bool Level::operator>(const Level &rOther) const
-{   // QMutexLocker locker(&mObjectGuard); // Read/Write of int is safe
-    return mValue > rOther.mValue;
-}
-
-bool Level::operator>=(const Level &rOther) const
-{   // QMutexLocker locker(&mObjectGuard); // Read/Write of int is safe
-    return mValue >= rOther.mValue;
-}
-
-} // namespace Log4Qt