[Orxonox-commit 4862] r9531 - code/branches/testing/src/libraries/util/output
landauf at orxonox.net
landauf at orxonox.net
Sun Feb 24 16:27:44 CET 2013
Author: landauf
Date: 2013-02-24 16:27:43 +0100 (Sun, 24 Feb 2013)
New Revision: 9531
Modified:
code/branches/testing/src/libraries/util/output/AdditionalContextListener.h
code/branches/testing/src/libraries/util/output/ConsoleWriter.cc
Log:
eol-style native
Modified: code/branches/testing/src/libraries/util/output/AdditionalContextListener.h
===================================================================
--- code/branches/testing/src/libraries/util/output/AdditionalContextListener.h 2013-02-24 15:26:33 UTC (rev 9530)
+++ code/branches/testing/src/libraries/util/output/AdditionalContextListener.h 2013-02-24 15:27:43 UTC (rev 9531)
@@ -1,58 +1,58 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Fabian 'x3n' Landau
- * Co-authors:
- * ...
- *
- */
-
-/**
- @file
- @ingroup Output
- @brief Declaration of the AdditionalContextListener interface
-*/
-
-#ifndef _AdditionalContextListener_H__
-#define _AdditionalContextListener_H__
-
-#include "util/UtilPrereqs.h"
-
-#include <vector>
-
-#include "OutputDefinitions.h"
-
-namespace orxonox
-{
- /**
- @brief AdditionalContextListener is an interface which is used to notify OutputManager about additional contexts in OutputListeners
- */
- class _UtilExport AdditionalContextListener
- {
- public:
- virtual void updatedLevelMask(const OutputListener* listener) = 0;
- virtual void updatedAdditionalContextsLevelMask(const OutputListener* listener) = 0;
- virtual void updatedAdditionalContextsMask(const OutputListener* listener) = 0;
- };
-}
-
-#endif /* _AdditionalContextListener_H__ */
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @ingroup Output
+ @brief Declaration of the AdditionalContextListener interface
+*/
+
+#ifndef _AdditionalContextListener_H__
+#define _AdditionalContextListener_H__
+
+#include "util/UtilPrereqs.h"
+
+#include <vector>
+
+#include "OutputDefinitions.h"
+
+namespace orxonox
+{
+ /**
+ @brief AdditionalContextListener is an interface which is used to notify OutputManager about additional contexts in OutputListeners
+ */
+ class _UtilExport AdditionalContextListener
+ {
+ public:
+ virtual void updatedLevelMask(const OutputListener* listener) = 0;
+ virtual void updatedAdditionalContextsLevelMask(const OutputListener* listener) = 0;
+ virtual void updatedAdditionalContextsMask(const OutputListener* listener) = 0;
+ };
+}
+
+#endif /* _AdditionalContextListener_H__ */
Property changes on: code/branches/testing/src/libraries/util/output/AdditionalContextListener.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/testing/src/libraries/util/output/ConsoleWriter.cc
===================================================================
--- code/branches/testing/src/libraries/util/output/ConsoleWriter.cc 2013-02-24 15:26:33 UTC (rev 9530)
+++ code/branches/testing/src/libraries/util/output/ConsoleWriter.cc 2013-02-24 15:27:43 UTC (rev 9531)
@@ -1,107 +1,107 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Fabian 'x3n' Landau
- * Co-authors:
- * Reto Grieder
- *
- */
-
-/**
- @file
- @brief Implementation of the ConsoleWriter singleton.
-*/
-
-#include "ConsoleWriter.h"
-
-#include <iostream>
-
-#include "OutputManager.h"
-
-namespace orxonox
-{
- /**
- @brief Constructor, initializes the output level.
-
- In debug builds, it writes output up to level::internal_warning to the
- console, in release builds only up to level::user_info.
-
- After creation, the instance is enabled.
- */
- ConsoleWriter::ConsoleWriter() : BaseWriter("Console")
- {
-#ifdef ORXONOX_RELEASE
- this->setLevelMax(level::user_info);
-#else
- this->setLevelMax(level::internal_warning);
-#endif
- this->bEnabled_ = true;
- }
-
- /**
- @brief Destructor.
- */
- ConsoleWriter::~ConsoleWriter()
- {
- }
-
- /**
- @brief Returns the only existing instance of this class.
- */
- /*static*/ ConsoleWriter& ConsoleWriter::getInstance()
- {
- static ConsoleWriter instance;
- return instance;
- }
-
- /**
- @brief Inherited function from BaseWriter, writes output to the console using std::cout.
- */
- void ConsoleWriter::printLine(const std::string& line, OutputLevel)
- {
- std::cout << line << std::endl;
- }
-
- /**
- @brief Enables the instance by registering itself as listener at OutputManager.
- */
- void ConsoleWriter::enable()
- {
- if (!this->bEnabled_)
- {
- OutputManager::getInstance().registerListener(this);
- this->bEnabled_ = true;
- }
- }
-
- /**
- @brief Disables the instance by unregistering itself from OutputManager.
- */
- void ConsoleWriter::disable()
- {
- if (this->bEnabled_)
- {
- OutputManager::getInstance().unregisterListener(this);
- this->bEnabled_ = false;
- }
- }
-}
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * Reto Grieder
+ *
+ */
+
+/**
+ @file
+ @brief Implementation of the ConsoleWriter singleton.
+*/
+
+#include "ConsoleWriter.h"
+
+#include <iostream>
+
+#include "OutputManager.h"
+
+namespace orxonox
+{
+ /**
+ @brief Constructor, initializes the output level.
+
+ In debug builds, it writes output up to level::internal_warning to the
+ console, in release builds only up to level::user_info.
+
+ After creation, the instance is enabled.
+ */
+ ConsoleWriter::ConsoleWriter() : BaseWriter("Console")
+ {
+#ifdef ORXONOX_RELEASE
+ this->setLevelMax(level::user_info);
+#else
+ this->setLevelMax(level::internal_warning);
+#endif
+ this->bEnabled_ = true;
+ }
+
+ /**
+ @brief Destructor.
+ */
+ ConsoleWriter::~ConsoleWriter()
+ {
+ }
+
+ /**
+ @brief Returns the only existing instance of this class.
+ */
+ /*static*/ ConsoleWriter& ConsoleWriter::getInstance()
+ {
+ static ConsoleWriter instance;
+ return instance;
+ }
+
+ /**
+ @brief Inherited function from BaseWriter, writes output to the console using std::cout.
+ */
+ void ConsoleWriter::printLine(const std::string& line, OutputLevel)
+ {
+ std::cout << line << std::endl;
+ }
+
+ /**
+ @brief Enables the instance by registering itself as listener at OutputManager.
+ */
+ void ConsoleWriter::enable()
+ {
+ if (!this->bEnabled_)
+ {
+ OutputManager::getInstance().registerListener(this);
+ this->bEnabled_ = true;
+ }
+ }
+
+ /**
+ @brief Disables the instance by unregistering itself from OutputManager.
+ */
+ void ConsoleWriter::disable()
+ {
+ if (this->bEnabled_)
+ {
+ OutputManager::getInstance().unregisterListener(this);
+ this->bEnabled_ = false;
+ }
+ }
+}
Property changes on: code/branches/testing/src/libraries/util/output/ConsoleWriter.cc
___________________________________________________________________
Added: svn:eol-style
+ native
More information about the Orxonox-commit
mailing list