From c00fb4b2ef6c509613ada71356b7cd197fc83756 Mon Sep 17 00:00:00 2001 From: Christophe Alexandre Date: Thu, 20 Mar 2008 18:07:05 +0000 Subject: [PATCH] small cleaning --- hurricane/src/hurricane/Collection.h | 8 +++--- hurricane/src/hurricane/Component.cpp | 2 +- hurricane/src/hurricane/DisplaySlot.cpp | 2 +- hurricane/src/hurricane/Path.cpp | 2 +- hurricane/src/hurricane/Region.cpp | 34 ++++++++++++------------- hurricane/src/hurricane/Region.h | 4 +-- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/hurricane/src/hurricane/Collection.h b/hurricane/src/hurricane/Collection.h index af117b4f..3fad4a5b 100644 --- a/hurricane/src/hurricane/Collection.h +++ b/hurricane/src/hurricane/Collection.h @@ -114,7 +114,7 @@ template class Collection : public NestedSlotAdapter { // Utilitarians // ************ - public: void Fill(list& list) const + public: void fill(list& list) const // ************************************** { GenericLocator locator = getLocator(); @@ -124,7 +124,7 @@ template class Collection : public NestedSlotAdapter { } } - public: void Fill(set& set) const + public: void fill(set& set) const // ************************************ { GenericLocator locator = getLocator(); @@ -134,7 +134,7 @@ template class Collection : public NestedSlotAdapter { } } - public: template void Fill(set& set) const + public: template void fill(set& set) const // ********************************************************************* { GenericLocator locator = getLocator(); @@ -144,7 +144,7 @@ template class Collection : public NestedSlotAdapter { } } - public: void Fill(vector& vector) const + public: void fill(vector& vector) const // ****************************************** { GenericLocator locator = getLocator(); diff --git a/hurricane/src/hurricane/Component.cpp b/hurricane/src/hurricane/Component.cpp index 9959c606..10595595 100644 --- a/hurricane/src/hurricane/Component.cpp +++ b/hurricane/src/hurricane/Component.cpp @@ -382,7 +382,7 @@ void Component::_preDestroy() clearProperties(); set componentSet; - getSlaveComponents().Fill(componentSet); + getSlaveComponents().fill(componentSet); set masterHookSet; componentSet.insert(this); diff --git a/hurricane/src/hurricane/DisplaySlot.cpp b/hurricane/src/hurricane/DisplaySlot.cpp index f736d9d2..822a5dbb 100644 --- a/hurricane/src/hurricane/DisplaySlot.cpp +++ b/hurricane/src/hurricane/DisplaySlot.cpp @@ -98,7 +98,7 @@ void DisplaySlot::Flush() { OpenUpdateSession(); vector govect; - _quadTree.getGos().Fill(govect); + _quadTree.getGos().fill(govect); for (unsigned i = 0 ; i < govect.size() ; i++) { govect[i]->destroy(); } diff --git a/hurricane/src/hurricane/Path.cpp b/hurricane/src/hurricane/Path.cpp index 55eb1cf3..e86adfef 100644 --- a/hurricane/src/hurricane/Path.cpp +++ b/hurricane/src/hurricane/Path.cpp @@ -79,7 +79,7 @@ Path::Path(const Path& headPath, const Path& tailPath) : _sharedPath(tailPath._getSharedPath()) { vector instances; - headPath.getInstances().Fill(instances); + headPath.getInstances().fill(instances); for (vector::reverse_iterator rit=instances.rbegin() ; rit != instances.rend() ; rit++) { Instance* instance=*rit; diff --git a/hurricane/src/hurricane/Region.cpp b/hurricane/src/hurricane/Region.cpp index c687e580..d86fb2d3 100644 --- a/hurricane/src/hurricane/Region.cpp +++ b/hurricane/src/hurricane/Region.cpp @@ -2447,7 +2447,7 @@ Region::Region(const Region& region) _bottomRightTile = new Tile(region.getBoundingBox(), true); _topLeftTile = _bottomRightTile; for_each_box(box, region.getBoxes()) { - Fill(box); + fill(box); end_for; } } @@ -2469,7 +2469,7 @@ Region& Region::operator=(const Region& region) _bottomRightTile = new Tile (initialBoundingBox, true); _topLeftTile = _bottomRightTile; for_each_box(box, region.getBoxes()) { - Fill(box); + fill(box); end_for; } } @@ -2648,7 +2648,7 @@ Region& Region::Clear() return *this; } -Region& Region::Fill(const Box& box) +Region& Region::fill(const Box& box) // ********************************* { if (box.isEmpty() || !box.getWidth() || !box.getHeight()) return *this; @@ -2670,11 +2670,11 @@ Region& Region::Fill(const Box& box) return *this; } -Region& Region::Fill(const Region& region) +Region& Region::fill(const Region& region) // *************************************** { for_each_box(box, region.getBoxes()) { - Fill(box); + fill(box); end_for; } return *this; @@ -2683,7 +2683,7 @@ Region& Region::Fill(const Region& region) Region& Region::getUnion (const Region& region) // ******************************************** { - return Fill(region); + return fill(region); } Region& Region::Groove(const Box& box) @@ -2737,7 +2737,7 @@ Region& Region::Inflate(const Unit& quantity) end_for; } for_each_box(box, getCollection(boxList)) { - Fill(box.inflate(quantity)); + fill(box.inflate(quantity)); end_for; } } @@ -2763,7 +2763,7 @@ Region& Region::Translate(const Unit& dx, const Unit& dy) { if ((dx != 0) || (dy != 0)) { set tileSet; - _getTiles().Fill(tileSet); + _getTiles().fill(tileSet); for_each_object(Tile*, tile, getCollection(tileSet)) { tile->_boundingBox.translate(dx, dy); end_for; @@ -2848,7 +2848,7 @@ void Region::_Split(const Box& box) list tileList; Box line = Box(box.getXMin(), box.getYMin(), box.getXMax() - 1, box.getYMin()); - _getTilesUnder(line, startTile).Fill(tileList); + _getTilesUnder(line, startTile).fill(tileList); for_each_object(Tile*, tile, getCollection(tileList)) { tile->SplitHorizontal(this, box.getYMin()); end_for; @@ -2856,7 +2856,7 @@ void Region::_Split(const Box& box) tileList.clear(); line = Box(box.getXMin(), box.getYMax(), box.getXMax() - 1, box.getYMax()); - _getTilesUnder(line, startTile).Fill(tileList); + _getTilesUnder(line, startTile).fill(tileList); for_each_object(Tile*, tile, getCollection(tileList)) { tile->SplitHorizontal(this, box.getYMax()); end_for; @@ -2864,7 +2864,7 @@ void Region::_Split(const Box& box) tileList.clear(); line = Box(box.getXMin(), box.getYMin(), box.getXMin(), box.getYMax() - 1); - _getTilesUnder(line, startTile).Fill(tileList); + _getTilesUnder(line, startTile).fill(tileList); for_each_object(Tile*, tile, getCollection(tileList)) { tile->SplitVertical(this, box.getXMin()); end_for; @@ -2872,7 +2872,7 @@ void Region::_Split(const Box& box) tileList.clear(); line = Box(box.getXMax(), box.getYMin(), box.getXMax(), box.getYMax() - 1); - _getTilesUnder(line, startTile).Fill(tileList); + _getTilesUnder(line, startTile).fill(tileList); for_each_object(Tile*, tile, getCollection(tileList)) { tile->SplitVertical(this, box.getXMax()); end_for; @@ -2950,7 +2950,7 @@ void Region::_Update(const Box& box, bool isVoid, Tile* startTile) Tile* newTile = new Tile(box, isVoid); list tileList; - _getTilesUnder(Box(box).inflate(0, 0, -1, -1), startTile).Fill(tileList); + _getTilesUnder(Box(box).inflate(0, 0, -1, -1), startTile).fill(tileList); for_each_object(Tile*, tile, getCollection(tileList)) { if (_topLeftTile == tile) _topLeftTile = newTile; if (_bottomRightTile == tile) _bottomRightTile = newTile; @@ -3027,10 +3027,10 @@ Region::VerticalEnhancement() if (maxBox.getWidth() >= getUnit(2)) { modif = tile->VerticalEnhancement (this); } - result.Fill (tile->getBoundingBox()); + result.fill (tile->getBoundingBox()); Groove (tile->getBoundingBox()); } while (! IsEmpty()); - Fill (result); + fill (result); return modif; }; // Region::VerticalEnhancement @@ -3073,10 +3073,10 @@ Region::HorizontalEnhancement() if (maxBox.getWidth() >= getUnit(2)) { modif = tile->HorizontalEnhancement (this); } - result.Fill (tile->getBoundingBox()); + result.fill (tile->getBoundingBox()); Groove (tile->getBoundingBox()); } while (! IsEmpty()); - Fill (result); + fill (result); return modif; }; // Region::HorizontalEnhancement diff --git a/hurricane/src/hurricane/Region.h b/hurricane/src/hurricane/Region.h index 9d68a199..b334dccb 100644 --- a/hurricane/src/hurricane/Region.h +++ b/hurricane/src/hurricane/Region.h @@ -175,8 +175,8 @@ class Region { public: Region& Clear(); - public: Region& Fill(const Box& box); - public: Region& Fill(const Region& region); + public: Region& fill(const Box& box); + public: Region& fill(const Region& region); public: Region& getUnion(const Region& region); public: Region& Groove(const Box& box);