diff Framework/Viewport/IViewport.h @ 726:4f2416d519b4

moving layers, widgets and loaders to Deprecated namespace
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 21 May 2019 11:43:25 +0200
parents f0008c55e5f7
children
line wrap: on
line diff
--- a/Framework/Viewport/IViewport.h	Mon May 20 16:26:34 2019 +0200
+++ b/Framework/Viewport/IViewport.h	Tue May 21 11:43:25 2019 +0200
@@ -28,16 +28,16 @@
 #include <Core/Images/ImageAccessor.h>
 #include "../Viewport/IMouseTracker.h" // only to get the "Touch" definition
 
-namespace OrthancStone
+namespace Deprecated
 {
   class IWidget;   // Forward declaration
   
-  class IViewport : public IObservable
+  class IViewport : public OrthancStone::IObservable
   {
   public:
     ORTHANC_STONE_DEFINE_ORIGIN_MESSAGE(__FILE__, __LINE__, ViewportChangedMessage, IViewport);
 
-    IViewport(MessageBroker& broker) :
+    IViewport(OrthancStone::MessageBroker& broker) :
       IObservable(broker)
     {
     }
@@ -56,10 +56,10 @@
     // The function returns "true" iff. a new frame was rendered
     virtual bool Render(Orthanc::ImageAccessor& surface) = 0;
 
-    virtual void MouseDown(MouseButton button,
+    virtual void MouseDown(OrthancStone::MouseButton button,
                            int x,
                            int y,
-                           KeyboardModifiers modifiers,
+                           OrthancStone::KeyboardModifiers modifiers,
                            const std::vector<Touch>& touches) = 0;
 
     virtual void MouseUp() = 0;
@@ -72,14 +72,14 @@
 
     virtual void MouseLeave() = 0;
 
-    virtual void MouseWheel(MouseWheelDirection direction,
+    virtual void MouseWheel(OrthancStone::MouseWheelDirection direction,
                             int x,
                             int y,
-                            KeyboardModifiers modifiers) = 0;
+                            OrthancStone::KeyboardModifiers modifiers) = 0;
 
-    virtual void KeyPressed(KeyboardKeys key,
+    virtual void KeyPressed(OrthancStone::KeyboardKeys key,
                             char keyChar,
-                            KeyboardModifiers modifiers) = 0;
+                            OrthancStone::KeyboardModifiers modifiers) = 0;
 
     virtual bool HasAnimation() = 0;