From db5d4214bc85836e390cca9b346307a8568d3b9e Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Thu, 25 Oct 2012 10:14:01 +0200
Subject: always set event description

Change-Id: I8d83c0d65fff0b0d3d08f32aa3d5c0bb5e7e9c8a
---
 slideshow/source/inc/delayevent.hxx              | 25 ++++++++----------------
 slideshow/source/inc/event.hxx                   |  8 ++------
 slideshow/source/inc/interruptabledelayevent.hxx |  4 +---
 3 files changed, 11 insertions(+), 26 deletions(-)

(limited to 'slideshow/source/inc')

diff --git a/slideshow/source/inc/delayevent.hxx b/slideshow/source/inc/delayevent.hxx
index 5115fd7e7522..ba7ac03b904a 100644
--- a/slideshow/source/inc/delayevent.hxx
+++ b/slideshow/source/inc/delayevent.hxx
@@ -37,22 +37,14 @@ public:
     template <typename FuncT>
         Delay( FuncT const& func,
                double nTimeout
-#if OSL_DEBUG_LEVEL > 1
             ,  const ::rtl::OUString& rsDescription
             ) : Event(rsDescription),
-#else
-            ) :
-#endif
             mnTimeout(nTimeout), maFunc(func), mbWasFired(false) {}
 
     Delay( const boost::function0<void>& func,
            double nTimeout
-#if OSL_DEBUG_LEVEL > 1
         , const ::rtl::OUString& rsDescription
         ) : Event(rsDescription),
-#else
-        ) :
-#endif
         mnTimeout(nTimeout),
         maFunc(func),
         mbWasFired(false) {}
@@ -83,9 +75,9 @@ private:
     @return generated delay event
 */
 template <typename FuncT>
-inline EventSharedPtr makeDelay_( FuncT const& func, double nTimeout )
+inline EventSharedPtr makeDelay_( FuncT const& func, double nTimeout, rtl::OUString const& rsDescription )
 {
-    return EventSharedPtr( new Delay( func, nTimeout ) );
+    return EventSharedPtr( new Delay( func, nTimeout, rsDescription ) );
 }
 
 /** Generate immediate event
@@ -96,15 +88,14 @@ inline EventSharedPtr makeDelay_( FuncT const& func, double nTimeout )
     @return generated immediate event.
 */
 template <typename FuncT>
-inline EventSharedPtr makeEvent_( FuncT const& func )
+inline EventSharedPtr makeEvent_( FuncT const& func, rtl::OUString const& rsDescription)
 {
-    return EventSharedPtr( new Delay( func, 0.0 ) );
+    return EventSharedPtr( new Delay( func, 0.0, rsDescription ) );
 }
 
 
-// Strip away description.
-#define makeDelay(f, t, d) makeDelay_(f, t)
-#define makeEvent(f, d) makeEvent_(f)
+#define makeDelay(f, t, d) makeDelay_(f, t, d)
+#define makeEvent(f, d) makeEvent_(f, d)
 
 #else // OSL_DEBUG_LEVEL > 1
 
@@ -135,10 +126,10 @@ inline EventSharedPtr makeDelay_(
 
 #define makeDelay(f, t, d) makeDelay_(f, t,                   \
         BOOST_CURRENT_FUNCTION, __FILE__, __LINE__,           \
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(d)))
+        d)
 #define makeEvent(f, d) makeDelay_(f, 0.0,                  \
         BOOST_CURRENT_FUNCTION, __FILE__, __LINE__,         \
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(d)))
+        d)
 
 #endif // OSL_DEBUG_LEVEL <= 1
 
diff --git a/slideshow/source/inc/event.hxx b/slideshow/source/inc/event.hxx
index cd9b91ddc637..44b5bd8d7507 100644
--- a/slideshow/source/inc/event.hxx
+++ b/slideshow/source/inc/event.hxx
@@ -32,9 +32,7 @@ namespace internal {
 class Event : public Disposable
 {
 public:
-#if OSL_DEBUG_LEVEL > 1
-    Event (const ::rtl::OUString& rsDescription) : msDescription(rsDescription) {};
-#endif
+    Event (const ::rtl::OUString& rsDescription) : msDescription(rsDescription) {}
 
     /** Execute the event.
 
@@ -66,12 +64,10 @@ public:
     */
     virtual double getActivationTime( double nCurrentTime ) const = 0;
 
-#if OSL_DEBUG_LEVEL > 1
-    ::rtl::OUString GetDescription (void) const { return msDescription; }
+    const ::rtl::OUString& GetDescription (void) const { return msDescription; }
 
 private:
     const ::rtl::OUString msDescription;
-#endif
 };
 
 typedef ::boost::shared_ptr< Event > EventSharedPtr;
diff --git a/slideshow/source/inc/interruptabledelayevent.hxx b/slideshow/source/inc/interruptabledelayevent.hxx
index a8c2fef7568b..d5f962d69946 100644
--- a/slideshow/source/inc/interruptabledelayevent.hxx
+++ b/slideshow/source/inc/interruptabledelayevent.hxx
@@ -38,9 +38,7 @@ namespace slideshow
         public:
             DelayFacade( const EventSharedPtr&  rEvent,
                          double                 nTimeout    ) :
-#if OSL_DEBUG_LEVEL > 1
-                Event(::rtl::OUString("DelayFacade")),
-#endif
+                Event("DelayFacade"),
                 mpEvent( rEvent ),
                 mnTimeout( nTimeout )
             {
-- 
cgit