[mousetrap/gnome3-wip: 85/240] Rename MousePointer to ScreenPointer.

[Heidi Ellis <heidiellis src gnome org>]

commit 2ffce2ceea21991ee2ae50215199852da452f84b
Author: Stoney Jackson <dr stoney gmail com>
Date:   Thu Jun 12 13:24:21 2014 -0400

    Rename MousePointer to ScreenPointer.

 src/mousetrap/gui.py                       |    2 +-
 src/mousetrap/main.py                      |    4 ++--
 src/mousetrap/tests/nose_locator_sample.py |    3 ++-
 src/mousetrap/tests/test_mouse_pointer.py  |    4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/src/mousetrap/gui.py b/src/mousetrap/gui.py
index 63ae31e..2dbe0e7 100644
--- a/src/mousetrap/gui.py
+++ b/src/mousetrap/gui.py
@@ -50,7 +50,7 @@ class Gui(object):
         return Gtk.Window().get_screen().get_height()
 
 
-class MousePointer(object):
+class ScreenPointer(object):
     def __init__(self):
         gdk_display = Gdk.Display.get_default()
         device_manager = gdk_display.get_device_manager()
diff --git a/src/mousetrap/main.py b/src/mousetrap/main.py
index cdd6309..21fe111 100644
--- a/src/mousetrap/main.py
+++ b/src/mousetrap/main.py
@@ -5,7 +5,7 @@ Where it all begins.
 from datetime import datetime
 from gi.repository import GObject
 from mousetrap.vision import Camera
-from mousetrap.gui import MousePointer, Gui
+from mousetrap.gui import ScreenPointer, Gui
 from mousetrap.pointers.nose import Pointer
 
 
@@ -19,7 +19,7 @@ class Main(object):
         self.camera = Camera()
         self.camera.set_dimensions(300, 200)
         self.gui = Gui()
-        self.pointer = MousePointer()
+        self.pointer = ScreenPointer()
         self.nose = Pointer()
 
     def run(self):
diff --git a/src/mousetrap/tests/nose_locator_sample.py b/src/mousetrap/tests/nose_locator_sample.py
index 807f762..9528ac1 100644
--- a/src/mousetrap/tests/nose_locator_sample.py
+++ b/src/mousetrap/tests/nose_locator_sample.py
@@ -1,4 +1,5 @@
-from mousetrap.vision import Camera, NoseLocator
+from mousetrap.vision import Camera
+from mousetrap.pointers.nose import NoseLocator
 
 
 class NoseLocatorSample(object):
diff --git a/src/mousetrap/tests/test_mouse_pointer.py b/src/mousetrap/tests/test_mouse_pointer.py
index 07f76a1..20287f0 100644
--- a/src/mousetrap/tests/test_mouse_pointer.py
+++ b/src/mousetrap/tests/test_mouse_pointer.py
@@ -1,11 +1,11 @@
 import unittest
-from mousetrap.gui import MousePointer
+from mousetrap.gui import ScreenPointer
 
 
 class test_pointer(unittest.TestCase):
 
     def setUp(self):
-        self.pointer = MousePointer()
+        self.pointer = ScreenPointer()
 
     def test_get_position(self):
         pointer_x, pointer_y = self.pointer.get_position()