Changeset 7349 for code/branches/notifications/src

Timestamp:

Sep 4, 2010, 5:25:36 PM (14 years ago)

Author:

dafrick

Message:

Making the background of the NotificationQueue transparent. (Had to change/update TaharezLook look'n'feel file, so don't forget to update data_extern as well…)
Removing some obsolete includes and a warning.

Location:

code/branches/notifications/src/modules/notifications

Files:

• NotificationManager.cc (modified) (3 diffs)
• NotificationManager.h (modified) (1 diff)
• NotificationQueue.cc (modified) (1 diff)
• NotificationQueue.h (modified) (1 diff)

code/branches/notifications/src/modules/notifications/NotificationManager.cc

@@ -34 +34 @@
 #include "NotificationManager.h"
 
-#include <set>
-
+#include "core/CoreIncludes.h"
+#include "core/GUIManager.h"
 #include "util/ScopedSingletonManager.h"
-#include "core/CoreIncludes.h"
+#include "interfaces/NotificationListener.h"
 #include "Notification.h"
-#include "interfaces/NotificationListener.h"
-#include "core/GUIManager.h"
 #include "NotificationQueue.h"
 
@@ -66 +64 @@
 
             // Create first queue:
-            NotificationQueue* queue = new NotificationQueue("all");
+            this->queue_ = new NotificationQueue("all");
         }
     }
@@ -76 +74 @@
     NotificationManager::~NotificationManager()
     {
-
+        this->queue_->destroy();
     }
 

code/branches/notifications/src/modules/notifications/NotificationManager.h

@@ -83 +83 @@
             static NotificationManager* singletonPtr_s;
 
+            NotificationQueue* queue_; //!< Initial, first, NotificationQueue.
+
             int highestIndex_; //!< This variable holds the highest index (resp. key) in notificationLists_s, to secure that no key appears twice.
 

code/branches/notifications/src/modules/notifications/NotificationQueue.cc

@@ -34 +34 @@
 #include "NotificationQueue.h"
 
-#include <algorithm>
-
-#include "util/Convert.h"
+#include <map>
+
 #include "core/CoreIncludes.h"
 #include "core/GUIManager.h"
 #include "core/LuaState.h"
+#include "util/Convert.h"
 #include "Notification.h"
 

code/branches/notifications/src/modules/notifications/NotificationQueue.h

@@ -38 +38 @@
 
 #include <ctime>
-#include <map>
 #include <set>
 #include <string>
 #include <vector>
 
+#include "tools/interfaces/Tickable.h"
 #include "util/Math.h"
-#include "core/OrxonoxClass.h"
-#include "tools/interfaces/Tickable.h"
 #include "interfaces/NotificationListener.h"
 #include "NotificationManager.h"