Fresco/Berlin/modules/Fonts FontKitImpl.cc,1.6,1.7 FontKitImpl.hh,1.6,1.7

Nick Lewycky <[email protected]>
Newsgroups gmane.comp.video.fresco.cvs
Message-ID <[email protected]>
Update of /cvs/fresco/Fresco/Berlin/modules/Fonts
In directory purcel:/tmp/cvs-serv16150/Berlin/modules/Fonts

Modified Files:
	FontKitImpl.cc FontKitImpl.hh 
Log Message:
Fix fallout from stefans' bug92 fix.


Index: FontKitImpl.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Fonts/FontKitImpl.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- FontKitImpl.cc	17 Feb 2003 02:10:33 -0000	1.6
+++ FontKitImpl.cc	18 Feb 2003 15:06:48 -0000	1.7
@@ -121,14 +121,21 @@
 }
 
 FontKitImpl::FontKitImpl(const std::string &id,
-                         const Fresco::Kit::PropertySeq &p)
-    : KitImpl(id, p)
+                         const Fresco::Kit::PropertySeq &p,
+                         ServerContextImpl *c)
+  : KitImpl(id, p, c)
 {
   FT_Init_FreeType(&my_library);
 }
 
 FontKitImpl::~FontKitImpl() {}
 
+KitImpl *FontKitImpl::clone(const Fresco::Kit::PropertySeq &p,
+                            ServerContextImpl *c)
+{
+  return new FontKitImpl(repo_id(), p, c);
+}
+
 Font_ptr FontKitImpl::_cxx_default()
 {
   Font *f = new Font("/usr/share/fonts/truetype/commercial/arialuni.ttf", 12, my_library);
@@ -205,7 +212,7 @@
 extern "C" KitImpl *load()
 {
   static std::string properties[] = {"implementation", "FontKitImpl"};
-  return create_kit<Berlin::FontKit::FontKitImpl> ("IDL:fresco.org/Fresco/FontKit:1.0", properties, 2);
+  return create_prototype<Berlin::FontKit::FontKitImpl> ("IDL:fresco.org/Fresco/FontKit:1.0", properties, 2);
 }
 
 } // namespace

Index: FontKitImpl.hh
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Fonts/FontKitImpl.hh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- FontKitImpl.hh	17 Feb 2003 02:10:33 -0000	1.6
+++ FontKitImpl.hh	18 Feb 2003 15:06:48 -0000	1.7
@@ -55,6 +55,7 @@
   public:
     FontIterator(FontKitImpl *);
     virtual ~FontIterator();
+
     virtual Font_ptr child();
     virtual void next();
     virtual void prev();
@@ -69,12 +70,12 @@
     std::vector<std::string>::iterator faces_iterator;
   };
 
-  FontKitImpl(const std::string &, const Fresco::Kit::PropertySeq &);
+  FontKitImpl(const std::string &,
+              const Fresco::Kit::PropertySeq &,
+              ServerContextImpl *);
   virtual ~FontKitImpl();
-  KitImpl *clone(const Fresco::Kit::PropertySeq &p)
-  {
-    return new FontKitImpl(repo_id(), p);
-  }
+  virtual KitImpl *clone(const Fresco::Kit::PropertySeq &,
+                         ServerContextImpl *);
 
   virtual Fresco::Font_ptr _cxx_default();
   virtual Fresco::Font_ptr filename(const char* file, const Fresco::Unistring& style,
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.