[Orxonox-commit 907] r5630 - in code/branches/libraries/src/orxonox/overlays: . debug hud notifications stats
landauf at orxonox.net
landauf at orxonox.net
Wed Aug 12 00:59:51 CEST 2009
Author: landauf
Date: 2009-08-12 00:59:51 +0200 (Wed, 12 Aug 2009)
New Revision: 5630
Added:
code/branches/libraries/src/orxonox/overlays/OverlaysPrereqs.h
Modified:
code/branches/libraries/src/orxonox/overlays/FadeoutText.h
code/branches/libraries/src/orxonox/overlays/GUIOverlay.h
code/branches/libraries/src/orxonox/overlays/OverlayText.h
code/branches/libraries/src/orxonox/overlays/debug/DebugFPSText.h
code/branches/libraries/src/orxonox/overlays/debug/DebugRTRText.h
code/branches/libraries/src/orxonox/overlays/hud/AnnounceMessage.h
code/branches/libraries/src/orxonox/overlays/hud/ChatOverlay.h
code/branches/libraries/src/orxonox/overlays/hud/DeathMessage.h
code/branches/libraries/src/orxonox/overlays/hud/GametypeStatus.h
code/branches/libraries/src/orxonox/overlays/hud/HUDBar.h
code/branches/libraries/src/orxonox/overlays/hud/HUDHealthBar.h
code/branches/libraries/src/orxonox/overlays/hud/HUDNavigation.h
code/branches/libraries/src/orxonox/overlays/hud/HUDRadar.h
code/branches/libraries/src/orxonox/overlays/hud/HUDSpeedBar.h
code/branches/libraries/src/orxonox/overlays/hud/HUDTimer.h
code/branches/libraries/src/orxonox/overlays/hud/KillMessage.h
code/branches/libraries/src/orxonox/overlays/hud/PongScore.h
code/branches/libraries/src/orxonox/overlays/hud/TeamBaseMatchScore.h
code/branches/libraries/src/orxonox/overlays/hud/UnderAttackHealthBar.h
code/branches/libraries/src/orxonox/overlays/notifications/NotificationOverlay.h
code/branches/libraries/src/orxonox/overlays/notifications/NotificationQueue.h
code/branches/libraries/src/orxonox/overlays/stats/CreateLines.h
code/branches/libraries/src/orxonox/overlays/stats/Scoreboard.h
code/branches/libraries/src/orxonox/overlays/stats/Stats.h
Log:
added OverlaysPrereqs.h
added _OverlaysExport macro
Modified: code/branches/libraries/src/orxonox/overlays/FadeoutText.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/FadeoutText.h 2009-08-11 22:45:43 UTC (rev 5629)
+++ code/branches/libraries/src/orxonox/overlays/FadeoutText.h 2009-08-11 22:59:51 UTC (rev 5630)
@@ -29,7 +29,7 @@
#ifndef _FadeoutText_H__
#define _FadeoutText_H__
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
#include "tools/Timer.h"
#include "interfaces/Tickable.h"
@@ -37,7 +37,7 @@
namespace orxonox
{
- class _OrxonoxExport FadeoutText : public OverlayText, public Tickable
+ class _OverlaysExport FadeoutText : public OverlayText, public Tickable
{
public:
FadeoutText(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/overlays/GUIOverlay.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/GUIOverlay.h 2009-08-11 22:45:43 UTC (rev 5629)
+++ code/branches/libraries/src/orxonox/overlays/GUIOverlay.h 2009-08-11 22:59:51 UTC (rev 5630)
@@ -29,14 +29,14 @@
#ifndef _GUIOverlay_H__
#define _GUIOverlay_H__
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
#include <string>
#include "OrxonoxOverlay.h"
namespace orxonox
{
- class _OrxonoxExport GUIOverlay : public OrxonoxOverlay
+ class _OverlaysExport GUIOverlay : public OrxonoxOverlay
{
public:
Modified: code/branches/libraries/src/orxonox/overlays/OverlayText.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/OverlayText.h 2009-08-11 22:45:43 UTC (rev 5629)
+++ code/branches/libraries/src/orxonox/overlays/OverlayText.h 2009-08-11 22:59:51 UTC (rev 5630)
@@ -29,7 +29,7 @@
#ifndef _OverlayText_H__
#define _OverlayText_H__
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
#include <string>
#include "util/Math.h"
@@ -38,7 +38,7 @@
namespace orxonox
{
- class _OrxonoxExport OverlayText : public OrxonoxOverlay
+ class _OverlaysExport OverlayText : public OrxonoxOverlay
{
public:
enum Alignment
Added: code/branches/libraries/src/orxonox/overlays/OverlaysPrereqs.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/OverlaysPrereqs.h (rev 0)
+++ code/branches/libraries/src/orxonox/overlays/OverlaysPrereqs.h 2009-08-11 22:59:51 UTC (rev 5630)
@@ -0,0 +1,93 @@
+/*
+ * 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:
+ * Reto Grieder
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Contains all the necessary forward declarations for all classes and structs.
+*/
+
+#ifndef _OverlaysPrereqs_H__
+#define _OverlaysPrereqs_H__
+
+#include "OrxonoxConfig.h"
+
+//-----------------------------------------------------------------------
+// Shared library settings
+//-----------------------------------------------------------------------
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
+# ifdef OVERLAYS_SHARED_BUILD
+# define _OverlaysExport __declspec(dllexport)
+# else
+# if defined( __MINGW32__ )
+# define _OverlaysExport
+# else
+# define _OverlaysExport __declspec(dllimport)
+# endif
+# endif
+#elif defined ( ORXONOX_GCC_VISIBILITY )
+# define _OverlaysExport __attribute__ ((visibility("default")))
+#else
+# define _OverlaysExport
+#endif
+
+//-----------------------------------------------------------------------
+// Forward declarations
+//-----------------------------------------------------------------------
+
+namespace orxonox
+{
+ class BarColour;
+ class DebugFPSText;
+ class DebugRTRText;
+ class GUIOverlay;
+ class HUDBar;
+ class HUDNavigation;
+ class HUDRadar;
+ class HUDSpeedBar;
+ class HUDHealthBar;
+ class HUDTimer;
+ class Notification;
+ class NotificationListener;
+ class NotificationManager;
+ class NotificationOverlay;
+ class NotificationQueue;
+ class OrxonoxOverlay;
+ class OverlayGroup;
+ class OverlayText;
+ class FadeoutText;
+ class GametypeStatus;
+ class AnnounceMessage;
+ class KillMessage;
+ class DeathMessage;
+
+ class CreateLines;
+ class Scoreboard;
+ class Stats;
+}
+
+#endif /* _OverlaysPrereqs_H__ */
Property changes on: code/branches/libraries/src/orxonox/overlays/OverlaysPrereqs.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/libraries/src/orxonox/overlays/debug/DebugFPSText.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/debug/DebugFPSText.h 2009-08-11 22:45:43 UTC (rev 5629)
+++ code/branches/libraries/src/orxonox/overlays/debug/DebugFPSText.h 2009-08-11 22:59:51 UTC (rev 5630)
@@ -29,14 +29,14 @@
#ifndef _DebugFPSText_H__
#define _DebugFPSText_H__
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
#include "interfaces/Tickable.h"
#include "overlays/OverlayText.h"
namespace orxonox
{
- class _OrxonoxExport DebugFPSText : public OverlayText, public Tickable
+ class _OverlaysExport DebugFPSText : public OverlayText, public Tickable
{
public:
DebugFPSText(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/overlays/debug/DebugRTRText.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/debug/DebugRTRText.h 2009-08-11 22:45:43 UTC (rev 5629)
+++ code/branches/libraries/src/orxonox/overlays/debug/DebugRTRText.h 2009-08-11 22:59:51 UTC (rev 5630)
@@ -29,14 +29,14 @@
#ifndef _DebugRTRText_H__
#define _DebugRTRText_H__
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
#include "interfaces/Tickable.h"
#include "overlays/OverlayText.h"
namespace orxonox
{
- class _OrxonoxExport DebugRTRText : public OverlayText, public Tickable
+ class _OverlaysExport DebugRTRText : public OverlayText, public Tickable
{
public:
DebugRTRText(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/overlays/hud/AnnounceMessage.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/hud/AnnounceMessage.h 2009-08-11 22:45:43 UTC (rev 5629)
+++ code/branches/libraries/src/orxonox/overlays/hud/AnnounceMessage.h 2009-08-11 22:59:51 UTC (rev 5630)
@@ -29,14 +29,14 @@
#ifndef _AnnounceMessage_H__
#define _AnnounceMessage_H__
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
#include "interfaces/GametypeMessageListener.h"
#include "overlays/FadeoutText.h"
namespace orxonox
{
- class _OrxonoxExport AnnounceMessage : public FadeoutText, public GametypeMessageListener
+ class _OverlaysExport AnnounceMessage : public FadeoutText, public GametypeMessageListener
{
public:
AnnounceMessage(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/overlays/hud/ChatOverlay.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/hud/ChatOverlay.h 2009-08-11 22:45:43 UTC (rev 5629)
+++ code/branches/libraries/src/orxonox/overlays/hud/ChatOverlay.h 2009-08-11 22:59:51 UTC (rev 5630)
@@ -29,7 +29,7 @@
#ifndef _ChatOverlay_H__
#define _ChatOverlay_H__
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
#include <list>
#include <OgreUTFString.h>
@@ -39,7 +39,7 @@
namespace orxonox
{
- class _OrxonoxExport ChatOverlay : public OverlayText, public ChatListener
+ class _OverlaysExport ChatOverlay : public OverlayText, public ChatListener
{
public:
ChatOverlay(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/overlays/hud/DeathMessage.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/hud/DeathMessage.h 2009-08-11 22:45:43 UTC (rev 5629)
+++ code/branches/libraries/src/orxonox/overlays/hud/DeathMessage.h 2009-08-11 22:59:51 UTC (rev 5630)
@@ -29,14 +29,14 @@
#ifndef _DeathMessage_H__
#define _DeathMessage_H__
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
#include "interfaces/GametypeMessageListener.h"
#include "overlays/FadeoutText.h"
namespace orxonox
{
- class _OrxonoxExport DeathMessage : public FadeoutText, public GametypeMessageListener
+ class _OverlaysExport DeathMessage : public FadeoutText, public GametypeMessageListener
{
public:
DeathMessage(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/overlays/hud/GametypeStatus.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/hud/GametypeStatus.h 2009-08-11 22:45:43 UTC (rev 5629)
+++ code/branches/libraries/src/orxonox/overlays/hud/GametypeStatus.h 2009-08-11 22:59:51 UTC (rev 5630)
@@ -29,14 +29,14 @@
#ifndef _GametypeStatus_H__
#define _GametypeStatus_H__
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
#include "interfaces/Tickable.h"
#include "overlays/OverlayText.h"
namespace orxonox
{
- class _OrxonoxExport GametypeStatus : public OverlayText, public Tickable
+ class _OverlaysExport GametypeStatus : public OverlayText, public Tickable
{
public:
GametypeStatus(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/overlays/hud/HUDBar.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/hud/HUDBar.h 2009-08-11 22:45:43 UTC (rev 5629)
+++ code/branches/libraries/src/orxonox/overlays/hud/HUDBar.h 2009-08-11 22:59:51 UTC (rev 5630)
@@ -31,7 +31,7 @@
#ifndef _HUDBar_H__
#define _HUDBar_H__
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
#include <map>
#include <vector>
@@ -43,7 +43,7 @@
namespace orxonox
{
- class _OrxonoxExport BarColour : public BaseObject
+ class _OverlaysExport BarColour : public BaseObject
{
public:
BarColour(BaseObject* creator);
@@ -63,7 +63,7 @@
};
- class _OrxonoxExport HUDBar : public OrxonoxOverlay
+ class _OverlaysExport HUDBar : public OrxonoxOverlay
{
public:
HUDBar(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/overlays/hud/HUDHealthBar.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/hud/HUDHealthBar.h 2009-08-11 22:45:43 UTC (rev 5629)
+++ code/branches/libraries/src/orxonox/overlays/hud/HUDHealthBar.h 2009-08-11 22:59:51 UTC (rev 5630)
@@ -29,7 +29,7 @@
#ifndef _HUDHealthBar_H__
#define _HUDHealthBar_H__
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
#include "util/Math.h"
#include "interfaces/Tickable.h"
@@ -38,7 +38,7 @@
namespace orxonox
{
- class _OrxonoxExport HUDHealthBar : public HUDBar, public Tickable
+ class _OverlaysExport HUDHealthBar : public HUDBar, public Tickable
{
public:
HUDHealthBar(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/overlays/hud/HUDNavigation.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/hud/HUDNavigation.h 2009-08-11 22:45:43 UTC (rev 5629)
+++ code/branches/libraries/src/orxonox/overlays/hud/HUDNavigation.h 2009-08-11 22:59:51 UTC (rev 5630)
@@ -29,7 +29,7 @@
#ifndef _HUDNavigation_H__
#define _HUDNavigation_H__
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
#include "util/OgreForwardRefs.h"
#include "interfaces/Tickable.h"
@@ -37,7 +37,7 @@
namespace orxonox
{
- class _OrxonoxExport HUDNavigation : public OrxonoxOverlay, public Tickable
+ class _OverlaysExport HUDNavigation : public OrxonoxOverlay, public Tickable
{
public:
HUDNavigation(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/overlays/hud/HUDRadar.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/hud/HUDRadar.h 2009-08-11 22:45:43 UTC (rev 5629)
+++ code/branches/libraries/src/orxonox/overlays/hud/HUDRadar.h 2009-08-11 22:59:51 UTC (rev 5630)
@@ -30,7 +30,7 @@
#ifndef _HUDRadar_H__
#define _HUDRadar_H__
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
#include <map>
#include <vector>
@@ -42,7 +42,7 @@
namespace orxonox
{
- class _OrxonoxExport HUDRadar : public OrxonoxOverlay, public RadarListener
+ class _OverlaysExport HUDRadar : public OrxonoxOverlay, public RadarListener
{
public:
HUDRadar(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/overlays/hud/HUDSpeedBar.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/hud/HUDSpeedBar.h 2009-08-11 22:45:43 UTC (rev 5629)
+++ code/branches/libraries/src/orxonox/overlays/hud/HUDSpeedBar.h 2009-08-11 22:59:51 UTC (rev 5630)
@@ -30,14 +30,14 @@
#ifndef _HUDSpeedBar_H__
#define _HUDSpeedBar_H__
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
#include "interfaces/Tickable.h"
#include "HUDBar.h"
namespace orxonox
{
- class _OrxonoxExport HUDSpeedBar : public HUDBar, public Tickable
+ class _OverlaysExport HUDSpeedBar : public HUDBar, public Tickable
{
public:
HUDSpeedBar(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/overlays/hud/HUDTimer.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/hud/HUDTimer.h 2009-08-11 22:45:43 UTC (rev 5629)
+++ code/branches/libraries/src/orxonox/overlays/hud/HUDTimer.h 2009-08-11 22:59:51 UTC (rev 5630)
@@ -29,14 +29,14 @@
#ifndef _HUDTimer_H__
#define _HUDTimer_H__
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
#include "interfaces/Tickable.h"
#include "overlays/OverlayText.h"
namespace orxonox
{
- class _OrxonoxExport HUDTimer : public OverlayText, public Tickable
+ class _OverlaysExport HUDTimer : public OverlayText, public Tickable
{
public:
HUDTimer(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/overlays/hud/KillMessage.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/hud/KillMessage.h 2009-08-11 22:45:43 UTC (rev 5629)
+++ code/branches/libraries/src/orxonox/overlays/hud/KillMessage.h 2009-08-11 22:59:51 UTC (rev 5630)
@@ -29,14 +29,14 @@
#ifndef _KillMessage_H__
#define _KillMessage_H__
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
#include "interfaces/GametypeMessageListener.h"
#include "overlays/FadeoutText.h"
namespace orxonox
{
- class _OrxonoxExport KillMessage : public FadeoutText, public GametypeMessageListener
+ class _OverlaysExport KillMessage : public FadeoutText, public GametypeMessageListener
{
public:
KillMessage(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/overlays/hud/PongScore.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/hud/PongScore.h 2009-08-11 22:45:43 UTC (rev 5629)
+++ code/branches/libraries/src/orxonox/overlays/hud/PongScore.h 2009-08-11 22:59:51 UTC (rev 5630)
@@ -29,14 +29,14 @@
#ifndef _PongScore_H__
#define _PongScore_H__
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
#include "interfaces/Tickable.h"
#include "overlays/OverlayText.h"
namespace orxonox
{
- class _OrxonoxExport PongScore : public OverlayText, public Tickable
+ class _OverlaysExport PongScore : public OverlayText, public Tickable
{
public:
PongScore(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/overlays/hud/TeamBaseMatchScore.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/hud/TeamBaseMatchScore.h 2009-08-11 22:45:43 UTC (rev 5629)
+++ code/branches/libraries/src/orxonox/overlays/hud/TeamBaseMatchScore.h 2009-08-11 22:59:51 UTC (rev 5630)
@@ -29,14 +29,14 @@
#ifndef _TeamBaseMatchScore_H__
#define _TeamBaseMatchScore_H__
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
#include "interfaces/Tickable.h"
#include "overlays/OverlayText.h"
namespace orxonox
{
- class _OrxonoxExport TeamBaseMatchScore : public OverlayText, public Tickable
+ class _OverlaysExport TeamBaseMatchScore : public OverlayText, public Tickable
{
public:
TeamBaseMatchScore(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/overlays/hud/UnderAttackHealthBar.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/hud/UnderAttackHealthBar.h 2009-08-11 22:45:43 UTC (rev 5629)
+++ code/branches/libraries/src/orxonox/overlays/hud/UnderAttackHealthBar.h 2009-08-11 22:59:51 UTC (rev 5630)
@@ -29,7 +29,7 @@
#ifndef _UnderAttackHealthBar_H__
#define _UnderAttackHealthBar_H__
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
#include "util/Math.h"
#include "tools/Timer.h"
@@ -37,7 +37,7 @@
namespace orxonox
{
- class _OrxonoxExport UnderAttackHealthBar : public HUDHealthBar
+ class _OverlaysExport UnderAttackHealthBar : public HUDHealthBar
{
public:
UnderAttackHealthBar(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/overlays/notifications/NotificationOverlay.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/notifications/NotificationOverlay.h 2009-08-11 22:45:43 UTC (rev 5629)
+++ code/branches/libraries/src/orxonox/overlays/notifications/NotificationOverlay.h 2009-08-11 22:59:51 UTC (rev 5630)
@@ -35,7 +35,7 @@
#ifndef _NotificationOverlay_H__
#define _NotificationOverlay_H__
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
#include <string>
#include "orxonox/overlays/OverlayText.h"
@@ -49,14 +49,14 @@
@author
Damian 'Mozork' Frick
*/
- class _OrxonoxExport NotificationOverlay : public OverlayText
+ class _OverlaysExport NotificationOverlay : public OverlayText
{
public:
NotificationOverlay(BaseObject* creator);
NotificationOverlay(NotificationQueue* queue, Notification* notification);
virtual ~NotificationOverlay();
-
+
bool processNotification(Notification* notification); //!< Processes the input Notification.
/**
@@ -65,7 +65,7 @@
*/
inline void setFontSize(float size)
{ this->setTextSize(size); }
-
+
protected:
std::string clipMessage(const std::string & message); //!< Clips the input message if too long.
Modified: code/branches/libraries/src/orxonox/overlays/notifications/NotificationQueue.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/notifications/NotificationQueue.h 2009-08-11 22:45:43 UTC (rev 5629)
+++ code/branches/libraries/src/orxonox/overlays/notifications/NotificationQueue.h 2009-08-11 22:59:51 UTC (rev 5630)
@@ -34,7 +34,7 @@
#ifndef _NotificationOueue_H__
#define _NotificationOueue_H__
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
#include <ctime>
#include <map>
@@ -84,7 +84,7 @@
Damian 'Mozork' Frick
*/
- class _OrxonoxExport NotificationQueue : public OverlayGroup, public Tickable, public NotificationListener
+ class _OverlaysExport NotificationQueue : public OverlayGroup, public Tickable, public NotificationListener
{
public:
Modified: code/branches/libraries/src/orxonox/overlays/stats/CreateLines.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/stats/CreateLines.h 2009-08-11 22:45:43 UTC (rev 5629)
+++ code/branches/libraries/src/orxonox/overlays/stats/CreateLines.h 2009-08-11 22:59:51 UTC (rev 5630)
@@ -27,11 +27,11 @@
#ifndef _CreateLines_H__
#define _CreateLines_H__
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
namespace orxonox
{
- class _OrxonoxExport CreateLines
+ class _OverlaysExport CreateLines
{
public: // functions
Modified: code/branches/libraries/src/orxonox/overlays/stats/Scoreboard.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/stats/Scoreboard.h 2009-08-11 22:45:43 UTC (rev 5629)
+++ code/branches/libraries/src/orxonox/overlays/stats/Scoreboard.h 2009-08-11 22:59:51 UTC (rev 5630)
@@ -28,7 +28,7 @@
#define _Scoreboard_H__
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
#include <string>
#include <vector>
@@ -37,7 +37,7 @@
namespace orxonox
{
- class _OrxonoxExport Scoreboard : public OrxonoxOverlay, public Tickable
+ class _OverlaysExport Scoreboard : public OrxonoxOverlay, public Tickable
{
public: // functions
Scoreboard(BaseObject* creator);
Modified: code/branches/libraries/src/orxonox/overlays/stats/Stats.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/stats/Stats.h 2009-08-11 22:45:43 UTC (rev 5629)
+++ code/branches/libraries/src/orxonox/overlays/stats/Stats.h 2009-08-11 22:59:51 UTC (rev 5630)
@@ -29,7 +29,7 @@
#ifndef _Stats_H__
#define _Stats_H__
-#include "OrxonoxPrereqs.h"
+#include "overlays/OverlaysPrereqs.h"
#include "util/OgreForwardRefs.h"
#include "interfaces/Tickable.h"
@@ -37,7 +37,7 @@
namespace orxonox
{
- class _OrxonoxExport Stats : public OrxonoxOverlay, public Tickable
+ class _OverlaysExport Stats : public OrxonoxOverlay, public Tickable
{
public: // functions
Stats(BaseObject* creator);
More information about the Orxonox-commit
mailing list