diff --git a/hurricane/src/hurricane/Cell.cpp b/hurricane/src/hurricane/Cell.cpp index 64da9d7d..75748a03 100644 --- a/hurricane/src/hurricane/Cell.cpp +++ b/hurricane/src/hurricane/Cell.cpp @@ -84,7 +84,7 @@ Box Cell::getBoundingBox() const bool Cell::isLeaf() const // ********************** { - return _instanceMap.IsEmpty(); + return _instanceMap.isEmpty(); } bool Cell::isCalledBy(Cell* cell) const @@ -145,7 +145,7 @@ void Cell::flattenNets(bool buildRings) for_each_component ( component, net->getComponents() ) { Plug* primaryPlug = dynamic_cast( component ); if ( primaryPlug ) { - if ( !primaryPlug->getBodyHook()->getSlaveHooks().IsEmpty() ) { + if ( !primaryPlug->getBodyHook()->getSlaveHooks().isEmpty() ) { cerr << "[ERROR] " << primaryPlug << "\n" << " has attached components, not managed yet." << endl; } else { diff --git a/hurricane/src/hurricane/CellCollections.cpp b/hurricane/src/hurricane/CellCollections.cpp index 87491866..d777a4d0 100644 --- a/hurricane/src/hurricane/CellCollections.cpp +++ b/hurricane/src/hurricane/CellCollections.cpp @@ -4044,7 +4044,7 @@ Cell_RecursiveSlavePathes::Locator::Locator ( const Cell* cell ) do { Instances slaveInstances = topCell->getSlaveInstances(); - if ( !slaveInstances.IsEmpty() ) { + if ( !slaveInstances.isEmpty() ) { _instancesStack.push_back ( *slaveInstances.getLocator() ); _instancePath = Path ( _instancesStack.back().getElement(), _instancePath ); @@ -4080,7 +4080,7 @@ void Cell_RecursiveSlavePathes::Locator::progress () do { Instances slaveInstances = topCell->getSlaveInstances(); - if ( !slaveInstances.IsEmpty() ) { + if ( !slaveInstances.isEmpty() ) { _instancesStack.push_back ( *slaveInstances.getLocator() ); // cerr << "Instances of R: " << topCell->getName() << endl; // cerr << "Head R: " << _instancesStack.back().getElement()->getName() << endl; diff --git a/hurricane/src/hurricane/DeepNet.cpp b/hurricane/src/hurricane/DeepNet.cpp index a656f5cf..1eab9c5d 100644 --- a/hurricane/src/hurricane/DeepNet.cpp +++ b/hurricane/src/hurricane/DeepNet.cpp @@ -181,7 +181,7 @@ Net* getDeepNet(HyperNet& hypernet) Occurrence rootNetOccurrence = getHyperNetRootNetOccurrence ( hypernet.getNetOccurrence() ); //if ( rootNetOccurrence.getMasterCell()->IsFlattenLeaf() ) return NULL; - //if ( rootNetOccurrence.getPath().IsEmpty() ) return NULL; + //if ( rootNetOccurrence.getPath().isEmpty() ) return NULL; return rootNetOccurrence.getOwnerCell()->getNet(rootNetOccurrence.getName()); diff --git a/hurricane/src/hurricane/Net.cpp b/hurricane/src/hurricane/Net.cpp index 1067fbe9..3677ccc1 100644 --- a/hurricane/src/hurricane/Net.cpp +++ b/hurricane/src/hurricane/Net.cpp @@ -443,7 +443,7 @@ void Net::setExternal(bool isExternal) { if (isExternal != _isExternal) { if (!isExternal) { - if (!getConnectedSlavePlugs().IsEmpty()) + if (!getConnectedSlavePlugs().isEmpty()) throw Error("Can't set internal : has connected slave plugs"); _direction = Direction::UNDEFINED; } @@ -547,7 +547,7 @@ void Net::merge(Net* net) if (net->getCell() != _cell) throw Error("Can't merge net : incompatible net"); - if (!isExternal() && net->isExternal() && !net->getConnectedSlavePlugs().IsEmpty()) + if (!isExternal() && net->isExternal() && !net->getConnectedSlavePlugs().isEmpty()) throw Error("Can't merge net : incompatible net"); for_each_rubber(rubber, net->getRubbers()) rubber->_setNet(this); end_for; @@ -570,7 +570,7 @@ void Net::merge(Net* net) mainPlug->getBodyHook()->merge(nextMasterHook); } Hooks slaveHooks = masterHook->getSlaveHooks(); - while (!slaveHooks.IsEmpty()) { + while (!slaveHooks.isEmpty()) { Hook* slaveHook = slaveHooks.getFirst(); slaveHook->detach(); slaveHook->attach(mainPlug->getBodyHook()); diff --git a/hurricane/src/hurricane/Plug.cpp b/hurricane/src/hurricane/Plug.cpp index 8e55cbe6..a5f2e35e 100644 --- a/hurricane/src/hurricane/Plug.cpp +++ b/hurricane/src/hurricane/Plug.cpp @@ -126,7 +126,7 @@ void Plug::setNet(Net* net) if (net && (getCell() != net->getCell())) throw Error("Can't change net of plug : net : " + getString(net) + "does not belong to the cell : " + getString(getCell())); - if (!getBodyHook()->getSlaveHooks().IsEmpty()) + if (!getBodyHook()->getSlaveHooks().isEmpty()) throw Error("Can't change net of plug : not empty slave hooks"); _setNet(net); diff --git a/hurricane/src/hurricane/Region.cpp b/hurricane/src/hurricane/Region.cpp index 6aaff4f7..0b0dda8f 100644 --- a/hurricane/src/hurricane/Region.cpp +++ b/hurricane/src/hurricane/Region.cpp @@ -2560,7 +2560,7 @@ Region::SwapLine Region::getHorizontalSwapLine(const DbU::Unit& y, const Interva bool Region::isEmpty() const // ************************* { - return Region_Tiles(this).getSubSet(!Tile::getIsVoidFilter()).IsEmpty(); + return Region_Tiles(this).getSubSet(!Tile::getIsVoidFilter()).isEmpty(); } bool Region::contains(const Point& point) const @@ -2575,7 +2575,7 @@ bool Region::contains(const Box& box) const if (box.isPonctual()) return contains(box.getCenter()); return getBoundingBox().contains(box) && Region_TilesUnder (this, Box(box).inflate(-1)) - .getSubSet(Tile::getIsVoidFilter()).IsEmpty(); + .getSubSet(Tile::getIsVoidFilter()).isEmpty(); } bool Region::contains(const Region& region) const @@ -2664,7 +2664,7 @@ Region& Region::fill(const Box& box) else { Tile* startTile = _getStartTile(_getTileAt(Point(box.getXMax(), box.getYMin()))); GenericCollection tiles = _getTilesUnder(Box(box).inflate(0,0,-1,-1), startTile); - if (!tiles.getSubSet(Tile::getIsVoidFilter()).IsEmpty()) _update(box, false, startTile); + if (!tiles.getSubSet(Tile::getIsVoidFilter()).isEmpty()) _update(box, false, startTile); } return *this; @@ -2697,7 +2697,7 @@ Region& Region::groove(const Box& box) Tile* startTile = _getStartTile(_getTileAt(Point(correctedBox.getXMax(), correctedBox.getYMin()))); GenericCollection tiles = _getTilesUnder(Box(correctedBox).inflate(0,0,-1,-1), startTile); - if (!tiles.getSubSet(!Tile::getIsVoidFilter()).IsEmpty()) _update(box, true, startTile); + if (!tiles.getSubSet(!Tile::getIsVoidFilter()).isEmpty()) _update(box, true, startTile); return *this; } diff --git a/hurricane/src/hurricane/hurricane/Collection.h b/hurricane/src/hurricane/hurricane/Collection.h index bc4c4b89..88779d4a 100644 --- a/hurricane/src/hurricane/hurricane/Collection.h +++ b/hurricane/src/hurricane/hurricane/Collection.h @@ -104,7 +104,7 @@ template class Collection { // Predicates // ********** - public: bool IsEmpty() const + public: bool isEmpty() const // ************************* { // we use a GenericLocator to delete the locator allocated by getLocator() @@ -169,7 +169,7 @@ template class Collection { // ************************* { Record* record = NULL; - if (!IsEmpty()) { + if (!isEmpty()) { record = new Record(getString(this)); unsigned n = 1; GenericLocator locator = getLocator(); diff --git a/hurricane/src/hurricane/hurricane/IntrusiveMap.h b/hurricane/src/hurricane/hurricane/IntrusiveMap.h index 0b2abb68..fa9e8bcc 100644 --- a/hurricane/src/hurricane/hurricane/IntrusiveMap.h +++ b/hurricane/src/hurricane/hurricane/IntrusiveMap.h @@ -271,7 +271,7 @@ template class IntrusiveMap { // Predicates // ********** - public: bool IsEmpty() const + public: bool isEmpty() const // ************************* { return (_size == 0); @@ -311,7 +311,7 @@ template class IntrusiveMap { public: string _getString() const // ****************************** { - if (IsEmpty()) + if (isEmpty()) return "<" + _getTypeName() + " empty>"; else return "<" + _getTypeName() + " " + getString(_size) + ">"; @@ -321,7 +321,7 @@ template class IntrusiveMap { // ************************* { Record* record = NULL; - if (!IsEmpty()) { + if (!isEmpty()) { record = new Record(getString(this)); unsigned n = 1; for (unsigned index = 0; index < _length; index++) {