- Timestamp:
- Dec 19, 2016, 8:15:56 AM (8 years ago)
- Location:
- code/branches/Presentation_HS16
- Files:
-
- 5 edited
- 4 copied
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Presentation_HS16
- Property svn:mergeinfo changed
/code/branches/Dialog_HS16 (added) merged: 11231,11247,11261,11270,11292,11317,11331
- Property svn:mergeinfo changed
-
code/branches/Presentation_HS16/src/modules/notifications/CMakeLists.txt
r8706 r11347 17 17 NotificationsPrecompiledHeaders.h 18 18 LINK_LIBRARIES 19 overlays 19 20 orxonox 20 21 SOURCE_FILES ${NOTIFICATIONS_SRC_FILES} -
code/branches/Presentation_HS16/src/modules/notifications/NotificationDispatcher.h
r11099 r11347 126 126 virtual const std::string& createNotificationMessage(void) 127 127 { return BLANKSTRING; } 128 128 129 129 130 }; -
code/branches/Presentation_HS16/src/modules/notifications/NotificationManager.h
r11071 r11347 77 77 inline const std::string & getMessage(void) const 78 78 { return this->message_; } 79 80 79 /** 81 80 @brief Get the sender of the Notification. … … 94 93 private: 95 94 std::string message_; //!< The Notification message. 96 std::string sender_; //!< The sender of the notification.95 std::string sender_;//!< The sender of the notifications. 97 96 NotificationMessageType type_; //!< The type of the notification. 98 97 -
code/branches/Presentation_HS16/src/modules/notifications/dispatchers/CMakeLists.txt
r7285 r11347 2 2 CommandNotification.cc 3 3 SimpleNotification.cc 4 Dialogue.cc 4 5 )
Note: See TracChangeset
for help on using the changeset viewer.