[Libreoffice-commits] core.git: svx/source
Tor Lillqvist
tml at collabora.com
Mon Mar 31 06:20:45 PDT 2014
svx/source/inc/eventhandler.hxx | 29 +++++------------------------
1 file changed, 5 insertions(+), 24 deletions(-)
New commits:
commit 0f492c419be2110937d3116f5c86c026d733f797
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Mar 31 16:19:33 2014 +0300
Cosmetics
Change-Id: Ibda0c9b7ef68f040af2459ceb7328e5641f21446
diff --git a/svx/source/inc/eventhandler.hxx b/svx/source/inc/eventhandler.hxx
index 36b27a1..3c7670c 100644
--- a/svx/source/inc/eventhandler.hxx
+++ b/svx/source/inc/eventhandler.hxx
@@ -17,17 +17,14 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SDR_EVENT_EVENTHANDLER_HXX
-#define INCLUDED_SVX_SDR_EVENT_EVENTHANDLER_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_EVENTHANDLER_HXX
+#define INCLUDED_SVX_SOURCE_INC_EVENTHANDLER_HXX
#include <sal/types.h>
#include <vector>
#include <vcl/timer.hxx>
-
-// predeclarations
-
namespace sdr
{
namespace event
@@ -35,13 +32,10 @@ namespace sdr
class BaseEvent;
class EventHandler;
- // typedefs for a list of BaseEvents
typedef ::std::vector< BaseEvent* > BaseEventVector;
} // end of namespace event
} // end of namespace sdr
-
-
namespace sdr
{
namespace event
@@ -49,13 +43,11 @@ namespace sdr
class BaseEvent
{
// the EventHandler this event is registered at
- EventHandler& mrEventHandler;
+ EventHandler& mrEventHandler;
public:
- // basic constructor.
BaseEvent(EventHandler& rEventHandler);
- // destructor
virtual ~BaseEvent();
// the called method if the event is triggered
@@ -64,15 +56,13 @@ namespace sdr
} // end of namespace event
} // end of namespace sdr
-
-
namespace sdr
{
namespace event
{
class EventHandler
{
- BaseEventVector maVector;
+ BaseEventVector maVector;
// to allow BaseEvents to use the add/remove functionality
friend class BaseEvent;
@@ -86,23 +76,18 @@ namespace sdr
BaseEvent* GetEvent();
public:
- // basic constructor.
EventHandler();
- // destructor
virtual ~EventHandler();
// Trigger and consume the events
virtual void ExecuteEvents();
- // for control
bool IsEmpty() const;
};
} // end of namespace event
} // end of namespace sdr
-
-
namespace sdr
{
namespace event
@@ -110,10 +95,8 @@ namespace sdr
class TimerEventHandler : public EventHandler, public Timer
{
public:
- // basic constructor.
TimerEventHandler(sal_uInt32 nTimeout = 1L);
- // destructor
virtual ~TimerEventHandler();
// The timer when it is triggered; from class Timer
@@ -125,8 +108,6 @@ namespace sdr
} // end of namespace event
} // end of namespace sdr
-
-
-#endif // INCLUDED_SVX_SDR_EVENT_EVENTHANDLER_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_EVENTHANDLER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list