diff --git a/hurricane/src/hurricane/Cell.cpp b/hurricane/src/hurricane/Cell.cpp index 79315eed..bb9a3a02 100644 --- a/hurricane/src/hurricane/Cell.cpp +++ b/hurricane/src/hurricane/Cell.cpp @@ -55,7 +55,7 @@ Cell::Cell(Library* library, const Name& name) throw Error("Can't create " + _TName("Cell") + " " + getString(_name) + " : already exists"); } -Cell* Cell::Create(Library* library, const Name& name) +Cell* Cell::create(Library* library, const Name& name) // *************************************************** { Cell* cell = new Cell(library, name); @@ -135,8 +135,8 @@ void Cell::FlattenNets(bool buildRings) for_each_occurrence ( occurrence, getHyperNetRootNetOccurrences() ) { HyperNet hyperNet ( occurrence ); if ( !occurrence.getPath().IsEmpty() ) { - DeepNet* deepNet = DeepNet::Create ( hyperNet ); - if (deepNet) deepNet->_CreateRoutingPads ( buildRings ); + DeepNet* deepNet = DeepNet::create ( hyperNet ); + if (deepNet) deepNet->_createRoutingPads ( buildRings ); } else { RoutingPad* previousRP = NULL; RoutingPad* currentRP = NULL; @@ -156,7 +156,7 @@ void Cell::FlattenNets(bool buildRings) } for_each_occurrence ( plugOccurrence, hyperNet.getLeafPlugOccurrences() ) { - currentRP = CreateRoutingPad ( net, plugOccurrence ); + currentRP = createRoutingPad ( net, plugOccurrence ); currentRP->Materialize (); if ( buildRings ) { if ( previousRP ) { @@ -176,7 +176,7 @@ void Cell::FlattenNets(bool buildRings) for_each_component ( component, net->getComponents() ) { Pin* pin = dynamic_cast( component ); if ( pin ) { - currentRP = CreateRoutingPad ( pin ); + currentRP = createRoutingPad ( pin ); if ( buildRings ) { if ( previousRP ) { currentRP->getBodyHook()->Attach ( previousRP->getBodyHook() ); diff --git a/hurricane/src/hurricane/Cell.h b/hurricane/src/hurricane/Cell.h index 3e920b9f..1c14c49b 100644 --- a/hurricane/src/hurricane/Cell.h +++ b/hurricane/src/hurricane/Cell.h @@ -178,7 +178,6 @@ class Cell : public Entity { public: PinMap& _getPinMap() {return _pinMap;}; public: SliceMap& _getSliceMap() {return _sliceMap;}; public: MarkerSet& _getMarkerSet() {return _markerSet;}; - //public: ViewSet& _getViewSet() {return _viewSet;}; public: Cell* _getNextOfLibraryCellMap() const {return _nextOfLibraryCellMap;}; public: Cell* _getNextOfSymbolCellSet() const {return _nextOfSymbolCellSet;}; @@ -193,21 +192,12 @@ class Cell : public Entity { public: void _getSlaveEntities(SlaveEntityMap::iterator& begin, SlaveEntityMap::iterator& end); public: void _getSlaveEntities(Entity* entity, SlaveEntityMap::iterator& begin, SlaveEntityMap::iterator& end); - //public: bool _IsDrawable(View* view) const; - //public: bool _ContentIsDrawable(View* view) const; - //public: void _DrawPhantoms(View* view, const Box& updateArea, const Transformation& transformation); - //public: void _DrawBoundaries(View* view, const Box& updateArea, const Transformation& transformation); - //public: void _DrawContent(View* view, BasicLayer* basicLayer, const Box& updateArea, const Transformation& transformation); - //public: void _DrawRubbers(View* view, const Box& updateArea, const Transformation& transformation); - //public: void _DrawMarkers(View* view, const Box& updateArea, const Transformation& transformation); - //public: void _DrawDisplaySlots(View* view, const Box& area, const Box& updateArea, const Transformation& transformation); - -# endif +#endif // Constructors // ************ - public: static Cell* Create(Library* library, const Name& name); + public: static Cell* create(Library* library, const Name& name); // Accessors // ********* @@ -249,9 +239,6 @@ class Cell : public Entity { public: Pins getPins() const {return _pinMap.getElements();}; public: Slice* getSlice(const Layer* layer) const {return _sliceMap.getElement(layer);}; public: Slices getSlices(const Layer::Mask& mask = ~0) const; -// public: Views getViews() const {return _viewSet.getElements();}; -// public: MainViews getMainViews() const; -// public: MainViews getImpactedMainViews() const; public: Rubbers getRubbers() const; public: Rubbers getRubbersUnder(const Box& area) const; public: Markers getMarkers() const {return _markerSet.getElements();}; diff --git a/hurricane/src/hurricane/Contact.cpp b/hurricane/src/hurricane/Contact.cpp index 7f02dcac..037bd7d4 100644 --- a/hurricane/src/hurricane/Contact.cpp +++ b/hurricane/src/hurricane/Contact.cpp @@ -125,7 +125,7 @@ Contact::Contact(Net* net, Component* anchor, Layer* layer, const Unit& dx, cons _anchorHook.Attach(anchor->getBodyHook()); } -Contact* Contact::Create(Net* net, Layer* layer, const Unit& x, const Unit& y, const Unit& width, const Unit& height) +Contact* Contact::create(Net* net, Layer* layer, const Unit& x, const Unit& y, const Unit& width, const Unit& height) // **************************************************************************************************** { Contact* contact = new Contact(net, layer, x, y, width, height); @@ -135,7 +135,7 @@ Contact* Contact::Create(Net* net, Layer* layer, const Unit& x, const Unit& y, c return contact; } -Contact* Contact::Create(Component* anchor, Layer* layer, const Unit& dx, const Unit& dy, const Unit& width, const Unit& height) +Contact* Contact::create(Component* anchor, Layer* layer, const Unit& dx, const Unit& dy, const Unit& width, const Unit& height) // **************************************************************************************************** { if (!anchor) diff --git a/hurricane/src/hurricane/Contact.h b/hurricane/src/hurricane/Contact.h index a4489f42..ca58a489 100644 --- a/hurricane/src/hurricane/Contact.h +++ b/hurricane/src/hurricane/Contact.h @@ -59,8 +59,8 @@ class Contact : public Component { protected: Contact(Net* net, Layer* layer, const Unit& x, const Unit& y, const Unit& width = 0, const Unit& height = 0); protected: Contact(Net* net, Component* anchor, Layer* layer, const Unit& dx, const Unit& dy, const Unit& width = 0, const Unit& height = 0); - public: static Contact* Create(Net* net, Layer* layer, const Unit& x, const Unit& y, const Unit& width = 0, const Unit& height = 0); - public: static Contact* Create(Component* anchor, Layer* layer, const Unit& dx, const Unit& dy, const Unit& width = 0, const Unit& height = 0); + public: static Contact* create(Net* net, Layer* layer, const Unit& x, const Unit& y, const Unit& width = 0, const Unit& height = 0); + public: static Contact* create(Component* anchor, Layer* layer, const Unit& dx, const Unit& dy, const Unit& width = 0, const Unit& height = 0); // Accessors // ********* diff --git a/hurricane/src/hurricane/DBo.cpp b/hurricane/src/hurricane/DBo.cpp index 351ee3e7..3940eeff 100644 --- a/hurricane/src/hurricane/DBo.cpp +++ b/hurricane/src/hurricane/DBo.cpp @@ -146,7 +146,7 @@ Record* DBo::_getRecord() const return record; } -void DBo::_onDeleted(Property* property) +void DBo::_onDestroyed(Property* property) // ************************************* { if (property && (_propertySet.find(property) != _propertySet.end())) { diff --git a/hurricane/src/hurricane/DBo.h b/hurricane/src/hurricane/DBo.h index cf6c6294..df3f9fd6 100644 --- a/hurricane/src/hurricane/DBo.h +++ b/hurricane/src/hurricane/DBo.h @@ -63,7 +63,7 @@ class DBo : public NestedSlotAdapter { public: virtual Record* _getRecord() const; public: PropertySet& _getPropertySet() {return _propertySet;}; - public: void _onDeleted(Property* property); + public: void _onDestroyed(Property* property); #endif diff --git a/hurricane/src/hurricane/DRCError.cpp b/hurricane/src/hurricane/DRCError.cpp index b75e6ebb..603a3cab 100644 --- a/hurricane/src/hurricane/DRCError.cpp +++ b/hurricane/src/hurricane/DRCError.cpp @@ -30,7 +30,7 @@ DRCError::DRCError(Cell* cell, const Name& name, const Box& boundingBox) throw Error("Can't create " + _TName("DRCError") + " : empty bounding box"); } -DRCError* DRCError::Create(Cell* cell, const Name& name, const Box& boundingBox) +DRCError* DRCError::create(Cell* cell, const Name& name, const Box& boundingBox) // ***************************************************************************** { DRCError* drcError = new DRCError(cell, name, boundingBox); diff --git a/hurricane/src/hurricane/DRCError.h b/hurricane/src/hurricane/DRCError.h index 307644c0..bb483404 100644 --- a/hurricane/src/hurricane/DRCError.h +++ b/hurricane/src/hurricane/DRCError.h @@ -36,7 +36,7 @@ class DRCError : public Marker { protected: DRCError(Cell* cell, const Name& name, const Box& boundingBox); - public: static DRCError* Create(Cell* cell, const Name& name, const Box& boundingBox); + public: static DRCError* create(Cell* cell, const Name& name, const Box& boundingBox); // Accessors // ********* diff --git a/hurricane/src/hurricane/DataBase.cpp b/hurricane/src/hurricane/DataBase.cpp index 630d0eb4..184e6eea 100644 --- a/hurricane/src/hurricane/DataBase.cpp +++ b/hurricane/src/hurricane/DataBase.cpp @@ -32,7 +32,7 @@ DataBase::DataBase() throw Error("Can't create " + _TName("DataBase") + " : already exists"); } -DataBase* DataBase::Create() +DataBase* DataBase::create() // ************************* { DataBase* dataBase = new DataBase(); diff --git a/hurricane/src/hurricane/DataBase.h b/hurricane/src/hurricane/DataBase.h index 62226e91..707f36d3 100644 --- a/hurricane/src/hurricane/DataBase.h +++ b/hurricane/src/hurricane/DataBase.h @@ -58,7 +58,7 @@ class DataBase : public DBo { # endif - public: static DataBase* Create(); + public: static DataBase* create(); // Accessors // ********* diff --git a/hurricane/src/hurricane/DeepNet.cpp b/hurricane/src/hurricane/DeepNet.cpp index 4d582144..cfccb560 100644 --- a/hurricane/src/hurricane/DeepNet.cpp +++ b/hurricane/src/hurricane/DeepNet.cpp @@ -123,9 +123,9 @@ Record* DeepNet::_getRecord () const // ------------------------------------------------------------------- -// Constructor : "DeepNet::Create ()". +// Constructor : "DeepNet::create ()". -DeepNet* DeepNet::Create ( HyperNet& hyperNet ) +DeepNet* DeepNet::create ( HyperNet& hyperNet ) { if ( !hyperNet.IsValid() ) throw Error ( "Can't create " + _TName("DeepNet") + ": occurence is invalid." ); @@ -145,9 +145,9 @@ DeepNet* DeepNet::Create ( HyperNet& hyperNet ) // ------------------------------------------------------------------- -// Internal Modifier : "DeepNet::_CreateRoutingPads ()". +// Internal Modifier : "DeepNet::_createRoutingPads ()". -size_t DeepNet::_CreateRoutingPads ( bool buildRings ) +size_t DeepNet::_createRoutingPads ( bool buildRings ) { size_t nbRoutingPads = 0; HyperNet hyperNet ( _netOccurrence ); @@ -157,7 +157,7 @@ size_t DeepNet::_CreateRoutingPads ( bool buildRings ) for_each_occurrence ( plugOccurrence, hyperNet.getLeafPlugOccurrences() ) { nbRoutingPads++; - currentRP = CreateRoutingPad ( this, plugOccurrence ); + currentRP = createRoutingPad ( this, plugOccurrence ); if ( buildRings ) { if ( previousRP ) { currentRP->getBodyHook()->Attach ( previousRP->getBodyHook() ); diff --git a/hurricane/src/hurricane/DeepNet.h b/hurricane/src/hurricane/DeepNet.h index 5eb82b8a..35096e3c 100644 --- a/hurricane/src/hurricane/DeepNet.h +++ b/hurricane/src/hurricane/DeepNet.h @@ -84,7 +84,7 @@ namespace Hurricane { // Constructors. public: - static DeepNet* Create ( HyperNet& hyperNet ); + static DeepNet* create ( HyperNet& hyperNet ); // Accessors. public: @@ -95,7 +95,7 @@ namespace Hurricane { // Internal Modifiers. public: - size_t _CreateRoutingPads ( bool buildRings=false ); + size_t _createRoutingPads ( bool buildRings=false ); }; diff --git a/hurricane/src/hurricane/DisplaySlot.cpp b/hurricane/src/hurricane/DisplaySlot.cpp index e7ebd99e..f736d9d2 100644 --- a/hurricane/src/hurricane/DisplaySlot.cpp +++ b/hurricane/src/hurricane/DisplaySlot.cpp @@ -52,7 +52,7 @@ DisplaySlot::DisplaySlot(Cell* cell,const Name& name, unsigned short red1, unsig //_fillGC = gtk_gc_new(red2, green2, blue2, pattern2, linewidth2); } -DisplaySlot* DisplaySlot::Create(Cell* cell, const Name& name, unsigned short red1, unsigned short green1, unsigned short blue1, const string& pattern1, unsigned linewidth1, unsigned short red2, unsigned short green2, unsigned short blue2, const string& pattern2, unsigned linewidth2) +DisplaySlot* DisplaySlot::create(Cell* cell, const Name& name, unsigned short red1, unsigned short green1, unsigned short blue1, const string& pattern1, unsigned linewidth1, unsigned short red2, unsigned short green2, unsigned short blue2, const string& pattern2, unsigned linewidth2) // ****************************************** { DisplaySlot* displaySlot = new DisplaySlot(cell, name, red1, green1, blue1, pattern1, linewidth1, red2, green2, blue2, pattern2, linewidth2); diff --git a/hurricane/src/hurricane/DisplaySlot.h b/hurricane/src/hurricane/DisplaySlot.h index dd02d898..f461b511 100644 --- a/hurricane/src/hurricane/DisplaySlot.h +++ b/hurricane/src/hurricane/DisplaySlot.h @@ -40,7 +40,7 @@ class DisplaySlot : public DBo { // ************ protected: DisplaySlot(Cell* cell,const Name& name, unsigned short red1, unsigned short green1, unsigned short blue1, const string& pattern1, unsigned linewidth1, unsigned short red2, unsigned short green2, unsigned short blue2, const string& pattern2, unsigned linewidth2); - public: static DisplaySlot* Create(Cell* cell, const Name& name, unsigned short red1, unsigned short green1, unsigned short blue1, const string& pattern1 = "FFFFFFFFFFFFFFFF", unsigned linewidth1=0, unsigned short red2 = 0, unsigned short green2 = 0, unsigned short blue2 = 0, const string& pattern2 = "FFFFFFFFFFFFFFFF", unsigned linewidth2=0); + public: static DisplaySlot* create(Cell* cell, const Name& name, unsigned short red1, unsigned short green1, unsigned short blue1, const string& pattern1 = "FFFFFFFFFFFFFFFF", unsigned linewidth1=0, unsigned short red2 = 0, unsigned short green2 = 0, unsigned short blue2 = 0, const string& pattern2 = "FFFFFFFFFFFFFFFF", unsigned linewidth2=0); protected: virtual void _postCreate(); // Accessors diff --git a/hurricane/src/hurricane/Hook.cpp b/hurricane/src/hurricane/Hook.cpp index ad2575a2..6271c049 100644 --- a/hurricane/src/hurricane/Hook.cpp +++ b/hurricane/src/hurricane/Hook.cpp @@ -313,7 +313,7 @@ Hook* Hook::Attach(Hook* hook) if (rubber) getComponent()->_SetRubber(rubber); else - Rubber::_Create(this); + Rubber::_create(this); } // */ @@ -355,7 +355,7 @@ Hook* Hook::Merge(Hook* hook) if (rubber) rubber->_destroy(); rubber = hook->getComponent()->getRubber(); if (rubber) rubber->_destroy(); - Rubber::_Create(this); + Rubber::_create(this); return this; } diff --git a/hurricane/src/hurricane/Horizontal.cpp b/hurricane/src/hurricane/Horizontal.cpp index 11da3f9a..4c0b2b4e 100644 --- a/hurricane/src/hurricane/Horizontal.cpp +++ b/hurricane/src/hurricane/Horizontal.cpp @@ -28,7 +28,7 @@ Horizontal::Horizontal(Net* net, Component* source, Component* target, Layer* la { } -Horizontal* Horizontal::Create(Net* net, Layer* layer, const Unit& y, const Unit& width, const Unit& dxSource, const Unit& dxTarget) +Horizontal* Horizontal::create(Net* net, Layer* layer, const Unit& y, const Unit& width, const Unit& dxSource, const Unit& dxTarget) // **************************************************************************************************** { if (!net) @@ -41,7 +41,7 @@ Horizontal* Horizontal::Create(Net* net, Layer* layer, const Unit& y, const Unit return horizontal; } -Horizontal* Horizontal::Create(Component* source, Component* target, Layer* layer, const Unit& y, const Unit& width, const Unit& dxSource, const Unit& dxTarget) +Horizontal* Horizontal::create(Component* source, Component* target, Layer* layer, const Unit& y, const Unit& width, const Unit& dxSource, const Unit& dxTarget) // **************************************************************************************************** { if (!source) diff --git a/hurricane/src/hurricane/Horizontal.h b/hurricane/src/hurricane/Horizontal.h index 7402d810..9f40bbe1 100644 --- a/hurricane/src/hurricane/Horizontal.h +++ b/hurricane/src/hurricane/Horizontal.h @@ -38,8 +38,8 @@ class Horizontal : public Segment { protected: Horizontal(Net* net, Component* source, Component* target, Layer* layer, const Unit& y, const Unit& width = 0, const Unit& dxSource = 0, const Unit& dxTarget = 0); - public: static Horizontal* Create(Net* net, Layer* layer, const Unit& y, const Unit& width = 0, const Unit& dxSource = 0, const Unit& dxTarget = 0); - public: static Horizontal* Create(Component* source, Component* target, Layer* layer, const Unit& y, const Unit& width = 0, const Unit& dxSource = 0, const Unit& dxTarget = 0); + public: static Horizontal* create(Net* net, Layer* layer, const Unit& y, const Unit& width = 0, const Unit& dxSource = 0, const Unit& dxTarget = 0); + public: static Horizontal* create(Component* source, Component* target, Layer* layer, const Unit& y, const Unit& width = 0, const Unit& dxSource = 0, const Unit& dxTarget = 0); // Accessors // ********* diff --git a/hurricane/src/hurricane/Instance.cpp b/hurricane/src/hurricane/Instance.cpp index ff6c1c77..3abc1946 100644 --- a/hurricane/src/hurricane/Instance.cpp +++ b/hurricane/src/hurricane/Instance.cpp @@ -182,7 +182,7 @@ Instance::Instance(Cell* cell, const Name& name, Cell* masterCell, const Transfo throw Error("Can't create " + _TName("Instance") + " : cyclic construction"); } -Instance* Instance::Create(Cell* cell, const Name& name, Cell* masterCell, bool secureFlag) +Instance* Instance::create(Cell* cell, const Name& name, Cell* masterCell, bool secureFlag) // **************************************************************************************** { Instance* instance = @@ -193,7 +193,7 @@ Instance* Instance::Create(Cell* cell, const Name& name, Cell* masterCell, bool return instance; } -Instance* Instance::Create(Cell* cell, const Name& name, Cell* masterCell, const Transformation& transformation, const PlacementStatus& placementstatus, bool secureFlag) +Instance* Instance::create(Cell* cell, const Name& name, Cell* masterCell, const Transformation& transformation, const PlacementStatus& placementstatus, bool secureFlag) // **************************************************************************************************** { Instance* instance = @@ -420,7 +420,7 @@ void Instance::SetMasterCell(Cell* masterCell, bool secureFlag) _masterCell->_getSlaveInstanceSet()._Insert(this); for_each_net(externalNet, _masterCell->getExternalNets()) { - if (!getPlug(externalNet)) Plug::_Create(this, externalNet); + if (!getPlug(externalNet)) Plug::_create(this, externalNet); end_for; } } @@ -433,7 +433,7 @@ void Instance::_postCreate() _masterCell->_getSlaveInstanceSet()._Insert(this); for_each_net(externalNet, _masterCell->getExternalNets()) { - Plug::_Create(this, externalNet); + Plug::_create(this, externalNet); end_for; } diff --git a/hurricane/src/hurricane/Instance.h b/hurricane/src/hurricane/Instance.h index 9f6f601e..f68d6bcd 100644 --- a/hurricane/src/hurricane/Instance.h +++ b/hurricane/src/hurricane/Instance.h @@ -101,8 +101,8 @@ class Instance : public Go { protected: Instance(Cell* cell, const Name& name, Cell* masterCell, const Transformation& transformation, const PlacementStatus& placementstatus, bool secureFlag); - public: static Instance* Create(Cell* cell, const Name& name, Cell* masterCell, bool secureFlag = true); - public: static Instance* Create(Cell* cell, const Name& name, Cell* masterCell, const Transformation& transformation, const PlacementStatus& placementstatus, bool secureFlag = true); + public: static Instance* create(Cell* cell, const Name& name, Cell* masterCell, bool secureFlag = true); + public: static Instance* create(Cell* cell, const Name& name, Cell* masterCell, const Transformation& transformation, const PlacementStatus& placementstatus, bool secureFlag = true); // Accessors // ********* diff --git a/hurricane/src/hurricane/Library.cpp b/hurricane/src/hurricane/Library.cpp index 4d54b179..036cc7ab 100644 --- a/hurricane/src/hurricane/Library.cpp +++ b/hurricane/src/hurricane/Library.cpp @@ -44,7 +44,7 @@ Library::Library(DataBase* dataBase, Library* library, const Name& name) } } -Library* Library::Create(DataBase* dataBase, const Name& name) +Library* Library::create(DataBase* dataBase, const Name& name) // *********************************************************** { Library* library = new Library(dataBase, NULL, name); @@ -54,7 +54,7 @@ Library* Library::Create(DataBase* dataBase, const Name& name) return library; } -Library* Library::Create(Library* library, const Name& name) +Library* Library::create(Library* library, const Name& name) // ********************************************************* { if (!library) diff --git a/hurricane/src/hurricane/Library.h b/hurricane/src/hurricane/Library.h index 2adc1e7f..2e0f1506 100644 --- a/hurricane/src/hurricane/Library.h +++ b/hurricane/src/hurricane/Library.h @@ -73,8 +73,8 @@ class Library : public DBo { protected: Library(DataBase* dataBase, Library* library, const Name& name); - public: static Library* Create(DataBase* dataBase, const Name& name); - public: static Library* Create(Library* library, const Name& name); + public: static Library* create(DataBase* dataBase, const Name& name); + public: static Library* create(Library* library, const Name& name); // Accessors // ********* diff --git a/hurricane/src/hurricane/Net.cpp b/hurricane/src/hurricane/Net.cpp index 14b9e7a6..19409b35 100644 --- a/hurricane/src/hurricane/Net.cpp +++ b/hurricane/src/hurricane/Net.cpp @@ -261,7 +261,7 @@ Net::Net(Cell* cell, const Name& name) throw Error("Can't create " + _TName("Net ") + getString(_name) + " : already exists"); } -Net* Net::Create(Cell* cell, const Name& name) +Net* Net::create(Cell* cell, const Name& name) // ******************************************* { Net* net = new Net(cell, name); @@ -452,7 +452,7 @@ void Net::SetExternal(bool isExternal) OpenUpdateSession(); SetPosition(Point(0, 0)); for_each_instance(instance, _cell->getSlaveInstances()) { - Plug::_Create(instance, this); + Plug::_create(instance, this); end_for; } CloseUpdateSession(); @@ -590,7 +590,7 @@ void Net::_postCreate() if (_isExternal) { for_each_instance(instance, _cell->getSlaveInstances()) { - Plug::_Create(instance, this); + Plug::_create(instance, this); end_for; } } diff --git a/hurricane/src/hurricane/Net.h b/hurricane/src/hurricane/Net.h index a86e291d..105c2788 100644 --- a/hurricane/src/hurricane/Net.h +++ b/hurricane/src/hurricane/Net.h @@ -131,7 +131,7 @@ class Net : public Entity { protected: Net(Cell* cell, const Name& name); - public: static Net* Create(Cell* cell, const Name& name); + public: static Net* create(Cell* cell, const Name& name); // Accessors // ********* diff --git a/hurricane/src/hurricane/Occurrence.cpp b/hurricane/src/hurricane/Occurrence.cpp index f303fdf6..9d72f687 100644 --- a/hurricane/src/hurricane/Occurrence.cpp +++ b/hurricane/src/hurricane/Occurrence.cpp @@ -144,7 +144,7 @@ void Occurrence::Put(Property* property) throw Error("Can't put property : null property"); Quark* quark = _getQuark(); - if (!quark) quark = Quark::_Create(*this); + if (!quark) quark = Quark::_create(*this); quark->put(property); } diff --git a/hurricane/src/hurricane/Pad.cpp b/hurricane/src/hurricane/Pad.cpp index f8ab9a36..65e69d0f 100644 --- a/hurricane/src/hurricane/Pad.cpp +++ b/hurricane/src/hurricane/Pad.cpp @@ -32,7 +32,7 @@ Pad::Pad(Net* net, Layer* layer, const Box& boundingBox) throw Error("Can't create " + _TName("Pad") + " : empty bounding box"); } -Pad* Pad::Create(Net* net, Layer* layer, const Box& boundingBox) +Pad* Pad::create(Net* net, Layer* layer, const Box& boundingBox) // ************************************************************* { Pad* pad = new Pad(net, layer, boundingBox); diff --git a/hurricane/src/hurricane/Pad.h b/hurricane/src/hurricane/Pad.h index 87455f96..a8d10e1e 100644 --- a/hurricane/src/hurricane/Pad.h +++ b/hurricane/src/hurricane/Pad.h @@ -39,7 +39,7 @@ class Pad : public Component { protected: Pad(Net* net, Layer* layer, const Box& boundingBox); - public: static Pad* Create(Net* net, Layer* layer, const Box& boundingBox); + public: static Pad* create(Net* net, Layer* layer, const Box& boundingBox); // Accessors // ********* diff --git a/hurricane/src/hurricane/Pin.cpp b/hurricane/src/hurricane/Pin.cpp index 9b602a05..1b054159 100644 --- a/hurricane/src/hurricane/Pin.cpp +++ b/hurricane/src/hurricane/Pin.cpp @@ -32,7 +32,7 @@ Pin::Pin(Net* net, const Name& name, const AccessDirection& accessDirection, con } -Pin* Pin::Create(Net* net, const Name& name, const AccessDirection& accessDirection, const PlacementStatus& placementStatus, Layer* layer, const Unit& x, const Unit& y, const Unit& width, const Unit& height) +Pin* Pin::create(Net* net, const Name& name, const AccessDirection& accessDirection, const PlacementStatus& placementStatus, Layer* layer, const Unit& x, const Unit& y, const Unit& width, const Unit& height) // **************************************************************************************************** { if (!net) diff --git a/hurricane/src/hurricane/Pin.h b/hurricane/src/hurricane/Pin.h index a84d7fc6..915d121c 100644 --- a/hurricane/src/hurricane/Pin.h +++ b/hurricane/src/hurricane/Pin.h @@ -87,7 +87,7 @@ class Pin : public Contact { protected: Pin(Net* net, const Name& name, const AccessDirection& accessDirection, const PlacementStatus& placementStatus, Layer* layer, const Unit& x, const Unit& y, const Unit& width = 0, const Unit& height = 0); - public: static Pin* Create(Net* net, const Name& name, const AccessDirection& accessDirection, const PlacementStatus& placementStatus, Layer* layer, const Unit& x, const Unit& y, const Unit& width = 0, const Unit& height = 0); + public: static Pin* create(Net* net, const Name& name, const AccessDirection& accessDirection, const PlacementStatus& placementStatus, Layer* layer, const Unit& x, const Unit& y, const Unit& width = 0, const Unit& height = 0); // Accessors // ********* diff --git a/hurricane/src/hurricane/Plug.cpp b/hurricane/src/hurricane/Plug.cpp index c2ce81cb..85f1c42a 100644 --- a/hurricane/src/hurricane/Plug.cpp +++ b/hurricane/src/hurricane/Plug.cpp @@ -143,7 +143,7 @@ void Plug::SetNet(Net* net) } } -Plug* Plug::_Create(Instance* instance, Net* masterNet) +Plug* Plug::_create(Instance* instance, Net* masterNet) // **************************************************** { Plug* plug = new Plug(instance, masterNet); diff --git a/hurricane/src/hurricane/Plug.h b/hurricane/src/hurricane/Plug.h index 7a3dadb0..b101a097 100644 --- a/hurricane/src/hurricane/Plug.h +++ b/hurricane/src/hurricane/Plug.h @@ -83,7 +83,7 @@ class Plug : public Component { // Others // ****** - public: static Plug* _Create(Instance* instance, Net* masterNet); + public: static Plug* _create(Instance* instance, Net* masterNet); protected: virtual void _postCreate(); public: void _destroy(); diff --git a/hurricane/src/hurricane/Property.cpp b/hurricane/src/hurricane/Property.cpp index 46b52057..5859c769 100644 --- a/hurricane/src/hurricane/Property.cpp +++ b/hurricane/src/hurricane/Property.cpp @@ -66,7 +66,7 @@ void PrivateProperty::_preDestroy() { Inherit::_preDestroy(); - if (_owner) _owner->_onDeleted(this); + if (_owner) _owner->_onDestroyed(this); } void PrivateProperty::onCapturedBy(DBo* owner) @@ -124,7 +124,7 @@ void SharedProperty::_preDestroy() while (!_ownerSet.empty()) { DBo* owner = *_ownerSet.begin(); _ownerSet.erase(owner); - owner->_onDeleted(this); + owner->_onDestroyed(this); } } diff --git a/hurricane/src/hurricane/Property.h b/hurricane/src/hurricane/Property.h index 609a04a5..b4ece26e 100644 --- a/hurricane/src/hurricane/Property.h +++ b/hurricane/src/hurricane/Property.h @@ -287,7 +287,7 @@ template class StandardSharedProperty : public SharedProperty { { }; - public: static StandardSharedProperty* Create(const Name& name, const Value& value ) + public: static StandardSharedProperty* create(const Name& name, const Value& value ) // ********************************************************************************* { StandardSharedProperty* property = new StandardSharedProperty(name, value); diff --git a/hurricane/src/hurricane/Quark.cpp b/hurricane/src/hurricane/Quark.cpp index 37bd6ebe..1de8f706 100644 --- a/hurricane/src/hurricane/Quark.cpp +++ b/hurricane/src/hurricane/Quark.cpp @@ -40,7 +40,7 @@ Quark::Quark(const Occurrence& occurrence) throw Error("Can't create " + _TName("Quark") + " : already exists"); } -Quark* Quark::_Create(const Occurrence& occurrence) +Quark* Quark::_create(const Occurrence& occurrence) // ********************************************** { Quark* quark = new Quark(occurrence); diff --git a/hurricane/src/hurricane/Quark.h b/hurricane/src/hurricane/Quark.h index ca1b5400..b8507448 100644 --- a/hurricane/src/hurricane/Quark.h +++ b/hurricane/src/hurricane/Quark.h @@ -46,7 +46,7 @@ class Quark : public DBo { // Others // ****** - public: static Quark* _Create(const Occurrence& occurrence); + public: static Quark* _create(const Occurrence& occurrence); protected: virtual void _postCreate(); protected: virtual void _preDestroy(); diff --git a/hurricane/src/hurricane/Reference.cpp b/hurricane/src/hurricane/Reference.cpp index 086a2ddd..38d49dff 100644 --- a/hurricane/src/hurricane/Reference.cpp +++ b/hurricane/src/hurricane/Reference.cpp @@ -36,7 +36,7 @@ Reference::Reference(Cell* cell, const Name& name, Unit x, Unit y) throw Error("Can't create " + _TName("Reference") + " : empty name"); } -Reference* Reference::Create(Cell* cell, const Name& name, Unit x, Unit y) +Reference* Reference::create(Cell* cell, const Name& name, Unit x, Unit y) // *********************************************************************** { Reference* reference = new Reference(cell, name, x, y); @@ -46,10 +46,10 @@ Reference* Reference::Create(Cell* cell, const Name& name, Unit x, Unit y) return reference; } -Reference* Reference::Create(Cell* cell, const Name& name, const Point& point) +Reference* Reference::create(Cell* cell, const Name& name, const Point& point) // *************************************************************************** { - return Create(cell,name,point.getX(),point.getY()); + return create(cell,name,point.getX(),point.getY()); } Box Reference::getBoundingBox() const diff --git a/hurricane/src/hurricane/Reference.h b/hurricane/src/hurricane/Reference.h index 9865053a..bef6216a 100644 --- a/hurricane/src/hurricane/Reference.h +++ b/hurricane/src/hurricane/Reference.h @@ -38,8 +38,8 @@ class Reference : public Marker { protected: Reference(Cell* cell, const Name& name, Unit x, Unit y); - public: static Reference* Create(Cell* cell, const Name& name, Unit x, Unit y ); - public: static Reference* Create(Cell* cell, const Name& name, const Point& point ); + public: static Reference* create(Cell* cell, const Name& name, Unit x, Unit y ); + public: static Reference* create(Cell* cell, const Name& name, const Point& point ); // Accessors // ********* diff --git a/hurricane/src/hurricane/RoutingPad.cpp b/hurricane/src/hurricane/RoutingPad.cpp index 384c765f..9b8964f0 100644 --- a/hurricane/src/hurricane/RoutingPad.cpp +++ b/hurricane/src/hurricane/RoutingPad.cpp @@ -37,7 +37,7 @@ RoutingPad::RoutingPad(Net* net, const Point& p, Occurrence occurrence ) } -RoutingPad* RoutingPad::Create(Net* net, Occurrence occurrence) +RoutingPad* RoutingPad::create(Net* net, Occurrence occurrence) // *********************************************************** { if (!net) @@ -420,14 +420,14 @@ void RoutingPad::Builder::Scan(InputFile& inputFile, char*& arguments) DBo* RoutingPad::Builder::CreateDBo() // ******************************* { - return RoutingPad::Create(getNet(), getLayer(), getX(), getY(), getWidth(), getHeight()); + return RoutingPad::create(getNet(), getLayer(), getX(), getY(), getWidth(), getHeight()); } RoutingPad::Builder ROUTINGPAD_BUILDER("RP"); #endif -RoutingPad* CreateRoutingPad ( Net* net, Occurrence plugOccurrence ) +RoutingPad* createRoutingPad ( Net* net, Occurrence plugOccurrence ) // ***************************************************************** { Component* bestComponent = NULL; @@ -449,13 +449,13 @@ RoutingPad* CreateRoutingPad ( Net* net, Occurrence plugOccurrence ) throw Error ( message ); } - RoutingPad* rp = RoutingPad::Create ( net, plugOccurrence ); + RoutingPad* rp = RoutingPad::create ( net, plugOccurrence ); rp->SetExternalComponent ( bestComponent ); return rp; } -RoutingPad* CreateRoutingPad ( Pin* pin ) +RoutingPad* createRoutingPad ( Pin* pin ) // ************************************** { Occurrence pinOccurrence ( pin, Path() ); @@ -468,7 +468,7 @@ RoutingPad* CreateRoutingPad ( Pin* pin ) } # endif - return RoutingPad::Create ( pin->getNet(), pinOccurrence ); + return RoutingPad::create ( pin->getNet(), pinOccurrence ); } diff --git a/hurricane/src/hurricane/RoutingPad.h b/hurricane/src/hurricane/RoutingPad.h index d42237af..ebcc6b18 100644 --- a/hurricane/src/hurricane/RoutingPad.h +++ b/hurricane/src/hurricane/RoutingPad.h @@ -47,7 +47,7 @@ class RoutingPad : public Component { // ************ protected: RoutingPad(Net* net, const Point& p, Occurrence occurrence = Occurrence()); - public: static RoutingPad* Create(Net* net, Occurrence occurrence); + public: static RoutingPad* create(Net* net, Occurrence occurrence); // Accessors // ********* @@ -97,8 +97,8 @@ class RoutingPad : public Component { }; -RoutingPad* CreateRoutingPad ( Net* net, Occurrence plugOccurrence ); -RoutingPad* CreateRoutingPad ( Pin* pin ); +RoutingPad* createRoutingPad ( Net* net, Occurrence plugOccurrence ); +RoutingPad* createRoutingPad ( Pin* pin ); } // End of Hurricane namespace. diff --git a/hurricane/src/hurricane/Rubber.cpp b/hurricane/src/hurricane/Rubber.cpp index 2e96ff1b..73793316 100644 --- a/hurricane/src/hurricane/Rubber.cpp +++ b/hurricane/src/hurricane/Rubber.cpp @@ -122,7 +122,7 @@ void Rubber::Translate(const Unit& dx, const Unit& dy) { } -Rubber* Rubber::_Create(Hook* hook) +Rubber* Rubber::_create(Hook* hook) // ******************************** { if (!hook) diff --git a/hurricane/src/hurricane/Rubber.h b/hurricane/src/hurricane/Rubber.h index 4747e55c..41c869cb 100644 --- a/hurricane/src/hurricane/Rubber.h +++ b/hurricane/src/hurricane/Rubber.h @@ -72,7 +72,7 @@ class Rubber : public Go { // Others // ****** - public: static Rubber* _Create(Hook* hook); + public: static Rubber* _create(Hook* hook); protected: virtual void _postCreate(); public: void _destroy(); diff --git a/hurricane/src/hurricane/Technology.cpp b/hurricane/src/hurricane/Technology.cpp index 40b05e4f..68a188f3 100644 --- a/hurricane/src/hurricane/Technology.cpp +++ b/hurricane/src/hurricane/Technology.cpp @@ -108,7 +108,7 @@ Technology::Technology(DataBase* dataBase, const Name& name) throw Error("Can't create " + _TName("Technology") + " : empty name"); } -Technology* Technology::Create(DataBase* dataBase, const Name& name) +Technology* Technology::create(DataBase* dataBase, const Name& name) // ***************************************************************** { Technology* technology = new Technology(dataBase, name); diff --git a/hurricane/src/hurricane/Technology.h b/hurricane/src/hurricane/Technology.h index 28414d90..0f805d22 100644 --- a/hurricane/src/hurricane/Technology.h +++ b/hurricane/src/hurricane/Technology.h @@ -62,7 +62,7 @@ class Technology : public DBo { protected: Technology(DataBase* dataBase, const Name& name); - public: static Technology* Create(DataBase* dataBase, const Name& name); + public: static Technology* create(DataBase* dataBase, const Name& name); // Accessors // ********* diff --git a/hurricane/src/hurricane/Vertical.cpp b/hurricane/src/hurricane/Vertical.cpp index c4b06956..b78f28a6 100644 --- a/hurricane/src/hurricane/Vertical.cpp +++ b/hurricane/src/hurricane/Vertical.cpp @@ -28,7 +28,7 @@ Vertical::Vertical(Net* net, Component* source, Component* target, Layer* layer, { } -Vertical* Vertical::Create(Net* net, Layer* layer, const Unit& x, const Unit& width, const Unit& dySource, const Unit& dyTarget) +Vertical* Vertical::create(Net* net, Layer* layer, const Unit& x, const Unit& width, const Unit& dySource, const Unit& dyTarget) // **************************************************************************************************** { if (!net) @@ -41,7 +41,7 @@ Vertical* Vertical::Create(Net* net, Layer* layer, const Unit& x, const Unit& wi return vertical; } -Vertical* Vertical::Create(Component* source, Component* target, Layer* layer, const Unit& x, const Unit& width, const Unit& dySource, const Unit& dyTarget) +Vertical* Vertical::create(Component* source, Component* target, Layer* layer, const Unit& x, const Unit& width, const Unit& dySource, const Unit& dyTarget) // **************************************************************************************************** { if (!source) diff --git a/hurricane/src/hurricane/Vertical.h b/hurricane/src/hurricane/Vertical.h index 87cca7f7..91032482 100644 --- a/hurricane/src/hurricane/Vertical.h +++ b/hurricane/src/hurricane/Vertical.h @@ -38,8 +38,8 @@ class Vertical : public Segment { protected: Vertical(Net* net, Component* source, Component* target, Layer* layer, const Unit& x, const Unit& width = 0, const Unit& dySource = 0, const Unit& dyTarget = 0); - public: static Vertical* Create(Net* net, Layer* layer, const Unit& x, const Unit& width = 0, const Unit& dySource = 0, const Unit& dyTarget = 0); - public: static Vertical* Create(Component* source, Component* target, Layer* layer, const Unit& x, const Unit& width = 0, const Unit& dySource = 0, const Unit& dyTarget = 0); + public: static Vertical* create(Net* net, Layer* layer, const Unit& x, const Unit& width = 0, const Unit& dySource = 0, const Unit& dyTarget = 0); + public: static Vertical* create(Component* source, Component* target, Layer* layer, const Unit& x, const Unit& width = 0, const Unit& dySource = 0, const Unit& dyTarget = 0); // Accessors // ********* diff --git a/hurricane/src/pyext/ProxyProperty.cpp b/hurricane/src/pyext/ProxyProperty.cpp index d6a804d3..6f3f849a 100644 --- a/hurricane/src/pyext/ProxyProperty.cpp +++ b/hurricane/src/pyext/ProxyProperty.cpp @@ -122,14 +122,14 @@ ProxyProperty::ProxyProperty ( void* shadow ) // ------------------------------------------------------------------- -// Constructor : "ProxyProperty::Create ()". +// Constructor : "ProxyProperty::create ()". ProxyProperty* ProxyProperty::create ( void* shadow ) { ProxyProperty* property = new ProxyProperty ( shadow ); if ( property == NULL ) - throw Error ( "ProxyProperty::Create()" ); + throw Error ( "ProxyProperty::create()" ); return ( property ); } @@ -141,7 +141,7 @@ ProxyProperty* ProxyProperty::create ( void* shadow ) // Destructor : "ProxyProperty::_preDestroy ()". void ProxyProperty::_preDestroy () { - if ( _owner ) _owner->_onDeleted ( this ); + if ( _owner ) _owner->_onDestroyed ( this ); trace << "ProxyProperty::_owner := " << hex << (void*)_owner << endl; diff --git a/hurricane/src/pyext/PyCell.cpp b/hurricane/src/pyext/PyCell.cpp index 7c4527d8..face6058 100644 --- a/hurricane/src/pyext/PyCell.cpp +++ b/hurricane/src/pyext/PyCell.cpp @@ -659,7 +659,7 @@ extern "C" { Cell* cell = NULL; HTRY - cell = Cell::Create(PYLIBRARY_O(arg0), getString(*PYNAME_O(arg1))); + cell = Cell::create(PYLIBRARY_O(arg0), getString(*PYNAME_O(arg1))); HCATCH return PyCell_Link(cell); diff --git a/hurricane/src/pyext/PyContact.cpp b/hurricane/src/pyext/PyContact.cpp index 3d31ad32..ce4e61bb 100644 --- a/hurricane/src/pyext/PyContact.cpp +++ b/hurricane/src/pyext/PyContact.cpp @@ -152,20 +152,20 @@ extern "C" { //cerr << "Format := " << __cs.getObjectIds() << endl; if ( __cs.getObjectIds() == NET_LAYER_INTS2_ARG ) - contact = Contact::Create ( PYNET_O(arg0) + contact = Contact::create ( PYNET_O(arg0) , PYLAYER_O(arg1) , PyInt_AsLong(arg2) , PyInt_AsLong(arg3) ); else if ( __cs.getObjectIds() == NET_LAYER_INTS3_ARG ) - contact = Contact::Create ( PYNET_O(arg0) + contact = Contact::create ( PYNET_O(arg0) , PYLAYER_O(arg1) , PyInt_AsLong(arg2) , PyInt_AsLong(arg3) , PyInt_AsLong(arg4) ); else if ( __cs.getObjectIds() == NET_LAYER_INTS4_ARG ) - contact = Contact::Create ( PYNET_O(arg0) + contact = Contact::create ( PYNET_O(arg0) , PYLAYER_O(arg1) , PyInt_AsLong(arg2) , PyInt_AsLong(arg3) @@ -173,20 +173,20 @@ extern "C" { , PyInt_AsLong(arg5) ); else if ( __cs.getObjectIds() == COMP_LAYER_INTS2_ARG ) - contact = Contact::Create ( PYCOMPONENT_O(arg0) + contact = Contact::create ( PYCOMPONENT_O(arg0) , PYLAYER_O(arg1) , PyInt_AsLong(arg2) , PyInt_AsLong(arg3) ); else if ( __cs.getObjectIds() == COMP_LAYER_INTS3_ARG ) - contact = Contact::Create ( PYCOMPONENT_O(arg0) + contact = Contact::create ( PYCOMPONENT_O(arg0) , PYLAYER_O(arg1) , PyInt_AsLong(arg2) , PyInt_AsLong(arg3) , PyInt_AsLong(arg4) ); else if ( __cs.getObjectIds() == COMP_LAYER_INTS4_ARG ) - contact = Contact::Create ( PYCOMPONENT_O(arg0) + contact = Contact::create ( PYCOMPONENT_O(arg0) , PYLAYER_O(arg1) , PyInt_AsLong(arg2) , PyInt_AsLong(arg3) diff --git a/hurricane/src/pyext/PyDataBase.cpp b/hurricane/src/pyext/PyDataBase.cpp index b952efbe..191941f3 100644 --- a/hurricane/src/pyext/PyDataBase.cpp +++ b/hurricane/src/pyext/PyDataBase.cpp @@ -153,7 +153,7 @@ extern "C" { DataBase* db = NULL; HTRY - db = DataBase::Create (); + db = DataBase::create (); HCATCH return PyDataBase_Link(db); diff --git a/hurricane/src/pyext/PyHorizontal.cpp b/hurricane/src/pyext/PyHorizontal.cpp index c219b86f..727afcb2 100644 --- a/hurricane/src/pyext/PyHorizontal.cpp +++ b/hurricane/src/pyext/PyHorizontal.cpp @@ -122,8 +122,8 @@ extern "C" { HTRY - __cs.Init ("Horizontal.Create"); - if ( ! PyArg_ParseTuple(args,"O&O&O&|O&O&O&O&:Horizontal.Create" + __cs.Init ("Horizontal.create"); + if ( ! PyArg_ParseTuple(args,"O&O&O&|O&O&O&O&:Horizontal.create" ,Converter,&arg0 ,Converter,&arg1 ,Converter,&arg2 @@ -134,47 +134,47 @@ extern "C" { ) ) return ( NULL ); if ( __cs.getObjectIds() == NET_LAYER_INT_ARG ) - horizontal = Horizontal::Create ( PYNET_O(arg0) + horizontal = Horizontal::create ( PYNET_O(arg0) , PYLAYER_O(arg1) , PyInt_AsLong(arg2) ); else if ( __cs.getObjectIds() == NET_LAYER_INTS2_ARG ) - horizontal = Horizontal::Create ( PYNET_O(arg0) + horizontal = Horizontal::create ( PYNET_O(arg0) , PYLAYER_O(arg1) , PyInt_AsLong(arg2) , PyInt_AsLong(arg3) ); else if ( __cs.getObjectIds() == COMPS2_LAYER_INT_ARG ) - horizontal = Horizontal::Create ( ComponentCast(arg0) + horizontal = Horizontal::create ( ComponentCast(arg0) , ComponentCast(arg1) , PYLAYER_O(arg2) , PyInt_AsLong(arg3) ); else if ( __cs.getObjectIds() == NET_LAYER_INTS3_ARG ) - horizontal = Horizontal::Create ( PYNET_O(arg0) + horizontal = Horizontal::create ( PYNET_O(arg0) , PYLAYER_O(arg1) , PyInt_AsLong(arg2) , PyInt_AsLong(arg3) , PyInt_AsLong(arg4) ); else if ( __cs.getObjectIds() == COMPS2_LAYER_INTS2_ARG ) - horizontal = Horizontal::Create ( ComponentCast(arg0) + horizontal = Horizontal::create ( ComponentCast(arg0) , ComponentCast(arg1) , PYLAYER_O(arg2) , PyInt_AsLong(arg3) , PyInt_AsLong(arg4) ); else if ( __cs.getObjectIds() == NET_LAYER_INTS4_ARG ) - horizontal = Horizontal::Create ( PYNET_O(arg0) + horizontal = Horizontal::create ( PYNET_O(arg0) , PYLAYER_O(arg1) , PyInt_AsLong(arg2) , PyInt_AsLong(arg3) , PyInt_AsLong(arg4) , PyInt_AsLong(arg5) ); else if ( __cs.getObjectIds() == COMPS2_LAYER_INTS3_ARG ) - horizontal = Horizontal::Create ( ComponentCast(arg0) + horizontal = Horizontal::create ( ComponentCast(arg0) , ComponentCast(arg1) , PYLAYER_O(arg2) , PyInt_AsLong(arg3) , PyInt_AsLong(arg4) , PyInt_AsLong(arg5) ); else if ( __cs.getObjectIds() == COMPS2_LAYER_INTS4_ARG ) - horizontal = Horizontal::Create ( ComponentCast(arg0) + horizontal = Horizontal::create ( ComponentCast(arg0) , ComponentCast(arg1) , PYLAYER_O(arg2) , PyInt_AsLong(arg3) diff --git a/hurricane/src/pyext/PyHurricane.h b/hurricane/src/pyext/PyHurricane.h index 4c77294d..8e79eb33 100644 --- a/hurricane/src/pyext/PyHurricane.h +++ b/hurricane/src/pyext/PyHurricane.h @@ -694,7 +694,7 @@ extern "C" { Cell* cell = PYCELL_O(arg0); \ cengine = dynamic_cast(getCEngine(cell, Name(#CENGINE))); \ if (!cengine) { \ - cengine = CENGINE::Create (cell); \ + cengine = CENGINE::create (cell); \ } \ HCATCH \ return Py##CENGINE##_Link( cengine ); \ diff --git a/hurricane/src/pyext/PyHyperNet.cpp b/hurricane/src/pyext/PyHyperNet.cpp index f0fba1ba..a47ae143 100644 --- a/hurricane/src/pyext/PyHyperNet.cpp +++ b/hurricane/src/pyext/PyHyperNet.cpp @@ -165,7 +165,7 @@ extern "C" { // | "PyHyperNet" Object Methods | // x-------------------------------------------------------------x // --------------------------------------------------------------- - // Attribute Method : "PyHyperNet_Create ()" + // Attribute Method : "PyHyperNet_new ()" static PyObject* PyHyperNet_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { trace << "PyHyperNet_new()" << endl; diff --git a/hurricane/src/pyext/PyInstance.cpp b/hurricane/src/pyext/PyInstance.cpp index 3021a672..a27737a5 100644 --- a/hurricane/src/pyext/PyInstance.cpp +++ b/hurricane/src/pyext/PyInstance.cpp @@ -472,10 +472,10 @@ extern "C" { ,Converter,&arg3 ) ) return ( NULL ); - if ( __cs.getObjectIds() == CELL_NAME_CELL_ARG ) { instance = Instance::Create ( PYCELL_O(arg0) + if ( __cs.getObjectIds() == CELL_NAME_CELL_ARG ) { instance = Instance::create ( PYCELL_O(arg0) , *PYNAME_O(arg1) , PYCELL_O(arg2) ); } - else if ( __cs.getObjectIds() == CELL_NAME_CELL_TRANS_ARG ) { instance = Instance::Create ( PYCELL_O(arg0) + else if ( __cs.getObjectIds() == CELL_NAME_CELL_TRANS_ARG ) { instance = Instance::create ( PYCELL_O(arg0) , *PYNAME_O(arg1) , PYCELL_O(arg2) , *PYTRANSFORMATION_O(arg3) diff --git a/hurricane/src/pyext/PyLibrary.cpp b/hurricane/src/pyext/PyLibrary.cpp index ef2d3d61..b30a3dda 100644 --- a/hurricane/src/pyext/PyLibrary.cpp +++ b/hurricane/src/pyext/PyLibrary.cpp @@ -179,12 +179,12 @@ extern "C" { if (ParseTwoArg("Library.new", args, ":db:name", &arg0, &arg1)) { HTRY DataBase* db = PYDATABASE_O(arg0); - library = Library::Create(db, *PYNAME_O(arg1)); + library = Library::create(db, *PYNAME_O(arg1)); HCATCH } else if (ParseTwoArg("Library.new", args, ":db:name", &arg0, &arg1)) { HTRY Library* masterLibrary = PYLIBRARY_O(arg0); - library = Library::Create(masterLibrary, *PYNAME_O(arg1)); + library = Library::create(masterLibrary, *PYNAME_O(arg1)); HCATCH } else { return NULL; diff --git a/hurricane/src/pyext/PyNet.cpp b/hurricane/src/pyext/PyNet.cpp index a8358529..25fbde9b 100644 --- a/hurricane/src/pyext/PyNet.cpp +++ b/hurricane/src/pyext/PyNet.cpp @@ -588,7 +588,7 @@ extern "C" { if ( ! ParseTwoArg ( "Net.new", args, CELL_NAME_ARG, &arg0, &arg1 ) ) return ( NULL ); HTRY - net = Net::Create ( PYCELL_O(arg0), *PYNAME_O(arg1) ); + net = Net::create ( PYCELL_O(arg0), *PYNAME_O(arg1) ); HCATCH return PyNet_Link ( net ); diff --git a/hurricane/src/pyext/PyNetLocator.cpp b/hurricane/src/pyext/PyNetLocator.cpp index d31de4e9..ce56b156 100644 --- a/hurricane/src/pyext/PyNetLocator.cpp +++ b/hurricane/src/pyext/PyNetLocator.cpp @@ -78,14 +78,6 @@ extern "C" { // x-------------------------------------------------------------x - // --------------------------------------------------------------- - // Attribute Method : "PyNetLocator_Create ()" - - - - // Standart Accessors (Attributes). - - // Standart Predicates (Attributes). DirectGetBoolAttribute(PyNetLocator_IsValid,IsValid,PyNetLocator,Locator) diff --git a/hurricane/src/pyext/PyPin.cpp b/hurricane/src/pyext/PyPin.cpp index 4d66955b..bebe209a 100644 --- a/hurricane/src/pyext/PyPin.cpp +++ b/hurricane/src/pyext/PyPin.cpp @@ -188,7 +188,7 @@ extern "C" { string pin_arg1 = ":ent:name:int:int:layer:int:int:int:int"; string pin_arg2 = ":ent:name:int:int:layer:int:int:int"; string pin_arg3 = ":ent:name:int:int:layer:int:int"; - if ( __cs.getObjectIds() == pin_arg1 ) { pin = Pin::Create ( PYNET_O ( arg0 ) + if ( __cs.getObjectIds() == pin_arg1 ) { pin = Pin::create ( PYNET_O ( arg0 ) , *PYNAME_O ( arg1 ) , PyInt_AsAccessDirection ( arg2 ) , PyInt_AsPlacementStatus ( arg3 ) @@ -197,7 +197,7 @@ extern "C" { , PyInt_AsLong ( arg6 ) , PyInt_AsLong ( arg7 ) , PyInt_AsLong ( arg8 ) ); } - else if ( __cs.getObjectIds() == pin_arg2 ) { pin = Pin::Create ( PYNET_O ( arg0 ) + else if ( __cs.getObjectIds() == pin_arg2 ) { pin = Pin::create ( PYNET_O ( arg0 ) , *PYNAME_O ( arg1 ) , PyInt_AsAccessDirection ( arg2 ) , PyInt_AsPlacementStatus ( arg3 ) @@ -205,7 +205,7 @@ extern "C" { , PyInt_AsLong ( arg5 ) , PyInt_AsLong ( arg6 ) , PyInt_AsLong ( arg7 ) ); } - else if ( __cs.getObjectIds() == pin_arg3 ) { pin = Pin::Create ( PYNET_O ( arg0 ) + else if ( __cs.getObjectIds() == pin_arg3 ) { pin = Pin::create ( PYNET_O ( arg0 ) , *PYNAME_O ( arg1 ) , PyInt_AsAccessDirection ( arg2 ) , PyInt_AsPlacementStatus ( arg3 ) diff --git a/hurricane/src/pyext/PyPoint.cpp b/hurricane/src/pyext/PyPoint.cpp index d6dc0b4c..440b5fdc 100644 --- a/hurricane/src/pyext/PyPoint.cpp +++ b/hurricane/src/pyext/PyPoint.cpp @@ -145,8 +145,8 @@ extern "C" { PyObject* arg0; PyObject* arg1; - __cs.Init ("Point.Create"); - if ( ! PyArg_ParseTuple(args,"|O&O&:Point.Create" + __cs.Init ("Point.create"); + if ( ! PyArg_ParseTuple(args,"|O&O&:Point.create" ,Converter,&arg0 ,Converter,&arg1 ) ) return ( NULL ); diff --git a/hurricane/src/pyext/PyReference.cpp b/hurricane/src/pyext/PyReference.cpp index 59c4d890..06857f43 100644 --- a/hurricane/src/pyext/PyReference.cpp +++ b/hurricane/src/pyext/PyReference.cpp @@ -207,12 +207,12 @@ extern "C" { ) ) return ( NULL ); if ( __cs.getObjectIds() == CELL_NAME_INTS2_ARG ) - reference = Reference::Create ( PYCELL_O(arg0) + reference = Reference::create ( PYCELL_O(arg0) , *PYNAME_O(arg1) , PyInt_AsLong(arg2) , PyInt_AsLong(arg3) ); else if ( __cs.getObjectIds() == CELL_NAME_POINT_ARG ) - reference = Reference::Create ( PYCELL_O(arg0) + reference = Reference::create ( PYCELL_O(arg0) , *PYNAME_O(arg1) , *PYPOINT_O(arg2) ); else { diff --git a/hurricane/src/pyext/PyVertical.cpp b/hurricane/src/pyext/PyVertical.cpp index 89aa598a..03f5cc49 100644 --- a/hurricane/src/pyext/PyVertical.cpp +++ b/hurricane/src/pyext/PyVertical.cpp @@ -133,47 +133,47 @@ extern "C" { //cerr << "Format := " << __cs.getObjectIds() << endl; if ( __cs.getObjectIds() == NET_LAYER_INT_ARG ) - vertical = Vertical::Create ( PYNET_O(arg0) + vertical = Vertical::create ( PYNET_O(arg0) , PYLAYER_O(arg1) , PyInt_AsLong(arg2) ); else if ( __cs.getObjectIds() == NET_LAYER_INTS2_ARG ) - vertical = Vertical::Create ( PYNET_O(arg0) + vertical = Vertical::create ( PYNET_O(arg0) , PYLAYER_O(arg1) , PyInt_AsLong(arg2) , PyInt_AsLong(arg3) ); else if ( __cs.getObjectIds() == COMPS2_LAYER_INT_ARG ) - vertical = Vertical::Create ( ComponentCast(arg0) + vertical = Vertical::create ( ComponentCast(arg0) , ComponentCast(arg1) , PYLAYER_O(arg2) , PyInt_AsLong(arg3) ); else if ( __cs.getObjectIds() == NET_LAYER_INTS3_ARG ) - vertical = Vertical::Create ( PYNET_O(arg0) + vertical = Vertical::create ( PYNET_O(arg0) , PYLAYER_O(arg1) , PyInt_AsLong(arg2) , PyInt_AsLong(arg3) , PyInt_AsLong(arg4) ); else if ( __cs.getObjectIds() == COMPS2_LAYER_INTS2_ARG ) - vertical = Vertical::Create ( ComponentCast(arg0) + vertical = Vertical::create ( ComponentCast(arg0) , ComponentCast(arg1) , PYLAYER_O(arg2) , PyInt_AsLong(arg3) , PyInt_AsLong(arg4) ); else if ( __cs.getObjectIds() == NET_LAYER_INTS4_ARG ) - vertical = Vertical::Create ( PYNET_O(arg0) + vertical = Vertical::create ( PYNET_O(arg0) , PYLAYER_O(arg1) , PyInt_AsLong(arg2) , PyInt_AsLong(arg3) , PyInt_AsLong(arg4) , PyInt_AsLong(arg5) ); else if ( __cs.getObjectIds() == COMPS2_LAYER_INTS3_ARG ) - vertical = Vertical::Create ( ComponentCast(arg0) + vertical = Vertical::create ( ComponentCast(arg0) , ComponentCast(arg1) , PYLAYER_O(arg2) , PyInt_AsLong(arg3) , PyInt_AsLong(arg4) , PyInt_AsLong(arg5) ); else if ( __cs.getObjectIds() == COMPS2_LAYER_INTS4_ARG ) - vertical = Vertical::Create ( ComponentCast(arg0) + vertical = Vertical::create ( ComponentCast(arg0) , ComponentCast(arg1) , PYLAYER_O(arg2) , PyInt_AsLong(arg3)