clangformat

3 files changed, 50 insertions, 78 deletions

diff --git a/gui/quadtree.h b/gui/quadtree.h
index b3ebf81c..a6c38a85 100644
--- a/gui/quadtree.h
+++ b/gui/quadtree.h
@@ -50,7 +50,6 @@ template <typename CoordinateT, typename ElementT> class QuadTreeNode
         {
         }
 
-
         BoundingBox() : x0_(pinf), y0_(pinf), x1_(ninf), y1_(ninf) {}
 
         BoundingBox(const BoundingBox &other) : x0_(other.x0_), y0_(other.y0_), x1_(other.x1_), y1_(other.y1_) {}
@@ -83,7 +82,7 @@ template <typename CoordinateT, typename ElementT> class QuadTreeNode
         CoordinateT y0() const { return y0_; }
         CoordinateT x1() const { return x1_; }
         CoordinateT y1() const { return y1_; }
-        
+
         void setX0(CoordinateT v) { x0_ = v; }
         void setY0(CoordinateT v) { y0_ = v; }
         void setX1(CoordinateT v) { x1_ = v; }
diff --git a/gui/treemodel.cc b/gui/treemodel.cc
index 755e46ec..900d5101 100644
--- a/gui/treemodel.cc
+++ b/gui/treemodel.cc
@@ -25,7 +25,6 @@ NEXTPNR_NAMESPACE_BEGIN
 
 namespace TreeModel {
 
-
 // converts 'aa123bb432' -> ['aa', '123', 'bb', '432']
 std::vector<QString> IdStringList::alphaNumSplit(const QString &str)
 {
@@ -48,7 +47,7 @@ std::vector<QString> IdStringList::alphaNumSplit(const QString &str)
 
         current_part.push_back(c);
     }
-    
+
     res.push_back(current_part);
 
     return res;
@@ -69,7 +68,7 @@ void IdStringList::updateElements(Context *ctx, std::vector<IdString> elements)
             changed = true;
         }
     }
-    
+
     // For any elements that are in managed_ but not in new, delete them.
     for (auto &pair : managed_) {
         if (element_set.count(pair.first) != 0) {
@@ -92,7 +91,7 @@ void IdStringList::updateElements(Context *ctx, std::vector<IdString> elements)
     }
 
     // Sort new children
-    qSort(children_.begin(), children_.end(), [&](const Item *a, const Item *b){
+    qSort(children_.begin(), children_.end(), [&](const Item *a, const Item *b) {
         auto parts_a = alphaNumSplit(a->name());
         auto parts_b = alphaNumSplit(b->name());
 
@@ -104,7 +103,7 @@ void IdStringList::updateElements(Context *ctx, std::vector<IdString> elements)
         for (size_t i = 0; i < parts_a.size(); i++) {
             auto &part_a = parts_a.at(i);
             auto &part_b = parts_b.at(i);
-            
+
             bool a_is_number, b_is_number;
             int a_number = part_a.toInt(&a_is_number);
             int b_number = part_b.toInt(&b_is_number);
@@ -138,7 +137,7 @@ void IdStringList::updateElements(Context *ctx, std::vector<IdString> elements)
     });
 }
 
-void IdStringList::search(QList<Item*> &results, QString text, int limit)
+void IdStringList::search(QList<Item *> &results, QString text, int limit)
 {
     for (const auto &child : children_) {
         if (limit != -1 && results.size() > limit)
@@ -149,10 +148,7 @@ void IdStringList::search(QList<Item*> &results, QString text, int limit)
     }
 }
 
-
-Model::Model(QObject *parent) :
-        QAbstractItemModel(parent),
-        root_(new Item("Elements", nullptr)) {}
+Model::Model(QObject *parent) : QAbstractItemModel(parent), root_(new Item("Elements", nullptr)) {}
 
 Model::~Model() {}
 
@@ -176,7 +172,8 @@ void Model::loadContext(Context *ctx)
             belMap[std::pair<int, int>(loc.x, loc.y)].push_back(bel);
         }
         auto belGetter = [](Context *ctx, BelId id) { return ctx->getBelName(id); };
-        bel_root_ = std::unique_ptr<BelXYRoot>(new BelXYRoot(ctx, "Bels", root_.get(), belMap, belGetter, ElementType::BEL));
+        bel_root_ = std::unique_ptr<BelXYRoot>(
+                new BelXYRoot(ctx, "Bels", root_.get(), belMap, belGetter, ElementType::BEL));
 
         std::map<std::pair<int, int>, std::vector<WireId>> wireMap;
         for (int i = 0; i < ctx->chip_info->num_wires; i++) {
@@ -186,7 +183,8 @@ void Model::loadContext(Context *ctx)
             wireMap[std::pair<int, int>(wire->x, wire->y)].push_back(wireid);
         }
         auto wireGetter = [](Context *ctx, WireId id) { return ctx->getWireName(id); };
-        wire_root_ = std::unique_ptr<WireXYRoot>(new WireXYRoot(ctx, "Wires", root_.get(), wireMap, wireGetter, ElementType::WIRE));
+        wire_root_ = std::unique_ptr<WireXYRoot>(
+                new WireXYRoot(ctx, "Wires", root_.get(), wireMap, wireGetter, ElementType::WIRE));
 
         std::map<std::pair<int, int>, std::vector<PipId>> pipMap;
         for (int i = 0; i < ctx->chip_info->num_pips; i++) {
@@ -196,7 +194,8 @@ void Model::loadContext(Context *ctx)
             pipMap[std::pair<int, int>(pip->x, pip->y)].push_back(pipid);
         }
         auto pipGetter = [](Context *ctx, PipId id) { return ctx->getPipName(id); };
-        pip_root_ = std::unique_ptr<PipXYRoot>(new PipXYRoot(ctx, "Pips", root_.get(), pipMap, pipGetter, ElementType::PIP));
+        pip_root_ = std::unique_ptr<PipXYRoot>(
+                new PipXYRoot(ctx, "Pips", root_.get(), pipMap, pipGetter, ElementType::PIP));
     }
 #endif
 
@@ -284,7 +283,6 @@ Qt::ItemFlags Model::flags(const QModelIndex &index) const
     return Qt::ItemIsEnabled | (node->type() != ElementType::NONE ? Qt::ItemIsSelectable : Qt::NoItemFlags);
 }
 
