Fix for

Issue 23: QXmppBind compilation error on macosx starting from r23
Issue 26: examples fail to link on macosx and linux
Issue 24: all text files should have the svn property eol-style set

Contributed by: Marco Molteni

1 files changed, 96 insertions, 96 deletions

diff --git a/source/QXmppLogger.cpp b/source/QXmppLogger.cpp
index b6c7638d..522b5ff1 100644
--- a/source/QXmppLogger.cpp
+++ b/source/QXmppLogger.cpp
@@ -1,96 +1,96 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#include "QXmppLogger.h"

-#include <iostream>

-#include <QTime>

-

-QXmppLogger* QXmppLogger::m_logger = 0;

-QXmppLogger::LoggingType QXmppLogger::m_loggingType = QXmppLogger::FILE;

-QFile QXmppLogger::m_file("QXmppClientLog.log");

-QTextStream QXmppLogger::m_stream;

-

-QXmppLogger::QXmppLogger()

-{

-}

-

-QXmppLogger* QXmppLogger::getLogger()

-{

-    if(!m_logger)

-        m_logger = new QXmppLogger();

-

-    return m_logger;

-}

-

-void QXmppLogger::setLoggingType(QXmppLogger::LoggingType log)

-{

-    m_loggingType = log;

-}

-

-QXmppLogger::LoggingType QXmppLogger::getLoggingType()

-{

-    return m_loggingType;

-}

-

-void QXmppLogger::log(const QString& str)

-{

-    switch(m_loggingType)

-    {

-    case QXmppLogger::FILE:

-        m_file.open(QIODevice::Append);

-        m_stream.setDevice(&m_file);

-        m_stream << QTime::currentTime().toString("hh:mm:ss.zzz") << " : "<<

-                str << "\n\n";

-        m_file.close();

-        break;

-    case QXmppLogger::STDOUT:

-        std::cout<<qPrintable(str)<<std::endl;

-        break;

-    case QXmppLogger::NONE:

-        break;

-    default:

-        break;

-    }

-}

-

-void QXmppLogger::log(const QByteArray& str)

-{

-    switch(m_loggingType)

-    {

-    case QXmppLogger::FILE:

-        m_file.open(QIODevice::Append);

-        m_stream.setDevice(&m_file);

-        m_stream << QTime::currentTime().toString("hh:mm:ss.zzz") << " : "<<

-                str << "\n\n";

-        m_file.close();

-        break;

-    case QXmppLogger::STDOUT:

-        std::cout<<str.constData()<<std::endl;

-        break;

-    case QXmppLogger::NONE:

-        break;

-    default:

-        break;

-    }

-}

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#include "QXmppLogger.h"
+#include <iostream>
+#include <QTime>
+
+QXmppLogger* QXmppLogger::m_logger = 0;
+QXmppLogger::LoggingType QXmppLogger::m_loggingType = QXmppLogger::FILE;
+QFile QXmppLogger::m_file("QXmppClientLog.log");
+QTextStream QXmppLogger::m_stream;
+
+QXmppLogger::QXmppLogger()
+{
+}
+
+QXmppLogger* QXmppLogger::getLogger()
+{
+    if(!m_logger)
+        m_logger = new QXmppLogger();
+
+    return m_logger;
+}
+
+void QXmppLogger::setLoggingType(QXmppLogger::LoggingType log)
+{
+    m_loggingType = log;
+}
+
+QXmppLogger::LoggingType QXmppLogger::getLoggingType()
+{
+    return m_loggingType;
+}
+
+void QXmppLogger::log(const QString& str)
+{
+    switch(m_loggingType)
+    {
+    case QXmppLogger::FILE:
+        m_file.open(QIODevice::Append);
+        m_stream.setDevice(&m_file);
+        m_stream << QTime::currentTime().toString("hh:mm:ss.zzz") << " : "<<
+                str << "\n\n";
+        m_file.close();
+        break;
+    case QXmppLogger::STDOUT:
+        std::cout<<qPrintable(str)<<std::endl;
+        break;
+    case QXmppLogger::NONE:
+        break;
+    default:
+        break;
+    }
+}
+
+void QXmppLogger::log(const QByteArray& str)
+{
+    switch(m_loggingType)
+    {
+    case QXmppLogger::FILE:
+        m_file.open(QIODevice::Append);
+        m_stream.setDevice(&m_file);
+        m_stream << QTime::currentTime().toString("hh:mm:ss.zzz") << " : "<<
+                str << "\n\n";
+        m_file.close();
+        break;
+    case QXmppLogger::STDOUT:
+        std::cout<<str.constData()<<std::endl;
+        break;
+    case QXmppLogger::NONE:
+        break;
+    default:
+        break;
+    }
+}