Fresco/GGI/GGIKit GGIKitImpl.cc,1.9,1.10 GGIKitImpl.hh,1.9,1.10 VisualImpl.cc,1.16,1.17 VisualImpl.hh,1.10,1.11
Tobias Hunger <[email protected]> Mon, 27 Oct 2003 20:53:26 +0000
| Newsgroups | gmane.comp.video.fresco.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvs/fresco/Fresco/GGI/GGIKit
In directory purcel:/tmp/cvs-serv16351/GGI/GGIKit
Modified Files:
GGIKitImpl.cc GGIKitImpl.hh VisualImpl.cc VisualImpl.hh
Log Message:
Replace namespaces GGI::Kit with one namespace GGIKit as suggested by stefan.
Index: GGIKitImpl.cc
===================================================================
RCS file: /cvs/fresco/Fresco/GGI/GGIKit/GGIKitImpl.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- GGIKitImpl.cc 27 Oct 2003 20:19:46 -0000 1.9
+++ GGIKitImpl.cc 27 Oct 2003 20:53:24 -0000 1.10
@@ -24,18 +24,18 @@
using namespace Fresco;
-GGI::Kit::GGIKitImpl::GGIKitImpl(const std::string &id,
- const Fresco::Kit::PropertySeq &p,
- ServerContextImpl *c) :
+GGIKit::GGIKitImpl::GGIKitImpl(const std::string &id,
+ const Fresco::Kit::PropertySeq &p,
+ ServerContextImpl *c) :
KitImpl(id, p, c)
{ }
-GGI::Kit::GGIKitImpl::~GGIKitImpl() { }
+GGIKit::GGIKitImpl::~GGIKitImpl() { }
-GGI::Visual_ptr GGI::Kit::GGIKitImpl::create_visual(Fresco::PixelCoord w,
- Fresco::PixelCoord h)
+GGI::Visual_ptr GGIKit::GGIKitImpl::create_visual(Fresco::PixelCoord w,
+ Fresco::PixelCoord h)
{
- return create<GGI::Visual>(new GGI::Kit::VisualImpl(w, h));
+ return create<GGI::Visual>(new VisualImpl(w, h));
}
@@ -43,6 +43,6 @@
extern "C" KitImpl *load()
{
static std::string properties[] = {"implementation", "GGIKitImpl"};
- return create_prototype<GGI::Kit::GGIKitImpl>("IDL:GGI/GGIKit:1.0",
- properties, 2);
+ return create_prototype<GGIKit::GGIKitImpl>("IDL:GGI/GGIKit:1.0",
+ properties, 2);
}
Index: GGIKitImpl.hh
===================================================================
RCS file: /cvs/fresco/Fresco/GGI/GGIKit/GGIKitImpl.hh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- GGIKitImpl.hh 27 Oct 2003 17:08:40 -0000 1.9
+++ GGIKitImpl.hh 27 Oct 2003 20:53:24 -0000 1.10
@@ -27,28 +27,25 @@
#include <Berlin/KitImpl.hh>
#include <vector>
-namespace GGI
+namespace GGIKit
{
- namespace Kit
- {
- class GGIKitImpl : public virtual POA_GGI::GGIKit,
- public KitImpl
- {
- public:
- GGIKitImpl(const std::string &,
- const Fresco::Kit::PropertySeq &,
- ServerContextImpl *);
- virtual ~GGIKitImpl();
- virtual KitImpl *clone(const Fresco::Kit::PropertySeq &p,
- ServerContextImpl *c)
- {
- return new GGIKitImpl(repo_id(), p, c);
- }
- virtual GGI::Visual_ptr create_visual(Fresco::PixelCoord, Fresco::PixelCoord);
- };
+ class GGIKitImpl : public virtual POA_GGI::GGIKit,
+ public KitImpl
+ {
+ public:
+ GGIKitImpl(const std::string &,
+ const Fresco::Kit::PropertySeq &,
+ ServerContextImpl *);
+ virtual ~GGIKitImpl();
+ virtual KitImpl *clone(const Fresco::Kit::PropertySeq &p,
+ ServerContextImpl *c)
+ {
+ return new GGIKitImpl(repo_id(), p, c);
+ }
+ virtual GGI::Visual_ptr create_visual(Fresco::PixelCoord, Fresco::PixelCoord);
+ };
- } // namespace
} // namespace
#endif
Index: VisualImpl.cc
===================================================================
RCS file: /cvs/fresco/Fresco/GGI/GGIKit/VisualImpl.cc,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- VisualImpl.cc 27 Oct 2003 20:19:46 -0000 1.16
+++ VisualImpl.cc 27 Oct 2003 20:53:24 -0000 1.17
@@ -34,9 +34,9 @@
using namespace Prague;
using namespace Fresco;
-GGIDrawableFactory * GGI::Kit::VisualImpl::_factory = 0;
+GGIDrawableFactory * GGIKit::VisualImpl::_factory = 0;
-GGI::Kit::VisualImpl::VisualImpl(PixelCoord w, PixelCoord h) :
+GGIKit::VisualImpl::VisualImpl(PixelCoord w, PixelCoord h) :
ControllerImpl(false),
_width(w),
_height(h)
@@ -59,23 +59,23 @@
_mode = buffer;
}
-GGI::Kit::VisualImpl::~VisualImpl()
+GGIKit::VisualImpl::~VisualImpl()
{
Trace trace("VisualImpl::~VisualImpl");
SHM::deallocate(_shm);
}
-char * GGI::Kit::VisualImpl::name()
+char * GGIKit::VisualImpl::name()
{
return CORBA::string_dup(_ggi->name().c_str());
}
-char * GGI::Kit::VisualImpl::mode()
+char * GGIKit::VisualImpl::mode()
{
return CORBA::string_dup(_mode.c_str());
}
-void GGI::Kit::VisualImpl::request(Fresco::Graphic::Requisition &requisition)
+void GGIKit::VisualImpl::request(Fresco::Graphic::Requisition &requisition)
{
Trace trace("VisualImpl::request");
requisition.x.defined = true;
@@ -89,21 +89,21 @@
requisition.z.defined = false;
}
-void GGI::Kit::VisualImpl::draw(DrawTraversal_ptr traversal)
+void GGIKit::VisualImpl::draw(DrawTraversal_ptr traversal)
{
Trace trace("VisualImpl::draw");
DrawingKit_var drawing = traversal->drawing();
drawing->copy_drawable(_drawable, 0, 0, _width, _height);
}
-void GGI::Kit::VisualImpl::extension(const Allocation::Info &info, Region_ptr region)
+void GGIKit::VisualImpl::extension(const Allocation::Info &info, Region_ptr region)
{
Trace trace("VisualImpl::extension");
GraphicImpl::extension(info, region);
}
-CORBA::Boolean GGI::Kit::VisualImpl::handle_positional(PickTraversal_ptr traversal,
- const Fresco::Input::Event &event)
+CORBA::Boolean GGIKit::VisualImpl::handle_positional(PickTraversal_ptr traversal,
+ const Fresco::Input::Event &event)
{
Trace trace("VisualImpl::handle_positional");
@@ -121,7 +121,7 @@
return true;
}
-CORBA::Boolean GGI::Kit::VisualImpl::handle_non_positional(const Fresco::Input::Event &event)
+CORBA::Boolean GGIKit::VisualImpl::handle_non_positional(const Fresco::Input::Event &event)
{
Trace trace("VisualImpl::handle_non_positional");
/*
@@ -168,8 +168,8 @@
return true;
}
-void GGI::Kit::VisualImpl::move(Fresco::PickTraversal_ptr traversal,
- const Input::Event &event)
+void GGIKit::VisualImpl::move(Fresco::PickTraversal_ptr traversal,
+ const Input::Event &event)
{
Trace trace("VisualImpl::move");
@@ -201,7 +201,7 @@
forward_event(ggi);
}
-void GGI::Kit::VisualImpl::handle_pointer_button(const Input::Event &event)
+void GGIKit::VisualImpl::handle_pointer_button(const Input::Event &event)
{
Trace trace("VisualImpl::handle_pointer_button");
@@ -236,7 +236,7 @@
forward_event(ggi);
}
-void GGI::Kit::VisualImpl::forward_event(const ggi_event &event)
+void GGIKit::VisualImpl::forward_event(const ggi_event &event)
{
Trace trace("VisualImpl::forward_event");
// giiEventSend(ggiJoinInputs(_ggi->visual(), 0), const_cast<ggi_event *>(&event));
Index: VisualImpl.hh
===================================================================
RCS file: /cvs/fresco/Fresco/GGI/GGIKit/VisualImpl.hh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- VisualImpl.hh 27 Oct 2003 20:19:46 -0000 1.10
+++ VisualImpl.hh 27 Oct 2003 20:53:24 -0000 1.11
@@ -32,40 +32,37 @@
#include <ggi/ggi-unix.h>
}
-namespace GGI
+namespace GGIKit
{
- namespace Kit
- {
- class VisualImpl : public virtual POA_GGI::Visual,
- public ControllerImpl
- {
- public:
- VisualImpl(Fresco::PixelCoord, Fresco::PixelCoord);
- virtual ~VisualImpl();
- virtual char *name();
- virtual char *mode();
- virtual void request(Fresco::Graphic::Requisition &);
- virtual void draw(Fresco::DrawTraversal_ptr);
- virtual void extension(const Fresco::Allocation::Info &info, Fresco::Region_ptr region);
- virtual CORBA::Boolean handle_positional(Fresco::PickTraversal_ptr,
- const Fresco::Input::Event &);
- virtual CORBA::Boolean handle_non_positional(const Fresco::Input::Event &);
- // this overrides ControllerImpl:
- virtual void move(Fresco::PickTraversal_ptr, const Fresco::Input::Event &);
- private:
- virtual void handle_pointer_button(const Fresco::Input::Event &);
- void forward_event(const ggi_event &);
- static GGIDrawableFactory *_factory;
- Fresco::PixelCoord _width;
- Fresco::PixelCoord _height;
- Fresco::Drawable_var _drawable;
- int _shm;
- GGIDrawable *_ggi;
- std::string _mode;
- };
+ class VisualImpl : public virtual POA_GGI::Visual,
+ public ControllerImpl
+ {
+ public:
+ VisualImpl(Fresco::PixelCoord, Fresco::PixelCoord);
+ virtual ~VisualImpl();
+ virtual char *name();
+ virtual char *mode();
+ virtual void request(Fresco::Graphic::Requisition &);
+ virtual void draw(Fresco::DrawTraversal_ptr);
+ virtual void extension(const Fresco::Allocation::Info &info, Fresco::Region_ptr region);
+ virtual CORBA::Boolean handle_positional(Fresco::PickTraversal_ptr,
+ const Fresco::Input::Event &);
+ virtual CORBA::Boolean handle_non_positional(const Fresco::Input::Event &);
+ // this overrides ControllerImpl:
+ virtual void move(Fresco::PickTraversal_ptr, const Fresco::Input::Event &);
+ private:
+ virtual void handle_pointer_button(const Fresco::Input::Event &);
+ void forward_event(const ggi_event &);
+ static GGIDrawableFactory *_factory;
+ Fresco::PixelCoord _width;
+ Fresco::PixelCoord _height;
+ Fresco::Drawable_var _drawable;
+ int _shm;
+ GGIDrawable *_ggi;
+ std::string _mode;
+ };
- } // namepace
} // namespace
#endif