-
 void Model::fetchMore(const QModelIndex &parent)
 {
     if (ctx_ == nullptr)
@@ -296,15 +294,12 @@ void Model::fetchMore(const QModelIndex &parent)
     nodeFromIndex(parent)->fetchMore();
 }
 
-bool Model::canFetchMore(const QModelIndex &parent) const
-{
-    return nodeFromIndex(parent)->canFetchMore();
-}
+bool Model::canFetchMore(const QModelIndex &parent) const { return nodeFromIndex(parent)->canFetchMore(); }
 
 QList<QModelIndex> Model::search(QString text)
 {
     const int limit = 500;
-    QList<Item*> list;
+    QList<Item *> list;
     cell_root_->search(list, text, limit);
     net_root_->search(list, text, limit);
     bel_root_->search(list, text, limit);
diff --git a/gui/treemodel.h b/gui/treemodel.h
index 1d25dde4..3157dbab 100644
--- a/gui/treemodel.h
+++ b/gui/treemodel.h
@@ -60,14 +60,10 @@ class Item
     // Children that are loaded into memory.
     QList<Item *> children_;
 
-    void addChild(Item *child)
-    {
-        children_.append(child);
-    }
+    void addChild(Item *child) { children_.append(child); }
 
   public:
-    Item(QString name, Item *parent) :
-            name_(name), parent_(parent)
+    Item(QString name, Item *parent) : name_(name), parent_(parent)
     {
         // Register in parent if exists.
         if (parent_ != nullptr) {
@@ -90,7 +86,7 @@ class Item
 
     // indexOf gets index of child in children array.
     int indexOf(const Item *child) const
-    { 
+    {
         // Dropping the const for indexOf to work.
         return children_.indexOf((Item *)child, 0);
     }
@@ -115,23 +111,19 @@ class IdStringItem : public Item
     ElementType type_;
 
   public:
-    IdStringItem(Context *ctx, IdString str, Item *parent, ElementType type) :
-            Item(QString(str.c_str(ctx)), parent), id_(str), type_(type) {}
-
-    virtual IdString id() const override
+    IdStringItem(Context *ctx, IdString str, Item *parent, ElementType type)
+            : Item(QString(str.c_str(ctx)), parent), id_(str), type_(type)
     {
-        return id_;
     }
 
-    virtual ElementType type() const override
-    {
-       return type_;
-    }
+    virtual IdString id() const override { return id_; }
+
+    virtual ElementType type() const override { return type_; }
 };
 
 // IdString list is a static list of IdStrings which can be set/updates from
 // a vector of IdStrings. It will render each IdStrings as a child, with the
-// list sorted in a smart way. 
+// list sorted in a smart way.
 class IdStringList : public Item
 {
   private:
@@ -144,33 +136,27 @@ class IdStringList : public Item
   public:
     // Create an IdStringList at given partent that will contain elements of
     // the given type.
-    IdStringList(QString name, Item *parent, ElementType type) :
-            Item(name, parent), child_type_(type) {}
+    IdStringList(QString name, Item *parent, ElementType type) : Item(name, parent), child_type_(type) {}
 
     // Split a name into alpha/non-alpha parts, which is then used for sorting
     // of children.
     static std::vector<QString> alphaNumSplit(const QString &str);
 
     // getById finds a child for the given IdString.
-    IdStringItem *getById(IdString id) const
-    {
-        return managed_.at(id).get();
-    }
+    IdStringItem *getById(IdString id) const { return managed_.at(id).get(); }
 
     // (Re-)create children from a list of IdStrings.
     void updateElements(Context *ctx, std::vector<IdString> elements);
 
     // Find children that contain the given text.
-    void search(QList<Item*> &results, QString text, int limit);
+    void search(QList<Item *> &results, QString text, int limit);
 };
 
-
 // ElementList is a dynamic list of ElementT (BelId,WireId,...) that are
 // automatically generated based on an overall map of elements.
 // ElementList is emitted from ElementXYRoot, and contains the actual
 // Bels/Wires/Pips underneath it.
-template <typename ElementT>
-class ElementList : public Item
+template <typename ElementT> class ElementList : public Item
 {
   public:
     // A map from tile (X,Y) to list of ElementTs in that tile.
@@ -193,23 +179,18 @@ class ElementList : public Item
 
     // Gets elements that this list should create from the map. This pointer is
     // short-lived (as it will change when the map mutates.
-    const std::vector<ElementT> *elements() const
-    {
-        return &map_->at(std::make_pair(x_, y_));
-    }
+    const std::vector<ElementT> *elements() const { return &map_->at(std::make_pair(x_, y_)); }
 
   public:
-    ElementList(Context *ctx, QString name, Item *parent, ElementMap *map, int x, int y, ElementGetter getter, ElementType type) :
-            Item(name, parent), ctx_(ctx), map_(map), x_(x), y_(y), getter_(getter), child_type_(type)
+    ElementList(Context *ctx, QString name, Item *parent, ElementMap *map, int x, int y, ElementGetter getter,
+                ElementType type)
+            : Item(name, parent), ctx_(ctx), map_(map), x_(x), y_(y), getter_(getter), child_type_(type)
     {
     }
 
     // Lazy loading of elements.
 
-    virtual bool canFetchMore() const override
-    {
-        return (size_t)children_.size() < elements()->size();
-    }
+    virtual bool canFetchMore() const override { return (size_t)children_.size() < elements()->size(); }
 
     void fetchMore(int count)
     {
@@ -229,16 +210,14 @@ class ElementList : public Item
         }
     }
 
-    virtual void fetchMore() override
-    {
-         fetchMore(100);
-    }
+    virtual void fetchMore() override { fetchMore(100); }
 
     // getById finds a child for the given IdString.
-    boost::optional<Item*> getById(IdString id)
+    boost::optional<Item *> getById(IdString id)
     {
         // Search requires us to load all our elements...
-        while (canFetchMore()) fetchMore();
+        while (canFetchMore())
+            fetchMore();
 
         auto res = managed_.find(id);
         if (res != managed_.end()) {
@@ -248,14 +227,15 @@ class ElementList : public Item
     }
 
     // Find children that contain the given text.
-    void search(QList<Item*> &results, QString text, int limit)
+    void search(QList<Item *> &results, QString text, int limit)
     {
         // Last chance to bail out from loading entire tree into memory.
         if (limit != -1 && results.size() > limit)
             return;
 
         // Search requires us to load all our elements...
-        while (canFetchMore()) fetchMore();
+        while (canFetchMore())
+            fetchMore();
 
         for (const auto &child : children_) {
             if (limit != -1 && results.size() > limit)
@@ -270,8 +250,7 @@ class ElementList : public Item
 // It can take any of {BelId,WireId,PipId} and create a tree that
 // hierarchizes them by X and Y tile positions, when given a map from X,Y to
 // list of ElementTs in that tile.
-template <typename ElementT>
-class ElementXYRoot : public Item
+template <typename ElementT> class ElementXYRoot : public Item
 {
   public:
     // A map from tile (X,Y) to list of ElementTs in that tile.
@@ -279,7 +258,6 @@ class ElementXYRoot : public Item
     // A method that converts an ElementT to an IdString.
     using ElementGetter = std::function<IdString(Context *, ElementT)>;
 
-
   private:
     Context *ctx_;
     // X-index children that we manage the memory for.
@@ -293,8 +271,8 @@ class ElementXYRoot : public Item
     ElementType child_type_;
 
   public:
-    ElementXYRoot(Context *ctx, QString name, Item *parent, ElementMap map, ElementGetter getter, ElementType type) :
-            Item(name, parent), ctx_(ctx), map_(map), getter_(getter), child_type_(type)
+    ElementXYRoot(Context *ctx, QString name, Item *parent, ElementMap map, ElementGetter getter, ElementType type)
+            : Item(name, parent), ctx_(ctx), map_(map), getter_(getter), child_type_(type)
     {
         // Create all X and Y label Items/ElementLists.
 
@@ -320,7 +298,8 @@ class ElementXYRoot : public Item
 
             for (auto j : y_present) {
                 // Create Y list ElementList.
-                auto item2 = new ElementList<ElementT>(ctx_, QString("Y%1").arg(j), item, &map_, i, j, getter_, child_type_);
+                auto item2 =
+                        new ElementList<ElementT>(ctx_, QString("Y%1").arg(j), item, &map_, i, j, getter_, child_type_);
                 // Pre-populate list with one element, other Qt will never ask for more.
                 item2->fetchMore(1);
                 managed_lists_.push_back(std::move(std::unique_ptr<ElementList<ElementT>>(item2)));
@@ -329,7 +308,7 @@ class ElementXYRoot : public Item
     }
 
     // getById finds a child for the given IdString.
-    boost::optional<Item*> getById(IdString id)
+    boost::optional<Item *> getById(IdString id)
     {
         // For now, scan linearly all ElementLists.
         // TODO(q3k) fix this once we have tree API from arch
@@ -343,7 +322,7 @@ class ElementXYRoot : public Item
     }
 
     // Find children that contain the given text.
-    void search(QList<Item*> &results, QString text, int limit)
+    void search(QList<Item *> &results, QString text, int limit)
     {
         for (auto &l : managed_lists_) {
             if (limit != -1 && results.size() > limit)
@@ -374,13 +353,13 @@ class Model : public QAbstractItemModel
         const Item *parent = node->parent();
         if (parent == nullptr)
             return QModelIndex();
-        
+
         return createIndex(parent->indexOf(node), 0, node);
     }
 
     QList<QModelIndex> search(QString text);
 
-    boost::optional<Item*> nodeForIdType(ElementType type, IdString id) const
+    boost::optional<Item *> nodeForIdType(ElementType type, IdString id) const
     {
         switch (type) {
         case ElementType::BEL:
@@ -397,7 +376,7 @@ class Model : public QAbstractItemModel
             return boost::none;
         }
     }
- 
+
     // Override QAbstractItemModel methods
     int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
     int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
@@ -410,7 +389,6 @@ class Model : public QAbstractItemModel
     bool canFetchMore(const QModelIndex &parent) const Q_DECL_OVERRIDE;
 
   private:
-
     // Tree elements that we manage the memory for.
     std::unique_ptr<Item> root_;
     std::unique_ptr<BelXYRoot> bel_root_;