[Orxonox-commit 912] r5635 - in code/branches/libraries/src/orxonox: . interfaces objects/quest/notifications
landauf at orxonox.net
landauf at orxonox.net
Wed Aug 12 01:50:49 CEST 2009
Author: landauf
Date: 2009-08-12 01:50:49 +0200 (Wed, 12 Aug 2009)
New Revision: 5635
Modified:
code/branches/libraries/src/orxonox/Main.h
code/branches/libraries/src/orxonox/Orxonox.cc
code/branches/libraries/src/orxonox/interfaces/NotificationListener.h
code/branches/libraries/src/orxonox/objects/quest/notifications/CMakeLists.txt
Log:
found more missing eolstyle:native properties
Modified: code/branches/libraries/src/orxonox/Main.h
===================================================================
--- code/branches/libraries/src/orxonox/Main.h 2009-08-11 23:45:42 UTC (rev 5634)
+++ code/branches/libraries/src/orxonox/Main.h 2009-08-11 23:50:49 UTC (rev 5635)
@@ -1,40 +1,40 @@
-/*
- * 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:
- * Benjamin Knecht <beni_at_orxonox.net>, (C) 2007
- * Reto Grieder
- * Co-authors:
- * ...
- *
- */
-
-#ifndef _Main_H__
-#define _Main_H__
-
-#include "OrxonoxPrereqs.h"
-
-namespace orxonox
-{
- _OrxonoxExport int main(const std::string& strCmdLine);
-}
-
-#endif /* _Main_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:
+ * Benjamin Knecht <beni_at_orxonox.net>, (C) 2007
+ * Reto Grieder
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _Main_H__
+#define _Main_H__
+
+#include "OrxonoxPrereqs.h"
+
+namespace orxonox
+{
+ _OrxonoxExport int main(const std::string& strCmdLine);
+}
+
+#endif /* _Main_H__ */
Property changes on: code/branches/libraries/src/orxonox/Main.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/libraries/src/orxonox/Orxonox.cc
===================================================================
--- code/branches/libraries/src/orxonox/Orxonox.cc 2009-08-11 23:45:42 UTC (rev 5634)
+++ code/branches/libraries/src/orxonox/Orxonox.cc 2009-08-11 23:50:49 UTC (rev 5635)
@@ -1,81 +1,81 @@
-/*
- * 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:
- * Benjamin Knecht <beni_at_orxonox.net>, (C) 2007
- * Reto Grieder
- * Co-authors:
- * ...
- *
- */
-
-/**
- at file
- at brief
- Entry point of the program.
-*/
-
-#include "OrxonoxPrereqs.h"
-#include "SpecialConfig.h"
-
-#ifdef ORXONOX_USE_WINMAIN
-# ifndef WIN32_LEAN_AND_MEAN
-# define WIN32_LEAN_AND_MEAN
-# endif
-#include <windows.h>
-#endif
-
-#include "util/Debug.h"
-#include "Main.h"
-
-/*
- at brief
- Main method. Game starts here (except for static initialisations).
-*/
-#ifdef ORXONOX_USE_WINMAIN
-INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT)
-#else
-int main(int argc, char** argv)
-#endif
-{
- try
- {
-#ifndef ORXONOX_USE_WINMAIN
- std::string strCmdLine;
- for (int i = 1; i < argc; ++i)
- strCmdLine += argv[i] + std::string(" ");
-
- return orxonox::main(strCmdLine);
-#endif
- }
- catch (const std::exception& ex)
- {
- COUT(0) << "Orxonox failed to initialise: " << ex.what() << std::endl;
- COUT(0) << "Terminating program." << std::endl;
- return 1;
- }
- catch (...)
- {
- COUT(0) << "Orxonox failed to initialise: " << std::endl;
- COUT(0) << "Terminating program." << std::endl;
- return 1;
- }
-}
+/*
+ * 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:
+ * Benjamin Knecht <beni_at_orxonox.net>, (C) 2007
+ * Reto Grieder
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ at file
+ at brief
+ Entry point of the program.
+*/
+
+#include "OrxonoxPrereqs.h"
+#include "SpecialConfig.h"
+
+#ifdef ORXONOX_USE_WINMAIN
+# ifndef WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+# endif
+#include <windows.h>
+#endif
+
+#include "util/Debug.h"
+#include "Main.h"
+
+/*
+ at brief
+ Main method. Game starts here (except for static initialisations).
+*/
+#ifdef ORXONOX_USE_WINMAIN
+INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT)
+#else
+int main(int argc, char** argv)
+#endif
+{
+ try
+ {
+#ifndef ORXONOX_USE_WINMAIN
+ std::string strCmdLine;
+ for (int i = 1; i < argc; ++i)
+ strCmdLine += argv[i] + std::string(" ");
+
+ return orxonox::main(strCmdLine);
+#endif
+ }
+ catch (const std::exception& ex)
+ {
+ COUT(0) << "Orxonox failed to initialise: " << ex.what() << std::endl;
+ COUT(0) << "Terminating program." << std::endl;
+ return 1;
+ }
+ catch (...)
+ {
+ COUT(0) << "Orxonox failed to initialise: " << std::endl;
+ COUT(0) << "Terminating program." << std::endl;
+ return 1;
+ }
+}
Property changes on: code/branches/libraries/src/orxonox/Orxonox.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/libraries/src/orxonox/interfaces/NotificationListener.h
===================================================================
--- code/branches/libraries/src/orxonox/interfaces/NotificationListener.h 2009-08-11 23:45:42 UTC (rev 5634)
+++ code/branches/libraries/src/orxonox/interfaces/NotificationListener.h 2009-08-11 23:50:49 UTC (rev 5635)
@@ -1,59 +1,59 @@
-/*
- * 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
- @brief Definition of the NotificationListener class.
-*/
-
-#ifndef _NotificationListener_H__
-#define _NotificationListener_H__
-
-#include "OrxonoxPrereqs.h"
-
-#include <ctime>
-#include <set>
-#include <string>
-
-#include "core/OrxonoxClass.h"
-
-namespace orxonox
-{
- class _OrxonoxExport NotificationListener : virtual public OrxonoxClass
- {
- public:
- NotificationListener();
- virtual ~NotificationListener() {}
-
- virtual const std::set<std::string> & getTargetsSet() = 0;
- virtual void update(void) = 0;
- virtual void update(Notification* notification, const std::time_t & time) = 0;
- };
-}
-
-#endif /* _NotificationListener_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
+ @brief Definition of the NotificationListener class.
+*/
+
+#ifndef _NotificationListener_H__
+#define _NotificationListener_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include <ctime>
+#include <set>
+#include <string>
+
+#include "core/OrxonoxClass.h"
+
+namespace orxonox
+{
+ class _OrxonoxExport NotificationListener : virtual public OrxonoxClass
+ {
+ public:
+ NotificationListener();
+ virtual ~NotificationListener() {}
+
+ virtual const std::set<std::string> & getTargetsSet() = 0;
+ virtual void update(void) = 0;
+ virtual void update(Notification* notification, const std::time_t & time) = 0;
+ };
+}
+
+#endif /* _NotificationListener_H__ */
Property changes on: code/branches/libraries/src/orxonox/interfaces/NotificationListener.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/libraries/src/orxonox/objects/quest/notifications/CMakeLists.txt
===================================================================
--- code/branches/libraries/src/orxonox/objects/quest/notifications/CMakeLists.txt 2009-08-11 23:45:42 UTC (rev 5634)
+++ code/branches/libraries/src/orxonox/objects/quest/notifications/CMakeLists.txt 2009-08-11 23:50:49 UTC (rev 5635)
@@ -1,4 +1,4 @@
-ADD_SOURCE_FILES(ORXONOX_SRC_FILES
- Notification.cc
- NotificationManager.cc
-)
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+ Notification.cc
+ NotificationManager.cc
+)
Property changes on: code/branches/libraries/src/orxonox/objects/quest/notifications/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
+ native
More information about the Orxonox-commit
mailing list