Merge branch 'master' into notifications

Conflicts:
	daemon/manager.cpp

1 files changed, 80 insertions, 0 deletions

diff --git a/ext/Log4Qt/src/helpers/dispatcher.h b/ext/Log4Qt/src/helpers/dispatcher.h
new file mode 100644
index 0000000..00e7167
--- /dev/null
+++ b/ext/Log4Qt/src/helpers/dispatcher.h
@@ -0,0 +1,80 @@
+/******************************************************************************
+ *
+ * package:     Log4Qt
+ * file:        dispatcher.h
+ * created:     February 2011
+ * author:      Andreas Bacher
+ *
+ *
+ * Copyright 2011 Andreas Bacher
+ *
+ * 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.
+ *
+ ******************************************************************************/
+
+#ifndef LOG4QTDISPATCHER_H
+#define LOG4QTDISPATCHER_H
+
+/******************************************************************************
+ * Dependencies
+ ******************************************************************************/
+
+#include <QtCore/QThread>
+#include <QtCore/QList>
+
+#include "loggingevent.h"
+
+/******************************************************************************
+ * Declarations
+ ******************************************************************************/
+
+namespace Log4Qt
+{
+
+class AsyncAppender;
+
+/*!
+ * \brief The class Dispatcher does the actual logging to the attached appanders.
+ *
+ * The Dispatcher is the worker object which class the attached apperders in the
+ * the context of the DispatcherThread.
+ *
+ * \note All the functions declared in this class are thread-safe.
+ */
+class Dispatcher : public QObject
+{
+    Q_OBJECT
+public:
+    explicit Dispatcher(QObject *parent = 0);
+
+    void setAsyncAppender(AsyncAppender *pAsyncAppender);
+
+protected:
+    virtual void customEvent(QEvent* event);
+
+private:
+    AsyncAppender *mpAsyncAppender;
+};
+
+
+/**************************************************************************
+ * Operators, Helper
+ **************************************************************************/
+
+
+/**************************************************************************
+ * Inline
+ **************************************************************************/
+} // namespace Log4Qt
+
+#endif // DISPATCHER_H