Merge branch 'master' into notifications

Conflicts:
	daemon/manager.cpp

1 files changed, 84 insertions, 0 deletions

diff --git a/ext/Log4Qt/src/signalappender.h b/ext/Log4Qt/src/signalappender.h
new file mode 100755
index 0000000..4fca738
--- /dev/null
+++ b/ext/Log4Qt/src/signalappender.h
@@ -0,0 +1,84 @@
+/******************************************************************************
+ *
+ * package:     Log4Qt
+ * file:        signalappender.h
+ * created:     March 2010
+ * author:      Filonenko Michael
+ *
+ *
+ * Copyright 2010 Filonenko Michael
+ *
+ * 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 SIGNALAPPENDER_H
+#define SIGNALAPPENDER_H
+
+#include "appenderskeleton.h"
+
+#include "loggingevent.h"
+
+namespace Log4Qt {
+
+	/*!
+	\ingroup log4qt
+	Класс генерирующий сигнал при полчении какого-либо лог-сообщения. Удобно использовать для GUI интерфейса.
+	\note не объявлен в простанстве имен log4qt вроде из-за отстуствия у moc (Qt metaobject compiler) средств для обработки пространств имен.
+* @class SignalAppender signalappender.h "src/kernel/components/signalappender.h"
+*/
+	class  LOG4QT_EXPORT SignalAppender : public AppenderSkeleton
+	{
+		Q_OBJECT
+	public:
+		explicit SignalAppender(QObject *parent = 0);
+
+		bool requiresLayout() const;
+
+	protected:
+		virtual void append(const Log4Qt::LoggingEvent &rEvent);
+
+#ifndef QT_NO_DEBUG_STREAM
+		/*!
+		 * Writes all object member variables to the given debug stream
+		 * \a rDebug and returns the stream.
+		 *
+		 * The member function is used by
+		 * QDebug operator<<(QDebug debug, const LogObject &rLogObject) to
+		 * generate class specific output.
+		 *
+		 * \sa QDebug operator<<(QDebug debug, const LogObject &rLogObject)
+		 */
+		virtual QDebug debug(QDebug &rDebug) const;
+
+		// Needs to be friend to access internal data
+		friend QDebug operator<<(QDebug debug,
+														 const LogObject &rLogObject);
+#endif // QT_NO_DEBUG_STREAM
+
+	signals:
+		/*!
+		Генерируется во время получения лог-сообщения.
+	* @param message
+	*/
+		void appended(const QString& message);
+	public slots:
+
+	};
+
+	inline bool SignalAppender::requiresLayout() const
+	{   return true;    }
+
+} // namespace Log4Qt
+
+#endif // SIGNALAPPENDER_H