summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <Sam@XPS-SUSE.site>2009-03-13 22:51:29 +0900
committerSam Spilsbury <Sam@XPS-SUSE.site>2009-03-13 22:51:29 +0900
commita0b114bd78d446896b3ca8111243a83b6e714c79 (patch)
treef89f2e2ef0954f8e89d41cd6306455a0dd1980c0
parent0b9ecdd4d0a09a8d9a17152e99c521c1fe581411 (diff)
downloadmousepoll-a0b114bd78d446896b3ca8111243a83b6e714c79.tar.gz
mousepoll-a0b114bd78d446896b3ca8111243a83b6e714c79.tar.bz2
CompTimer and Mousepoller namespaces do not conflict.
-rw-r--r--mousepoll.cpp2
-rw-r--r--mousepoll.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/mousepoll.cpp b/mousepoll.cpp
index 32704d2..223d39c 100644
--- a/mousepoll.cpp
+++ b/mousepoll.cpp
@@ -111,7 +111,7 @@ MousepollScreen::removeTimer (MousePoller *poller)
}
void
-MousePoller::setCallback (MousePoller::MPCallBack callback)
+MousePoller::setCallback (MousePoller::CallBack callback)
{
bool wasActive = mActive;
if (mActive)
diff --git a/mousepoll.h b/mousepoll.h
index 39d259c..7061792 100644
--- a/mousepoll.h
+++ b/mousepoll.h
@@ -27,13 +27,13 @@ class MousePoller
{
public:
- typedef boost::function<void (const CompPoint &)> MPCallBack;
+ typedef boost::function<void (const CompPoint &)> CallBack;
MousePoller ();
~MousePoller ();
void
- setCallback (MPCallBack callback);
+ setCallback (CallBack callback);
void
start ();
@@ -54,7 +54,7 @@ class MousePoller
bool mActive;
CompPoint mPoint;
- MPCallBack mCallback;
+ CallBack mCallback;
friend class MousepollScreen;
};