Merge branch 'master' into notifications

Conflicts:
	daemon/manager.cpp

1 files changed, 111 insertions, 0 deletions

diff --git a/ext/Log4Qt/src/colorconsoleappender.h b/ext/Log4Qt/src/colorconsoleappender.h
new file mode 100755
index 0000000..5027b5d
--- /dev/null
+++ b/ext/Log4Qt/src/colorconsoleappender.h
@@ -0,0 +1,111 @@
+/******************************************************************************
+ *
+ * package:     log4qt
+ * file:        colorconsoleappender.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 _COLORCONSOLEAPPENDER_H
+#define _COLORCONSOLEAPPENDER_H
+
+
+/******************************************************************************
+ * Dependencies
+ ******************************************************************************/
+
+#include "consoleappender.h"
+
+#include <QtCore/QHash>
+#include <QtCore/QPair>
+#include <QtCore/QRegExp>
+
+// if we are in WIN*
+#if defined(__WIN32__) || defined(WIN) || defined(WIN32) || defined(Q_OS_WIN32)
+#define WIN32_LEAN_AND_MEAN
+#define NOGDI
+#include <windows.h>
+#endif
+
+/******************************************************************************
+ * Declarations
+ ******************************************************************************/
+
+class QFile;
+class QTextStream;
+
+namespace Log4Qt
+{
+
+	/*!
+	 * \brief The class ColorConsoleAppender appends to stdout or stderr with color formatting.
+	 *
+	 * \note All the functions declared in this class are thread-safe.
+	 *
+	 * \note The ownership and lifetime of objects of this class are managed.
+	 *       See \ref Ownership "Object ownership" for more details.
+	 */
+	class LOG4QT_EXPORT ColorConsoleAppender : public ConsoleAppender
+	{
+			Q_OBJECT
+
+		public:
+
+			ColorConsoleAppender(QObject *pParent = 0);
+			ColorConsoleAppender(Layout *pLayout,
+											QObject *pParent = 0);
+				ColorConsoleAppender(Layout *pLayout,
+												const QString &rTarget,
+												QObject *pParent = 0);
+
+				/*!
+				 * Creates a ConsoleAppender with the layout \a pLayout, the target
+				 * value specified by the \a target constant and the parent
+				 * \a pParent.
+				 */
+				ColorConsoleAppender(Layout *pLayout,
+												Target target,
+												QObject *pParent = 0);
+	// if we are in WIN*
+	#if defined(__WIN32__) || defined(WIN) || defined(WIN32) || defined(Q_OS_WIN32)
+
+				virtual void activateOptions();
+
+				virtual void close();
+protected:
+			virtual void append(const LoggingEvent& rEvent);
+ private:
+			HANDLE hConsole;
+		#endif
+
+	};
+
+	/**************************************************************************
+	 * Operators, Helper
+	 **************************************************************************/
+
+
+	/**************************************************************************
+	 * Inline
+	 **************************************************************************/
+
+} // namespace Log4Qt
+
+
+#endif // #ifndef _COLORCONSOLEAPPENDER_H